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

Add impassable road implementation

Browse source
This commit is contained in:
Victor Shcherb 2014-10-21 23:17:46 +02:00
parent dd429d1923
commit 8e44071064
2 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd-java/src/net/osmand/router/GeneralRouter.java
View file

@ -1,5 +1,7 @@
package net.osmand.router;
import gnu.trove.set.hash.TLongHashSet;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.BitSet;
@ -50,6 +52,8 @@ public class GeneralRouter implements VehicleRouter {
// speed in m/s
private float maxDefaultSpeed = 10;
private TLongHashSet impassableRoads;
public enum RouteDataObjectAttribute {
ROAD_SPEED("speed"),
@ -180,9 +184,16 @@ public class GeneralRouter implements VehicleRouter {
@Override
public boolean acceptLine(RouteDataObject way) {
int res = getObjContext(RouteDataObjectAttribute.ACCESS).evaluateInt(way, 0);
if(impassableRoads != null && impassableRoads.contains(way.id)) {
return false;
}
return res >= 0;
}
public long[] getImpassableRoadIds() {
return impassableRoads.toArray();
}
private int registerTagValueAttribute(String tag, String value) {
String key = tag +"$"+value;
if(universalRules.containsKey(key)) {
@ -860,5 +871,14 @@ public class GeneralRouter implements VehicleRouter {
}
}
public void addImpassableRoads(TLongHashSet impassableRoads) {
if (impassableRoads != null && !impassableRoads.isEmpty()) {
if (this.impassableRoads == null) {
this.impassableRoads = new TLongHashSet();
}
this.impassableRoads.addAll(impassableRoads);
}
}
}

29
OsmAnd-java/src/net/osmand/router/RoutingConfiguration.java
View file

@ -1,12 +1,17 @@
package net.osmand.router;
import gnu.trove.set.hash.TLongHashSet;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Stack;
import net.osmand.PlatformUtil;
import net.osmand.binary.RouteDataObject;
import net.osmand.router.GeneralRouter.GeneralRouterProfile;
import net.osmand.router.GeneralRouter.RouteAttributeContext;
import net.osmand.router.GeneralRouter.RouteDataObjectAttribute;
@ -45,12 +50,18 @@ public class RoutingConfiguration {
public float recalculateDistance = 10000f;
public static class Builder {
// Design time storage
private String defaultRouter = "";
private Map<String, GeneralRouter> routers = new LinkedHashMap<String, GeneralRouter>();
private Map<String, String> attributes = new LinkedHashMap<String, String>();
private TLongHashSet impassableRoadIds = new TLongHashSet();
private List<RouteDataObject> impassableRoads = new ArrayList<RouteDataObject>();
// Example
// {
// impassableRoadIds.add(23000069L);
// }
public RoutingConfiguration build(String router, int memoryLimitMB) {
return build(router, null, memoryLimitMB, null);
@ -76,6 +87,7 @@ public class RoutingConfiguration {
i.initialDirection = direction;
i.recalculateDistance = parseSilentFloat(getAttribute(i.router, "recalculateDistanceHelp"), i.recalculateDistance) ;
i.heuristicCoefficient = parseSilentFloat(getAttribute(i.router, "heuristicCoefficient"), i.heuristicCoefficient);
i.router.addImpassableRoads(impassableRoadIds);
i.ZOOM_TO_LOAD_TILES = parseSilentInt(getAttribute(i.router, "zoomToLoadTiles"), i.ZOOM_TO_LOAD_TILES);
int desirable = parseSilentInt(getAttribute(i.router, "memoryLimitInMB"), 0);
if(desirable != 0) {
@ -92,6 +104,21 @@ public class RoutingConfiguration {
return i;
}
public List<RouteDataObject> getImpassableRoads() {
return impassableRoads;
}
public TLongHashSet getImpassableRoadIds() {
return impassableRoadIds;
}
public void addImpassableRoad(RouteDataObject r) {
impassableRoadIds.add(r.id);
impassableRoads.add(r);
}
private String getAttribute(VehicleRouter router, String propertyName) {
if (router.containsAttribute(propertyName)) {
return router.getAttribute(propertyName);