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

Update RouteLayer.java

Browse source
This commit is contained in:
vshcherb 2020-02-11 19:28:47 +01:00 committed by GitHub
parent 6b0595f6a0
commit 6369969acd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1135,7 +1135,6 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
Location previousInRoute = null; Location previousInRoute = null;
Location nextInRoute = null; Location nextInRoute = null;
//need to change this code by fixing helper.route.getCurrentRoute() miscalculation //need to change this code by fixing helper.route.getCurrentRoute() miscalculation
log.debug("intermediates: " + helper.getIntermediatePoints());
if (helper.getRoute().getIntermediatePointsToPass() > 0) { if (helper.getRoute().getIntermediatePointsToPass() > 0) {
for (int i = 1; i < routeNodes.size(); i++) { for (int i = 1; i < routeNodes.size(); i++) {
LatLon routePoint = new LatLon(routeNodes.get(i).getLatitude(), routeNodes.get(i).getLongitude()); LatLon routePoint = new LatLon(routeNodes.get(i).getLatitude(), routeNodes.get(i).getLongitude());
@ -1159,7 +1158,6 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
double radius = MapUtils.getVectorMagnitude(centerX, centerY, aX, aY); double radius = MapUtils.getVectorMagnitude(centerX, centerY, aX, aY);
double angle2 = MapUtils.getAngleForRadiusVector(centerX, centerY, bX, bY); double angle2 = MapUtils.getAngleForRadiusVector(centerX, centerY, bX, bY);
projectionXY = MapUtils.getCoordinatesFromRadiusAndAngle(centerX, centerY, radius, angle2); projectionXY = MapUtils.getCoordinatesFromRadiusAndAngle(centerX, centerY, radius, angle2);
log.debug("Projection: " + projectionXY[0] + ", " + projectionXY[1]);
visible = box.containsPoint((float)projectionXY[0], (float)projectionXY[1], 20.0f) 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; && Math.abs(Math.toDegrees(MapUtils.getAngleBetweenVectors(centerX, centerY, aX, aY, centerX, centerY, bX, bY))) < 90;