Browse Source

natural/water: move some feature to water category (bay, spring, ...)

railway-electrification
parent
commit
5724fad918
  1. 28
      natural.json
  2. 5
      water.json

28
natural.json

@ -24,16 +24,12 @@
], ],
"13": [ "13": [
"(", "(",
"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)$\"];",
"nwr[natural~\"^(peak|volcano|wood|scrub|heath|grassland|fell|bare_rock|scree|shingle|sand|mud|wetland|glacier|cape|beach|coastline|valley|ridge|arete|cliff|saddle|rock|stone|sinkhole|cave_entrance)$\"];",
")" ")"
], ],
"16": [ "16": [
"(", "(",
"node[natural][natural!~\"^(water)$\"];",
"way[natural][natural!~\"^(water)$\"];",
"relation[natural][natural!~\"^(water)$\"];",
"nwr[natural][natural!~\"^(water|divide|bay|strait|spring|hot_spring|geyser)$\"];",
")" ")"
] ]
}, },
@ -126,10 +122,6 @@
"color": "white", "color": "white",
"group": "water" "group": "water"
}, },
"bay": {
"sign": "",
"group": "water"
},
"cape": { "cape": {
"sign": "", "sign": "",
"group": "water" "group": "water"
@ -138,10 +130,6 @@
"sign": "", "sign": "",
"group": "water" "group": "water"
}, },
"strait": {
"sign": "",
"group": "water"
},
"beach": { "beach": {
"sign": "<i class='fas fa-umbrella-beach'></i>", "sign": "<i class='fas fa-umbrella-beach'></i>",
"color": "#f9d199", "color": "#f9d199",
@ -151,18 +139,6 @@
"sign": "", "sign": "",
"group": "water" "group": "water"
}, },
"spring": {
"sign": "",
"group": "water"
},
"hot_spring": {
"sign": "",
"group": "water"
},
"geyser": {
"sign": "",
"group": "water"
},
"reef": { "reef": {
"sign": "", "sign": "",
"group": "water" "group": "water"

5
water.json

@ -12,15 +12,14 @@
"10": [ "10": [
"(", "(",
"way[waterway~\"^(river|canal)$\"];", "way[waterway~\"^(river|canal)$\"];",
"way[natural~\"^(divide)$\"];",
"nwr[natural~\"^(divide|bay|strait)$\"];",
"way[natural=water][water~\"^(lake|lagoon|reservoir|canal)$\"];", "way[natural=water][water~\"^(lake|lagoon|reservoir|canal)$\"];",
"relation[natural=water][type=multipolygon][water~\"^(lake|lagoon|reservoir|canal)$\"];", "relation[natural=water][type=multipolygon][water~\"^(lake|lagoon|reservoir|canal)$\"];",
")" ")"
], ],
"13": [ "13": [
"(", "(",
"node[natural~\"^(water|divide)$\"];",
"way[natural~\"^(water|divide)$\"];",
"nwr[natural~\"^(water|divide|bay|strait|spring|hot_spring|geyser)$\"];",
"relation[type=multipolygon][natural=water];", "relation[type=multipolygon][natural=water];",
"relation[type=multipolygon][waterway=riverbank];", "relation[type=multipolygon][waterway=riverbank];",
"way[waterway];", "way[waterway];",

Loading…
Cancel
Save