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-08-14 22:14:32 +02:00
commit f9acbf4cb9
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.PriorityQueue; import java.util.PriorityQueue;
import net.osmand.OsmAndCollator;
import net.osmand.PlatformUtil; import net.osmand.PlatformUtil;
import net.osmand.binary.RouteDataObject; import net.osmand.binary.RouteDataObject;
import net.osmand.osm.MapRenderingTypes; import net.osmand.osm.MapRenderingTypes;
@ -28,7 +29,7 @@ public class BinaryRoutePlanner {
protected static final Log log = PlatformUtil.getLog(BinaryRoutePlanner.class); protected static final Log log = PlatformUtil.getLog(BinaryRoutePlanner.class);
private static final int ROUTE_POINTS = 11; private static final int ROUTE_POINTS = 11;
private static final boolean TRACE_ROUTING = false; private static final boolean TRACE_ROUTING = true;
public static double squareRootDist(int x1, int y1, int x2, int y2) { public static double squareRootDist(int x1, int y1, int x2, int y2) {
@ -86,7 +87,8 @@ public class BinaryRoutePlanner {
TLongObjectHashMap<RouteSegment> visitedDirectSegments = new TLongObjectHashMap<RouteSegment>(); TLongObjectHashMap<RouteSegment> visitedDirectSegments = new TLongObjectHashMap<RouteSegment>();
TLongObjectHashMap<RouteSegment> visitedOppositeSegments = new TLongObjectHashMap<RouteSegment>(); TLongObjectHashMap<RouteSegment> visitedOppositeSegments = new TLongObjectHashMap<RouteSegment>();
initQueuesWithStartEnd(ctx, start, end, recalculationEnd, graphDirectSegments, graphReverseSegments); initQueuesWithStartEnd(ctx, start, end, recalculationEnd, graphDirectSegments, graphReverseSegments,
visitedDirectSegments, visitedOppositeSegments);
// Extract & analyze segment with min(f(x)) from queue while final segment is not found // Extract & analyze segment with min(f(x)) from queue while final segment is not found
boolean forwardSearch = true; boolean forwardSearch = true;
@ -244,7 +246,8 @@ public class BinaryRoutePlanner {
private void initQueuesWithStartEnd(final RoutingContext ctx, RouteSegment start, RouteSegment end, private void initQueuesWithStartEnd(final RoutingContext ctx, RouteSegment start, RouteSegment end,
RouteSegment recalculationEnd, PriorityQueue<RouteSegment> graphDirectSegments, PriorityQueue<RouteSegment> graphReverseSegments) { RouteSegment recalculationEnd, PriorityQueue<RouteSegment> graphDirectSegments, PriorityQueue<RouteSegment> graphReverseSegments,
TLongObjectHashMap<RouteSegment> visitedDirectSegments, TLongObjectHashMap<RouteSegment> visitedOppositeSegments) {
RouteSegment startPos = initRouteSegment(ctx, start, true); RouteSegment startPos = initRouteSegment(ctx, start, true);
RouteSegment startNeg = initRouteSegment(ctx, start, false); RouteSegment startNeg = initRouteSegment(ctx, start, false);
RouteSegment endPos = initRouteSegment(ctx, end, true); RouteSegment endPos = initRouteSegment(ctx, end, true);
@ -447,10 +450,9 @@ public class BinaryRoutePlanner {
directionAllowed = false; directionAllowed = false;
continue; continue;
} }
obstaclesTime += obstacle;
boolean alreadyVisited = checkIfOppositeSegmentWasVisited(ctx, reverseWaySearch, graphSegments, segment, oppositeSegments, boolean alreadyVisited = checkIfOppositeSegmentWasVisited(ctx, reverseWaySearch, graphSegments, segment, oppositeSegments,
segmentPoint, segmentDist, obstaclesTime); segmentPoint, segmentDist, obstaclesTime);
obstaclesTime += obstacle;
if (alreadyVisited) { if (alreadyVisited) {
directionAllowed = false; directionAllowed = false;
continue; continue;
@ -554,9 +556,8 @@ public class BinaryRoutePlanner {
RouteSegment from = !reverseWaySearch ? getParentDiffId(segment) : getParentDiffId(opposite); RouteSegment from = !reverseWaySearch ? getParentDiffId(segment) : getParentDiffId(opposite);
if (checkViaRestrictions(from, to)) { if (checkViaRestrictions(from, to)) {
FinalRouteSegment frs = new FinalRouteSegment(road, segmentPoint); FinalRouteSegment frs = new FinalRouteSegment(road, segmentPoint);
// obstacles already count on backward calculation (so don't include obstaclesTime)
float distStartObstacles = segment.distanceFromStart float distStartObstacles = segment.distanceFromStart
+ calculateTimeWithObstacles(ctx, road, segmentDist, 0); + calculateTimeWithObstacles(ctx, road, segmentDist, obstaclesTime);
frs.setParentRoute(segment); frs.setParentRoute(segment);
frs.setParentSegmentEnd(segmentPoint); frs.setParentSegmentEnd(segmentPoint);
frs.reverseWaySearch = reverseWaySearch; frs.reverseWaySearch = reverseWaySearch;