Changeset 17934 in josm for trunk/resources

Timestamp:

2021-06-21T17:32:59+02:00 (3 years ago)

Author:

Klumbumbus

Message:

Fix #21026, see #14532 - Better warnings for negative numeric values

File:

• trunk/resources/data/validator/numeric.mapcss (modified) (5 diffs)

trunk/resources/data/validator/numeric.mapcss

@@ -29 +29 @@
 }
 
-*[building:levels][building:levels !~ /^(([0-9]|[1-9][0-9]*)(\.5)?)$/],
+/* negative values, #21026 */
+*[building:levels^="-"] {
+  throwError: tr("negative {0} value", "{0.key}");
+  set negative_value;
+  assertMatch: "node building:levels=-1";
+  assertNoMatch: "node building:levels=+1";
+  assertNoMatch: "node building:levels=1";
+  assertNoMatch: "node building:levels=foo";
+  assertMatch: "node building:levels=-foo";
+  assertNoMatch: "node level=-1";
+}
+
+*[building:levels][building:levels !~ /^(([0-9]|[1-9][0-9]*)(\.5)?)$/]!.negative_value,
 *[level][level !~ /^((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5)(;((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5))*$/] { /* all numbers from -∞ to ∞ in 0.5 steps, optional multiple values separated by a ; */
   throwWarning: tr("{0} should have numbers only with optional .5 increments", "{0.key}");
@@ -223 +235 @@
 *[width        ][width !~ /^(([0-9]+(\.[0-9]+)?( (m|ft))?)|([0-9]+\'([0-9]+(\.[0-9]+)?\")?))$/]!.width_separator_autofix!.width_meter_autofix!.width_foot_autofix,
 *[maxwidth  ][maxwidth !~ /^(([0-9]+(\.[0-9]+)?( (m|ft))?)|([0-9]+\'([0-9]+(\.[0-9]+)?\")?))$/]!.maxwidth_separator_autofix!.maxwidth_meter_autofix!.maxwidth_foot_autofix {
-  throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}");
+  throwWarning: tr("unusual value of {0}: {1} is default; only positive values; point is decimal separator; if units, put space then unit", "{0.key}", "meters");
   assertMatch: "node height=medium";
   assertMatch: "node maxheight=-5";
@@ -269 +281 @@
 *[maxaxleload][maxaxleload !~ /^([0-9]+(\.[0-9]+)?( (t|kg|st|lbs))?)$/]!.maxaxleload_separator_autofix,
 *[maxweight][maxweight !~ /^([0-9]+(\.[0-9]+)?( (t|kg|st|lbs))?)$/]!.maxweight_separator_autofix {
-  throwWarning: tr("unusual value of {0}: tonne is default; point is decimal separator; if units, put space then unit", "{0.key}");
+  throwWarning: tr("unusual value of {0}: {1} is default; only positive values; point is decimal separator; if units, put space then unit", "{0.key}", "tonne");
   assertMatch: "node maxaxleload=something";
   assertMatch: "node maxweight=-5";
@@ -280 +292 @@
 way[maxspeed:forward][maxspeed:forward !~ /^(signals|none|unposted|variable|walk|[1-9][0-9]*( [a-z]+)?|[A-Z][A-Z]:(urban|rural|living_street|motorway))$/],
 way[maxspeed:backward][maxspeed:backward !~ /^(signals|none|unposted|variable|walk|[1-9][0-9]*( [a-z]+)?|[A-Z][A-Z]:(urban|rural|living_street|motorway))$/] {
-  throwWarning: tr("unusual value of {0}", "{0.key}");
+  throwWarning: tr("unusual value of {0}: {1} is default; only positive values; point is decimal separator; if units, put space then unit", "{0.key}", "km/h");
   assertMatch: "way maxspeed=something";
   assertMatch: "way maxspeed=-50";
@@ -307 +319 @@
 }
 *[distance][distance !~ /^(([0-9]+(\.[0-9]+)?( (m|km|mi|nmi))?)|([0-9]+\'([0-9]+(\.[0-9]+)?\")?))$/]!.distance_separator_autofix {
-  throwWarning: tr("unusual value of {0}: kilometers is default; point is decimal separator; if units, put space then unit", "{0.key}");
+  throwWarning: tr("unusual value of {0}: {1} is default; only positive values; point is decimal separator; if units, put space then unit", "{0.key}", "kilometers");
   assertMatch: "way distance=something";
   assertMatch: "way distance=-5";