diff --git a/whwhw.json b/whwhw.json
index 0e0e0cfb2..5864a8a90 100644
--- a/whwhw.json
+++ b/whwhw.json
@@ -5,251 +5,18 @@
"en": "Whitewater routes"
},
"query": {
- "10": [
+ "8": [
"(",
"way[waterway~\"^(river)$\"];"
")"
]
},
"feature": {
- "pre": [
- "{% if tags.waterway %}",
- " {% set key = 'waterway' %}",
- " {% set value = tags.waterway %}",
- "{% elseif tags.water %}",
- " {% set key = 'water' %}",
- " {% set value = tags.water %}",
- "{% elseif tags.natural %}",
- " {% set key = 'natural' %}",
- " {% set value = tags.natural %}",
- "{% endif %}",
- "{% set kv = key ~ '=' ~ value %}",
- "{% set data = const[kv]|default(const['natural=water']) %}"
- ],
+
"description": [
"{{ tagTrans(key, value) }}"
],
- "body": [
- "
",
- "{% if tags.intermittent %}",
- " - ",
- " ",
- " {{ keyTrans('intermittent') }}:",
- " {{ tagTrans('intermittent', tags.intermittent) }}",
- "{% endif %}",
- "
"
- ],
- "markerSign": [
- "{{ const[kv].sign|raw }}"
- ],
- "markerSymbol": [
- "{% if data.symbol == 'pointer' %}",
- "{{ markerPointer({ fillColor: '#3388ff' })|raw }}",
- "{% endif %}"
- ],
- "listMarkerSymbol": [
- "{% if data.symbol == 'pointer' %}",
- "{{ markerCircle({ fillColor: '#3388ff' })|raw }}",
- "{% elseif data.symbol == 'polygon' %}",
- "polygon",
- "{% else %}",
- "line",
- "{% endif %}"
- ],
- "priority": "{{ data.priority }}",
- "style": {
- "width": "{{ data.style.width }}",
- "color": "{{ data.style.color }}",
- "text": [
- "{% if data.text %}",
- "{{ tags.name }} ➔ ",
- "{% endif %}"
- ],
- "textRepeat": "1",
- "dashArray": "{% if tags.intermittent == 'yes' %}5,5{% endif %}",
- "lineCap": "{% if tags.intermittent == 'yes' %}butt{% else %}round{% endif %}"
- }
- },
- "const": {
- "natural=water": {
- "zoom": 10,
- "symbol": "polygon",
- "style": {
- "width": 3,
- "color": "#3388ff"
- },
- "priority": 2
- },
- "water=lake": {
- "zoom": 10,
- "symbol": "polygon",
- "style": {
- "width": 3,
- "color": "#3388ff"
- },
- "hideInfo": true,
- "priority": 0
- },
- "water=lagoon": {
- "zoom": 10,
- "symbol": "polygon",
- "style": {
- "width": 3,
- "color": "#3388ff"
- },
- "hideInfo": true,
- "priority": 0
- },
- "water=reservoir": {
- "zoom": 10,
- "symbol": "polygon",
- "style": {
- "width": 3,
- "color": "#3388ff"
- },
- "hideInfo": true,
- "priority": 0
- },
- "waterway=river": {
- "zoom": 10,
- "symbol": "line",
- "style": {
- "width": 4,
- "color": "#3388ff"
- },
- "text": true,
- "priority": 1
- },
- "waterway=canal": {
- "alias": [
- "water=canal"
- ],
- "zoom": 10,
- "symbol": "line",
- "style": {
- "width": 4,
- "color": "#3388ff"
- },
- "text": true,
- "priority": 1
- },
- "waterway=stream": {
- "zoom": 13,
- "symbol": "line",
- "style": {
- "width": 2,
- "color": "#3388ff"
- },
- "text": true,
- "priority": 3
- },
- "waterway=drain": {
- "zoom": 13,
- "symbol": "line",
- "style": {
- "width": 2,
- "color": "#3388ff"
- },
- "text": true,
- "priority": 3
- },
- "waterway=ditch": {
- "zoom": 13,
- "symbol": "line",
- "style": {
- "width": 1,
- "color": "#3388ff"
- },
- "text": true,
- "priority": 5
- },
- "natural=spring": {
- "sign": "",
- "zoom": 13,
- "symbol": "pointer"
- },
- "natural=hot_spring": {
- "sign": "",
- "zoom": 13,
- "symbol": "pointer"
- },
- "natural=geyser": {
- "sign": "",
- "zoom": 13,
- "symbol": "pointer"
- },
- "waterway=waterfall": {
- "sign": "",
- "zoom": 13,
- "symbol": "pointer"
- },
- "waterway=dam": {
- "zoom": 13,
- "symbol": "line",
- "style": {
- "width": 3,
- "color": "#000000"
- },
- "priority": 3
- },
- "waterway=weir": {
- "zoom": 13,
- "symbol": "line",
- "style": {
- "width": 3,
- "color": "#000000"
- },
- "priority": 3
- },
- "natural=divide": {
- "zoom": 10,
- "symbol": "line",
- "style": {
- "width": 3,
- "color": "#ff0000"
- },
- "text": true,
- "priority": 0
- }
- },
- "filter": {
- "type": {
- "name": "{{ trans('filter:type') }}",
- "key": "natural",
- "type": "select",
- "show_default": "true",
- "values": "{% for k, data in const %}{% endfor %}",
- "sort": "natsort"
- },
- "intermittent": {
- "name": "{{ keyTrans('intermittent') }}",
- "key": "intermittent",
- "type": "radio",
- "values": ""
- }
- },
- "info": [
- "",
- " {% for k, data in const %}",
- " {% if not data.hideInfo and data.zoom <= map.zoom %}",
- " ",
- " ",
- " {% if data.symbol == 'pointer' %}",
- " {{ markerCircle({ fillColor: '#3388ff' })|raw }} {{ data.sign|raw }} ",
- " {% elseif data.symbol == 'polygon' %}",
- " {{ markerPolygon(data.style)|raw }}",
- " {% elseif data.symbol == 'line' %}",
- " {{ markerLine(data.style)|raw }}",
- " {% endif %}",
- " | ",
- " {{ tagTrans(k) }} | ",
- "
",
- " {% endif %}",
- " {% endfor %}",
- " ",
- " {{ markerLine({ width: 3, color: '#3388ff', dashArray: '5,5', lineCap: 'butt' })|raw }} | ",
- " {{ keyTrans('intermittent') }} | ",
- "
",
- "
"
- ]
+ "styles": ""
+
+}
}
\ No newline at end of file