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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-03-09 17:15:45 +01:00
commit 8517907c80
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -307,7 +307,7 @@ public class RoutingContext {
return original;
}
public void loadSubregionTile(final RoutingSubregionTile ts, boolean loadObjectsInMemory, List<RouteDataObject> toLoad) {
public void loadSubregionTile(final RoutingSubregionTile ts, boolean loadObjectsInMemory, List<RouteDataObject> toLoad, TLongHashSet excludeNotAllowed) {
boolean wasUnloaded = ts.isUnloaded();
int ucount = ts.getUnloadCont();
if (nativeLib == null) {
@ -321,8 +321,14 @@ public class RoutingContext {
toLoad.addAll(res);
} else {
for(RouteDataObject ro : res){
if(ro != null && config.router.acceptLine(ro)) {
ts.add(ro);
if(ro != null) {
if(config.router.acceptLine(ro)) {
if(excludeNotAllowed != null && !excludeNotAllowed.contains(ro.getId())) {
ts.add(ro);
}
} else if(excludeNotAllowed != null){
excludeNotAllowed.add(ro.getId());
}
}
}
}
@ -500,9 +506,10 @@ public class RoutingContext {
}
List<RoutingSubregionTile> subregions = indexedSubregions.get(tileId);
if (subregions != null) {
TLongHashSet duplicates = new TLongHashSet();
for (RoutingSubregionTile ts : subregions) {
if (!ts.isLoaded()) {
loadSubregionTile(ts, loadOptions == OPTION_IN_MEMORY_LOAD, null);
loadSubregionTile(ts, loadOptions == OPTION_IN_MEMORY_LOAD, null, duplicates);
}
}
}