From ee62dd45810700f8cad727ab1728935a74aecd70 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:48:25 -0400
Subject: [PATCH] Show trail ferries (close #73)

---
 img/map/ferry.png   | Bin 0 -> 1563 bytes
 js/index.js         |   1 +
 js/mapController.js |  75 ++++++++++++++++++++++++++++++--------------
 3 files changed, 53 insertions(+), 23 deletions(-)
 create mode 100644 img/map/ferry.png

diff --git a/img/map/ferry.png b/img/map/ferry.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c2880f1e5075d5375fdce46935a271ae446008a
GIT binary patch
literal 1563
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
N002ovPDHLkV1fVy$msw8

literal 0
HcmV?d00001

diff --git a/js/index.js b/js/index.js
index f164925..395a122 100644
--- a/js/index.js
+++ b/js/index.js
@@ -491,6 +491,7 @@ window.onload = function(event) {
     'dam-canoeable',
     'dam-hazard',
     'disallowed-stripes',
+    'ferry',
     'guidepost',
     'lock',
     'lock-canoeable',
diff --git a/js/mapController.js b/js/mapController.js
index 50dfc7f..bc6f4aa 100644
--- a/js/mapController.js
+++ b/js/mapController.js
@@ -41,6 +41,16 @@ const editedDateColors = [
   2022, '#980043',
   thisYear, '#380010',
 ];
+const isHighwayExpression = [
+  "any",
+  ["has", "highway"],
+  ["==", "route", "ferry"],
+];
+const isNotHighwayExpression = [
+  "all",
+  ["!has", "highway"],
+  ["!=", "route", "ferry"],
+];
 const impliedYesExpressions = {
   atv: [],
   bicycle: [
@@ -91,7 +101,7 @@ const impliedNoExpressions = {
       ["in", "highway", "footway", "steps"],
       ["in", "vehicle", "no", "private", "discouraged"],
       ["in", "motor_vehicle", "no", "private", "discouraged"],
-      ["!has", "highway"],
+      isNotHighwayExpression,
     ]
   ],
   snowmobile: [
@@ -100,7 +110,7 @@ const impliedNoExpressions = {
       ["in", "highway", "footway", "steps"],
       ["in", "vehicle", "no", "private", "discouraged"],
       ["in", "motor_vehicle", "no", "private", "discouraged"],
-      ["!has", "highway"],
+      isNotHighwayExpression,
     ]
   ],
   bicycle: [
@@ -112,11 +122,11 @@ const impliedNoExpressions = {
         ["!=", "ramp:bicycle", "yes"],
       ],
       ["in", "vehicle", "no", "private", "discouraged"],
-      ["!has", "highway"],
+      isNotHighwayExpression,
     ]
   ],
   foot: [
-    ["!has", "highway"],
+    isNotHighwayExpression,
   ],
   canoe: [
     ["!has", "canoe"],
@@ -128,7 +138,7 @@ const impliedNoExpressions = {
     [
       "any",
       ["==", "highway", "steps"],
-      ["!has", "highway"],
+      isNotHighwayExpression,
     ],
   ],
   wheelchair: [
@@ -145,7 +155,7 @@ const impliedNoExpressions = {
         ["has", "smoothness"],
         ["!in", "smoothness", "excellent", "very_good", "good", "intermediate"],
       ],
-      ["!has", "highway"],
+      isNotHighwayExpression,
     ]
   ],
 };
@@ -227,9 +237,9 @@ function loadTrailLayers() {
     ],
   }, 'hovered');
   addTrailLayer({
-    "id": "hovered-trails-qa",
+    "id": "hovered-trail-centerpoints",
     "source": "trails",
-    "source-layer": "trail_qa",
+    "source-layer": "trail_centerpoint",
     "type": "circle",
     "paint": hoveredPoiPaint,
     "filter": [
@@ -275,9 +285,9 @@ function loadTrailLayers() {
     ],
   }, 'selected');
   addTrailLayer({
-    "id": "selected-trails-qa",
+    "id": "selected-trail-centerpoints",
     "source": "trails",
-    "source-layer": "trail_qa",
+    "source-layer": "trail_centerpoint",
     "type": "circle",
     "paint": selectedPoiPaint,
     "filter": [
@@ -751,16 +761,20 @@ function loadTrailLayers() {
     },
   }, 'clickable');
   addTrailLayer({
-    "id": "trails-qa",
+    "id": "trail-centerpoints",
     "source": "trails",
-    "source-layer": "trail_qa",
+    "source-layer": "trail_centerpoint",
     "type": "symbol",
     "transition": {
       "duration": 0,
       "delay": 0
     },
     "layout": {
-      "icon-image": ["image", "question"],
+      "icon-image": [
+        "case",
+        ["==", ["get", "route"], "ferry"], ["image", "ferry"],
+        ["image", "question"],
+      ],
       "icon-size": [
         "interpolate", ["linear"], ["zoom"],
         12, 0.5,
@@ -1016,6 +1030,22 @@ function onewayArrowsFilter(travelMode) {
   return filter;
 }
 
+function trailCenterpointsFilter(lens) {
+  let filter = [
+    'any',
+    ["==", "route", "ferry"],
+  ];
+  if (lens === 'fixme') {
+    filter = filter.concat([
+      ["has", "fixme"],
+      ["has", "FIXME"],
+      ["has", "todo"],
+      ["has", "TODO"],
+    ]);
+  }
+  return filter;
+}
+
 function poiIconImageExpression(travelMode) {
   let showHazards = travelMode === "canoe";
   return [
@@ -1154,7 +1184,6 @@ function updateTrailLayers() {
   let specifiedAccessExpression = ["!=", "true", "false"];
   let specifiedExpression;
 
-  let showFixmesExpression = [lens === "fixme" ? "!=" : '==', "true", "false"];
   let showDisallowedExpression = [lens === "access" ? "!=" : '==', "true", "false"];
   let showUnspecifiedExpression = [lens !== "" ? "!=" : '==', "true", "false"];
 
@@ -1226,14 +1255,14 @@ function updateTrailLayers() {
     allowedAccessExpression,
     specifiedExpression,
     ["!=", "informal", "yes"],
-    ["has", "highway"],
+    isHighwayExpression,
   ]);
   setTrailsLayerFilter('informal-paths', [
     "all",
     allowedAccessExpression,
     specifiedExpression,
     ["==", "informal", "yes"],
-    ["has", "highway"],
+    isHighwayExpression,
   ]);
   setTrailsLayerFilter('disallowed-paths', [
     "all",
@@ -1241,7 +1270,7 @@ function updateTrailLayers() {
     ["none", allowedAccessExpression],
     specifiedExpression,
     ["!=", "informal", "yes"],
-    ["has", "highway"],
+    isHighwayExpression,
   ]);
   setTrailsLayerFilter('disallowed-informal-paths', [
     "all",
@@ -1249,7 +1278,7 @@ function updateTrailLayers() {
     ["none", allowedAccessExpression],
     specifiedExpression,
     ["==", "informal", "yes"],
-    ["has", "highway"],
+    isHighwayExpression,
   ]);
   setTrailsLayerFilter('unspecified-paths', [
     "all",
@@ -1257,7 +1286,7 @@ function updateTrailLayers() {
     allowedAccessExpression,
     ["none", specifiedExpression],
     ["!=", "informal", "yes"],
-    ["has", "highway"],
+    isHighwayExpression,
   ]);
   setTrailsLayerFilter('unspecified-informal-paths', [
     "all",
@@ -1265,7 +1294,7 @@ function updateTrailLayers() {
     allowedAccessExpression,
     ["none", specifiedExpression],
     ["==", "informal", "yes"],
-    ["has", "highway"],
+    isHighwayExpression,
   ]);
   setTrailsLayerFilter('disallowed-waterways', [
     "all",
@@ -1290,8 +1319,8 @@ function updateTrailLayers() {
 
   map.setLayerZoomRange('trail-pois', focusedEntityInfo ? 0 : 12, 24);
 
-  map.setLayoutProperty('hovered-trails-qa', 'visibility', lens === 'fixme' ? 'visible' : 'none')
-  map.setLayoutProperty('selected-trails-qa', 'visibility', lens === 'fixme' ? 'visible' : 'none')
+  map.setLayoutProperty('hovered-trail-centerpoints', 'visibility', lens === 'fixme' ? 'visible' : 'none')
+  map.setLayoutProperty('selected-trail-centerpoints', 'visibility', lens === 'fixme' ? 'visible' : 'none')
   map.setLayoutProperty('oneway-arrows', "icon-image", onewayArrowsIconImageExpression(travelMode))
   map.setLayoutProperty('trail-pois', "icon-image", poiIconImageExpression(travelMode))
   
@@ -1304,7 +1333,7 @@ function updateTrailLayers() {
   // if there isn't a relevant oneway value, but we might as well leave it for now in case we want
   // to add some other kind of styling in the future
   map.setFilter('oneway-arrows', ["all", onewayArrowsFilter(travelMode), combinedFilterExpression])
-  map.setFilter('trails-qa', ["all", showFixmesExpression, combinedFilterExpression])
+  map.setFilter('trail-centerpoints', ["all", trailCenterpointsFilter(lens), combinedFilterExpression])
   map.setFilter('trails-labels', combinedFilterExpression)
   map.setFilter('trails-pointer-targets', combinedFilterExpression)
   map.setFilter('trail-pois', trailPoisFilter(travelMode))