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 2014-11-28 00:58:16 +01:00
commit aaae65ab15
1 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -135,6 +135,7 @@ public class BinaryRoutePlanner {
checkIfGraphIsEmpty(ctx, ctx.getPlanRoadDirection() >= 0, graphDirectSegments, start, visitedDirectSegments, checkIfGraphIsEmpty(ctx, ctx.getPlanRoadDirection() >= 0, graphDirectSegments, start, visitedDirectSegments,
"Route is not found from selected start point."); "Route is not found from selected start point.");
if (ctx.planRouteIn2Directions()) { if (ctx.planRouteIn2Directions()) {
if(!graphDirectSegments.isEmpty() && !graphReverseSegments.isEmpty())
forwardSearch = (nonHeuristicSegmentsComparator.compare(graphDirectSegments.peek(), graphReverseSegments.peek()) < 0); forwardSearch = (nonHeuristicSegmentsComparator.compare(graphDirectSegments.peek(), graphReverseSegments.peek()) < 0);
// if (graphDirectSegments.size() * 2 > graphReverseSegments.size()) { // if (graphDirectSegments.size() * 2 > graphReverseSegments.size()) {
// forwardSearch = false; // forwardSearch = false;
@ -207,13 +208,40 @@ public class BinaryRoutePlanner {
} }
} }
public RouteSegment initRouteSegment(final RoutingContext ctx, RouteSegment segment, boolean positiveDirection) {
if(segment.getSegmentStart() == 0 && !positiveDirection && segment.getRoad().getPointsLength() > 0) {
segment = loadSameSegment(ctx, segment, 1);
} else if(segment.getSegmentStart() == segment.getRoad().getPointsLength() -1 && positiveDirection && segment.getSegmentStart() > 0) {
segment = loadSameSegment(ctx, segment, segment.getSegmentStart() -1);
}
if(segment == null) {
return null;
}
return segment.initRouteSegment(positiveDirection);
}
protected RouteSegment loadSameSegment(final RoutingContext ctx, RouteSegment segment, int ind) {
int x31 = segment.getRoad().getPoint31XTile(ind);
int y31 = segment.getRoad().getPoint31YTile(ind);
RouteSegment s = ctx.loadRouteSegment(x31, y31, 0);
while(s != null) {
if(s.getRoad().getId() == segment.getRoad().getId()) {
segment = s;
break;
}
s = s.getNext();
}
return segment;
}
private void initQueuesWithStartEnd(final RoutingContext ctx, RouteSegment start, RouteSegment end, private void initQueuesWithStartEnd(final RoutingContext ctx, RouteSegment start, RouteSegment end,
PriorityQueue<RouteSegment> graphDirectSegments, PriorityQueue<RouteSegment> graphReverseSegments) { PriorityQueue<RouteSegment> graphDirectSegments, PriorityQueue<RouteSegment> graphReverseSegments) {
RouteSegment startPos = start.initRouteSegment(true); RouteSegment startPos = initRouteSegment(ctx, start, true);
RouteSegment startNeg = start.initRouteSegment(false); RouteSegment startNeg = initRouteSegment(ctx, start, false);
RouteSegment endPos = end.initRouteSegment(true); RouteSegment endPos = initRouteSegment(ctx, end, true);
RouteSegment endNeg = end.initRouteSegment(false); RouteSegment endNeg = initRouteSegment(ctx, end, false);
// for start : f(start) = g(start) + h(start) = 0 + h(start) = h(start) // for start : f(start) = g(start) + h(start) = 0 + h(start) = h(start)
if(ctx.config.initialDirection != null) { if(ctx.config.initialDirection != null) {
// mark here as positive for further check // mark here as positive for further check