Changes between Version 5 and Version 6 of Rules/Geology

Timestamp:

2024-01-16T18:03:54+01:00 (14 months ago)

Author:

b1tw153

Comment:

Additional validation for closed waterways, unclosed water areas, and combined waterway/water tags

Rules/Geology

@@ -23 +23 @@
 *["natural"="archipelago"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use place=archipelago in place of natural=archipelago";
-        fixChangeKey: "natural=>place";
+    group: "deprecated tagging";
+    throwWarning: "Use place=archipelago in place of natural=archipelago";
+    fixChangeKey: "natural=>place";
 }
 
@@ -31 +31 @@
 way["place"="archipelago"]
 {
-        group: "geometry";
-        throwWarning: "Map place=archipelago as a relation with all the islands and islets as members";
+    group: "geometry";
+    throwWarning: "Map place=archipelago as a relation with all the islands and islets as members";
 }
 
 relation["place"="archipelago"] > *["natural"!="coastline"]["natural"!="atoll"]["place"!~/island|islet/]
 {
-        group: "missing tag";
-        throwWarning: "All the members of an archipelago relation should have either natural=coastline, natural=atoll, or place=island/islet";
+    group: "missing tag";
+    throwWarning: "All the members of an archipelago relation should have either natural=coastline, natural=atoll, or place=island/islet";
 }
 
@@ -46 +46 @@
 relation["natural"="arete"]:closed
 {
-        group: "geometry";
-        throwError: "Map natural=arete as an unclosed way";
+    group: "geometry";
+    throwError: "Map natural=arete as an unclosed way";
 }
 
@@ -57 +57 @@
 relation["place"="atoll"]
 {
-        group: "geometry";
-        throwWarning: "Map place=atoll as a single way enclosing the entire atoll";
+    group: "geometry";
+    throwWarning: "Map place=atoll as a single way enclosing the entire atoll";
 }
 
@@ -73 +73 @@
 *["geological"="basin"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Consider using natural=basin/depression/valley/flat in place of geological=basin";
+    group: "deprecated tagging";
+    throwWarning: "Consider using natural=basin/depression/valley/flat in place of geological=basin";
 }
 
@@ -81 +81 @@
 relation["natural"="bay"]
 {
-        group: "geometry";
-        throwWarning: "Consider mapping natural=bay as a single node";
+    group: "geometry";
+    throwWarning: "Consider mapping natural=bay as a single node";
 }
 */
@@ -92 +92 @@
 *["natural"="beach"][!"surface"]
 {
-        group: "missing tag";
-        throwWarning: "Add surface=sand/gravel/pebblestone/* for additional detail";
+    group: "missing tag";
+    throwWarning: "Add surface=sand/gravel/pebblestone/* for additional detail";
 }
 
@@ -102 +102 @@
 *["natural"="earth_bank"][!"earth_bank"]
 {
-        group: "missing tag";
-        throwWarning: "Add earth_bank=gully/scarp/grassy_steep_slope/cut_bank/* for additional detail";
+    group: "missing tag";
+    throwWarning: "Add earth_bank=gully/scarp/grassy_steep_slope/cut_bank/* for additional detail";
 }
 
 node["natural"="earth_bank"]
 {
-        group: "geometry";
-        throwWarning: "Map natural=earth_bank as a way with the lower terrain to the right";
+    group: "geometry";
+    throwWarning: "Map natural=earth_bank as a way with the lower terrain to the right";
 }
 
@@ -115 +115 @@
 *["water"="bend"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use waterway=bend along the flow line to tag a bend in a river or stream";
+    group: "deprecated tagging";
+    throwWarning: "Use waterway=bend along the flow line to tag a bend in a river or stream";
 }
 
@@ -129 +129 @@
 *["natural"="boulder"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=stone in place of natural=boulder";
-        fixAdd: "natural=stone";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=stone in place of natural=boulder";
+    fixAdd: "natural=stone";
 }
 
@@ -143 +143 @@
 *["natural"="caldera"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use geological=volcanic_caldera_rim in place of natural=caldera";
-        fixAdd: "geological=volcanic_caldera_rim";
-        fixRemove: "natural";
+    group: "deprecated tagging";
+    throwWarning: "Use geological=volcanic_caldera_rim in place of natural=caldera";
+    fixAdd: "geological=volcanic_caldera_rim";
+    fixRemove: "natural";
 }
 
@@ -152 +152 @@
 *["natural"="canyon"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=valley in place of natural=canyon";
-        fixAdd: "natural=valley";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=valley in place of natural=canyon";
+    fixAdd: "natural=valley";
 }
 
@@ -161 +161 @@
 *["natural"="headland"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=cape in place of {0.tag}";
-        fixAdd: "natural=cape";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=cape in place of {0.tag}";
+    fixAdd: "natural=cape";
 }
 
@@ -169 +169 @@
 relation["natural"="cape"]
 {
-        group: "geometry";
-        throwWarning: "Map natural=cape as a single node, not as a way or relation";
+    group: "geometry";
+    throwWarning: "Map natural=cape as a single node, not as a way or relation";
 }
 
@@ -179 +179 @@
 *["geological"="grotto"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=cave_entrance in place of {0.tag}";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=cave_entrance in place of {0.tag}";
 }
 
@@ -194 +194 @@
 *["natural"="old_coastline"]
 {
-        throwError: "Delete old coastline ways once the new coastline is in place";
+    throwError: "Delete old coastline ways once the new coastline is in place";
 }
 
@@ -200 +200 @@
 *["natural"="col"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=saddle in place of natural=col";
-        fixAdd: "natural=saddle";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=saddle in place of natural=col";
+    fixAdd: "natural=saddle";
 }
 
@@ -218 +218 @@
 *["natural"="cove"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=bay in place of natural=cove";
-        fixAdd: "natural=bay";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=bay in place of natural=cove";
+    fixAdd: "natural=bay";
 }
 
@@ -238 +238 @@
 *["geological"="maar"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Consider natural=depression + geological=volcanic_caldera_rim in place of geological=maar";
-        fixRemove: "geological";
-        fixAdd: "natural=depression";
-        fixAdd: "geological=volcanic_caldera_rim";
+    group: "deprecated tagging";
+    throwWarning: "Consider natural=depression + geological=volcanic_caldera_rim in place of geological=maar";
+    fixRemove: "geological";
+    fixAdd: "natural=depression";
+    fixAdd: "geological=volcanic_caldera_rim";
 }
 
@@ -249 +249 @@
 relation["natural"="desert"]
 {
-        group: "geometry";
-        throwWarning: "Map natural=desert as a single node at the center of a named desert area";
+    group: "geometry";
+    throwWarning: "Map natural=desert as a single node at the center of a named desert area";
 }
 
 node["natural"="desert"][!"name"]
 {
-        group: "missing tag";
-        throwWarning: "natural=desert without name=* tag";
+    group: "missing tag";
+    throwWarning: "natural=desert without name=* tag";
 }
 
@@ -267 +267 @@
 *["waterway"="sink"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use waterway=stream_end in place of waterway=sink";
-        fixAdd: "waterway=stream_end";
+    group: "deprecated tagging";
+    throwWarning: "Use waterway=stream_end in place of waterway=sink";
+    fixAdd: "waterway=stream_end";
 }
 
@@ -276 +276 @@
 relation["waterway"="stream_end"]
 {
-        group: "geometry";
-        throwError: "Map waterway=stream_end as a single node on a waterway";
+    group: "geometry";
+    throwError: "Map waterway=stream_end as a single node on a waterway";
 }
 
@@ -292 +292 @@
 *["natural"="dry_lake"][!"surface"]
 {
-        group: "missing tag";
-        throwWarning: "Add surface=salt/silt/clay/* for additional detail";
+    group: "missing tag";
+    throwWarning: "Add surface=salt/silt/clay/* for additional detail";
 }
 
@@ -310 +310 @@
 *["estuary"="yes"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Consider tidal=yes in place of estuary=yes";
-        fixChangeKey: "estuary=>tidal";
+    group: "deprecated tagging";
+    throwWarning: "Consider tidal=yes in place of estuary=yes";
+    fixChangeKey: "estuary=>tidal";
 }
 
@@ -322 +322 @@
 *["natural"="fault"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use geological=fault in place of natural=fault";
-        fixChangeKey: "natural=>geological";
+    group: "deprecated tagging";
+    throwWarning: "Use geological=fault in place of natural=fault";
+    fixChangeKey: "natural=>geological";
 }
 
@@ -346 +346 @@
 *["geological"="volcanic_geyser"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=geyser + geyser:type=volcanic in place of geological=volcanic_geyser";
-        fixAdd: "natural=geyser";
-        fixAdd: "geyser:type=volcanic";
-        fixRemove: "geological";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=geyser + geyser:type=volcanic in place of geological=volcanic_geyser";
+    fixAdd: "natural=geyser";
+    fixAdd: "geyser:type=volcanic";
+    fixRemove: "geological";
 }
 
 *["natural"="geyser"][!"geyser:type"]
 {
-        group: "missing tag";
-        throwWarning: "Add geyser_type=volcanic/co2 for additional detail";
+    group: "missing tag";
+    throwWarning: "Add geyser_type=volcanic/co2 for additional detail";
 }
 
@@ -362 +362 @@
 *["geological"="giants_kettle"][!"natural"]
 {
-        group: "missing tag";
-        throwWarning: "Add natural=depression for additional detail";
-        fixAdd: "natural=depression";
+    group: "missing tag";
+    throwWarning: "Add natural=depression for additional detail";
+    fixAdd: "natural=depression";
 }
 
@@ -370 +370 @@
 *["geological"="glacial_erratic"]["natural"!="stone"]
 {
-        group: "missing tag";
-        throwWarning: "Add natural=stone for additional detail";
-        fixAdd: "natural=stone";
+    group: "missing tag";
+    throwWarning: "Add natural=stone for additional detail";
+    fixAdd: "natural=stone";
 }
 
@@ -381 +381 @@
 *["natural"="glacier"][!"glacier:type"]
 {
-        group: "missing tag";
-        throwWarning: "Add glacier:type=mountain/valley/shelf/* for additional detail";
+    group: "missing tag";
+    throwWarning: "Add glacier:type=mountain/valley/shelf/* for additional detail";
 }
 
@@ -398 +398 @@
 relation["place"="sea"]
 {
-        group: "geometry";
-        throwError: "Map {0.tag} as a single node, not as a way or relation";
+    group: "geometry";
+    throwError: "Map {0.tag} as a single node, not as a way or relation";
 }
 
@@ -416 +416 @@
 *["geological"="hoodoo"]["natural"!="cliff"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=cliff with geological=hoodoo to outline the vertical rock face of the pinnacle";
-        fixAdd: "natural=cliff";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=cliff with geological=hoodoo to outline the vertical rock face of the pinnacle";
+    fixAdd: "natural=cliff";
 }
 
@@ -426 +426 @@
 *["geological"="geothermal"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=hot_spring in place of geological=geothermal";
-        fixAdd: "natural=hot_spring";
-        fixRemove: "geological";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=hot_spring in place of geological=geothermal";
+    fixAdd: "natural=hot_spring";
+    fixRemove: "geological";
 }
 
@@ -439 +439 @@
 *["natural"="crater"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use geological=meteor_crater/volcanic_caldera_rim in place of natural=crater";
+    group: "deprecated tagging";
+    throwWarning: "Use geological=meteor_crater/volcanic_caldera_rim in place of natural=crater";
 }
 
@@ -446 +446 @@
 *["natural"="inlet"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=bay in place of natural=inlet";
-        fixAdd: "natural=bay";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=bay in place of natural=inlet";
+    fixAdd: "natural=bay";
 }
 
@@ -458 +458 @@
 *["natural"="island"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use place=island in place of natural=island";
-        fixChangeKey: "natural=>place";
+    group: "deprecated tagging";
+    throwWarning: "Use place=island in place of natural=island";
+    fixChangeKey: "natural=>place";
 }
 
 *["natural"="land"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use place=island/islet in place of natural=land";
+    group: "deprecated tagging";
+    throwWarning: "Use place=island/islet in place of natural=land";
 }
 
@@ -472 +472 @@
 *["natural"="islet"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use place=islet in place of natural=islet";
-        fixChangeKey: "natural=>place";
+    group: "deprecated tagging";
+    throwWarning: "Use place=islet in place of natural=islet";
+    fixChangeKey: "natural=>place";
 }
 
@@ -487 +487 @@
 *["geological"="kettle"]["natural"!="depression"]
 {
-        group: "missing tag";
-        throwWarning: "Add natural=depression for additional detail";
-        fixAdd: "natural=depression";
+    group: "missing tag";
+    throwWarning: "Add natural=depression for additional detail";
+    fixAdd: "natural=depression";
 }
 
@@ -497 +497 @@
 *["natural"="knoll"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=hill in place of natural=knoll";
-        fixAdd: "natural=hill";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=hill in place of natural=knoll";
+    fixAdd: "natural=hill";
 }
 
@@ -510 +510 @@
 *["natural"="pond"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=water + water={0.value} in place of {0.tag}";
-        fixChangeKey: "natural=>water";
-        fixAdd: "natural=water";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=water + water={0.value} in place of {0.tag}";
+    fixChangeKey: "natural=>water";
+    fixAdd: "natural=water";
+}
+
+*["natural"="water"]["waterway"][!"water"]
+{
+    group: "incompatible tags";
+    throwWarning: "Use water=* in place of waterway=* in combination with natural=water";
+    fixChangeKey: "waterway=>water";
+}
+
+*["water"]["waterway"]
+{
+    group: "incompatible tags";
+    throwWarning: "Map water=* as an area and waterway=* as a linear feature";
+}
+
+*["water"]!:closed
+{
+    group: "geometry";
+    throwWarning: "Use water=* only on areas";
 }
 
@@ -520 +539 @@
 *["geological"="landslide"][!"landslide"]
 {
-        group: "missing tag";
-        throwWarning: "Add landslide=* for additional detail";
+    group: "missing tag";
+    throwWarning: "Add landslide=* for additional detail";
 }
 
@@ -527 +546 @@
 *["geological"="gravitational_creep"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=landslide + landslide=* in place of {0.tag}";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=landslide + landslide=* in place of {0.tag}";
 }
 
@@ -534 +553 @@
 *["natural"="lava"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=bare_rock + geological=volcanic_lava_flow in place of natural=lava";
-        fixAdd: "natural=bare_rock";
-        fixAdd: "geological=volcanic_lava_flow";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=bare_rock + geological=volcanic_lava_flow in place of natural=lava";
+    fixAdd: "natural=bare_rock";
+    fixAdd: "geological=volcanic_lava_flow";
 }
 
@@ -552 +571 @@
 *["natural"="bare_rock"][!"material"]
 {
-        group: "missing tag";
-        throwWarning: "Add material=granite/sandstone/marble/limestone/basalt/* for additional detail";
+    group: "missing tag";
+    throwWarning: "Add material=granite/sandstone/marble/limestone/basalt/* for additional detail";
 }
 
 *["geological"="lapiaz"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=bare_rock + material=limestone in place of geological=lapiaz";
-        fixAdd: "shop=gemstones";
-        fixRemove: "geological";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=bare_rock + material=limestone in place of geological=lapiaz";
+    fixAdd: "shop=gemstones";
+    fixRemove: "geological";
 }
 
@@ -580 +599 @@
 *["natural"="moraine"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=hill + geological=moraine in place of natural=moraine";
-        fixAdd: "natural=hill";
-        fixAdd: "geological=moraine";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=hill + geological=moraine in place of natural=moraine";
+    fixAdd: "natural=hill";
+    fixAdd: "geological=moraine";
 }
 
 *["geological"="moraine"][!"natural"]
 {
-        group: "missing tag";
-        throwWarning: "Consider adding natural=hill/ridge for additional detail";
+    group: "missing tag";
+    throwWarning: "Consider adding natural=hill/ridge for additional detail";
 }
 
@@ -600 +619 @@
 relation["mountain_pass"="yes"]
 {
-        group: "geometry";
-        throwError: "Map mountain_pass=yes as a node at the highest point on a highway";
+    group: "geometry";
+    throwError: "Map mountain_pass=yes as a node at the highest point on a highway";
 }
 
@@ -607 +626 @@
 *["natural"="range"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=mountain_range in place of natural=range";
-        fixAdd: "natural=mountain_range";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=mountain_range in place of natural=range";
+    fixAdd: "natural=mountain_range";
 }
 
@@ -628 +647 @@
 *["geological"="outcrop"]["natural"!~/bare_rock|rock/]
 {
-        group: "missing tag";
-        throwWarning: "Add natural=bare_rock for additional detail";
-        fixAdd: "natural=bare_rock";
+    group: "missing tag";
+    throwWarning: "Add natural=bare_rock for additional detail";
+    fixAdd: "natural=bare_rock";
 }
 
@@ -636 +655 @@
 *["natural"="rock_formation"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=bare_rock + geological=outcrop in place of {0.tag}";
-        fixAdd: "natural=bare_rock";
-        fixAdd: "geological=outcrop";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=bare_rock + geological=outcrop in place of {0.tag}";
+    fixAdd: "natural=bare_rock";
+    fixAdd: "geological=outcrop";
 }
 
@@ -661 +680 @@
 *["geological"="plateau"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=plateau in place of geological=plateau";
-        fixChangeKey: "geological=>natural";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=plateau in place of geological=plateau";
+    fixChangeKey: "geological=>natural";
 }
 
@@ -684 +703 @@
 *["natural"="rapids"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use waterway=rapids in place of natural=rapids";
-        fixChangeKey: "natural=>waterway";
+    group: "deprecated tagging";
+    throwWarning: "Use waterway=rapids in place of natural=rapids";
+    fixChangeKey: "natural=>waterway";
 }
 
@@ -703 +722 @@
 *["natural"="reef"][!"reef"]
 {
-        group: "missing tag";
-        throwWarning: "Add reef=coral/rock/sand/* for additional detail";
+    group: "missing tag";
+    throwWarning: "Add reef=coral/rock/sand/* for additional detail";
 }
 
 *["natural"="sandbar"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=reef + reef=sand in place of natural=sandbar";
-        fixAdd: "natural=reef";
-        fixAdd: "reef=sand";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=reef + reef=sand in place of natural=sandbar";
+    fixAdd: "natural=reef";
+    fixAdd: "reef=sand";
 }
 
@@ -723 +742 @@
 *["natural"="riverbed"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=water + water=river in place of {0.tag}";
-        fixAdd: "natural=water";
-        fixAdd: "water=river";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=water + water=river in place of {0.tag}";
+    fixAdd: "natural=water";
+    fixAdd: "water=river";
 }
 
@@ -736 +755 @@
 *["natural"="glacier"]["glacier:type"="rock"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use geological=rock_glacier + natural=scree in place of natural=glacier + glacier:type=rock";
-        fixAdd: "geological=rock_glacier";
-        fixAdd: "natural=scree";
-        fixRemove: "glacier:type";
+    group: "deprecated tagging";
+    throwWarning: "Use geological=rock_glacier + natural=scree in place of natural=glacier + glacier:type=rock";
+    fixAdd: "geological=rock_glacier";
+    fixAdd: "natural=scree";
+    fixRemove: "glacier:type";
 }
 
 *["geological"="rock_glacier"][!"natural"]
 {
-        group: "missing tag";
-        throwWarning: "Consider adding natural=scree for additional detail";
-        fixAdd: "natural=scree";
+    group: "missing tag";
+    throwWarning: "Consider adding natural=scree for additional detail";
+    fixAdd: "natural=scree";
 }
 
@@ -753 +772 @@
 *["natural"="rock_shelter"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=rock_overhang in place of natural=rock_shelter";
-        fixAdd: "natural=rock_overhang";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=rock_overhang in place of natural=rock_shelter";
+    fixAdd: "natural=rock_overhang";
 }
 
@@ -765 +784 @@
 relation["natural"="saddle"]
 {
-        group: "geometry";
-        throwError: "Map natural=saddle as a node, not as a way or relation";
+    group: "geometry";
+    throwError: "Map natural=saddle as a node, not as a way or relation";
 }
 
@@ -774 +793 @@
 *["natural"="pass"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=saddle in place of {0.tag}";
-        fixAdd: "natural=saddle";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=saddle in place of {0.tag}";
+    fixAdd: "natural=saddle";
 }
 
@@ -784 +803 @@
 *["geological"="salt_pan"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Consider natural=dry_lake + surface=salt in place of geological=salt_pan";
-        fixAdd: "natural=dry_lake";
-        fixAdd: "surface=salt";
-        fixRemove: "geological";
+    group: "deprecated tagging";
+    throwWarning: "Consider natural=dry_lake + surface=salt in place of geological=salt_pan";
+    fixAdd: "natural=dry_lake";
+    fixAdd: "surface=salt";
+    fixRemove: "geological";
 }
 
@@ -807 +826 @@
 *["natural"="sinkhole"][!"sinkhole"]
 {
-        group: "missing tag";
-        throwWarning: "Add sinkhole=bluehole/doline/estavelle/pit/ponor for additional detail";
+    group: "missing tag";
+    throwWarning: "Add sinkhole=bluehole/doline/estavelle/pit/ponor for additional detail";
 }
 
@@ -822 +841 @@
 *["natural"="channel"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=strait in place of natural=channel";
-        fixAdd: "natural=strait";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=strait in place of natural=channel";
+    fixAdd: "natural=strait";
 }
 
@@ -835 +854 @@
 *["natural"="stream"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use waterway=stream in place of {0.tag}";
-        fixAdd: "waterway=stream";
-        fixRemove: "natural";
+    group: "deprecated tagging";
+    throwWarning: "Use waterway=stream in place of {0.tag}";
+    fixAdd: "waterway=stream";
+    fixRemove: "natural";
 }
 
 *["natural"="waterway"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use waterway=river/stream in place of natural=waterway";
-}
-
-/* Stream pool */
+    group: "deprecated tagging";
+    throwWarning: "Use waterway=river/stream in place of natural=waterway";
+}
+
+*["waterway"]:closed
+{
+    group: "geometry";
+    throwWarning: "Use waterway=* only on linear features";
+}
+
+/* Stream pool - see Lake */
 /* Strike ridge */
 /* Structural bench - see Bench */
@@ -859 +884 @@
 *["natural"="summit"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use natural=peak in place of natural=summit";
-        fixAdd: "natural=peak";
+    group: "deprecated tagging";
+    throwWarning: "Use natural=peak in place of natural=summit";
+    fixAdd: "natural=peak";
 }
 way["natural"="peak"],
 relation["natural"="peak"]
 {
-        group: "geometry";
-        throwError: "Map natural=peak as a single node at the highest point of elevation, not as a way or relation";
+    group: "geometry";
+    throwError: "Map natural=peak as a single node at the highest point of elevation, not as a way or relation";
 }
 
@@ -887 +912 @@
 *["geological"="tor"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use geological=outcrop in place of geological=tor";
-        fixAdd: "geological=outcrop";
+    group: "deprecated tagging";
+    throwWarning: "Use geological=outcrop in place of geological=tor";
+    fixAdd: "geological=outcrop";
 }
 
@@ -912 +937 @@
 relation["natural"="gully"]:closed
 {
-        group: "geometry";
-        throwError: "Map {0.tag} as an unclosed way";
+    group: "geometry";
+    throwError: "Map {0.tag} as an unclosed way";
 }
 
@@ -926 +951 @@
 *["natural"="crater_rim"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use geological=volcanic_caldera_rim in place of {0.tag}";
-        fixAdd: "geological=volcanic_caldera_rim";
-        fixRemove: "natural";
+    group: "deprecated tagging";
+    throwWarning: "Use geological=volcanic_caldera_rim in place of {0.tag}";
+    fixAdd: "geological=volcanic_caldera_rim";
+    fixRemove: "natural";
 }
 
@@ -945 +970 @@
 *["natural"="volcano"][!"volcano:status"]
 {
-        group: "missing tag";
-        throwWarning: "Add {1.key}=* for additional detail";
+    group: "missing tag";
+    throwWarning: "Add {1.key}=* for additional detail";
 }
 
@@ -952 +977 @@
 *["natural"="wadi"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use waterway=stream + intermittent=yes in place of natural=wadi";
-        fixAdd: "waterway=stream";
-        fixAdd: "intermittent=yes";
-        fixRemove: "natural";
+    group: "deprecated tagging";
+    throwWarning: "Use waterway=stream + intermittent=yes in place of natural=wadi";
+    fixAdd: "waterway=stream";
+    fixAdd: "intermittent=yes";
+    fixRemove: "natural";
 }
 
@@ -962 +987 @@
 node["waterway"="waterfall"]["intermittent"!="yes"] < way["waterway"]["intermittent"="yes"]
 {
-        group: "missing tag";
-        throwWarning: "Add intermittent=yes to a waterfall on an intermittent waterway";
-        fixAdd: "intermittent=yes";
+    group: "missing tag";
+    throwWarning: "Add intermittent=yes to a waterfall on an intermittent waterway";
+    fixAdd: "intermittent=yes";
 }
 
@@ -974 +999 @@
 *["natural"="wetland"][!"wetland"]
 {
-        group: "missing tag";
-        throwWarning: "Add wetland=bog/swamp/marsh/tidalflat/* for additional detail";
+    group: "missing tag";
+    throwWarning: "Add wetland=bog/swamp/marsh/tidalflat/* for additional detail";
 }
 
@@ -986 +1011 @@
 *["natural"="landform"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use a more specific tag for the landform in place of {0.tag}";
+    group: "deprecated tagging";
+    throwWarning: "Use a more specific tag for the landform in place of {0.tag}";
 }
 
 *["natural"="oilfield"]
 {
-        group: "deprecated tagging";
-        throwWarning: "Use man_made=oilfield in place of natural=oilfield";
-        fixChangeKey: "natural=>man_made";
+    group: "deprecated tagging";
+    throwWarning: "Use man_made=oilfield in place of natural=oilfield";
+    fixChangeKey: "natural=>man_made";
 }