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

Formatting

Browse source
This commit is contained in:
Roman Inflianskas 2016-06-24 17:59:32 +03:00
parent f85db1938a
commit cd68355c97
2 changed files with 85 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd-java/src/net/osmand/binary/GeocodingUtilities.java
View file

@ -234,7 +234,7 @@ public class GeocodingUtilities {
} }
public List<GeocodingResult> justifyReverseGeocodingSearch(final GeocodingResult road, BinaryMapIndexReader reader, public List<GeocodingResult> justifyReverseGeocodingSearch(final GeocodingResult road, BinaryMapIndexReader reader,
double knownMinBuidlingDistance, final ResultMatcher<GeocodingResult> result) throws IOException { double knownMinBuildingDistance, final ResultMatcher<GeocodingResult> result) throws IOException {
// test address index search // test address index search
final List<GeocodingResult> streetsList = new ArrayList<GeocodingResult>(); final List<GeocodingResult> streetsList = new ArrayList<GeocodingResult>();
final List<String> streetNamePacked = prepareStreetName(road.streetName); final List<String> streetNamePacked = prepareStreetName(road.streetName);
@ -297,14 +297,14 @@ public class GeocodingUtilities {
Collections.sort(streetBuildings, DISTANCE_COMPARATOR); Collections.sort(streetBuildings, DISTANCE_COMPARATOR);
if (streetBuildings.size() > 0) { if (streetBuildings.size() > 0) {
Iterator<GeocodingResult> it = streetBuildings.iterator(); Iterator<GeocodingResult> it = streetBuildings.iterator();
if (knownMinBuidlingDistance == 0) { if (knownMinBuildingDistance == 0) {
GeocodingResult firstBld = it.next(); GeocodingResult firstBld = it.next();
knownMinBuidlingDistance = firstBld.getDistance(); knownMinBuildingDistance = firstBld.getDistance();
res.add(firstBld); res.add(firstBld);
} }
while (it.hasNext()) { while (it.hasNext()) {
GeocodingResult nextBld = it.next(); GeocodingResult nextBld = it.next();
if (nextBld.getDistance() > knownMinBuidlingDistance if (nextBld.getDistance() > knownMinBuildingDistance
* THRESHOLD_MULTIPLIER_SKIP_BUILDINGS_AFTER) { * THRESHOLD_MULTIPLIER_SKIP_BUILDINGS_AFTER) {
break; break;
} }

85
OsmAnd-java/src/net/osmand/router/RoutePlannerFrontEnd.java
View file

@ -51,7 +51,7 @@ public class RoutePlannerFrontEnd {
private static double squareDist(int x1, int y1, int x2, int y2) { private static double squareDist(int x1, int y1, int x2, int y2) {
// translate into meters // translate into meters
double dy = MapUtils.convert31YToMeters(y1, y2); double dy = MapUtils.convert31YToMeters(y1, y2);
double dx = MapUtils. convert31XToMeters(x1, x2); double dx = MapUtils.convert31XToMeters(x1, x2);
return dx * dx + dy * dy; return dx * dx + dy * dy;
} }
@ -63,7 +63,7 @@ public class RoutePlannerFrontEnd {
if (dataObjects.isEmpty()) { if (dataObjects.isEmpty()) {
ctx.loadTileData(px, py, 15, dataObjects); ctx.loadTileData(px, py, 15, dataObjects);
} }
if(list == null) { if (list == null) {
list = new ArrayList<BinaryRoutePlanner.RouteSegmentPoint>(); list = new ArrayList<BinaryRoutePlanner.RouteSegmentPoint>();
} }
for (RouteDataObject r : dataObjects) { for (RouteDataObject r : dataObjects) {
@ -71,8 +71,8 @@ public class RoutePlannerFrontEnd {
RouteSegmentPoint road = null; RouteSegmentPoint road = null;
for (int j = 1; j < r.getPointsLength(); j++) { for (int j = 1; j < r.getPointsLength(); j++) {
QuadPoint pr = MapUtils.getProjectionPoint31(px, py, r.getPoint31XTile(j - 1), QuadPoint pr = MapUtils.getProjectionPoint31(px, py, r.getPoint31XTile(j - 1),
r.getPoint31YTile(j - 1), r.getPoint31XTile(j ), r.getPoint31YTile(j )); r.getPoint31YTile(j - 1), r.getPoint31XTile(j), r.getPoint31YTile(j));
double currentsDistSquare = squareDist((int) pr.x, (int)pr.y, px, py); double currentsDistSquare = squareDist((int) pr.x, (int) pr.y, px, py);
if (road == null || currentsDistSquare < road.distSquare) { if (road == null || currentsDistSquare < road.distSquare) {
RouteDataObject ro = new RouteDataObject(r); RouteDataObject ro = new RouteDataObject(r);
road = new RouteSegmentPoint(ro, j, currentsDistSquare); road = new RouteSegmentPoint(ro, j, currentsDistSquare);
@ -80,7 +80,7 @@ public class RoutePlannerFrontEnd {
road.preciseY = (int) pr.y; road.preciseY = (int) pr.y;
} }
} }
if(road != null) { if (road != null) {
list.add(road); list.add(road);
} }
} }
@ -92,7 +92,7 @@ public class RoutePlannerFrontEnd {
return Double.compare(o1.distSquare, o2.distSquare); return Double.compare(o1.distSquare, o2.distSquare);
} }
}); });
if(list.size() > 0) { if (list.size() > 0) {
RouteSegmentPoint ps = list.get(0); RouteSegmentPoint ps = list.get(0);
ps.others = list; ps.others = list;
return ps; return ps;
@ -111,40 +111,40 @@ public class RoutePlannerFrontEnd {
public List<RouteSegmentResult> searchRoute(final RoutingContext ctx, LatLon start, LatLon end, List<LatLon> intermediates, public List<RouteSegmentResult> searchRoute(final RoutingContext ctx, LatLon start, LatLon end, List<LatLon> intermediates,
PrecalculatedRouteDirection routeDirection) throws IOException, InterruptedException { PrecalculatedRouteDirection routeDirection) throws IOException, InterruptedException {
if(ctx.calculationProgress == null) { if (ctx.calculationProgress == null) {
ctx.calculationProgress = new RouteCalculationProgress(); ctx.calculationProgress = new RouteCalculationProgress();
} }
boolean intermediatesEmpty = intermediates == null || intermediates.isEmpty(); boolean intermediatesEmpty = intermediates == null || intermediates.isEmpty();
double maxDistance = MapUtils.getDistance(start, end); double maxDistance = MapUtils.getDistance(start, end);
if(!intermediatesEmpty) { if (!intermediatesEmpty) {
LatLon b = start; LatLon b = start;
for(LatLon l : intermediates) { for (LatLon l : intermediates) {
maxDistance = Math.max(MapUtils.getDistance(b, l), maxDistance); maxDistance = Math.max(MapUtils.getDistance(b, l), maxDistance);
b = l; b = l;
} }
} }
if(ctx.calculationMode == RouteCalculationMode.COMPLEX && routeDirection == null if (ctx.calculationMode == RouteCalculationMode.COMPLEX && routeDirection == null
&& maxDistance > ctx.config.DEVIATION_RADIUS * 6) { && maxDistance > ctx.config.DEVIATION_RADIUS * 6) {
RoutingContext nctx = buildRoutingContext(ctx.config, ctx.nativeLib, ctx.getMaps(), RouteCalculationMode.BASE); RoutingContext nctx = buildRoutingContext(ctx.config, ctx.nativeLib, ctx.getMaps(), RouteCalculationMode.BASE);
nctx.calculationProgress = ctx.calculationProgress ; nctx.calculationProgress = ctx.calculationProgress;
List<RouteSegmentResult> ls = searchRoute(nctx, start, end, intermediates); List<RouteSegmentResult> ls = searchRoute(nctx, start, end, intermediates);
routeDirection = PrecalculatedRouteDirection.build(ls, ctx.config.DEVIATION_RADIUS, ctx.getRouter().getMaxDefaultSpeed()); routeDirection = PrecalculatedRouteDirection.build(ls, ctx.config.DEVIATION_RADIUS, ctx.getRouter().getMaxDefaultSpeed());
} }
if(intermediatesEmpty && ctx.nativeLib != null) { if (intermediatesEmpty && ctx.nativeLib != null) {
ctx.startX = MapUtils.get31TileNumberX(start.getLongitude()); ctx.startX = MapUtils.get31TileNumberX(start.getLongitude());
ctx.startY = MapUtils.get31TileNumberY(start.getLatitude()); ctx.startY = MapUtils.get31TileNumberY(start.getLatitude());
ctx.targetX = MapUtils.get31TileNumberX(end.getLongitude()); ctx.targetX = MapUtils.get31TileNumberX(end.getLongitude());
ctx.targetY = MapUtils.get31TileNumberY(end.getLatitude()); ctx.targetY = MapUtils.get31TileNumberY(end.getLatitude());
RouteSegment recalculationEnd = getRecalculationEnd(ctx); RouteSegment recalculationEnd = getRecalculationEnd(ctx);
if(recalculationEnd != null) { if (recalculationEnd != null) {
ctx.initTargetPoint(recalculationEnd); ctx.initTargetPoint(recalculationEnd);
} }
if(routeDirection != null) { if (routeDirection != null) {
ctx.precalculatedRouteDirection = routeDirection.adopt(ctx); ctx.precalculatedRouteDirection = routeDirection.adopt(ctx);
} }
List<RouteSegmentResult> res = runNativeRouting(ctx, recalculationEnd); List<RouteSegmentResult> res = runNativeRouting(ctx, recalculationEnd);
if(res != null) { if (res != null) {
new RouteResultPreparation().printResults(ctx, start, end, res); new RouteResultPreparation().printResults(ctx, start, end, res);
} }
makeStartEndPointsPrecise(res, start, end, intermediates); makeStartEndPointsPrecise(res, start, end, intermediates);
@ -152,7 +152,7 @@ public class RoutePlannerFrontEnd {
} }
int indexNotFound = 0; int indexNotFound = 0;
List<RouteSegmentPoint> points = new ArrayList<RouteSegmentPoint>(); List<RouteSegmentPoint> points = new ArrayList<RouteSegmentPoint>();
if(!addSegment(start, ctx, indexNotFound++, points)){ if (!addSegment(start, ctx, indexNotFound++, points)) {
return null; return null;
} }
if (intermediates != null) { if (intermediates != null) {
@ -162,13 +162,13 @@ public class RoutePlannerFrontEnd {
} }
} }
} }
if(!addSegment(end, ctx, indexNotFound++, points)){ if (!addSegment(end, ctx, indexNotFound++, points)) {
return null; return null;
} }
List<RouteSegmentResult> res = searchRoute(ctx, points, routeDirection); List<RouteSegmentResult> res = searchRoute(ctx, points, routeDirection);
// make start and end more precise // make start and end more precise
makeStartEndPointsPrecise(res, start, end, intermediates); makeStartEndPointsPrecise(res, start, end, intermediates);
if(res != null) { if (res != null) {
new RouteResultPreparation().printResults(ctx, start, end, res); new RouteResultPreparation().printResults(ctx, start, end, res);
} }
return res; return res;
@ -214,25 +214,25 @@ public class RoutePlannerFrontEnd {
QuadPoint pp = MapUtils.getProjectionPoint31(px, py, QuadPoint pp = MapUtils.getProjectionPoint31(px, py,
r.getPoint31XTile(sr.getStartPointIndex()), r.getPoint31YTile(sr.getStartPointIndex()), r.getPoint31XTile(sr.getStartPointIndex()), r.getPoint31YTile(sr.getStartPointIndex()),
r.getPoint31XTile(sr.getEndPointIndex()), r.getPoint31YTile(sr.getEndPointIndex())); r.getPoint31XTile(sr.getEndPointIndex()), r.getPoint31YTile(sr.getEndPointIndex()));
double currentsDist = squareDist((int) pp.x, (int)pp.y, px, py); double currentsDist = squareDist((int) pp.x, (int) pp.y, px, py);
return currentsDist; return currentsDist;
} }
private void updateResult(RouteSegmentResult routeSegmentResult, LatLon point, boolean st) { private void updateResult(RouteSegmentResult routeSegmentResult, LatLon point, boolean st) {
int px = MapUtils.get31TileNumberX(point.getLongitude()); int px = MapUtils.get31TileNumberX(point.getLongitude());
int py = MapUtils.get31TileNumberY(point.getLatitude()); int py = MapUtils.get31TileNumberY(point.getLatitude());
int pind = st ? routeSegmentResult.getStartPointIndex() : routeSegmentResult.getEndPointIndex(); int pind = st ? routeSegmentResult.getStartPointIndex() : routeSegmentResult.getEndPointIndex();
RouteDataObject r = routeSegmentResult.getObject(); RouteDataObject r = routeSegmentResult.getObject();
QuadPoint before = null; QuadPoint before = null;
QuadPoint after = null; QuadPoint after = null;
if(pind > 0) { if (pind > 0) {
before = MapUtils.getProjectionPoint31(px, py, r.getPoint31XTile(pind - 1), before = MapUtils.getProjectionPoint31(px, py, r.getPoint31XTile(pind - 1),
r.getPoint31YTile(pind - 1), r.getPoint31XTile(pind ), r.getPoint31YTile(pind )); r.getPoint31YTile(pind - 1), r.getPoint31XTile(pind), r.getPoint31YTile(pind));
} }
if(pind < r.getPointsLength() - 1) { if (pind < r.getPointsLength() - 1) {
after = MapUtils.getProjectionPoint31(px, py, r.getPoint31XTile(pind + 1), after = MapUtils.getProjectionPoint31(px, py, r.getPoint31XTile(pind + 1),
r.getPoint31YTile(pind + 1), r.getPoint31XTile(pind ), r.getPoint31YTile(pind )); r.getPoint31YTile(pind + 1), r.getPoint31XTile(pind), r.getPoint31YTile(pind));
} }
int insert = 0; int insert = 0;
double dd = MapUtils.getDistance(point, MapUtils.get31LatitudeY(r.getPoint31YTile(pind)), double dd = MapUtils.getDistance(point, MapUtils.get31LatitudeY(r.getPoint31YTile(pind)),
@ -240,19 +240,19 @@ public class RoutePlannerFrontEnd {
double ddBefore = Double.POSITIVE_INFINITY; double ddBefore = Double.POSITIVE_INFINITY;
double ddAfter = Double.POSITIVE_INFINITY; double ddAfter = Double.POSITIVE_INFINITY;
QuadPoint i = null; QuadPoint i = null;
if(before != null) { if (before != null) {
ddBefore = MapUtils.getDistance(point, MapUtils.get31LatitudeY((int) before.y), ddBefore = MapUtils.getDistance(point, MapUtils.get31LatitudeY((int) before.y),
MapUtils.get31LongitudeX((int) before.x)); MapUtils.get31LongitudeX((int) before.x));
if(ddBefore < dd) { if (ddBefore < dd) {
insert = -1; insert = -1;
i = before; i = before;
} }
} }
if(after != null) { if (after != null) {
ddAfter = MapUtils.getDistance(point, MapUtils.get31LatitudeY((int) after.y), ddAfter = MapUtils.getDistance(point, MapUtils.get31LatitudeY((int) after.y),
MapUtils.get31LongitudeX((int) after.x)); MapUtils.get31LongitudeX((int) after.x));
if(ddAfter < dd && ddAfter < ddBefore) { if (ddAfter < dd && ddAfter < ddBefore) {
insert = 1; insert = 1;
i = after; i = after;
} }
@ -283,7 +283,7 @@ public class RoutePlannerFrontEnd {
private boolean addSegment(LatLon s, RoutingContext ctx, int indexNotFound, List<RouteSegmentPoint> res) throws IOException { private boolean addSegment(LatLon s, RoutingContext ctx, int indexNotFound, List<RouteSegmentPoint> res) throws IOException {
RouteSegmentPoint f = findRouteSegment(s.getLatitude(), s.getLongitude(), ctx, null); RouteSegmentPoint f = findRouteSegment(s.getLatitude(), s.getLongitude(), ctx, null);
if(f == null){ if (f == null) {
ctx.calculationProgress.segmentNotFound = indexNotFound; ctx.calculationProgress.segmentNotFound = indexNotFound;
return false; return false;
} else { } else {
@ -295,14 +295,14 @@ public class RoutePlannerFrontEnd {
} }
private List<RouteSegmentResult> searchRouteInternalPrepare(final RoutingContext ctx, RouteSegmentPoint start, RouteSegmentPoint end, private List<RouteSegmentResult> searchRouteInternalPrepare(final RoutingContext ctx, RouteSegmentPoint start, RouteSegmentPoint end,
PrecalculatedRouteDirection routeDirection) throws IOException, InterruptedException { PrecalculatedRouteDirection routeDirection) throws IOException, InterruptedException {
RouteSegment recalculationEnd = getRecalculationEnd(ctx); RouteSegment recalculationEnd = getRecalculationEnd(ctx);
if(recalculationEnd != null) { if (recalculationEnd != null) {
ctx.initStartAndTargetPoints(start, recalculationEnd); ctx.initStartAndTargetPoints(start, recalculationEnd);
} else { } else {
ctx.initStartAndTargetPoints(start, end); ctx.initStartAndTargetPoints(start, end);
} }
if(routeDirection != null) { if (routeDirection != null) {
ctx.precalculatedRouteDirection = routeDirection.adopt(ctx); ctx.precalculatedRouteDirection = routeDirection.adopt(ctx);
} }
if (ctx.nativeLib != null) { if (ctx.nativeLib != null) {
@ -310,7 +310,7 @@ public class RoutePlannerFrontEnd {
} else { } else {
refreshProgressDistance(ctx); refreshProgressDistance(ctx);
// Split into 2 methods to let GC work in between // Split into 2 methods to let GC work in between
if(useOldVersion) { if (useOldVersion) {
new BinaryRoutePlannerOld().searchRouteInternal(ctx, start, end); new BinaryRoutePlannerOld().searchRouteInternal(ctx, start, end);
} else { } else {
ctx.finalRouteSegment = new BinaryRoutePlanner().searchRouteInternal(ctx, start, end, recalculationEnd); ctx.finalRouteSegment = new BinaryRoutePlanner().searchRouteInternal(ctx, start, end, recalculationEnd);
@ -355,14 +355,14 @@ public class RoutePlannerFrontEnd {
private void refreshProgressDistance(RoutingContext ctx) { private void refreshProgressDistance(RoutingContext ctx) {
if(ctx.calculationProgress != null) { if (ctx.calculationProgress != null) {
ctx.calculationProgress.distanceFromBegin = 0; ctx.calculationProgress.distanceFromBegin = 0;
ctx.calculationProgress.distanceFromEnd = 0; ctx.calculationProgress.distanceFromEnd = 0;
ctx.calculationProgress.reverseSegmentQueueSize = 0; ctx.calculationProgress.reverseSegmentQueueSize = 0;
ctx.calculationProgress.directSegmentQueueSize = 0; ctx.calculationProgress.directSegmentQueueSize = 0;
float rd = (float) MapUtils.squareRootDist31(ctx.startX, ctx.startY, ctx.targetX, ctx.targetY); float rd = (float) MapUtils.squareRootDist31(ctx.startX, ctx.startY, ctx.targetX, ctx.targetY);
float speed = 0.9f * ctx.config.router.getMaxDefaultSpeed(); float speed = 0.9f * ctx.config.router.getMaxDefaultSpeed();
ctx.calculationProgress.totalEstimatedDistance = (float) (rd / speed); ctx.calculationProgress.totalEstimatedDistance = (float) (rd / speed);
} }
} }
@ -378,10 +378,10 @@ public class RoutePlannerFrontEnd {
ctx.config, regions, ctx.calculationProgress, ctx.precalculatedRouteDirection, ctx.calculationMode == RouteCalculationMode.BASE); ctx.config, regions, ctx.calculationProgress, ctx.precalculatedRouteDirection, ctx.calculationMode == RouteCalculationMode.BASE);
log.info("Native routing took " + (System.currentTimeMillis() - time) / 1000f + " seconds"); log.info("Native routing took " + (System.currentTimeMillis() - time) / 1000f + " seconds");
ArrayList<RouteSegmentResult> result = new ArrayList<RouteSegmentResult>(Arrays.asList(res)); ArrayList<RouteSegmentResult> result = new ArrayList<RouteSegmentResult>(Arrays.asList(res));
if(recalculationEnd != null) { if (recalculationEnd != null) {
log.info("Native routing use precalculated route"); log.info("Native routing use precalculated route");
RouteSegment current = recalculationEnd; RouteSegment current = recalculationEnd;
while(current.getParentRoute() != null) { while (current.getParentRoute() != null) {
RouteSegment pr = current.getParentRoute(); RouteSegment pr = current.getParentRoute();
result.add(new RouteSegmentResult(pr.getRoad(), current.getParentSegmentEnd(), pr.getSegmentStart())); result.add(new RouteSegmentResult(pr.getRoad(), current.getParentSegmentEnd(), pr.getSegmentStart()));
current = pr; current = pr;
@ -397,7 +397,7 @@ public class RoutePlannerFrontEnd {
private List<RouteSegmentResult> searchRoute(final RoutingContext ctx, List<RouteSegmentPoint> points, PrecalculatedRouteDirection routeDirection) private List<RouteSegmentResult> searchRoute(final RoutingContext ctx, List<RouteSegmentPoint> points, PrecalculatedRouteDirection routeDirection)
throws IOException, InterruptedException { throws IOException, InterruptedException {
if (points.size() <= 2) { if (points.size() <= 2) {
if(!useSmartRouteRecalculation) { if (!useSmartRouteRecalculation) {
ctx.previouslyCalculatedRoute = null; ctx.previouslyCalculatedRoute = null;
} }
return searchRoute(ctx, points.get(0), points.get(1), routeDirection); return searchRoute(ctx, points.get(0), points.get(1), routeDirection);
@ -467,11 +467,11 @@ public class RoutePlannerFrontEnd {
@SuppressWarnings("static-access") @SuppressWarnings("static-access")
private List<RouteSegmentResult> searchRoute(final RoutingContext ctx, RouteSegmentPoint start, RouteSegmentPoint end, private List<RouteSegmentResult> searchRoute(final RoutingContext ctx, RouteSegmentPoint start, RouteSegmentPoint end,
PrecalculatedRouteDirection routeDirection) throws IOException, InterruptedException { PrecalculatedRouteDirection routeDirection) throws IOException, InterruptedException {
if(ctx.SHOW_GC_SIZE){ if (ctx.SHOW_GC_SIZE) {
long h1 = ctx.runGCUsedMemory(); long h1 = ctx.runGCUsedMemory();
float mb = (1 << 20); float mb = (1 << 20);
log.warn("Used before routing " + h1 / mb+ " actual"); log.warn("Used before routing " + h1 / mb + " actual");
} }
List<RouteSegmentResult> result = searchRouteInternalPrepare(ctx, start, end, routeDirection); List<RouteSegmentResult> result = searchRouteInternalPrepare(ctx, start, end, routeDirection);
if (RoutingContext.SHOW_GC_SIZE) { if (RoutingContext.SHOW_GC_SIZE) {
@ -489,5 +489,4 @@ public class RoutePlannerFrontEnd {
} }
} }