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

Back out AND-160 fix attempts for now, looks like they did not work

Browse source
This commit is contained in:
sonora 2014-09-09 23:37:46 +02:00
parent af93ab7f37
commit 752f4a2ae0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -246,7 +246,7 @@ public class WaypointHelper {
if (pointTypes != null) { if (pointTypes != null) {
for (int r = 0; r < pointTypes.length; r++) { for (int r = 0; r < pointTypes.length; r++) {
RouteTypeRule typeRule = reg.quickGetEncodingRule(pointTypes[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 != null) {
if (info.getType() != AlarmInfoType.SPEED_CAMERA || showCameras) { if (info.getType() != AlarmInfoType.SPEED_CAMERA || showCameras) {
long ms = System.currentTimeMillis() ; long ms = System.currentTimeMillis() ;

2
OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java
View file

@ -97,7 +97,7 @@ public class AlarmInfo implements LocationPoint {
if(alarmInfo != null) { if(alarmInfo != null) {
alarmInfo.setLatLon(loc.getLatitude(), loc.getLongitude()); alarmInfo.setLatLon(loc.getLatitude(), loc.getLongitude());
} }
return alarmInfo; return null;
} }
public int updateDistanceAndGetPriority(float time, float distance) { public int updateDistanceAndGetPriority(float time, float distance) {