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

Made open hours parser aware of PH and SH tags. Fixes #2116

Browse source
This commit is contained in:
GaidamakUA 2016-01-05 13:18:03 +02:00
parent 7255c25a56
commit a96234d32d
1 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -595,6 +595,11 @@ public class OpeningHoursParser {
public String toRuleString(boolean avoidMonths) {
return ruleString;
}
@Override
public String toString() {
return toRuleString(false);
}
}
@ -607,6 +612,7 @@ public class OpeningHoursParser {
// 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"};
String sunrise = "07:00";
String sunset = "21:00";
String endOfDay = "24:00";
@ -705,6 +711,14 @@ public class OpeningHoursParser {
}
previousMonth = m;
}
if (previousMonth == -1) {
int h = 0;
for(String s : holidayStr){
if(s.charAt(0) == ch && s.charAt(1) == r.charAt(k+1)){
return new UnparseableRule(r);
}
}
}
}
} else {
return new UnparseableRule(r);
@ -858,11 +872,21 @@ public class OpeningHoursParser {
cal.setTime(new SimpleDateFormat("dd.MM.yyyy HH:mm").parse(time));
boolean calculated = hours.isOpenedForTime(cal);
System.out.printf(" %sok: Expected %s: %b = %b (rule %s)\n",
((calculated != expected) ? "NOT " : ""), time, expected, calculated, hours.getCurrentRuleTime(cal));
((calculated != expected) ? "NOT " : ""), time, expected, calculated, hours.getCurrentRuleTime(cal));
if(calculated != expected) {
throw new IllegalArgumentException("BUG!!!");
}
}
private static void testParsedAndAssembledCorrectly(String timeString, OpeningHours hours) {
String assembledString = hours.toStringNoMonths();
boolean isCorrect = assembledString.equals(timeString);
System.out.printf(" %sok: Expected: \"%s\" got: \"%s\"\n",
(isCorrect ? "NOT " : ""), timeString, assembledString);
if (!isCorrect) {
throw new IllegalArgumentException("BUG!!!");
}
}
public static void main(String[] args) throws ParseException {
@ -1010,5 +1034,10 @@ public class OpeningHoursParser {
testOpened("02.12.2015 16:00", hours, true);
testOpened("05.12.2015 16:00", hours, false);
// Test holidays
String hoursString = "Mo-Fr 11:00-21:00; PH off";
hours = parseOpenedHoursHandleErrors(hoursString);
testParsedAndAssembledCorrectly(hoursString, hours);
}
}