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

Fix error with maxspeed:forward /backward support

Browse source
This commit is contained in:
sonora 2016-08-03 00:35:01 +02:00
parent 749ca29ea2
commit 54d55f5b49
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
View file

@ -265,8 +265,8 @@ public class WaypointHelper {
boolean direction = true; boolean direction = true;
if (loc.hasBearing()) { if (loc.hasBearing()) {
double diff = MapUtils.alignAngleDifference(ro.directionRoute(0, true) - double diff = MapUtils.alignAngleDifference(ro.directionRoute(0, true) -
loc.getBearing() / (2 * Math.PI)); loc.getBearing() / 180f * Math.PI));
direction = Math.abs(diff) < Math.PI; direction = Math.abs(diff) < Math.PI /2f;
} }
float mxspeed = ro.getMaximumSpeed(direction); float mxspeed = ro.getMaximumSpeed(direction);
float delta = app.getSettings().SPEED_LIMIT_EXCEED.get() / 3.6f; float delta = app.getSettings().SPEED_LIMIT_EXCEED.get() / 3.6f;
@ -285,12 +285,12 @@ public class WaypointHelper {
//if (loc.hasBearing()) { //if (loc.hasBearing()) {
// Issue #2873: Check if Alarm is in forward direction // Issue #2873: Check if Alarm is in forward direction
//but not sure this is needed //TODO: but not sure this is needed, and also need to check direction towards alarm location, not just alignment with routeDataObject
// if (Math.abs(MapUtils.alignAngleDifference(ro.directionRoute(0, true) - // if (Math.abs(MapUtils.alignAngleDifference(ro.directionRoute(0, true) -
// loc.getBearing() / 360f * 2 * Math.PI)) >= Math.PI / 2f) { // loc.getBearing() / 180f * Math.PI)) >= Math.PI / 2f) {
// info = null; // info = null;
// } // }
//Toast.makeText(app.getApplicationContext(), Double.toString(ro.directionRoute(0, true)) + ",\n" + Double.toString(loc.getBearing()) + ",\n" + Double.toString(MapUtils.alignAngleDifference(ro.directionRoute(0, true) - loc.getBearing() / 360f / (2 * Math.PI))), Toast.LENGTH_LONG).show(); //Toast.makeText(app.getApplicationContext(), Double.toString(ro.directionRoute(0, true)) + ",\n" + Double.toString(loc.getBearing()) + ",\n" + Double.toString(MapUtils.alignAngleDifference(ro.directionRoute(0, true) - loc.getBearing() / 180f * Math.PI))), Toast.LENGTH_LONG).show();
//} //}
if (info != null) { if (info != null) {

4
OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
View file

@ -394,8 +394,8 @@ public class RouteInfoWidgetsFactory {
Location loc = locationProvider.getLastKnownLocation(); Location loc = locationProvider.getLastKnownLocation();
if(loc != null && loc.hasBearing()) { if(loc != null && loc.hasBearing()) {
double diff = MapUtils.alignAngleDifference(ro.directionRoute(0, true) - double diff = MapUtils.alignAngleDifference(ro.directionRoute(0, true) -
loc.getBearing() / (2 * Math.PI)); loc.getBearing() / 180f * Math.PI));
direction = Math.abs(diff) < Math.PI; direction = Math.abs(diff) < Math.PI / 2f;
} }
mx = ro.getMaximumSpeed(direction); mx = ro.getMaximumSpeed(direction);
} }