Imporoved marker contrast and removed markers from portage segments in water.

paddling_amenities.yaml

@@ -17,7 +17,10 @@ query:
     )
 feature:
   pre: |-
-    {% if tags.canoe %}
+    {% if tags.canoe == 'portage' (and not attribute(tags, 'surface') or attribute(tags, 'surface') == 'water') %}
+      {% set key = 'waterway' %}
+      {% set value = 'portage' %}
+    {% elseif tags.canoe %}
       {% set key = 'canoe' %}
       {% set value = tags.canoe %}
     {% elseif tags.leisure %}
@@ -33,7 +36,6 @@ feature:
 
     {% set constIndex = (key ~ "=" ~ value) %}
     {% set item = const[constIndex] %}
-
   title: |
     {{ localizedTag(tags, 'name') }}
     {% if attribute(tags, 'ref') %}
@@ -73,15 +75,20 @@ feature:
       </dl>
     {% endif %}   
   markerSign: '{{ item[''sign''] }}'
-
+  markerSymbol: |
+    {% if item['sign'] %}{{ markerPointer({ fillColor: '#DDDDDD' }) }}{% endif %}
+  listMarkerSymbol: |
+    {% if item['sign'] %}{{ markerCircle({ fillColor: '#FFFFFF' }) }}{% endif %}
   priority: |-
     {% if item is defined %}
       {{ item['priority'] }}
     {% else %}
       10
     {% endif %}
-
 const:
+  waterway=portage:
+    sign:
+    priority: 2
   canoe=put_in:
     sign: 🛶
     priority: 0

paddling_hazards.yaml

@@ -15,7 +15,6 @@ feature:
 
     {% set constIndex = (key ~ "=" ~ value) %}
     {% set item = const[constIndex] %}
-
   title: |
     {{ item['sign'] }} {{ localizedTag(tags, 'name') | default(localizedTag(tags, 'key')) | default(localizedTag(tags, 'ref')) }}
   description: |
@@ -40,16 +39,17 @@ feature:
       </dd>
 
     </dl>
-
   markerSign: '⚠️'
-
+  markerSymbol: |
+      {{ markerPointer({ fillColor: '#DDDDDD' }) }}
+  listMarkerSymbol: |
+    {{ markerCircle({ fillColor: '#FFFFFF' }) }}
   priority: |-
     {% if const[constIndex] is defined %}
       {{ const[constIndex]['priority'] }}
     {% else %}
       10
     {% endif %}
-
 const:
   waterway=dam:
     sign: '🦫'