diff --git a/DataExtractionOSM/src/net/osmand/router/BinaryRoutePlanner.java b/DataExtractionOSM/src/net/osmand/router/BinaryRoutePlanner.java index e41ee251eb..ef70e892fe 100644 --- a/DataExtractionOSM/src/net/osmand/router/BinaryRoutePlanner.java +++ b/DataExtractionOSM/src/net/osmand/router/BinaryRoutePlanner.java @@ -177,7 +177,7 @@ public class BinaryRoutePlanner { }; PriorityQueue graphSegments = new PriorityQueue(50, segmentsComparator); // initialize temporary lists to calculate not forbidden ways at way intersections - ArrayList segmentsToVisitPrescricted = new ArrayList(5); + ArrayList segmentsToVisitPrescripted = new ArrayList(5); ArrayList segmentsToVisitNotForbidden = new ArrayList(5); // Set to not visit one segment twice (stores road.id << X + segmentStart) @@ -282,7 +282,7 @@ public class BinaryRoutePlanner { RouteSegment next = ctx.routes.get(l); if (next != null) { - segmentsToVisitPrescricted.clear(); + segmentsToVisitPrescripted.clear(); segmentsToVisitNotForbidden.clear(); boolean exclusiveRestriction = false; @@ -355,7 +355,7 @@ public class BinaryRoutePlanner { // case exclusive restriction (only_right, only_straight, ...) exclusiveRestriction = true; segmentsToVisitNotForbidden.clear(); - segmentsToVisitPrescricted.add(next); + segmentsToVisitPrescripted.add(next); } } @@ -369,7 +369,7 @@ public class BinaryRoutePlanner { for(RouteSegment s : segmentsToVisitNotForbidden){ graphSegments.add(s); } - for(RouteSegment s : segmentsToVisitPrescricted){ + for(RouteSegment s : segmentsToVisitPrescripted){ graphSegments.add(s); } } diff --git a/DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java b/DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java index 6f0382c8bb..0650b93843 100644 --- a/DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java +++ b/DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java @@ -33,8 +33,8 @@ import net.osmand.osm.LatLon; import net.osmand.osm.MapUtils; import net.osmand.osm.Way; import net.osmand.router.BinaryRoutePlanner; +import net.osmand.router.RouteSegmentResult; import net.osmand.router.BinaryRoutePlanner.RouteSegment; -import net.osmand.router.BinaryRoutePlanner.RouteSegmentResult; import net.osmand.router.BinaryRoutePlanner.RouteSegmentVisitor; import net.osmand.router.BinaryRoutePlanner.RoutingContext; @@ -48,8 +48,8 @@ import org.xml.sax.SAXException; public class MapRouterLayer implements MapPanelLayer { - private /*final */ static boolean ANIMATE_CALCULATING_ROUTE = true; - private /*final */ static int SIZE_OF_ROUTES_TO_ANIMATE = 1; + private /*final */ static boolean ANIMATE_CALCULATING_ROUTE = false; + private /*final */ static int SIZE_OF_ROUTES_TO_ANIMATE = 50; private MapPanel map;