Changeset 18453 in josm

Timestamp:

2022-05-19T00:17:54+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22074, #22075: OpeningHoursParser updates (patch by SimonPoole)

Disable time strict mode

This change makes parsing in strict mode slightly more lenient with
respect to time ranges that extend over midnight, with other words this
will no longer complain if non-conflicting long time ranges are used
instead of using the extended time syntax.

Parsing in non-strict mode remains unchanged.

Update OpeningHoursParser to 0.27.0

The update fixes an issue with parsing open ended date ranges followed
by a weekday.

Location:

trunk

Files:

• ivy.xml (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (modified) (1 diff)

trunk/ivy.xml

@@ -31 +31 @@
         <dependency conf="api->default" org="com.drewnoakes" name="metadata-extractor" rev="2.17.0" transitive="false"/>
         <dependency conf="api->default" org="com.formdev" name="svgSalamander" rev="1.1.3"/>
-        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.26.0"/>
+        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.27.0"/>
         <dependency conf="api->default" org="oauth.signpost" name="signpost-core" rev="2.1.1"/>
         <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2021.3.21"/>

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -103 +103 @@
         try {
             final boolean strict = PREF_STRICT_MODE.get();
-            final List<Rule> rules = new OpeningHoursParser(new StringReader(value)).rules(strict);
+            final List<Rule> rules = new OpeningHoursParser(new StringReader(value)).rules(strict, false);
             prettifiedValue = Util.rulesToOpeningHoursString(rules);
             if (!Objects.equals(value, prettifiedValue) && !strict) {
                 // parse again in strict mode for detailed message
-                new OpeningHoursParser(new StringReader(value)).rules(true);
+                new OpeningHoursParser(new StringReader(value)).rules(true, false);
             }
         } catch (OpeningHoursParseException e) {