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

Fix bearing when we calculate projection

Browse source
This commit is contained in:
Victor Shcherb 2012-06-30 01:50:55 +02:00
parent 123fc002cb
commit 594fafdc50
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
View file

@ -200,15 +200,19 @@ public class RoutingHelper {
log.info("Recalculate route, because correlation : " + dist); //$NON-NLS-1$ log.info("Recalculate route, because correlation : " + dist); //$NON-NLS-1$
calculateRoute = true; calculateRoute = true;
} }
// calculate projection of current location
if(dist < POSITION_TOLERANCE * 1.5f) { if(dist < POSITION_TOLERANCE * 1.5f) {
Location nextLocation = routeNodes.get(currentRoute);
LatLon project = getProject(currentLocation, routeNodes.get(currentRoute - 1), routeNodes.get(currentRoute)); LatLon project = getProject(currentLocation, routeNodes.get(currentRoute - 1), routeNodes.get(currentRoute));
// calculate projection of current location
locationProjection.setLatitude(project.getLatitude()); locationProjection.setLatitude(project.getLatitude());
locationProjection.setLongitude(project.getLongitude()); locationProjection.setLongitude(project.getLongitude());
float bearingTo = locationProjection.bearingTo(nextLocation);
// we need to update bearing too
locationProjection.setBearing(bearingTo);
} }
} }
// 3. Identify wrong movement direction (very similar to 2?) // 3. Identify wrong movement direction (very similar to 2?)
// Put 3*POSITION_TOLERANCE/2 in order to avoid sharp turns
Location next = route.getNextRouteLocation(); Location next = route.getNextRouteLocation();
boolean wrongMovementDirection = checkWrongMovementDirection(currentLocation, next); boolean wrongMovementDirection = checkWrongMovementDirection(currentLocation, next);
if (wrongMovementDirection && currentLocation.distanceTo(routeNodes.get(currentRoute)) > 2 * POSITION_TOLERANCE) { if (wrongMovementDirection && currentLocation.distanceTo(routeNodes.get(currentRoute)) > 2 * POSITION_TOLERANCE) {