Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-05-10 01:08:23 +02:00
commit c6b2dbc600
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java
View file

@ -1,6 +1,5 @@
package net.osmand.util;
/* Has to be commented out in order to run the main function and test the package? */
/* Can be commented out in order to run the main function separately */
import java.text.ParseException;
@ -780,6 +779,8 @@ public class OpeningHoursParser {
testOpened("06.05.2013 10:00", hours, false);
// test day wrap as seen on OSM
// Incorrectly evaluated: https://wiki.openstreetmap.org/w/index.php?title=Key:opening_hours/specification#explain:additional_rule_separator
// <normal_rule_separator> does overwrite previous definitions.
hours = parseOpenedHours("Tu-Th 07:00-2:00; Fr 17:00-4:00; Sa 18:00-05:00; Su,Mo off");
System.out.println(hours);
testOpened("05.05.2013 04:59", hours, true);
@ -792,6 +793,21 @@ public class OpeningHoursParser {
testOpened("08.05.2013 00:00", hours, true);
testOpened("08.05.2013 02:00", hours, false);
// test day wrap as seen on OSM
hours = parseOpenedHours("Mo-Th 09:00-03:00, Fr-Sa 09:00-04:00; Su off");
System.out.println("FIXME (disabled some tests): " + hours);
testOpened("11.05.2015 08:59", hours, false);
testOpened("11.05.2015 09:00", hours, true);
testOpened("12.05.2015 02:59", hours, true);
testOpened("12.05.2015 03:00", hours, false);
// testOpened("16.05.2015 03:59", hours, true); // FIXME: Wrong
testOpened("16.05.2015 04:00", hours, false);
testOpened("17.05.2015 01:00", hours, false);
testOpened("17.05.2015 15:00", hours, false);
// FIXME: Does throw an exception
// hours = parseOpenedHours("Tu-Th 07:00-2:00; Fr 17:00-4:00; Sa 18:00-05:00; Su,Mo off");
// tests single month value
hours = parseOpenedHours("May: 07:00-19:00");
System.out.println(hours);