From 73cc730a5ca6fa9b5fc571316f1d5cfe9357ea5c Mon Sep 17 00:00:00 2001
From: Alexis <35.alexis.pele@gmail.com>
Date: Wed, 11 Oct 2023 20:32:55 +0200
Subject: [PATCH] Changed variable names

Because the map will eventually be used for everything, not just one continent
---
 src/assets/scss/_leaflet.scss                             | 2 +-
 .../maps/{AllianceKaldelienne.astro => WorldMap.astro}    | 8 ++++----
 .../api/data/{alliance.markers.ts => world.markers.ts}    | 2 +-
 src/pages/api/markers.json.ts                             | 4 ++--
 src/pages/index.astro                                     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename src/components/maps/{AllianceKaldelienne.astro => WorldMap.astro} (98%)
 rename src/pages/api/data/{alliance.markers.ts => world.markers.ts} (99%)

diff --git a/src/assets/scss/_leaflet.scss b/src/assets/scss/_leaflet.scss
index 8ab520e5..6fd81eaf 100644
--- a/src/assets/scss/_leaflet.scss
+++ b/src/assets/scss/_leaflet.scss
@@ -5,7 +5,7 @@
     width: 100%;
     max-width: 100%;
     max-height: 100%;
-    background: #98bcd0 !important;
+    background: #f1f5f9;
 
     .leaflet-map-pane {
         .leaflet-tooltip-pane {
diff --git a/src/components/maps/AllianceKaldelienne.astro b/src/components/maps/WorldMap.astro
similarity index 98%
rename from src/components/maps/AllianceKaldelienne.astro
rename to src/components/maps/WorldMap.astro
index 7f7e9daf..4c0fc63b 100644
--- a/src/components/maps/AllianceKaldelienne.astro
+++ b/src/components/maps/WorldMap.astro
@@ -9,13 +9,15 @@ interface Props {
 const { markers, players } = Astro.props
 ---
 
-<div id="map"></div>
+<div class="world-wrapper">
+    <div id="world"></div>
+</div>
 
 <script lang="ts" define:vars={{ markers, players }}>
     const mapHeight = 15168;
     const mapWidth = 14658;
 
-    const map = L.map('map', {
+    const map = L.map('world', {
         crs: L.CRS.Simple,
         maxZoom: 12,
         minZoom: 2.5,
@@ -121,8 +123,6 @@ const { markers, players } = Astro.props
 
         const playerMarker = L.marker(playersPosition, { icon: playerIcon }).addTo(map)
         playerMarker.addTo(layerGroups['players'])
-
-        console.log(map)
     }
 
     map.fitBounds(layer.getBounds());
diff --git a/src/pages/api/data/alliance.markers.ts b/src/pages/api/data/world.markers.ts
similarity index 99%
rename from src/pages/api/data/alliance.markers.ts
rename to src/pages/api/data/world.markers.ts
index 64099962..7d681b5f 100644
--- a/src/pages/api/data/alliance.markers.ts
+++ b/src/pages/api/data/world.markers.ts
@@ -1,6 +1,6 @@
 import type { MapMarker } from "@/types/Leaflet";
 
-export const allianceMarkers: MapMarker[] = [
+export const worldMarkers: MapMarker[] = [
     {
         group: "capitals",
         title: "Ambrose",
diff --git a/src/pages/api/markers.json.ts b/src/pages/api/markers.json.ts
index ae503bed..b1fa3ab6 100644
--- a/src/pages/api/markers.json.ts
+++ b/src/pages/api/markers.json.ts
@@ -1,8 +1,8 @@
 import type { APIRoute } from "astro";
-import { allianceMarkers } from "./data/alliance.markers";
+import { worldMarkers } from "./data/world.markers";
 
 export const GET: APIRoute = ({ params, request }) => {
     return new Response(
-        JSON.stringify(allianceMarkers)
+        JSON.stringify(worldMarkers)
     )
 }
\ No newline at end of file
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 947fbef7..b37074c5 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,6 +1,6 @@
 ---
 import Layout from '../layouts/Layout.astro';
-import AllianceKaldelienne from '../components/maps/AllianceKaldelienne.astro'
+import WorldMap from '../components/maps/WorldMap.astro'
 
 const fetchLandMarkers = await fetch('http://localhost:4321/api/markers.json');
 const fetchPlayersPosition = await fetch('http://localhost:4321/api/players.json');
@@ -9,5 +9,5 @@ const playerCoords = await fetchPlayersPosition.json();
 ---
 
 <Layout title="Cartographie">
-    <AllianceKaldelienne markers={landData} players={playerCoords} />
+    <WorldMap markers={landData} players={playerCoords} />
 </Layout>