From d06d716fc9cc3aead44c4b69bb9ee58801377831 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com>
Date: Thu, 5 Sep 2024 12:43:15 -0400
Subject: [PATCH] Add tag values to labels for the selected filter (close #80)

---
 js/mapController.js | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/js/mapController.js b/js/mapController.js
index db5b248..52e45e6 100644
--- a/js/mapController.js
+++ b/js/mapController.js
@@ -533,7 +533,6 @@ function loadTrailLayers() {
     "source-layer": "trail",
     "type": "symbol",
     "layout": {
-      "text-field": ["coalesce", ['get', 'name'], ['get', 'mtb:name'], ['get', 'waterbody:name']],
       "text-font": ["Americana-Regular"],
       "text-size": 13,
       "symbol-placement": "line"
@@ -793,10 +792,14 @@ function maxspeedKeysForTravelMode(travelMode) {
 
 function specifyingKeysForLens(lens, travelMode) {
   switch (lens) {
+    case 'access':
+      let keys = accessHierarchy[travelMode].reverse();
+      if (travelMode === 'canoe') keys.push('portage');
+      return keys;
     case 'name': 
       switch (travelMode) {
-        case "canoe": return ['name', 'noname', 'waterbody:name'];
-        case 'mtb': return ['name', 'noname', 'mtb:name'];
+        case "canoe": return ['name', 'waterbody:name', 'noname'];
+        case 'mtb': return ['name', 'mtb:name', 'noname'];
       }
       return ['name', 'noname'];
     case 'oneway': return onewayKeysForTravelMode(travelMode);
@@ -1326,6 +1329,7 @@ function updateTrailLayers() {
     ["has", "todo"],
     ["has", "TODO"],
   ], combinedFilterExpression])
+  map.setLayoutProperty('trails-labels', 'text-field', getTrailLabelExpression(lens, travelMode))
   map.setFilter('trails-labels', combinedFilterExpression)
   map.setFilter('trails-pointer-targets', combinedFilterExpression)
   map.setFilter('trail-pois', trailPoisFilter(travelMode))
@@ -1601,6 +1605,37 @@ function didMouseMoveMap(e) {
   }
 }
 
+function getTrailLabelExpression(lens, travelMode) {
+
+  let sublabels = null;
+
+  if (lens !== "") {
+    let keys = specifyingKeysForLens(lens, travelMode);
+    sublabels = [{
+      selector: ["any", ...keys.map(key => ["has", key])],
+      label: ["case", ...keys.map(key => {
+        let val = ["concat", key, "=", ["get", key]];
+        if (key === 'name' || key.endsWith(':name')) val = key;
+        return [["has", key], val];
+      }).flat(1), ""],
+    }];
+  }
+
+  return getLabelExpression([
+    {
+      caseSelector: ['has', 'waterway'],
+      selector: ["any", ["has", "name"], ["has", "waterbody:name"]],
+      label: ["coalesce", ["get", "name"], ["get", "waterbody:name"]],
+      sublabels: sublabels
+    },
+    {
+      selector: ["any", ["has", "name"], ["has", "mtb:name"]],
+      label: ["coalesce", ["get", "name"], ["get", "mtb:name"]],
+      sublabels: sublabels
+    }
+  ]);
+}
+
 const poiLabelData = [
   {
     caseSelector: ['in', ["get", "tourism"], ["literal", ["camp_site", "caravan_site"]]],