Changeset 17020 in josm


Ignore:
Timestamp:
2020-09-12T19:10:42+02:00 (9 days ago)
Author:
Klumbumbus
Message:

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

Location:
trunk/resources/data
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/defaultpresets.xml

    r17019 r17020  
    49154915            <combo key="climbing:length:max" text="Maximum climbing length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
    49164916            <space />
    4917             <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" />
    4918             <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" />
    4919             <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" />
     4917            <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" />
     4918            <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" />
     4919            <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" />
    49204920            <space />
    49214921            <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" />
     
    49404940            <combo key="climbing:length" text="Route length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
    49414941            <space />
    4942             <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" />
     4942            <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" />
    49434943            <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" />
    49444944            <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

    r17017 r17020  
    20552055}
    20562056
     2057/* #19782 */
     2058*[climbing:grade:UIAA:min] {
     2059  throwWarning: tr("{0} is deprecated", "{0.key}");
     2060  suggestAlternative: "climbing:grade:uiaa:min";
     2061  group: tr("deprecated tagging");
     2062  fixChangeKey: "climbing:grade:UIAA:min => climbing:grade:uiaa:min";
     2063}
     2064*[climbing:grade:UIAA:max] {
     2065  throwWarning: tr("{0} is deprecated", "{0.key}");
     2066  suggestAlternative: "climbing:grade:uiaa:max";
     2067  group: tr("deprecated tagging");
     2068  fixChangeKey: "climbing:grade:UIAA:max => climbing:grade:uiaa:max";
     2069}
     2070*[climbing:grade:UIAA:mean] {
     2071  throwWarning: tr("{0} is deprecated", "{0.key}");
     2072  suggestAlternative: "climbing:grade:uiaa:mean";
     2073  group: tr("deprecated tagging");
     2074  fixChangeKey: "climbing:grade:UIAA:mean => climbing:grade:uiaa:mean";
     2075}
     2076*[climbing:grade:UIAA] {
     2077  throwWarning: tr("{0} is deprecated", "{0.key}");
     2078  suggestAlternative: "climbing:grade:uiaa";
     2079  group: tr("deprecated tagging");
     2080  fixChangeKey: "climbing:grade:UIAA => climbing:grade:uiaa";
     2081}
     2082
    20572083/* When tags are deprecated they should be added to ignoretags.cfg too. */
  • trunk/resources/data/validator/ignoretags.cfg

    r17017 r17020  
    696696K:building=part
    697697K:natural=sink_hole
     698E:climbing:grade:UIAA:min
     699E:climbing:grade:UIAA:max
     700E:climbing:grade:UIAA:mean
     701E:climbing:grade:UIAA
    698702;
    699703; Tags not yet decided (to remove from this section when added or moved up when deprecated)
Note: See TracChangeset for help on using the changeset viewer.