Changeset 8725 in josm

Timestamp:

2015-09-03T23:05:24+02:00 (9 years ago)

Author:

Klumbumbus

Message:

fix #8717 - add highway=milestone and railway=milestone to preset and mappaint style; add numerical validator tests and fix for pk/kp => distance; prefer distance before ref as text in MapView; typo

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (2 diffs)
• data/validator/deprecated.mapcss (modified) (1 diff)
• data/validator/numeric.mapcss (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java (modified) (1 diff)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -1277 +1277 @@
             <key key="highway" value="traffic_mirror" />
         </item> <!-- Traffic Mirror -->
+        <item name="Highway milestone" icon="styles/standard/vehicle/milestone.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=milestone" />
+            <key key="highway" value="milestone" />
+            <text key="distance" text="Distance (kilometers)" />
+            <text key="ref" text="Reference" />
+        </item> <!-- Highway Milestone -->
         <item name="Named Junction" name_context="junction=yes" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=yes"
@@ -2353 +2359 @@
             <text key="ref" text="Reference" />
         </item> <!-- Railway Switch -->
+        <item name="Railway milestone" icon="styles/standard/vehicle/milestone.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=milestone" />
+            <key key="railway" value="milestone" />
+            <text key="distance" text="Distance (kilometers)" />
+            <text key="ref" text="Reference" />
+        </item> <!-- Railway Milestone -->
     </group> <!-- Railway -->
     <group name="Aerialway" icon="presets/aerialway.png">

trunk/data/validator/deprecated.mapcss

@@ -513 +513 @@
   suggestAlternative: "...";
 }
+
+/* see #8717 */
+*[kp][highway=milestone],
+*[kp][railway=milestone],
+*[kp][waterway=milestone] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "distance";
+  fixChangeKey: "kp => distance";
+}
+*[pk][highway=milestone],
+*[pk][railway=milestone],
+*[pk][waterway=milestone] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "distance";
+  fixChangeKey: "pk => distance";
+}

trunk/data/validator/numeric.mapcss

@@ -82 +82 @@
 }
 *[maxweight][maxweight !~ /^(([0-9]+\.?[0-9]*( (t|kg|lbs))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/] {
-  throwWarning: tr("{0}: meters is default; period is separator; if units, put space then unit", "maxweight");
+  throwWarning: tr("{0}: tonne is default; period is separator; if units, put space then unit", "maxweight");
   assertMatch: "way maxweight=something";
   assertMatch: "way maxweight=-5";
@@ -106 +106 @@
   assertNoMatch: "way maxspeed=none";
   assertNoMatch: "way maxspeed=variable";
+}
+
+*[distance][distance !~ /^(([0-9]+\.?[0-9]*( (km|mi|nmi))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/] {
+  throwWarning: tr("{0}: kilometers is default; period is separator; if units, put space then unit", "distance");
+  assertMatch: "way distance=something";
+  assertMatch: "way distance=-5";
+  assertNoMatch: "way distance=2";
+  assertNoMatch: "way distance=2.5";
+  assertNoMatch: "way distance=7 mi";
 }
 

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

@@ -160 +160 @@
             "operator",
             "brand",
-            "addr:housenumber"
+            "addr:housenumber",
+            "distance"
         };
 

trunk/styles/standard/elemstyles.mapcss

@@ -660 +660 @@
     set icon_z17;
     text: auto;
+}
+node[highway=milestone] {
+    icon-image: "vehicle/milestone.svg";
+    set icon_z17;
+    text: auto;
+}
+node[highway=milestone][distance] {
+    text: distance;
 }
 node[direction=clockwise] {
@@ -3386 +3394 @@
     text: auto;
 }
+node[railway=milestone] {
+    icon-image: "vehicle/milestone.svg";
+    set icon_z17;
+    text: auto;
+}
+node[railway=milestone][distance] {
+    text: distance;
+}
 node[railway=rail], node[railway=tram], node[railway=light_rail],
 node[railway=subway], node[railway=preserved],