Changeset 11074 in josm

Timestamp:

2016-10-03T15:40:21+02:00 (8 years ago)

Author:

Klumbumbus

Message:

fix #13727 - improve "waterway=weir together with bridge=yes" warning

File:

• trunk/data/validator/combinations.mapcss (modified) (1 diff)

trunk/data/validator/combinations.mapcss

@@ -217 +217 @@
 }
 
-/* #11127 */
-way[waterway][bridge=yes] {
+/* #11127, #13727 */
+way[waterway][bridge=yes][waterway!=weir] {
   throwWarning: tr("{0} together with {1}", "{0.key}", "{1.tag}");
   suggestAlternative: "bridge=aqueduct";
   fixAdd: "bridge=aqueduct";
+}
+way[waterway=weir][bridge=yes][highway] {
+  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  suggestAlternative: "waterway=weir + ford=yes";
+  suggestAlternative: "waterway=dam";
+  suggestAlternative: tr("two objects, one with {0} and one with {1} + {2} + {3}", "{0.tag}", "{2.key}", "{1.tag}", "layer");
 }