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

work in progress

Browse source
This commit is contained in:
MadWasp79 2020-02-11 12:47:44 +02:00
parent b39612f985
commit f4645fcaf2
1 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
OsmAnd/src/net/osmand/plus/views/RouteLayer.java
View file

@ -92,7 +92,7 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
private GeometryWayContext wayContext;
private LayerDrawable projectionIcon;
private final static Log log = PlatformUtil.getLog(RouteLayer.class);
public RouteLayer(RoutingHelper helper) {
this.helper = helper;
this.transportHelper = helper.getTransportRoutingHelper();
@ -841,7 +841,6 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
return simplifyPoints;
}
}
private final static Log log = PlatformUtil.getLog(RouteLayer.class);
private class RouteSimplificationGeometry {
RouteCalculationResult route;
@ -1105,7 +1104,7 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
RouteCalculationResult route = helper.getRoute();
routeGeometry.clearTransportRoute();
routeGeometry.updateRoute(tb, route);
if (helper.getRoute().isShowOriginalRoute()) {
if (helper.getRoute().isShowOriginalRoute() && helper.getOriginalStartingLocation() != null) {
routeGeometry.drawSegments(tb, canvas, topLatitude, leftLongitude, bottomLatitude, rightLongitude,
helper.getOriginalStartingLocation(), route == null ? 0 : route.getCurrentRoute(), true);
} else {
@ -1121,11 +1120,9 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
}
if (helper.getRoute().isShowOriginalRoute()) {
//add projection point on original route
double[] projectionOnRoute = calculateProjectionOnRoutePoint(helper.getLastProjection(),
helper.getOriginalRouteAllLoc(), helper.getRoute().getCurrentRoute(), tb);
if (projectionOnRoute != null) {
log.debug("Draw projection");
drawProjectionPoint(tb, canvas, projectionOnRoute);
}
}
@ -1133,12 +1130,22 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
}
private double[] calculateProjectionOnRoutePoint(Location lastProjection, List<Location> routeNodes, int cd, RotatedTileBox box) {
double[] projectionXY = new double[2];
boolean visible = false;
if (cd < routeNodes.size() - 1) {
Location previousInRoute = routeNodes.get(cd);
Location nextInRoute = routeNodes.get(cd + 1);
log.debug("cd: " + cd);
double[] projectionXY;
boolean visible;
Location previousInRoute;
Location nextInRoute;
//need to change this code by fixing helper.route.getCurrentRoute() miscalculation
if (cd == 0) {
previousInRoute = routeNodes.get(cd);
nextInRoute = routeNodes.get(cd + 1);
} else if (cd == routeNodes.size() - 1) {
previousInRoute = routeNodes.get(cd - 1);
nextInRoute = routeNodes.get(cd);
} else {
previousInRoute = routeNodes.get(cd);
nextInRoute = routeNodes.get(cd + 1);
}
int centerX = box.getPixXFromLonNoRot(nextInRoute.getLongitude());
int centerY = box.getPixYFromLatNoRot(nextInRoute.getLatitude());
int aX = box.getPixXFromLonNoRot(lastProjection.getLongitude());
@ -1149,10 +1156,10 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
double radius = MapUtils.getVectorMagnitude(centerX, centerY, aX, aY);
double angle2 = MapUtils.getAngleForRadiusVector(centerX, centerY, bX, bY);
projectionXY = MapUtils.getCoordinatesFromRadiusAndAngle(centerX, centerY, radius, angle2);
log.debug("Projection: " + projectionXY[0] + ", " + projectionXY[1]);
// log.debug("Projection: " + projectionXY[0] + ", " + projectionXY[1]);
visible = box.containsPoint((float)projectionXY[0], (float)projectionXY[1], 20.0f)
&& Math.abs(Math.toDegrees(MapUtils.getAngleBetweenVectors(centerX, centerY, aX, aY, centerX, centerY, bX, bY))) < 90;
}
if (visible) {
return projectionXY;
} else {