Changeset 15372 in josm

Timestamp:

2019-09-25T12:13:31+02:00 (5 years 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:

• data/defaultpresets.xml (modified) (1 diff)
• data/validator/deprecated.mapcss (modified) (1 diff)
• data/validator/ignoretags.cfg (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -337 +337 @@
     </chunk>
     <chunk id="power_loc">
-        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,rooftop" values_context="power" />
+        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof" values_context="power" />
     </chunk>
     <chunk id="power_extra">

trunk/data/validator/deprecated.mapcss

@@ -189 +189 @@
   fixAdd: "power=substation";
 }
-  
+
+*[location=rooftop] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "location=roof";
+  group: tr("deprecated tagging");
+  fixAdd: "location=roof";
+}
+
+*[generator:location=*] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "location";
+  group: tr("deprecated tagging");
+  fixChangeKey: "generator:location => location";
+}
+
 *[generator:method=dam] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");

trunk/data/validator/ignoretags.cfg

@@ -64 +64 @@
 E:hour_off
 E:tower:type
+E:icn
+E:ncn
+E:rcn
+E:lcn
+E:icn_ref
+E:ncn_ref
 E:rcn_ref
+E:lcn_ref
 E:place_name
 E:cycleway

trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java

@@ -296 +296 @@
     // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
     private static final String[] GENERIC_TLDS = new String[] {
-        // Taken from Version 2019091200, Last Updated Thu Sep 12 07:07:02 2019 UTC
+        // Taken from Version 2019092301, Last Updated Tue Sep 24 07:07:01 2019 UTC
         "aaa", // aaa American Automobile Association, Inc.
         "aarp", // aarp AARP
@@ -544 +544 @@
         "coupons", // coupons Black Island, LLC
         "courses", // courses OPEN UNIVERSITIES AUSTRALIA PTY LTD
+        "cpa", // cpa American Institute of Certified Public Accountants
         "credit", // credit Snow Shadow, LLC
         "creditcard", // creditcard Binky Frostbite, LLC