From 752f4a2ae03ddacda0b501ecdc85938d9f8e72f2 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 9 Sep 2014 23:37:46 +0200 Subject: [PATCH] Back out AND-160 fix attempts for now, looks like they did not work --- OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java | 2 +- OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java index 4765f387ca..3119531c8d 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java @@ -246,7 +246,7 @@ public class WaypointHelper { if (pointTypes != null) { for (int r = 0; r < pointTypes.length; r++) { RouteTypeRule typeRule = reg.quickGetEncodingRule(pointTypes[r]); - AlarmInfo info = AlarmInfo.createAlarmInfo(typeRule, i, loc); + AlarmInfo info = AlarmInfo.createAlarmInfo(typeRule, 0, loc); if (info != null) { if (info.getType() != AlarmInfoType.SPEED_CAMERA || showCameras) { long ms = System.currentTimeMillis() ; diff --git a/OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java b/OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java index d61f217c98..f998c0b6da 100644 --- a/OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java +++ b/OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java @@ -97,7 +97,7 @@ public class AlarmInfo implements LocationPoint { if(alarmInfo != null) { alarmInfo.setLatLon(loc.getLatitude(), loc.getLongitude()); } - return alarmInfo; + return null; } public int updateDistanceAndGetPriority(float time, float distance) {