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

Small fix - opening hours parser

Browse source
This commit is contained in:
Alexey Kulish 2018-01-22 18:47:33 +03:00
parent a110057489
commit 3b132e95ea
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1305,7 +1305,6 @@ public class OpeningHoursParser {
Token t = i == tokens.size() ? null : tokens.get(i);
if (t == null || t.type.ord() > currentParse.ord()) {
presentTokens.add(currentParse);
// case tokens.get(i).type.ordinal() < currentParse.ordinal() - not supported (Fr 15:00-18:00, Sa 16-18)
if (currentParse == TokenType.TOKEN_MONTH || currentParse == TokenType.TOKEN_DAY_MONTH
|| currentParse == TokenType.TOKEN_DAY_WEEK || currentParse == TokenType.TOKEN_HOLIDAY) {
@ -1360,7 +1359,7 @@ public class OpeningHoursParser {
if (t != null) {
currentParse = t.type;
}
} else if (t.type.ord() < currentParse.ord() && indexP == 0) {
} else if (t.type.ord() < currentParse.ord() && indexP == 0 && tokens.size() > i) {
buildRule(new BasicOpeningHourRule(), tokens.subList(i, tokens.size()), rules);
tokens = tokens.subList(0, i + 1);
} else if (t.type == TokenType.TOKEN_COMMA) {