Changeset 8204 in josm

Timestamp:

2015-04-17T22:18:26+02:00 (10 years ago)

Author:

Klumbumbus

Message:

see #11245 - remove controversial clothes tag; fix #10329 - improve color validator warning; fix #11330 - improve uncommon short key validator warning; fix #11344 - add validator warning for 'tower|pole=air_to_ground'

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (1 diff)
• validator/deprecated.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -6275 +6275 @@
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <combo key="organic" text="Organic" values="only,yes,no" />
-            <multiselect key="clothes" text="Clothes" values="babies;children;costumes;denim;fashion;fur;hats;leather;maternity;men;motorcycle;oversize;schoolwear;sports;suits;swimwear;traditional;underwear;wedding;women;workwear" values_context="clothes" values_searchable="true" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Clothes -->

trunk/data/validator/deprecated.mapcss

@@ -437 +437 @@
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
 }
+*[/:color/]{
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: ":colour";
+}
+*[/color:/] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "colour:";
+}
 
 /* see #11234 */
@@ -445 +453 @@
 /* see #11330 */
 *[/^.$/],
-*[/^..$/][!to] {
+node[/^..$/],
+way[/^..$/],
+relation[/^..$/][!to] {
   throwWarning: tr("uncommon short key");
 }
+
+/* see #11344 */
+*[tower=air_to_ground] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "tower=transition";
+  fixAdd: "tower=transition";
+}
+*[pole=air_to_ground] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "pole=transition";
+  fixAdd: "pole=transition";
+}