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

Routing with combined intervals

Browse source
This commit is contained in:
Victor Shcherb 2012-10-09 01:00:25 +02:00
parent 624021fa66
commit 34d75b1b91
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
DataExtractionOSM/src/net/osmand/router/BinaryRoutePlanner.java
View file

@ -319,9 +319,9 @@ public class BinaryRoutePlanner {
int memOverhead = (visitedDirectSegments.size() + visitedOppositeSegments.size()) * STANDARD_ROAD_VISITED_OVERHEAD +
(graphDirectSegments.size() +
graphReverseSegments.size()) * STANDARD_ROAD_IN_QUEUE_OVERHEAD;
String pr = " pend="+segment.parentSegmentEnd +" " +( segment.parentRoute == null ? "" : (" parent=" + segment.parentRoute.road));
System.out.println("Seg " + segment.road + " ind=" + segment.segmentStart +
" ds=" + ((float)segment.distanceFromStart) + " es="+((float)segment.distanceToEnd) + pr);
// String pr = " pend="+segment.parentSegmentEnd +" " +( segment.parentRoute == null ? "" : (" parent=" + segment.parentRoute.road));
// System.out.println("Seg " + segment.road + " ind=" + segment.segmentStart +
// " ds=" + ((float)segment.distanceFromStart) + " es="+((float)segment.distanceToEnd) + pr);
if(segment instanceof FinalRouteSegment) {
if(RoutingContext.SHOW_GC_SIZE){
log.warn("Estimated overhead " + (memOverhead / (1<<20))+ " mb");
@ -746,9 +746,10 @@ public class BinaryRoutePlanner {
visitedSegments.containsKey(calculateRoutePointId(next.road, next.segmentStart, true));
boolean nextMinusNotAllowed = (next.segmentStart == 0) ||
visitedSegments.containsKey(calculateRoutePointId(next.road, next.segmentStart - 1, false));
boolean skipSameDirection = next.road.id == segment.road.id && next.segmentStart == segmentEnd;
// road.id could be equal on roundabout, but we should accept them
boolean alreadyVisited = nextPlusNotAllowed && nextMinusNotAllowed;
if (!alreadyVisited) {
if (!alreadyVisited && !skipSameDirection) {
double distanceToEnd = h(ctx, distToFinalPoint, next);
// assigned to wrong direction
if(next.directionAssigned == -direction){
@ -773,7 +774,7 @@ public class BinaryRoutePlanner {
if (ctx.visitor != null) {
ctx.visitor.visitSegment(next, false);
}
} else {
} else if(!skipSameDirection){
// the segment was already visited! We need to follow better route if it exists
// that is very strange situation and almost exception (it can happen when we underestimate distnceToEnd)
if (next.directionAssigned == direction &&

2
DataExtractionOSM/src/net/osmand/router/RoutingContext.java
View file

@ -226,9 +226,11 @@ public class RoutingContext {
routes = new ArrayList<RouteDataObject>();
tileRoutes.put(tileId, routes);
}
if(!routes.contains(o)){
routes.add(o);
}
}
}
public void unloadAllData() {
unloadAllData(null);

2
DataExtractionOSM/src/net/osmand/router/routing.xml
View file

@ -10,7 +10,7 @@
<attribute name="zoomToLoadTiles" value="16" />
<!-- by default it is 30. Value specified here overwrites all others
(don't specify here ! it is device dependent) -->
<attribute name="memoryLimitInMB" value="300" />
<attribute name="memoryLimitInMB" value="" />
<!-- 1.2 Dynamic road prioritizing (heuristic) -->
<attribute name="useDynamicRoadPrioritising" value="false" />