Changeset 16340 in josm for trunk

Timestamp:

2020-04-18T18:00:12+02:00 (4 years ago)

Author:

Klumbumbus

Message:

fix #11253 - require to add unit to maxstay tag, rework preset and add validator rules with autofixes for the most common cases (patch by skyper, modified)

Location:

trunk/resources/data

Files:

• defaultpresets.xml (modified) (2 diffs)
• validator/numeric.mapcss (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -231 +231 @@
     </chunk>
     <chunk id="maxstay">
-        <combo key="maxstay" text="Time Limit (minutes)" values="0,30,60,90,120,180" />
+        <combo key="maxstay" text="Time Limit" values="30 minutes,60 minutes,180 minutes,1 hour,1.5 hours,1 day,3 days,2 weeks,4 months,1.5 years,unlimited,no,load-unload" values_no_i18n="true" values_sort="false" />
     </chunk>
     <chunk id="supervised">
@@ -2424 +2424 @@
             <reference ref="parking_access_fee_operator_surface_smoothness" />
             <reference ref="supervised_lit_oh" />
+            <reference ref="maxstay" />
             <check key="covered" text="Covered (with roof)" />
         </item> <!-- Parking -->

trunk/resources/data/validator/numeric.mapcss

@@ -415 +415 @@
   assertNoMatch: "node isced:level=0-3";
 }
+
+/* #11253, maxstay=0 is unclear. Was in presets. */
+*[maxstay=0] {
+  throwWarning: tr("Definition of {0} is unclear", "{0.tag}");
+  assertMatch: "node maxstay=0";
+  assertMatch: "way maxstay=0";
+  assertNoMatch: "node maxstay=2";
+  assertNoMatch: "way maxstay=no";
+}
+
+/* #11253, maxstay needs unit. Was in presets without it. Autofixes for the most common cases. */
+*[maxstay][maxstay =~ /^([1-9][0-9]*(\.[0-9]+)? min)$/][maxstay!="1 min"] {
+  throwWarning: tr("unusual value of {0}: set unit e.g. {1} or {2}; only positive values; point is decimal separator; space between value and unit", "{0.key}", "minutes", "hours");
+  fixAdd: concat("maxstay=", replace(tag("maxstay"), "min", "minutes"));
+  set maxstay_autofix;
+  assertMatch: "node maxstay=\"5 min\"";
+  assertMatch: "node maxstay=\"15 min\"";
+  assertNoMatch: "node maxstay=\"1 min\"";
+  assertNoMatch: "node maxstay=\"02 minutes\"";
+  assertNoMatch: "node maxstay=\"2 minutes\"";
+}
+*[maxstay="1h"],
+*[maxstay="1 h"],
+*[maxstay="1 hr"] {
+  throwWarning: tr("unusual value of {0}: set unit e.g. {1} or {2}; only positive values; point is decimal separator; space between value and unit", "{0.key}", "minutes", "hours");
+  fixAdd: "maxstay=1 hour";
+  set maxstay_autofix;
+  assertMatch: "node maxstay=1h";
+  assertMatch: "node maxstay=\"1 h\"";
+  assertMatch: "node maxstay=\"1 hr\"";
+}
+*[maxstay][maxstay =~ /^([1-9][0-9]*(\.[0-9]+)? h)$/][maxstay!="1 h"] {
+  throwWarning: tr("unusual value of {0}: set unit e.g. {1} or {2}; only positive values; point is decimal separator; space between value and unit", "{0.key}", "minutes", "hours");
+  fixAdd: concat("maxstay=", replace(tag("maxstay"), "h", "hours"));
+  set maxstay_autofix;
+  assertMatch: "node maxstay=\"5 h\"";
+  assertMatch: "node maxstay=\"15 h\"";
+  assertNoMatch: "node maxstay=\"1 h\"";
+  assertNoMatch: "node maxstay=\"02 hours\"";
+  assertNoMatch: "node maxstay=\"2 hours\"";
+}
+*[maxstay][maxstay =~ /^([1-9][0-9]*(\.[0-9]+)? hr)$/][maxstay!="1 hr"] {
+  throwWarning: tr("unusual value of {0}: set unit e.g. {1} or {2}; only positive values; point is decimal separator; space between value and unit", "{0.key}", "minutes", "hours");
+  fixAdd: concat("maxstay=", replace(tag("maxstay"), "hr", "hours"));
+  set maxstay_autofix;
+  assertMatch: "node maxstay=\"5 hr\"";
+  assertMatch: "node maxstay=\"15 hr\"";
+  assertNoMatch: "node maxstay=\"1 hr\"";
+  assertNoMatch: "node maxstay=\"02 hours\"";
+  assertNoMatch: "node maxstay=\"2 hours\"";
+}
+*[maxstay][maxstay =~ /^([1-9][0-9]*(\.[0-9]+)?h)$/][maxstay!="1h"] {
+  throwWarning: tr("unusual value of {0}: set unit e.g. {1} or {2}; only positive values; point is decimal separator; space between value and unit", "{0.key}", "minutes", "hours");
+  fixAdd: concat("maxstay=", replace(tag("maxstay"), "h", " hours"));
+  set maxstay_autofix;
+  assertMatch: "node maxstay=5h";
+  assertMatch: "node maxstay=15h";
+  assertNoMatch: "node maxstay=1h";
+  assertNoMatch: "node maxstay=02hours";
+  assertNoMatch: "node maxstay=2hours";
+  assertNoMatch: "node maxstay=\"2 h\"";
+  assertNoMatch: "node maxstay=\"2 hr\"";
+}
+/* the rest without autofix */
+*[maxstay][maxstay !~ /^(([1-9][0-9]*(\.[0-9]+)?( (minute|minutes|hour|hours|day|days|week|weeks|month|months|year|years)))|(no|unlimited|0|load-unload))$/]!.maxstay_autofix {
+  throwWarning: tr("unusual value of {0}: set unit e.g. {1} or {2}; only positive values; point is decimal separator; space between value and unit", "{0.key}", "minutes", "hours");
+  assertMatch: "node maxstay=something";
+  assertMatch: "node maxstay=-5";
+  assertMatch: "node maxstay=180";
+  assertMatch: "node maxstay=66minutes";
+  assertMatch: "node maxstay=\"1. hours\"";
+  assertMatch: "node maxstay=\"0 minutes\"";
+  assertNoMatch: "node maxstay=0";
+  assertNoMatch: "node maxstay=no";
+  assertNoMatch: "node maxstay=\"7 h\"";
+  assertNoMatch: "node maxstay=\"7 hr\"";
+  assertNoMatch: "node maxstay=unlimited";
+  assertNoMatch: "node maxstay=load-unload";
+  assertNoMatch: "node maxstay=\"66 minutes\"";
+  assertNoMatch: "node maxstay=\"2.5 hours\"";
+}