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-09-16 10:36:14 +02:00
commit 1b7a9d06b0
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
View file

@ -75,13 +75,13 @@ public class BinaryInspector {
// "-vpoi",
// "-vmap", "-vmapobjects", // "-vmapcoordinates",
// "-vrouting",
"-vtransport",
// "-vaddress", "-vcities","-vstreetgroups",
// "-vtransport",
"-vaddress", "-vcities","-vstreetgroups",
// "-vstreets", "-vbuildings", "-vintersections",
// "-lang=ru",
// "-bbox=4.8486,52.3084,4.8747,52.2970",
// "-osm="+System.getProperty("maps.dir")+"/map.obf.osm",
System.getProperty("maps.dir")+"/Terminus_3518858.obf"
System.getProperty("maps.dir")+"/Map.obf"
});
} else {
in.inspector(args);

1
OsmAnd-java/src/net/osmand/osm/edit/Relation.java
View file

@ -135,6 +135,7 @@ public class Relation extends Entity {
while(it.hasNext()) {
RelationMember rm = it.next();
if(rm == key) {
it.remove();
return true;
}
}

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

@ -1500,9 +1500,21 @@ public class OpeningHoursParser {
}
public static void main(String[] args) throws ParseException {
// FIXME bug
// parseOpenedHours("Feb 16-Oct 15: 09:00-18:30; Oct 16-Nov 15: 09:00-17:30; Nov 16-Feb 15: 09:00-16:30");
// not supported (,)
// hours = parseOpenedHours("Mo-Su 07:00-23:00, Fr 08:00-20:00");
// parseOpenedHours("Sa-Su 10:00-17:00 || \"by appointment\"");
// comment is dropped
// not properly supported
// hours = parseOpenedHours("Mo-Su (sunrise-00:30)-(sunset+00:30)");
// Test basic case
OpeningHours hours = parseOpenedHours("Mo-Fr 08:30-14:40"); //$NON-NLS-1$
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");
@ -1584,9 +1596,6 @@ public class OpeningHoursParser {
testOpened("06.05.2013 10:00", hours, false);
// test day wrap as seen on OSM
// Incorrectly evaluated: https://wiki.openstreetmap.org/w/index.php?title=Key:opening_hours/specification#explain:additional_rule_separator
// <normal_rule_separator> does overwrite previous definitions.
// VICTOR: Do we have a test for incorrectly evaluated?
hours = parseOpenedHours("Tu-Th 07:00-2:00; Fr 17:00-4:00; Sa 18:00-05:00; Su,Mo off");
System.out.println(hours);
testOpened("05.05.2013 04:59", hours, true); // sunday 05.05.2013
@ -1672,15 +1681,12 @@ public class OpeningHoursParser {
testOpened("25.12.2015 14:00", hours, false);
testOpened("24.12.2015 08:00", hours, true);
// not supported (,)
// hours = parseOpenedHours("Mo-Su 07:00-23:00, Fr 08:00-20:00");
// Test holidays
String hoursString = "mo-fr 11:00-21:00; PH off";
hours = parseOpenedHoursHandleErrors(hoursString);
testParsedAndAssembledCorrectly(hoursString, hours);
// not properly supported
// hours = parseOpenedHours("Mo-Su (sunrise-00:30)-(sunset+00:30)");
}
}