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

Fix osm live restrictions

Browse source
This commit is contained in:
Victor Shcherb 2016-04-27 00:10:12 +02:00
parent efe669f5bc
commit 5146c8283c
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
OsmAnd-java/src/net/osmand/router/RoutingContext.java
View file

@ -326,8 +326,12 @@ public class RoutingContext {
if(excludeNotAllowed != null && !excludeNotAllowed.contains(ro.getId())) {
ts.add(ro);
}
} else if(excludeNotAllowed != null){
} else if(excludeNotAllowed != null && ro.getId() > 0){
excludeNotAllowed.add(ro.getId());
if(ts.excludedIds == null ){
ts.excludedIds = new TLongHashSet();
}
ts.excludedIds.add(ro.getId());
}
}
}
@ -506,10 +510,22 @@ public class RoutingContext {
}
List<RoutingSubregionTile> subregions = indexedSubregions.get(tileId);
if (subregions != null) {
TLongHashSet duplicates = new TLongHashSet();
boolean load = false;
for (RoutingSubregionTile ts : subregions) {
if (!ts.isLoaded()) {
loadSubregionTile(ts, loadOptions == OPTION_IN_MEMORY_LOAD, null, duplicates);
load = true;
}
}
if (load) {
TLongHashSet excludeIds = new TLongHashSet();
for (RoutingSubregionTile ts : subregions) {
if (!ts.isLoaded()) {
loadSubregionTile(ts, loadOptions == OPTION_IN_MEMORY_LOAD, null, excludeIds);
} else {
if(ts.excludedIds != null) {
excludeIds.addAll(ts.excludedIds);
}
}
}
}
}
@ -628,6 +644,7 @@ public class RoutingContext {
private NativeRouteSearchResult searchResult = null;
private int isLoaded = 0;
private TLongObjectMap<RouteSegment> routes = null;
private TLongHashSet excludedIds = null;
public RoutingSubregionTile(RouteSubregion subregion) {
this.subregion = subregion;
@ -738,6 +755,7 @@ public class RoutingContext {
}
searchResult = null;
routes = null;
excludedIds = null;
}
public void setLoadedNonNative(){