From ec2352b2c848bbb222f2a2e265665e2afc0b7be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Wed, 29 Nov 2017 22:15:01 +0100
Subject: [PATCH] water: improvements
- show description
- rule for waterway=ditch, riverbank multipolygons
- priority objects from zoom=10
---
water.json | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/water.json b/water.json
index d3c4f99..9298974 100644
--- a/water.json
+++ b/water.json
@@ -5,16 +5,34 @@
"de": "Gewässer"
},
"query": {
- "12": [
+ "10": [
+ "(",
+ "way[waterway~\"^(river|canal)$\"];",
+ "way[natural~\"^(divide)$\"];",
+ "way[natural=water][water~\"^(lake|lagoon|reservoir|canal)$\"];",
+ "relation[natural=water][type=multipolygon][water~\"^(lake|lagoon|reservoir|canal)$\"];",
+ ")"
+ ],
+ "13": [
"(",
"node[natural~\"^(water|divide)$\"];",
"way[natural~\"^(water|divide)$\"];",
"relation[type=multipolygon][natural=water];",
+ "relation[type=multipolygon][waterway=riverbank];",
"way[waterway];",
")"
]
},
"feature": {
+ "description": [
+ "{% if tags.waterway %}",
+ "{{ tagTrans('waterway', tags.waterway) }}",
+ "{% elseif tags.water %}",
+ "{{ tagTrans('water', tags.water) }}",
+ "{% elseif tags.natural %}",
+ "{{ tagTrans('natural', tags.natural) }}",
+ "{% endif %}"
+ ],
"markerSign": null,
"listMarkerSymbol": [
"{% if tags.natural == 'water' %}",
@@ -25,8 +43,12 @@
],
"style": {
"weight": [
- "{% if tags.waterway == 'stream' %}",
- "1.5",
+ "{% if tags.waterway == 'river' %}",
+ "4",
+ "{% elseif tags.waterway == 'stream' %}",
+ "2",
+ "{% elseif tags.waterway == 'ditch' %}",
+ "1",
"{% else %}",
"3",
"{% endif %}"