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

finalize changes

Browse source
This commit is contained in:
vshcherb 2014-02-01 02:06:36 +01:00
parent bc55c294d5
commit 311ec40157
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd-java/src/net/osmand/router/PrecalculatedRouteDirection.java
View file

@ -40,11 +40,12 @@ public class PrecalculatedRouteDirection {
pointsX = new int[s2 - s1 + 1];
pointsY = new int[s2 - s1 + 1];
for (int i = s1; i <= s2; i++) {
pointsX[i - s1] = parent.pointsX[i];
pointsY[i - s1] = parent.pointsY[i];
int shiftInd = i - s1;
pointsX[shiftInd] = parent.pointsX[i];
pointsY[shiftInd] = parent.pointsY[i];
// indexedPoints.registerObjectXY(parent.pointsX.get(i), parent.pointsY.get(i), pointsX.size() - 1);
quadTree.insert(pointsX.length - 1, parent.pointsX[i], parent.pointsY[i]);
tms[i - s1] = parent.tms[i] - parent.tms[s2];
quadTree.insert(shiftInd, parent.pointsX[i], parent.pointsY[i]);
tms[shiftInd] = parent.tms[i] - parent.tms[s2];
}
}

2
OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
View file

@ -18,7 +18,7 @@ import net.osmand.util.MapUtils;
public class RouteResultPreparation {
public static boolean PRINT_TO_CONSOLE_ROUTE_INFORMATION_TO_TEST = true;
public static boolean PRINT_TO_CONSOLE_ROUTE_INFORMATION_TO_TEST = false;
private static final float TURN_DEGREE_MIN = 45;
/**
* Helper method to prepare final result

2
OsmAnd-java/src/net/osmand/router/RoutingConfiguration.java
View file

@ -15,7 +15,7 @@ import org.xmlpull.v1.XmlPullParserException;
public class RoutingConfiguration {
public static final int DEFAULT_MEMORY_LIMIT = 30;
public final float DEVIATION_RADIUS = 5000;
public final float DEVIATION_RADIUS = 3000;
public Map<String, String> attributes = new LinkedHashMap<String, String>();
// 1. parameters of routing and different tweaks

1
OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
View file

@ -420,7 +420,6 @@ public class RouteProvider {
params.start.getBearing() / 180d * Math.PI : null,
memoryLimit, specialization);
RoutingContext ctx = router.buildRoutingContext(cf, params.ctx.getInternalAPI().getNativeLibrary(), files,
// TODO introduce
params.mode.isDerivedRoutingFrom(ApplicationMode.CAR) ?
RouteCalculationMode.COMPLEX : RouteCalculationMode.NORMAL);
ctx.calculationProgress = params.calculationProgress;