From deae2a070ed8dd1415f902538a9c012b22001933 Mon Sep 17 00:00:00 2001 From: scarapella Date: Wed, 24 Dec 2025 12:43:28 +0100 Subject: [PATCH 1/2] added more appropriate icons, implemented support for informal tag and now show restricted access with different colors --- paddling_amenities.yaml | 156 +++++++++++++++++++++++++++++++++------- 1 file changed, 130 insertions(+), 26 deletions(-) diff --git a/paddling_amenities.yaml b/paddling_amenities.yaml index b6e39ff..112d341 100644 --- a/paddling_amenities.yaml +++ b/paddling_amenities.yaml @@ -8,7 +8,7 @@ name: tr: Kürek Tesisleri type: overpass query: - '14': |- + '12': |- ( node["canoe"~"^(put_in|egress|put_in;egress)$"]; node["waterway"="access_point"]; @@ -25,15 +25,12 @@ query: ) feature: pre: |- - {% if tags.canoe == 'portage' or attribute(tags, 'portage') %} + {% if type == 'way' and (tags.canoe == 'portage' or attribute(tags, 'portage')) %} {% set key = 'portage' %} {% set value = 'portage' %} - {% elseif tags.waterway and tags.waterway== 'access_point' %} + {% elseif type == 'node' and tags.waterway and tags.waterway == 'access_point' %} {% set key = 'waterway' %} {% set value = tags.waterway %} - {% elseif tags.canoe and tags.canoe not in ['yes','designated','permissive','permit','discouraged','private','no']%} - {% set key = 'canoe' %} - {% set value = tags.canoe %} {% elseif tags.leisure %} {% set key = 'leisure' %} {% set value = tags.leisure %} @@ -43,20 +40,50 @@ feature: {% 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' %} + {% elseif type == 'node' and tags.canoe and tags.canoe in ['put_in','egress','put_in;egress'] %} + {% set key = 'canoe' %} + {% set value = tags.canoe %} {% endif %} {% set constIndex = (key ~ "=" ~ value) %} {% set item = const[constIndex] %} - title: | + + {% if tags.informal and tags.informal in ['yes','unknown'] %} + {% set informal_value = tags.informal %} + {% endif %} + + {% if tags.ice_skates and tags.ice_skates in ['no','private','discouraged','unknown'] %} + {% set restricted_access_value = tags.ice_skates %} + {% elseif tags.access and tags.access in ['no','private','discouraged','unknown'] %} + {% set restricted_access_value = tags.access %} + {% elseif type == 'way' and tags.waterway and tags.waterway != 'access_point' and tags.ice_skates and tags.ice_skates == 'kluning' %} + {% set restricted_access_value = tags.ice_skates %} + {% endif %} + title: |- {{ localizedTag(tags, 'name') }} {% if attribute(tags, 'ref') %} ( {{ localizedTag(tags, 'ref') }} ) {% endif %} - description: | + listDetails: |- + {%if attribute(tags, 'waterbody:name')%} + {{ localizedTag(tags, 'waterbody:name') }} + {% endif %} + description: |- + {% if item.detailSign %} + {{ item.detailSign | raw }} + {% endif %} {{ tagTrans(key, value) }} body: |- {% if key not in ['shop'] %} {% endif %} - markerSign: '{{ item[''sign''] | raw }}' - markerSymbol: | - {% if item['sign'] %}{{ markerPointer({ fillColor: '#FFFFFF' }) }}{% endif %} - listMarkerSymbol: | - {% if item['sign'] %}{{ markerCircle({ fillColor: '#FFFFFF' }) }}{% endif %} + markerSymbol: |- + {% if item.symbol=='pointer' %} + {% if restricted_access_value %} + {{ markerPointer({ fillColor: const.marker.style.color_restricted }) }} + {% elseif informal_value %} + {{ markerPointer({ fillColor: const.marker.style.color_informal }) }} + {% else %} + {{ markerPointer({ fillColor: const.marker.style.color }) }} + {% endif %} + {% endif %} + listMarkerSymbol: |- + {% if item.symbol=='pointer' %} + {% if restricted_access_value %} + {{ markerCircle({ fillColor: const.marker.style.color_restricted }) }} + {% elseif informal_value %} + {{ markerCircle({ fillColor: const.marker.style.color_informal }) }} + {% else %} + {{ markerCircle({ fillColor: const.marker.style.color }) }} + {% endif %} + {% elseif item.symbol == 'polygon' %} + polygon + {% elseif item.symbol == 'line' %} + line + {% endif %} + styles : | + default{% if item.symbol == 'line' %},casing{% endif %} + style: + width: '{{ item.style.width }}' + color: |- + {% if restricted_access_value %} + {{ item.style.color_restricted }} + {% elseif informal_value %} + {{ item.style.color_informal }} + {% else %} + {{ item.style.color }} + {% endif %} + style:casing: + width: '{{item.style.casing.width}}' + pane: casing + text: |- + {% if item.text %} + {% if attribute(tags, "piste:name") %} + {{ localizedTag(tags, 'piste:name') }} + {% elseif attribute(tags, "name") %} + {{ localizedTag(tags, 'name') }} + {% endif %} + {% endif %} + textRepeat: '1' + lineCap: round + dashArray: |- + {% if restricted_access_value %}5,5{% endif %} priority: |- {% if item is defined %} {{ item['priority'] }} @@ -131,25 +211,49 @@ feature: 10 {% endif %} const: + marker: + style: + color: '#FFFFFF' + color_informal: '#BFBFBF' + color_restricted: '#7F7F7F' portage=portage: - sign: + symbol: line priority: 2 + text: true + style: + width: 4 + color: '#B3D2FF' + color_informal: '#99A9BF' + color_restricted: '#7F7F7F' + casing: + width: 10 waterway=access_point: - sign: + symbol: pointer + sign: + detailSign: priority: 0 canoe=put_in: - sign: + symbol: pointer + sign: + detailSign: priority: 0 canoe=egress: - sign: + symbol: pointer + sign: + detailSign: priority: 0 canoe=put_in;egress: - sign: + symbol: pointer + sign: + detailSign: priority: 0 leisure=slipway: - sign: + symbol: pointer + sign: + detailSign: priority: 1 shop=shop: + symbol: pointer sign: priority: 3 shop=rental: From b057ef03cf874ad088bc0b81b28dba2bca038672 Mon Sep 17 00:00:00 2001 From: scarapella Date: Wed, 24 Dec 2025 15:17:09 +0100 Subject: [PATCH 2/2] Adding support for additional categories (tidal, intermittent, canoe:description etc.) and improving some formatting --- paddling_amenities.yaml | 205 ++++++++++++++++++++++++---------------- 1 file changed, 123 insertions(+), 82 deletions(-) diff --git a/paddling_amenities.yaml b/paddling_amenities.yaml index 112d341..f138994 100644 --- a/paddling_amenities.yaml +++ b/paddling_amenities.yaml @@ -52,12 +52,14 @@ feature: {% set informal_value = tags.informal %} {% endif %} - {% if tags.ice_skates and tags.ice_skates in ['no','private','discouraged','unknown'] %} - {% set restricted_access_value = tags.ice_skates %} + {% if tags.canoe and tags.canoe in ['no','private','discouraged','unknown'] %} + {% set restricted_access_value = tags.canoe %} + {% set restricted_canoe_value = tags.canoe %} + {% elseif tags.portage and tags.portage in ['no','private','discouraged','unknown'] %} + {% set restricted_access_value = tags.portage %} + {% set restricted_portage_value = tags.canoe %} {% elseif tags.access and tags.access in ['no','private','discouraged','unknown'] %} {% set restricted_access_value = tags.access %} - {% elseif type == 'way' and tags.waterway and tags.waterway != 'access_point' and tags.ice_skates and tags.ice_skates == 'kluning' %} - {% set restricted_access_value = tags.ice_skates %} {% endif %} title: |- {{ localizedTag(tags, 'name') }} @@ -74,91 +76,131 @@ feature: {% endif %} {{ tagTrans(key, value) }} body: |- - {% if key not in ['shop'] %} - markerSign: '{{ item[''sign''] | raw }}' markerSymbol: |- {% if item.symbol=='pointer' %} {% if restricted_access_value %} {{ markerPointer({ fillColor: const.marker.style.color_restricted }) }} - {% elseif informal_value %} - {{ markerPointer({ fillColor: const.marker.style.color_informal }) }} {% else %} {{ markerPointer({ fillColor: const.marker.style.color }) }} {% endif %} @@ -167,8 +209,6 @@ feature: {% if item.symbol=='pointer' %} {% if restricted_access_value %} {{ markerCircle({ fillColor: const.marker.style.color_restricted }) }} - {% elseif informal_value %} - {{ markerCircle({ fillColor: const.marker.style.color_informal }) }} {% else %} {{ markerCircle({ fillColor: const.marker.style.color }) }} {% endif %} @@ -189,21 +229,22 @@ feature: {% else %} {{ item.style.color }} {% endif %} + text: |- + {% if item.text %} + {% if attribute(tags, "piste:name") %} + {{ localizedTag(tags, 'piste:name') }} + {% elseif attribute(tags, "name") %} + {{ localizedTag(tags, 'name') }} + {% endif %} + {% endif %} + textRepeat: '1' + textOffset: -8 + lineCap: round + dashArray: |- + {% if restricted_access_value %}5,5{% endif %} style:casing: width: '{{item.style.casing.width}}' pane: casing - text: |- - {% if item.text %} - {% if attribute(tags, "piste:name") %} - {{ localizedTag(tags, 'piste:name') }} - {% elseif attribute(tags, "name") %} - {{ localizedTag(tags, 'name') }} - {% endif %} - {% endif %} - textRepeat: '1' - lineCap: round - dashArray: |- - {% if restricted_access_value %}5,5{% endif %} priority: |- {% if item is defined %} {{ item['priority'] }} @@ -213,12 +254,11 @@ feature: const: marker: style: - color: '#FFFFFF' - color_informal: '#BFBFBF' + color: '#B3D2FF' color_restricted: '#7F7F7F' portage=portage: symbol: line - priority: 2 + priority: 4 text: true style: width: 4 @@ -257,6 +297,7 @@ const: sign: priority: 3 shop=rental: + symbol: pointer sign: priority: 3 \ No newline at end of file