Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-08-03 11:07:29 +02:00
commit d47aec85c0

View file

@ -283,9 +283,10 @@ public class WaypointHelper {
RouteTypeRule typeRule = reg.quickGetEncodingRule(pointTypes[r]); RouteTypeRule typeRule = reg.quickGetEncodingRule(pointTypes[r]);
AlarmInfo info = AlarmInfo.createAlarmInfo(typeRule, 0, loc); AlarmInfo info = AlarmInfo.createAlarmInfo(typeRule, 0, loc);
// Issue #2873 may indicate we need some sort of check here if Alarm is in forward direction
// But cannot reproduce the issue for now
//if (loc.hasBearing()) { //if (loc.hasBearing()) {
// Issue #2873: Check if Alarm is in forward direction //TODO: Check would be needed using bearingTo("actual alarm location"), not alignment with routeDataObject
//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() / 180f * Math.PI)) >= Math.PI / 2f) { // loc.getBearing() / 180f * Math.PI)) >= Math.PI / 2f) {
// info = null; // info = null;