Changeset 17466 in josm

Timestamp:

2021-01-18T13:47:54+01:00 (4 years ago)

Author:

Klumbumbus

Message:

fix #20326 - Support railway:position instead of distance for railway=milestone

Location:

trunk

Files:

• resources/data/defaultpresets.xml (modified) (1 diff)
• resources/data/validator/deprecated.mapcss (modified) (4 diffs)
• resources/data/validator/ignoretags.cfg (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -2374 +2374 @@
             <link wiki="Tag:railway=milestone" />
             <key key="railway" value="milestone" />
-            <text key="distance" text="Distance (kilometers)" />
+            <text key="railway:position" text="Position (kilometers)" />
             <text key="ref" text="Reference" />
         </item> <!-- Railway Milestone -->

trunk/resources/data/validator/deprecated.mapcss

@@ -670 +670 @@
 /* #11330, #18642 */
 *[/^.$/],
-node[/^..$/],
+node[/^..$/][!kp][!pk],
 way[/^..$/][route=ferry][!to],
 way[/^..$/][route!=ferry],
@@ -681 +681 @@
   assertMatch: "node fo=bar";
   assertMatch: "node f=b";
+  assertNoMatch: "node kp=5"; /* already has a deprecated warning */
+  assertNoMatch: "node pk=7"; /* already has a deprecated warning */
 }
 
@@ -725 +727 @@
 }
 
-/* #8717 */
-*[kp][highway=milestone],
-*[kp][railway=milestone],
-*[kp][waterway=milestone] {
+/* #8717, #20326 */
+*[kp][railway!=milestone] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "distance";
@@ -734 +734 @@
   fixChangeKey: "kp => distance";
 }
-*[pk][highway=milestone],
-*[pk][railway=milestone],
-*[pk][waterway=milestone] {
+*[pk][railway!=milestone] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "distance";
   group: tr("deprecated tagging");
   fixChangeKey: "pk => distance";
+}
+*[kp][railway=milestone] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "railway:position";
+  group: tr("deprecated tagging");
+  fixChangeKey: "kp => railway:position";
+}
+*[pk][railway=milestone] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "railway:position";
+  group: tr("deprecated tagging");
+  fixChangeKey: "pk => railway:position";
+}
+*[distance][railway=milestone] {
+  throwWarning: tr("{0} is deprecated for {1}", "{0.key}", "{1.tag}");
+  suggestAlternative: "railway:position";
+  group: tr("deprecated tagging");
+  fixChangeKey: "distance => railway:position";
 }
 

trunk/resources/data/validator/ignoretags.cfg

@@ -699 +699 @@
 K:cuisine=BBQ
 E:pole:type
+E:kp
+E:pk
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated) 

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java

@@ -150 +150 @@
             "int_name",
             "distance",
+            "railway:position",
             "ref",
             "operator",