Improved appearance of marker and description.

paddling_amenities.yaml

@@ -17,7 +17,7 @@ query:
     )
 feature:
   pre: |-
-    {% if tags.canoe == 'portage' (and not attribute(tags, 'surface') or attribute(tags, 'surface') == 'water') %}
+    {% if tags.canoe == 'portage' and ( not attribute(tags, 'surface') or attribute(tags, 'surface') == 'water' ) %}
       {% set key = 'waterway' %}
       {% set value = 'portage' %}
     {% elseif tags.canoe %}
@@ -28,7 +28,7 @@ feature:
       {% set value = tags.leisure %}
     {% elseif tags.shop %}
       {% set key = 'shop' %}
-      {% set value = tags.shop %}
+      {% set value = 'shop' %}
     {% elseif tags.rental or tags.canoe_rental or tags.kayak_rental or tags.standup_paddleboard_rental or tags.dingy_rental or tags.pedalboat_rental %}
       {% set key = 'shop' %}
       {% set value = 'rental' %}
@@ -76,7 +76,7 @@ feature:
     {% endif %}   
   markerSign: '{{ item[''sign''] }}'
   markerSymbol: |
-    {% if item['sign'] %}{{ markerPointer({ fillColor: '#DDDDDD' }) }}{% endif %}
+    {% if item['sign'] %}{{ markerPointer({ fillColor: '#FFFFFF' }) }}{% endif %}
   listMarkerSymbol: |
     {% if item['sign'] %}{{ markerCircle({ fillColor: '#FFFFFF' }) }}{% endif %}
   priority: |-
@@ -86,8 +86,8 @@ feature:
       10
     {% endif %}
 const:
-  waterway=portage:
-    sign:
+  canoe=portage:
+    sign: 🚶🏻
     priority: 2
   canoe=put_in:
     sign: 🛶
@@ -95,12 +95,12 @@ const:
   leisure=slipway:
     sign: 🚣🏻
     priority: 1
-  canoe=portage:
-    sign: 🚶🏻
-    priority: 2
-  shop=boat:
+  shop=shop:
     sign: 🛒
     priority: 3
   shop=rental:
     sign: 🛒
     priority: 3
+  waterway=portage:
+    sign:
+    priority: 2

paddling_hazards.yaml

@@ -41,7 +41,7 @@ feature:
     </dl>
   markerSign: '⚠️'
   markerSymbol: |
-      {{ markerPointer({ fillColor: '#DDDDDD' }) }}
+      {{ markerPointer({ fillColor: '#FFFFFF' }) }}
   listMarkerSymbol: |
     {{ markerCircle({ fillColor: '#FFFFFF' }) }}
   priority: |-