diff --git a/paddling_amenities.yaml b/paddling_amenities.yaml
index b6e39ff..f138994 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,87 +40,211 @@ 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.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 %}
+ {% 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'] %}
-
- {% if attribute(tags, 'surface') %}
- -
-
- {{ keyTrans('Surface') }}:
- {{ attribute(tags, 'surface') ? tagTrans('surface', attribute(tags, 'surface')) : '' }}
-
- {% endif %}
+
+ {% if attribute(tags, 'waterbody:name') %}
+ -
+
+ {{ tagTrans('natural', 'water') }}:
+ {{ localizedTag(tags, 'waterbody:name') }}
+
+ {% endif %}
+ {% if attribute(tags, 'surface') %}
+ -
+
+ {{ keyTrans('surface') }}:
+ {{ attribute(tags, 'surface') ? tagTrans('surface', attribute(tags, 'surface')) : '' }}
+
+ {% endif %}
- {% if attribute(tags, 'operator') %}
- -
-
- {{ keyTrans('Operator') }}:
- {{ attribute(tags, 'operator') ? tagTrans('operator', attribute(tags, 'operator')) : '' }}
-
- {% endif %}
+ {% if attribute(tags, 'operator') %}
+ -
+
+ {{ keyTrans('operator') }}:
+ {{ tagTrans('operator', attribute(tags, 'operator')) }}
+
+ {% endif %}
- {% if attribute(tags, 'access') %}
- -
-
- {{ keyTrans('Access') }}:
- {{ attribute(tags, 'access') ? tagTrans('access', attribute(tags, 'access')) : '' }}
-
- {% endif %}
+ {% if attribute(tags, 'informal') %}
+ -
+
+ {{ keyTrans('informal') }}:
+ {{ tagTrans('informal', attribute(tags, 'informal'))}}
+
+ {% endif %}
- {% if attribute(tags, 'canoe') and tags.canoe in ['yes','designated','permissive','permit','discouraged','private','no'] %}
+ {% if attribute(tags, 'canoe') %}
+ {% if tags.canoe != 'portage' %}
-
- {{ keyTrans('Canoe Access') }}:
- {{ attribute(tags, 'canoe') ? tagTrans('access', attribute(tags, 'canoe')) : '' }}
+ {{ keyTrans('canoe') }}:
+ {{ tagTrans('access', attribute(tags, 'canoe')) }}
- {% endif %}
-
- {% if attribute(tags, 'portage') and tags.portage in ['yes','designated','permissive','permit','discouraged','private','no'] %}
+ {% elseif type == 'way' and attribute(tags, 'highway') and tags.canoe == 'portage' %}
-
- {{ keyTrans('Portage Access') }}:
- {{ attribute(tags, 'portage') ? tagTrans('access', attribute(tags, 'portage')) : '' }}
+ {{ keyTrans('portage') }}:
+ {{ tagTrans('access', 'yes') }}
- {% endif %}
+ {% endif %}
+ {% endif %}
- {% if attribute(tags, 'fee') %}
- -
-
- {{ keyTrans('Fee') }}:
- {{ attribute(tags, 'fee') ? tagTrans('fee', attribute(tags, 'fee')) : '' }}
-
- {% endif %}
+ {% if attribute(tags, 'portage') %}
+ -
+
+ {{ keyTrans('portage') }}:
+ {{ tagTrans('access', attribute(tags, 'portage')) }}
+
+ {% endif %}
- {% if attribute(tags, 'mapillary') %}
- -
-
- {{ trans('Photos') }}:
-
- Mapillary
-
-
- {% endif %}
+ {% if attribute(tags, 'access') %}
+ -
+
+ {{ keyTrans('access') }}:
+ {{ tagTrans('access', attribute(tags, 'access'))}}
+
+ {% endif %}
+
+ {% if attribute(tags, 'fee') %}
+ -
+
+ {{ keyTrans('fee') }}:
+ {{ tagTrans('fee', attribute(tags, 'fee')) }}
+
+ {% endif %}
+
+ {% if attribute(tags, 'tidal') %}
+ -
+
+ {{ keyTrans('tidal') }}:
+ {{ tagTrans('tidal', attribute(tags, 'tidal')) }}
+
+ {% endif %}
+
+ {% if attribute(tags, 'intermittent') %}
+ -
+
+ {{ keyTrans('intermittent') }}:
+ {{ tagTrans('intermittent', attribute(tags, 'intermittent')) }}
+
+ {% endif %}
+
+ {% if attribute(tags, 'seasonal') %}
+ -
+
+ {{ keyTrans('seasonal') }}:
+ {{ tagTrans('seasonal', attribute(tags, 'seasonal')) }}
+
+ {% endif %}
+
+ {% if attribute(tags, 'mapillary') %}
+ -
+
+ {{ trans('Photos') }}:
+
+ Mapillary
+
+
+ {% endif %}
-
+ {% if attribute(tags,'canoe:description') %}
+ -
+
![]()
+ {{ localizedTag(tags, 'canoe:description') }}
+
{% endif %}
-
+ {% if attribute(tags,'wheelchair:description') %}
+ -
+
+ {{ localizedTag(tags, 'wheelchair:description') }}
+
+ {% 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 }) }}
+ {% 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 }) }}
+ {% 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 %}
+ 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
priority: |-
{% if item is defined %}
{{ item['priority'] }}
@@ -131,28 +252,52 @@ feature:
10
{% endif %}
const:
+ marker:
+ style:
+ color: '#B3D2FF'
+ color_restricted: '#7F7F7F'
portage=portage:
- sign:
- priority: 2
+ symbol: line
+ priority: 4
+ 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:
+ symbol: pointer
sign:
priority: 3
\ No newline at end of file