Changeset 6527 in josm

Timestamp:

2013-12-25T01:28:44+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9458 - tagchecker: detect emergency=permissive and fix it by emergency=yes + remove unecessary fixRemove statements

File:

• trunk/data/validator/deprecated.mapcss (modified) (12 diffs)

trunk/data/validator/deprecated.mapcss

@@ -1 +1 @@
 *[barrier=wire_fence] {
   throwWarning: tr("{0}={1} is deprecated", "barrier", "wire_fence");
-  fixRemove: "barrier";
   fixAdd: "barrier=fence";
   fixAdd: "fence_type=chain_link";
@@ -10 +9 @@
 *[barrier=wood_fence] {
   throwWarning: tr("{0}={1} is deprecated", "barrier", "wood_fence");
-  fixRemove: "barrier";
   fixAdd: "barrier=fence";
   fixAdd: "fence_type=wood";
@@ -49 +47 @@
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0}={1} is deprecated", "highway", "unsurfaced");
-  fixRemove: "highway";
   fixAdd: "highway=road";
   fixAdd: "incline=unpaved";
@@ -64 +61 @@
   /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0}={1} is deprecated", "natural", "marsh");
-  fixRemove: "natural";
   fixAdd: "natural=wetland";
   fixAdd: "wetland=marsh";
@@ -89 +85 @@
   /* from http://wiki.openstreetmap.org/wiki/Tag:shop=organic */
   throwWarning: tr("{0}={1} is deprecated", "shop", "organic");
-  fixRemove: "shop";
   fixAdd: "shop=supermarket";
   fixAdd: "organic=only";
@@ -97 +92 @@
   /* from http://wiki.openstreetmap.org/wiki/Key:bicycle_parking */
   throwWarning: tr("{0}={1} is deprecated", "bicycle_parking", "sheffield");
-  fixRemove: "bicycle_parking";
   fixAdd: "bicycle_parking=stands";
 }
@@ -111 +105 @@
   /* fix #8132 - http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_football */
   throwWarning: tr("{0}={1} is deprecated", "sport", "gaelic_football");
-  fixRemove: "sport";
   fixAdd: "sport=gaelic_games";
 }
@@ -124 +117 @@
 *[generator:method=dam] {
   throwWarning: tr("{0}={1} is deprecated", "generator:method", "dam");
-  fixRemove: "generator:method";
   fixAdd: "generator:method=water-storage";
 }
@@ -130 +122 @@
 *[generator:method=pumped-storage] {
   throwWarning: tr("{0}={1} is deprecated", "generator:method", "pumped-storage");
-  fixRemove: "generator:method";
   fixAdd: "generator:method=water-pumped-storage";
 }
@@ -136 +127 @@
 *[generator:method=pumping] {
   throwWarning: tr("{0}={1} is deprecated", "generator:method", "pumping");
-  fixRemove: "generator:method";
   fixAdd: "generator:method=water-pumped-storage";
 }
@@ -162 +152 @@
   /* see #8434 - http://wiki.openstreetmap.org/wiki/Proposed_features/monitoring_station */
   throwWarning: tr("{0}={1} is deprecated", "man_made", "measurement_station");
-  fixRemove: "man_made";
   fixAdd: "man_made=monitoring_station";
 }
@@ -194 +183 @@
   fixRemove: "layer";
 }
+
+*[emergency=permissive] {
+  /* see #9458 - emergency=permissive makes no sense */
+  throwWarning: tr("{0}={1} makes no sense", "emergency", "permissive");
+  fixAdd: "emergency=yes";
+  assertMatch: "way emergency=permissive";
+  assertNoMatch: "way emergency=designated";
+}