From 1bfeac2e018a32d85b811aab5f14fb31a8aa3f80 Mon Sep 17 00:00:00 2001
From: Miko <miko@none>
Date: Sat, 4 Jan 2025 01:00:04 +0100
Subject: [PATCH] add contour-label

---
 public/resources/contour-control.js |  2 +-
 public/templates/data.tmpl          | 43 ++++++++++++++---------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/public/resources/contour-control.js b/public/resources/contour-control.js
index 0bf2f02..2549d49 100644
--- a/public/resources/contour-control.js
+++ b/public/resources/contour-control.js
@@ -26,7 +26,7 @@ class MaplibreContourControl {
           this.controlContainer.classList.add("maplibre-ctrl-contour-active");
           this.contourButton.title = "Disable Contours";
         } else {
-          this.contourButton.title = "Ensable Contours";
+          this.contourButton.title = "Enable Contours";
         }
       });
     });
diff --git a/public/templates/data.tmpl b/public/templates/data.tmpl
index 0d823f0..5bea452 100644
--- a/public/templates/data.tmpl
+++ b/public/templates/data.tmpl
@@ -11,6 +11,7 @@
   <script src="{{public_url}}maplibre-gl-inspect.js{{&key_query}}"></script>
   <script src="{{public_url}}elevation-control.js{{&key_query}}"></script>
   <script src="{{public_url}}contour-control.js{{&key_query}}"></script>
+  <script src="{{public_url}}elevation-control.js{{&key_query}}"></script>
   <style>
     body {background:#fff;color:#333;font-family:Arial, sans-serif;}
     {{^is_terrain}}
@@ -73,9 +74,9 @@
     };
     {{/is_terrain}}
     {{#is_terrain}}
-    
+
     let baseUrl = window.location.origin;
-    
+
     var style = {
       version: 8,
       sources: {
@@ -94,7 +95,7 @@
           "tiles": [ baseUrl + "/data/{{id}}/contour/{z}/{x}/{y}" ],
         }
       },
-      "glyphs": "local://fonts/{fontstack}/{range}.pbf",
+      "glyphs": "/fonts/{fontstack}/{range}.pbf",
       "terrain": {
         "source": "terrain"
       },
@@ -127,24 +128,20 @@
           }
         },
         {
-          "id": 'contour-label',
-          "type": 'symbol',
-          "source": 'contour',
-          "source-layer": 'contours',
-          "filter": ['>', ['get', 'level'], 0],
+          "id": "contour-label",
+          "type": "symbol",
+          "source": "contour",
+          "source-layer": "contours",
+          "filter": [">", ["get", "ele"], 0 ],
           "paint": {
-            'text-halo-color': 'white',
-            'text-halo-width': 1
+            "text-halo-color": "white",
+            "text-halo-width": 1
           },
           "layout": {
-            'symbol-placement': 'line',
-            'text-size': 10,
-            'text-field': [
-              'concat',
-              ['number-format', ['get', 'ele'], {}],
-              '\''
-            ],
-            'text-font': ['Noto Sans Bold']
+            "symbol-placement": "line",
+            "text-size": 10,
+            "text-field": "{ele}",
+            "text-font": ["Noto Sans Bold"]
           }
         }
       ]
@@ -179,11 +176,11 @@
       })
     );
 
-    //map.addControl(
-    //  new ElevationInfo({
-    //    url: baseUrl + "/data/{{id}}/elvation/{z}/{x}/{y}"
-    //  })
-    //);
+    map.addControl(
+      new ElevationInfoControl({
+        url: baseUrl + "/data/{{id}}/elvation/{z}/{x}/{y}"
+      })
+    );
     {{/is_terrain}}
     {{^is_terrain}}