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

Merge pull request #7714 from osmandapp/issue_7576

Browse source 
fix for #7576
This commit is contained in:
vshcherb 2019-10-25 17:26:46 +02:00 committed by GitHub
commit 03144c7a2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
View file

@ -469,8 +469,6 @@ public class RouteDataObject {
}
return pointNameTypes[ind];
}
public int[] getPointTypes(int ind) {
if (pointTypes == null || ind >= pointTypes.length) {
@ -489,17 +487,17 @@ public class RouteDataObject {
RouteTypeRule r = region.quickGetEncodingRule(types[i]);
if (r != null && r.conditional()) {
int vl = r.conditionalValue(conditionalTime);
if(vl != 0) {
if (vl != 0) {
RouteTypeRule rtr = region.quickGetEncodingRule(vl);
String nonCondTag = rtr.getTag();
int ks;
for(ks = 0; ks < types.length; ks++) {
for (ks = 0; ks < types.length; ks++) {
RouteTypeRule toReplace = region.quickGetEncodingRule(types[ks]);
if(toReplace != null && toReplace.getTag().equals(nonCondTag)) {
if (toReplace != null && toReplace.getTag().equals(nonCondTag)) {
break;
}
}
if(ks == types.length) {
if (ks == types.length) {
int[] ntypes = new int[types.length + 1];
System.arraycopy(types, 0, ntypes, 0, types.length);
types = ntypes;
@ -508,6 +506,41 @@ public class RouteDataObject {
}
}
}
if (pointTypes != null) {
for (int i = 0; i < pointTypes.length; i++) {
if (pointTypes[i] != null) {
int[] pTypes = pointTypes[i];
int pSz = pTypes.length;
if (pSz > 0) {
for (int j = 0; j < pSz; j++) {
RouteTypeRule r = region.quickGetEncodingRule(pTypes[j]);
if (r != null && r.conditional()) {
int vl = r.conditionalValue(conditionalTime);
if (vl != 0) {
RouteTypeRule rtr = region.quickGetEncodingRule(vl);
String nonCondTag = rtr.getTag();
int ks;
for (ks = 0; ks < pointTypes[i].length; ks++) {
RouteTypeRule toReplace = region.quickGetEncodingRule(pointTypes[i][j]);
if (toReplace != null && toReplace.getTag().contentEquals(nonCondTag)) {
break;
}
}
if (ks == pTypes.length) {
int[] ntypes = new int[pTypes.length + 1];
System.arraycopy(pTypes, 0, ntypes, 0, pTypes.length);
pTypes = ntypes;
}
pTypes[ks] = vl;
}
}
}
}
pointTypes[i] = pTypes;
}
}
}
}
public float getMaximumSpeed(boolean direction) {