Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 6512)
+++ trunk/data/validator/deprecated.mapcss	(revision 6527)
@@ -1,5 +1,4 @@
 *[barrier=wire_fence] {
   throwWarning: tr("{0}={1} is deprecated", "barrier", "wire_fence");
-  fixRemove: "barrier";
   fixAdd: "barrier=fence";
   fixAdd: "fence_type=chain_link";
@@ -10,5 +9,4 @@
 *[barrier=wood_fence] {
   throwWarning: tr("{0}={1} is deprecated", "barrier", "wood_fence");
-  fixRemove: "barrier";
   fixAdd: "barrier=fence";
   fixAdd: "fence_type=wood";
@@ -49,5 +47,4 @@
   /* 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,5 +61,4 @@
   /* 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,5 +85,4 @@
   /* 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,5 +92,4 @@
   /* 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,5 +105,4 @@
   /* 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,5 +117,4 @@
 *[generator:method=dam] {
   throwWarning: tr("{0}={1} is deprecated", "generator:method", "dam");
-  fixRemove: "generator:method";
   fixAdd: "generator:method=water-storage";
 }
@@ -130,5 +122,4 @@
 *[generator:method=pumped-storage] {
   throwWarning: tr("{0}={1} is deprecated", "generator:method", "pumped-storage");
-  fixRemove: "generator:method";
   fixAdd: "generator:method=water-pumped-storage";
 }
@@ -136,5 +127,4 @@
 *[generator:method=pumping] {
   throwWarning: tr("{0}={1} is deprecated", "generator:method", "pumping");
-  fixRemove: "generator:method";
   fixAdd: "generator:method=water-pumped-storage";
 }
@@ -162,5 +152,4 @@
   /* 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,2 +183,10 @@
   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";
+}