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 2016-02-07 19:06:27 +01:00
commit 37af588dc8
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -608,11 +608,12 @@ public class OpeningHoursParser {
* @param r the string to parse
* @return BasicRule if the String is successfully parsed and UnparseableRule otherwise
*/
public static OpeningHoursParser.OpeningHoursRule parseRule(final String r){
public static OpeningHoursParser.OpeningHoursRule parseRule(String r){
// replace words "sunrise" and "sunset" by real hours
final String[] daysStr = new String[] {"Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"};
final String[] monthsStr = new String[] {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
final String[] holidayStr = new String[] {"PH", "SH"};
r = r.toLowerCase();
final String[] daysStr = new String[] {"mo", "tu", "we", "th", "fr", "sa", "su"};
final String[] monthsStr = new String[] {"jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"};
final String[] holidayStr = new String[] {"ph", "sh"};
String sunrise = "07:00";
String sunset = "21:00";
String endOfDay = "24:00";
@ -895,6 +896,8 @@ public class OpeningHoursParser {
System.out.println(hours);
testOpened("09.08.2012 11:00", hours, true);
testOpened("09.08.2012 16:00", hours, false);
hours = parseOpenedHours("mo-fr 07:00-19:00; sa 12:00-18:00");
System.out.println(hours);
hours = parseOpenedHours("Mo-Fr 11:30-15:00,17:30-23:00; Sa-Su,PH 11:30-23:00");
System.out.println(hours);
@ -1036,7 +1039,7 @@ public class OpeningHoursParser {
testOpened("05.12.2015 16:00", hours, false);
// Test holidays
String hoursString = "Mo-Fr 11:00-21:00; PH off";
String hoursString = "mo-fr 11:00-21:00; ph off";
hours = parseOpenedHoursHandleErrors(hoursString);
testParsedAndAssembledCorrectly(hoursString, hours);
}