From f6d52fc8b102b657583a36ad1f73e3269b51d644 Mon Sep 17 00:00:00 2001
From: Alexis <35.alexis.pele@gmail.com>
Date: Tue, 10 Oct 2023 00:09:08 +0200
Subject: [PATCH] Added current player marker

---
 public/icons/location-pin-shadow.png          | Bin 0 -> 2250 bytes
 public/icons/location-pin.png                 | Bin 0 -> 2736 bytes
 src/components/maps/AllianceKaldelienne.astro |  35 ++++++++++++++----
 src/pages/api/data/players.markers.ts         |   9 +++++
 src/pages/api/players.json.ts                 |   8 ++++
 src/pages/index.astro                         |   8 ++--
 src/types/Leaflet.ts                          |  10 +++++
 7 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 public/icons/location-pin-shadow.png
 create mode 100644 public/icons/location-pin.png
 create mode 100644 src/pages/api/data/players.markers.ts
 create mode 100644 src/pages/api/players.json.ts

diff --git a/public/icons/location-pin-shadow.png b/public/icons/location-pin-shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfc3d7251bb7ba635ca36bb55ce95b6a04e668a4
GIT binary patch
literal 2250
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

literal 0
HcmV?d00001

diff --git a/public/icons/location-pin.png b/public/icons/location-pin.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a4e6e15d9ce2a377d8f4527b4c83dbe79c51698
GIT binary patch
literal 2736
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

literal 0
HcmV?d00001

diff --git a/src/components/maps/AllianceKaldelienne.astro b/src/components/maps/AllianceKaldelienne.astro
index dcb564fa..7f7e9daf 100644
--- a/src/components/maps/AllianceKaldelienne.astro
+++ b/src/components/maps/AllianceKaldelienne.astro
@@ -2,15 +2,16 @@
 import type { MapMarker } from '@/types/Leaflet';
 
 interface Props {
-    markers: MapMarker;
+    markers: MapMarker[];
+    players?: MapMarker;
 }
 
-const { markers } = Astro.props
+const { markers, players } = Astro.props
 ---
 
 <div id="map"></div>
 
-<script lang="ts" define:vars={{ markers }}>
+<script lang="ts" define:vars={{ markers, players }}>
     const mapHeight = 15168;
     const mapWidth = 14658;
 
@@ -29,6 +30,7 @@ const { markers } = Astro.props
     }).addTo(map);
 
     const layerGroups = {
+        players: L.layerGroup(),
         capitals: L.layerGroup(),
         cities: L.layerGroup(),
         towns: L.layerGroup(),
@@ -38,8 +40,6 @@ const { markers } = Astro.props
     /**
      * Build all markers and their related info
      */
-
-
     for (let i = 0; i < markers.length; i++) {
         const m = markers[i];
 
@@ -53,9 +53,9 @@ const { markers } = Astro.props
                     iconUrl: `icons/castle.png`,
                     shadowUrl: `icons/castle-shadow.png`,
                     iconSize: [25, 25],
-                    shadowSize: [40, 30],
+                    shadowSize: [35, 30],
                     iconAnchor: [12.5, 8],
-                    shadowAnchor: [12.5, 12]
+                    shadowAnchor: [11, 12]
                 });
                 break;
             
@@ -104,6 +104,27 @@ const { markers } = Astro.props
         marker.addTo(layerGroups[m.group])
     }
 
+    /**
+     * Add player's position marker
+     */
+    if ( players ) {
+        const playersPosition = [players.markerCoords.y, players.markerCoords.x];
+
+        const playerIcon = L.icon({
+            iconUrl: `icons/location-pin.png`,
+            shadowUrl: `icons/location-pin-shadow.png`,
+            iconSize: [18, 24],
+            shadowSize: [20, 16],
+            iconAnchor: [11, 8],
+            shadowAnchor: [3, 0],
+        });
+
+        const playerMarker = L.marker(playersPosition, { icon: playerIcon }).addTo(map)
+        playerMarker.addTo(layerGroups['players'])
+
+        console.log(map)
+    }
+
     map.fitBounds(layer.getBounds());
 
     // L.control.layers({ "base": layer }, layerGroups).addTo(map);
diff --git a/src/pages/api/data/players.markers.ts b/src/pages/api/data/players.markers.ts
new file mode 100644
index 00000000..2f08882b
--- /dev/null
+++ b/src/pages/api/data/players.markers.ts
@@ -0,0 +1,9 @@
+import type { PlayerMarker } from "@/types/Leaflet";
+
+export const playerPosition: PlayerMarker = {
+    markerCoords: {
+        y: -57.83673,
+        x: 162.05197
+    },
+    title: "L'Éclipse",
+}
\ No newline at end of file
diff --git a/src/pages/api/players.json.ts b/src/pages/api/players.json.ts
new file mode 100644
index 00000000..85b3ef64
--- /dev/null
+++ b/src/pages/api/players.json.ts
@@ -0,0 +1,8 @@
+import type { APIRoute } from "astro";
+import { playerPosition } from "./data/players.markers";
+
+export const GET: APIRoute = ({ params, request }) => {
+    return new Response(
+        JSON.stringify(playerPosition)
+    )
+}
\ No newline at end of file
diff --git a/src/pages/index.astro b/src/pages/index.astro
index a54e705d..46856ff9 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -2,10 +2,12 @@
 import Layout from '../layouts/Layout.astro';
 import AllianceKaldelienne from '../components/maps/AllianceKaldelienne.astro'
 
-const res = await fetch('http://localhost:4321/api/markers.json');
-const data = await res.json();
+const fetchLandMarkers = await fetch('http://localhost:4321/api/markers.json');
+const fetchPlayersPosition = await fetch('http://localhost:4321/api/players.json');
+const landData = await fetchLandMarkers.json();
+const playerCoords = await fetchPlayersPosition.json();
 ---
 
 <Layout title="Leim Wiki - Cartographie">
-    <AllianceKaldelienne markers={data} />
+    <AllianceKaldelienne markers={landData} players={playerCoords} />
 </Layout>
diff --git a/src/types/Leaflet.ts b/src/types/Leaflet.ts
index f45b8dbc..29089e52 100644
--- a/src/types/Leaflet.ts
+++ b/src/types/Leaflet.ts
@@ -10,3 +10,13 @@ export type MapMarker = {
     link?: string,
     group?: MapMarkerGroup,
 }
+
+export type PlayerMarker = {
+    title: string,
+    markerCoords: {
+        x: number,
+        y: number,
+    }
+    description?: string,
+    link?: string,
+}