From 6ea4bdaef543523d4bf91b4f459d1a2d029db09d Mon Sep 17 00:00:00 2001
From: Alexis <35.alexis.pele@gmail.com>
Date: Fri, 10 Jan 2025 15:54:48 +0100
Subject: [PATCH] Optional walking distance

---
 src/components/maps/Map.astro       | 35 +++++++++++++++++++++--------
 src/pages/aldys/borelis/index.astro |  2 ++
 src/pages/aldys/cantane/index.astro |  2 ++
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/components/maps/Map.astro b/src/components/maps/Map.astro
index f1b31dd6..7c8ac9bc 100644
--- a/src/components/maps/Map.astro
+++ b/src/components/maps/Map.astro
@@ -9,7 +9,9 @@ interface Props {
     mapWidth: number
     markers?: MapMarker[]
     players?: PlayerMarker
+    rulerMainUnit?: string
     rulerDistanceRatio?: number
+    rulerHideWalkDistance?: boolean
     backgroundColor?: string
 }
 
@@ -20,7 +22,9 @@ const {
     mapWidth, // Find these in the zoomify / original image data
     markers = [] as MapMarker[],
     players = {} as PlayerMarker,
+    rulerMainUnit = 'Kilomètres',
     rulerDistanceRatio = 1,
+    rulerHideWalkDistance = false,
     backgroundColor = 'transparent',
 } = Astro.props
 ---
@@ -31,7 +35,7 @@ const {
     <MarkerCreator client:load mapKey={mapKey} />
 </div>
 
-<script lang="ts" define:vars={{ mapKey, rulerDistanceRatio, zoomifyKey, markers, players, mapHeight, mapWidth }} defer>
+<script lang="ts" define:vars={{ mapKey, zoomifyKey, markers, players, mapHeight, mapWidth, rulerDistanceRatio, rulerMainUnit, rulerHideWalkDistance }} defer>
 
 // Units used for convertions to avoid changing original marker coords
 const xRatio = .68447
@@ -311,15 +315,20 @@ L.Control.Measure.include({
     },
 })
 
-const rulerOptions = {
-    position: 'bottomleft',
-    primaryLengthUnit: 'kilometers',
-    secondaryLengthUnit: 'days',
-    primaryAreaUnit: 'hectares',
-    units: {
-        kilometers: {
+let rulerUnits
+
+if (rulerHideWalkDistance) {
+    rulerUnits = {
+        mainUnit: {
             factor: 0.00013 * rulerDistanceRatio,
-            display: 'Kilomètres',
+            display: rulerMainUnit,
+        }
+    }
+} else {
+    rulerUnits = {
+        mainUnit: {
+            factor: 0.00013 * rulerDistanceRatio,
+            display: rulerMainUnit,
         },
         days: {
             factor: 0.00000325 * rulerDistanceRatio,
@@ -329,6 +338,14 @@ const rulerOptions = {
     }
 }
 
+const rulerOptions = {
+    position: 'bottomleft',
+    primaryLengthUnit: 'mainUnit',
+    secondaryLengthUnit: 'days',
+    primaryAreaUnit: 'hectares',
+    units: rulerUnits
+}
+
 const measureControl = L.control.measure(rulerOptions)
 measureControl.addTo(map)
 
diff --git a/src/pages/aldys/borelis/index.astro b/src/pages/aldys/borelis/index.astro
index 8fe9a3c3..d7ef77d0 100644
--- a/src/pages/aldys/borelis/index.astro
+++ b/src/pages/aldys/borelis/index.astro
@@ -14,6 +14,8 @@ import MapOverlay from '@/components/maps/MapOverlay.astro'
         mapHeight={3710}
         mapWidth={4521}
         rulerDistanceRatio={1.8}
+        rulerMainUnit='Mètres'
+        rulerHideWalkDistance={true}
         backgroundColor="#C3CCD2"
     />
 </Layout>
diff --git a/src/pages/aldys/cantane/index.astro b/src/pages/aldys/cantane/index.astro
index 280b7dd0..ea216bf2 100644
--- a/src/pages/aldys/cantane/index.astro
+++ b/src/pages/aldys/cantane/index.astro
@@ -14,6 +14,8 @@ import MapOverlay from '@/components/maps/MapOverlay.astro'
         mapHeight={4124}
         mapWidth={4067}
         rulerDistanceRatio={1.15}
+        rulerMainUnit='Mètres'
+        rulerHideWalkDistance={true}
         backgroundColor="#CDCAC3"
     />
 </Layout>