Changeset 19025 in josm

Timestamp:

2024-04-02T20:50:57+02:00 (7 months ago)

Author:

taylor.smock

Message:

Fix #23177: Change ref:gnis to gnis:feature_id in the waterway tagging options

ref:gnis, gnis:id, tiger:PLACENS, NHS:GNIS_ID, and nhs:gnis_id have
been merged into gnis:feature_id.

The wiki pages have been stable for 6 months, and the changes were discussed on
the OSM forum.

Location:

trunk

Files:

• resources/data/defaultpresets.xml (modified) (1 diff)
• resources/data/validator/deprecated.mapcss (modified) (1 diff)
• resources/data/validator/ignoretags.cfg (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -9980 +9980 @@
                 <text key="ref:fgkz" text="Reference FGKZ (DE)" regions="DE" />
                 <text key="ref:regine" text="Reference REGINE (NO)" regions="NO" />
-                <text key="ref:gnis" text="Reference GNIS (USA)" regions="US" />
+                <text key="gnis:feature_id" text="Reference GNIS (USA)" regions="US" />
                 <text key="ref:gnbc" text="Reference GNBC (CA)" regions="CA" />
                 <reference ref="wikipedia_wikidata" />

trunk/resources/data/validator/deprecated.mapcss

@@ -2510 +2510 @@
 }
 
+/* Tags were consolidated, see #23177 */
+*[gnis:id][!gnis:feature_id],
+*[tiger:PLACENS][!gnis:feature_id],
+*[NHD:GNIS_ID][!gnis:feature_id],
+*[nhd:gnis_id][!gnis:feature_id],
+*[ref:gnis][!gnis:feature_id] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  group: tr("deprecated tagging");
+  suggestAlternative: "{1.key}={0.value}";
+  fixChangeKey: "{0.key} => {1.key}";
+}
+*[gnis:id][gnis:feature_id],
+*[tiger:PLACENS][gnis:feature_id],
+*[NHD:GNIS_ID][gnis:feature_id],
+*[nhd:gnis_id][gnis:feature_id],
+*[ref:gnis][gnis:feature_id] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  group: tr("deprecated tagging");
+  suggestAlternative: "{1.key}";
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */

trunk/resources/data/validator/ignoretags.cfg

@@ -747 +747 @@
 E:site_type
 E:parking:orientation
+K:NHD:GNIS_ID
+K:gnis:id
+K:nhd:gnis_id
+K:ref:gnis
+K:tiger:PLACENS
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated) 

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java

@@ -244 +244 @@
     @Test
     void testRegionTag() throws IOException {
-        final List<TestError> errors = test(OsmUtils.createPrimitive("relation type=waterway ref:gnis=123456"));
+        final List<TestError> errors = test(OsmUtils.createPrimitive("relation type=waterway gnis:feature_id=123456"));
         assertEquals(1, errors.size());
         assertEquals("Key from a preset is invalid in this region", errors.get(0).getMessage());
-        assertEquals("Preset Waterway should not have the key ref:gnis", errors.get(0).getDescription());
+        assertEquals("Preset Waterway should not have the key gnis:feature_id", errors.get(0).getDescription());
         assertEquals(Severity.WARNING, errors.get(0).getSeverity());
         assertFalse(errors.get(0).isFixable());