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

Merge pull request #4583 from osmandapp/PaulsBranch

Browse source 
Fixed #4319
This commit is contained in:
vshcherb 2017-10-13 17:43:04 +02:00 committed by GitHub
commit 53f9cc9dd9
1 changed files with 8 additions and 1 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

@ -52,6 +52,13 @@ public class PrecalculatedRouteDirection {
private PrecalculatedRouteDirection(PrecalculatedRouteDirection parent, int s1, int s2) { private PrecalculatedRouteDirection(PrecalculatedRouteDirection parent, int s1, int s2) {
this.minSpeed = parent.minSpeed; this.minSpeed = parent.minSpeed;
this.maxSpeed = parent.maxSpeed; this.maxSpeed = parent.maxSpeed;
boolean inverse = false;
if (s1 > s2) {
int tmp = s1;
s1 = s2;
s2 = tmp;
inverse = true;
}
tms = new float[s2 - s1 + 1]; tms = new float[s2 - s1 + 1];
pointsX = new int[s2 - s1 + 1]; pointsX = new int[s2 - s1 + 1];
pointsY = new int[s2 - s1 + 1]; pointsY = new int[s2 - s1 + 1];
@ -61,7 +68,7 @@ public class PrecalculatedRouteDirection {
pointsY[shiftInd] = parent.pointsY[i]; pointsY[shiftInd] = parent.pointsY[i];
// indexedPoints.registerObjectXY(parent.pointsX.get(i), parent.pointsY.get(i), pointsX.size() - 1); // indexedPoints.registerObjectXY(parent.pointsX.get(i), parent.pointsY.get(i), pointsX.size() - 1);
quadTree.insert(shiftInd, parent.pointsX[i], parent.pointsY[i]); quadTree.insert(shiftInd, parent.pointsX[i], parent.pointsY[i]);
tms[shiftInd] = parent.tms[i] - parent.tms[s2]; tms[shiftInd] = parent.tms[i] - parent.tms[inverse ? s1 : s2];
} }
} }