Changeset 7490 in josm for trunk/data/validator

Timestamp:

2014-09-04T18:22:52+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10447 - support new bridge scheme:

• presets: update bridge values, add bridge:structure, bridge:movable, new items for bridge=movable and bridge:support, items moved to new group "Man Made/Bridges" (based on work from RicoZ and geozeisig)
• validator: new deprecation and combinations warnings

Location:

trunk/data/validator

Files:

• combinations.mapcss (modified) (2 diffs)
• deprecated.mapcss (modified) (1 diff)

trunk/data/validator/combinations.mapcss

@@ -46 +46 @@
 *[have_riverbank               ][!waterway],
 *[border_type                  ][!boundary],
+*[bridge:structure             ][!bridge],
 *[source:date                  ][!source],
 *[source:name                  ][!name],
@@ -100 +101 @@
 *[castle_type                  ][historic!=castle],
 *[reservoir_type               ][landuse!=reservoir][water!=reservoir],
+*[bridge:movable               ][bridge!=movable],
 *[bunker_type                  ][military!=bunker] {
   throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}");

trunk/data/validator/deprecated.mapcss

@@ -261 +261 @@
   assertMatch: "way natural=land";
 }
+
+/* see #10447 - https://wiki.openstreetmap.org/wiki/Proposed_features/Bridge_types#Deprecated_bridge_key_values */
+*[bridge=causeway] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  suggestAlternative: "ford=yes";
+  suggestAlternative: "bridge=low_water_crossing";
+  suggestAlternative: "embankment=yes";
+}
+
+*[bridge=swing] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  suggestAlternative: "bridge:movable=swing";
+  suggestAlternative: "bridge:structure=simple-suspension";
+}
+
+*[bridge=suspension] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  fixAdd: "bridge=yes";
+  fixAdd: "bridge:structure=suspension";
+}