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 2013-11-27 11:21:53 +01:00
commit e0b102de2b
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OsmAnd-java/src/net/osmand/router/TestRouting.java
View file

@ -30,6 +30,7 @@ public class TestRouting {
public static boolean TEST_BOTH_DIRECTION = false; public static boolean TEST_BOTH_DIRECTION = false;
public static NativeLibrary lib = null; public static NativeLibrary lib = null;
public static boolean oldRouting = false; public static boolean oldRouting = false;
private static String vehicle = "car";
public static Iterator getIterator(Iterable it){ public static Iterator getIterator(Iterable it){
@ -44,6 +45,7 @@ public class TestRouting {
public double endLat = 0; public double endLat = 0;
public double endLon = 0; public double endLon = 0;
public RoutingConfiguration.Builder configBuilder; public RoutingConfiguration.Builder configBuilder;
public String vehicle = "car";
public static Parameters init(String[] args) throws IOException, XmlPullParserException { public static Parameters init(String[] args) throws IOException, XmlPullParserException {
Parameters p = new Parameters(); Parameters p = new Parameters();
@ -57,6 +59,8 @@ public class TestRouting {
RouteResultPreparation.PRINT_TO_CONSOLE_ROUTE_INFORMATION_TO_TEST = true; RouteResultPreparation.PRINT_TO_CONSOLE_ROUTE_INFORMATION_TO_TEST = true;
} else if (a.startsWith("-obfDir=")) { } else if (a.startsWith("-obfDir=")) {
obfDirectory = a.substring("-obfDir=".length()); obfDirectory = a.substring("-obfDir=".length());
} else if (a.startsWith("-vehicle=")) {
p.vehicle = a.substring("-vehicle=".length());
} else if (a.startsWith("-start=")) { } else if (a.startsWith("-start=")) {
String start = a.substring("-start=".length()); String start = a.substring("-start=".length());
String[] pt = start.split(";"); String[] pt = start.split(";");
@ -115,6 +119,7 @@ public class TestRouting {
// calculateRoute(params.obfDir.getAbsolutePath(), params.startLat, params.startLon, // calculateRoute(params.obfDir.getAbsolutePath(), params.startLat, params.startLon,
// params.endLat, params.endLon); // params.endLat, params.endLon);
BinaryMapIndexReader[] rs = collectFiles(params.obfDir.getAbsolutePath()); BinaryMapIndexReader[] rs = collectFiles(params.obfDir.getAbsolutePath());
vehicle = params.vehicle;
calculateRoute(params.startLat, params.startLon, calculateRoute(params.startLat, params.startLon,
params.endLat, params.endLon, rs); params.endLat, params.endLon, rs);
calculateRoute(params.startLat, params.startLon, calculateRoute(params.startLat, params.startLon,
@ -139,7 +144,7 @@ public class TestRouting {
public static void info() { public static void info() {
println("Run router tests is console utility to test route calculation for osmand. It is also possible to calculate one route from -start to -end."); println("Run router tests is console utility to test route calculation for osmand. It is also possible to calculate one route from -start to -end.");
println("\nUsage for run tests : runTestsSuite [-routingXmlPath=PATH] [-verbose] [-obfDir=PATH] [-start=lat;lon] [-end=lat;lon] [-testDir=PATH] {individualTestPath}"); println("\nUsage for run tests : runTestsSuite [-routingXmlPath=PATH] [-verbose] [-obfDir=PATH] [-vehicle=VEHICLE_STRING] [-start=lat;lon] [-end=lat;lon] [-testDir=PATH] {individualTestPath}");
} }
@ -308,7 +313,7 @@ public class TestRouting {
throws IOException, InterruptedException { throws IOException, InterruptedException {
long ts = System.currentTimeMillis(); long ts = System.currentTimeMillis();
Builder config = RoutingConfiguration.getDefault(); Builder config = RoutingConfiguration.getDefault();
RoutingConfiguration rconfig = config.build("car", MEMORY_TEST_LIMIT); RoutingConfiguration rconfig = config.build(vehicle, MEMORY_TEST_LIMIT);
RoutePlannerFrontEnd router = new RoutePlannerFrontEnd(oldRouting); RoutePlannerFrontEnd router = new RoutePlannerFrontEnd(oldRouting);
RoutingContext ctx = new RoutingContext(rconfig, lib, rs); RoutingContext ctx = new RoutingContext(rconfig, lib, rs);
RouteSegment startSegment = router.findRouteSegment(startLat, startLon, ctx); RouteSegment startSegment = router.findRouteSegment(startLat, startLon, ctx);
@ -319,6 +324,8 @@ public class TestRouting {
if(endSegment == null){ if(endSegment == null){
throw new IllegalArgumentException("End segment is not found "); throw new IllegalArgumentException("End segment is not found ");
} }
// Clear ctx
ctx = new RoutingContext(rconfig, lib, rs);
List<RouteSegmentResult> route = router.searchRoute(ctx, List<RouteSegmentResult> route = router.searchRoute(ctx,
new LatLon(startLat, startLon), new LatLon(endLat, endLon), null, false); new LatLon(startLat, startLon), new LatLon(endLat, endLon), null, false);
System.out.println("Route is " + route.size() + " segments " + (System.currentTimeMillis() - ts) + " ms "); System.out.println("Route is " + route.size() + " segments " + (System.currentTimeMillis() - ts) + " ms ");