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

corrected handling of day wrap in opening_hours

Browse source
This commit is contained in:
axin 2013-05-09 14:59:53 +02:00
parent c82b9c8393
commit 96dc5f5291
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -275,18 +275,20 @@ public class OpeningHoursParser {
for (i = 0; i < startTimes.length; i++) { for (i = 0; i < startTimes.length; i++) {
int startTime = this.startTimes[i]; int startTime = this.startTimes[i];
int endTime = this.endTimes[i]; int endTime = this.endTimes[i];
// one day working 10 - 20 (not 20 - 04)
if (startTime < endTime || endTime == -1) { if (startTime < endTime || endTime == -1) {
// one day working like 10:00-20:00 (not 20:00-04:00)
if (days[d] && !checkPrevious) { if (days[d] && !checkPrevious) {
if (time >= startTime && (endTime == -1 || time <= endTime)) { if (time >= startTime && (endTime == -1 || time <= endTime)) {
return true; return true;
} }
} }
} else { } else {
if (time >= startTime && days[p] && checkPrevious) { // opening_hours includes day wrap like
// check in previous day // "We 20:00-03:00" or "We 07:00-07:00"
if (time >= startTime && days[d] && !checkPrevious) {
return true; return true;
} else if (time <= endTime && days[d] && !checkPrevious) { } else if (time < endTime && days[p] && checkPrevious) {
// check in previous day
return true; return true;
} }
} }