Changeset 17020 in josm for trunk

Timestamp:

2020-09-12T19:10:42+02:00 (4 years ago)

Author:

Klumbumbus

Message:

fix #19782 - Fix spelling of climbing keys containing UIAA to uiaa, add validator warnings

Location:

trunk/resources/data

Files:

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

trunk/resources/data/defaultpresets.xml

@@ -4915 +4915 @@
             <combo key="climbing:length:max" text="Maximum climbing length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
             <space />
-            <combo key="climbing:grade:UIAA:min" text="UIAA: Simplest route" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
-            <combo key="climbing:grade:UIAA:max" text="UIAA: Most difficult route" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
-            <combo key="climbing:grade:UIAA:mean" text="UIAA: Main difficulty" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
+            <combo key="climbing:grade:uiaa:min" text="UIAA: Simplest route" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
+            <combo key="climbing:grade:uiaa:max" text="UIAA: Most difficult route" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
+            <combo key="climbing:grade:uiaa:mean" text="UIAA: Main difficulty" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
             <space />
             <combo key="climbing:grade:french:min" text="French: Simplest route" values="4,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
@@ -4940 +4940 @@
             <combo key="climbing:length" text="Route length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
             <space />
-            <combo key="climbing:grade:UIAA" text="UIAA grading" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
+            <combo key="climbing:grade:uiaa" text="UIAA grading" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
             <combo key="climbing:grade:french" text="French grading" values="4,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
             <combo key="climbing:grade:saxon" text="Saxon grading" values="IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />

trunk/resources/data/validator/deprecated.mapcss

@@ -2055 +2055 @@
 }
 
+/* #19782 */
+*[climbing:grade:UIAA:min] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "climbing:grade:uiaa:min";
+  group: tr("deprecated tagging");
+  fixChangeKey: "climbing:grade:UIAA:min => climbing:grade:uiaa:min";
+}
+*[climbing:grade:UIAA:max] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "climbing:grade:uiaa:max";
+  group: tr("deprecated tagging");
+  fixChangeKey: "climbing:grade:UIAA:max => climbing:grade:uiaa:max";
+}
+*[climbing:grade:UIAA:mean] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "climbing:grade:uiaa:mean";
+  group: tr("deprecated tagging");
+  fixChangeKey: "climbing:grade:UIAA:mean => climbing:grade:uiaa:mean";
+}
+*[climbing:grade:UIAA] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "climbing:grade:uiaa";
+  group: tr("deprecated tagging");
+  fixChangeKey: "climbing:grade:UIAA => climbing:grade:uiaa";
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */

trunk/resources/data/validator/ignoretags.cfg

@@ -696 +696 @@
 K:building=part
 K:natural=sink_hole
+E:climbing:grade:UIAA:min
+E:climbing:grade:UIAA:max
+E:climbing:grade:UIAA:mean
+E:climbing:grade:UIAA
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated)