Ticket #22427: validate_level_ranges.patch

resources/data/validator/numeric.mapcss

@@ -39 +39 @@
   assertMatch: "node building:levels=-foo";
   assertNoMatch: "node level=-1";
 }
+*[building:levels][building:levels !~ /^(([0-9]|[1-9][0-9]*)(\.5)?)$/]!.negative_value {
+  throwWarning: tr("{0} should have numbers only with optional .5 increments", "{0.key}");
+  assertNoMatch: "node building:levels=1.5";
+  assertNoMatch: "node building:levels=-1"; /* excluded here via !.negative_value in selector */
+  assertMatch: "node building:levels=1A";
+  assertNoMatch: "node building:levels=0"; /* valid because there can be building:levels:underground > 0 or roof:levels > 0 */
+}
 
-*[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 ; */
+/* level values: all numbers from -∞ to ∞ in 0.5 steps, optional multiple values separated by a ;, optional second value separated by a - */
+*[level][level !~ /^((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5)(?:(;((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5))*|(-((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5)))$/] {
   throwWarning: tr("{0} should have numbers only with optional .5 increments", "{0.key}");
   assertMatch: "node level=one";
   assertMatch: "node level=01";
@@ -49 +56 @@
   assertMatch: "node level=-01.5";
   assertMatch: "node level=2.3";
   assertMatch: "node level=-0";
+  assertMatch: "node level=1-2-3";
   assertNoMatch: "node level=0";
   assertNoMatch: "node level=1";
   assertNoMatch: "node level=-1";
@@ -61 +69 @@
   assertNoMatch: "node level=0;-0.5";
   assertNoMatch: "node level=-0.5;0";
   assertNoMatch: "node level=-1;-0.5";
-  assertNoMatch: "node building:levels=1.5";
-  assertNoMatch: "node building:levels=-1"; /* tested already by rule above "negative values" and excluded here via !.negative_value in selector */
-  assertMatch: "node building:levels=1A";
-  assertNoMatch: "node building:levels=0"; /* valid because there can be building:levels:underground > 0 or roof:levels > 0 */
+  assertNoMatch: "node level=0-3";
+  assertNoMatch: "node level=-1-100";
 }
 
 *[roof:height][siunit_length(tag("roof:height")) == 0][roof:shape=flat] {