Changeset 15372 in josm


Ignore:
Timestamp:
2019-09-25T12:13:31+02:00 (7 weeks ago)
Author:
Don-vip
Message:
  • fix #18153 - prefer location=roof over location=rooftop, location over generator:location
  • update TLD from IANA
  • ignore cycling network tags icn[_ref], ncn[_ref], rcn[_ref], lcn[_ref]
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r15367 r15372  
    337337    </chunk>
    338338    <chunk id="power_loc">
    339         <combo key="location" text="Location" values="outdoor,indoor,underground,platform,rooftop" values_context="power" />
     339        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof" values_context="power" />
    340340    </chunk>
    341341    <chunk id="power_extra">
  • trunk/data/validator/deprecated.mapcss

    r15360 r15372  
    189189  fixAdd: "power=substation";
    190190}
    191  
     191
     192*[location=rooftop] {
     193  throwWarning: tr("{0} is deprecated", "{0.tag}");
     194  suggestAlternative: "location=roof";
     195  group: tr("deprecated tagging");
     196  fixAdd: "location=roof";
     197}
     198
     199*[generator:location=*] {
     200  throwWarning: tr("{0} is deprecated", "{0.key}");
     201  suggestAlternative: "location";
     202  group: tr("deprecated tagging");
     203  fixChangeKey: "generator:location => location";
     204}
     205
    192206*[generator:method=dam] {
    193207  throwWarning: tr("{0} is deprecated", "{0.tag}");
  • trunk/data/validator/ignoretags.cfg

    r15351 r15372  
    6464E:hour_off
    6565E:tower:type
     66E:icn
     67E:ncn
     68E:rcn
     69E:lcn
     70E:icn_ref
     71E:ncn_ref
    6672E:rcn_ref
     73E:lcn_ref
    6774E:place_name
    6875E:cycleway
  • trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java

    r15346 r15372  
    296296    // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
    297297    private static final String[] GENERIC_TLDS = new String[] {
    298         // Taken from Version 2019091200, Last Updated Thu Sep 12 07:07:02 2019 UTC
     298        // Taken from Version 2019092301, Last Updated Tue Sep 24 07:07:01 2019 UTC
    299299        "aaa", // aaa American Automobile Association, Inc.
    300300        "aarp", // aarp AARP
     
    544544        "coupons", // coupons Black Island, LLC
    545545        "courses", // courses OPEN UNIVERSITIES AUSTRALIA PTY LTD
     546        "cpa", // cpa American Institute of Certified Public Accountants
    546547        "credit", // credit Snow Shadow, LLC
    547548        "creditcard", // creditcard Binky Frostbite, LLC
Note: See TracChangeset for help on using the changeset viewer.