From 97dfe66828cd263a0aa0a7b622ce018b82f29a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@cg.tuwien.ac.at>
Date: Mon, 25 Mar 2019 13:55:16 +0100
Subject: [PATCH] natural: exclude natural=water (see category water instead)
---
natural.json | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/natural.json b/natural.json
index 457d371..7399392 100644
--- a/natural.json
+++ b/natural.json
@@ -24,16 +24,16 @@
],
"13": [
"(",
- "node[natural~\"^(peak|volcano|wood|scrub|heath|grassland|fell|bare_rock|scree|shingle|sand|mud|water|wetland|glacier|bay|cape|beach|coastline|spring|hot_spring|geyser|valley|ridge|arete|cliff|saddle|rock|stone|sinkhole|cave_entrance)$\"];",
- "way[natural~\"^(peak|volcano|wood|scrub|heath|grassland|fell|bare_rock|scree|shingle|sand|mud|water|wetland|glacier|bay|cape|beach|coastline|spring|hot_spring|geyser|valley|ridge|arete|cliff|saddle|rock|stone|sinkhole|cave_entrance)$\"];",
- "relation[natural~\"^(peak|volcano|wood|scrub|heath|grassland|fell|bare_rock|scree|shingle|sand|mud|water|wetland|glacier|bay|cape|beach|coastline|spring|hot_spring|geyser|valley|ridge|arete|cliff|saddle|rock|stone|sinkhole|cave_entrance)$\"];",
+ "node[natural~\"^(peak|volcano|wood|scrub|heath|grassland|fell|bare_rock|scree|shingle|sand|mud|wetland|glacier|bay|cape|beach|coastline|spring|hot_spring|geyser|valley|ridge|arete|cliff|saddle|rock|stone|sinkhole|cave_entrance)$\"];",
+ "way[natural~\"^(peak|volcano|wood|scrub|heath|grassland|fell|bare_rock|scree|shingle|sand|mud|wetland|glacier|bay|cape|beach|coastline|spring|hot_spring|geyser|valley|ridge|arete|cliff|saddle|rock|stone|sinkhole|cave_entrance)$\"];",
+ "relation[natural~\"^(peak|volcano|wood|scrub|heath|grassland|fell|bare_rock|scree|shingle|sand|mud|wetland|glacier|bay|cape|beach|coastline|spring|hot_spring|geyser|valley|ridge|arete|cliff|saddle|rock|stone|sinkhole|cave_entrance)$\"];",
")"
],
"16": [
"(",
- "node[natural];",
- "way[natural];",
- "relation[natural];",
+ "node[natural][natural!~\"^(water)$\"];",
+ "way[natural][natural!~\"^(water)$\"];",
+ "relation[natural][natural!~\"^(water)$\"];",
")"
]
},
@@ -116,11 +116,6 @@
"color": "#988b00",
"group": "vegetation"
},
- "water": {
- "sign": "<i class='fas fa-water'></i>",
- "color": "blue",
- "group": "water"
- },
"wetland": {
"sign": "<img data-src='maki:wetland?fill=white'>",
"color": "#00baff",