Changeset 8725 in josm for trunk/data/validator

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/data/validator

Files:

• deprecated.mapcss (modified) (1 diff)
• numeric.mapcss (modified) (2 diffs)

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";
 }