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

Fix easter

Browse source
This commit is contained in:
Victor Shcherb 2016-08-27 16:19:13 +02:00
parent dd97daaabf
commit 2d5721b815
1 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -186,6 +186,35 @@ public class OpeningHoursParser {
}
public String getCurrentRuleTime(Calendar cal) {
// make exception for overlapping times i.e.
// (1) Mo 14:00-16:00; Tu off
// (2) Mo 14:00-02:00; Tu off
// in (2) we need to check first rule even though it is against specification
String ruleClosed = null;
boolean overlap = false;
for (int i = rules.size() - 1; i >= 0; i--) {
OpeningHoursRule r = rules.get(i);
if (r.hasOverlapTimes()) {
overlap = true;
break;
}
}
// start from the most specific rule
for (int i = rules.size() - 1; i >= 0; i--) {
OpeningHoursRule r = rules.get(i);
if (r.contains(cal)) {
boolean open = r.isOpenedForTime(cal);
if (!open && overlap) {
ruleClosed = r.toLocalRuleString();
} else {
return r.toLocalRuleString();
}
}
}
return ruleClosed;
}
public String getCurrentRuleTimeV1(Calendar cal) {
String ruleOpen = null;
String ruleClosed = null;
for (OpeningHoursRule r : rules) {