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

Fix #5003

Browse source
This commit is contained in:
Victor Shcherb 2018-05-25 23:12:50 +02:00
parent d902888f4a
commit f8246c5cf4
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -237,6 +237,7 @@ public class RouteDataObject {
return null; return null;
} }
public String getName(String lang){ public String getName(String lang){
return getName(lang, false); return getName(lang, false);
} }
@ -685,6 +686,18 @@ public class RouteDataObject {
return direction; return direction;
} }
public boolean isRoadDeleted() {
int[] pt = getTypes();
int sz = pt.length;
for (int i = 0; i < sz; i++) {
RouteTypeRule r = region.quickGetEncodingRule(pt[i]);
if ("osmand_change".equals(r.getTag()) && "delete".equals(r.getValue())) {
return true;
}
}
return false;
}
public boolean isStopApplicable(boolean direction, int intId, int startPointInd, int endPointInd) { public boolean isStopApplicable(boolean direction, int intId, int startPointInd, int endPointInd) {
int[] pt = getPointTypes(intId); int[] pt = getPointTypes(intId);
int sz = pt.length; int sz = pt.length;

3
OsmAnd-java/src/net/osmand/router/RouteSegmentResult.java
View file

@ -71,6 +71,9 @@ public class RouteSegmentResult {
} }
public void attachRoute(int roadIndex, RouteSegmentResult r){ public void attachRoute(int roadIndex, RouteSegmentResult r){
if(r.getObject().isRoadDeleted()) {
return;
}
int st = Math.abs(roadIndex - startPointIndex); int st = Math.abs(roadIndex - startPointIndex);
if(attachedRoutes[st] == null) { if(attachedRoutes[st] == null) {
attachedRoutes[st] = new ArrayList<RouteSegmentResult>(); attachedRoutes[st] = new ArrayList<RouteSegmentResult>();