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

Merge pull request #805 from Bars107/refactor

Browse source 
Fixed bug with waypoint being announced twice
This commit is contained in:
vshcherb 2014-08-02 17:56:16 +02:00
commit 175032ebe1
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java
View file

@ -105,7 +105,6 @@ public class OsmAndLocationProvider implements SensorEventListener {
private static final int NOT_ANNOUNCED = 0; private static final int NOT_ANNOUNCED = 0;
private static final int ANNOUNCED_ONCE = 1; private static final int ANNOUNCED_ONCE = 1;
private static final int ANNOUNCED_TWICE = 2;
private ConcurrentHashMap<LocationPoint , Integer> locationPointsStates = new ConcurrentHashMap<LocationPoint, Integer>(); private ConcurrentHashMap<LocationPoint , Integer> locationPointsStates = new ConcurrentHashMap<LocationPoint, Integer>();
private List<LocationPoint> visibleLocationPoints = new CopyOnWriteArrayList<LocationPoint>(); private List<LocationPoint> visibleLocationPoints = new CopyOnWriteArrayList<LocationPoint>();
@ -184,12 +183,12 @@ public class OsmAndLocationProvider implements SensorEventListener {
double d1 = MapUtils.getDistance(lastLocation.getLatitude(), lastLocation.getLongitude(), double d1 = MapUtils.getDistance(lastLocation.getLatitude(), lastLocation.getLongitude(),
point.getLatitude(), point.getLongitude()); point.getLatitude(), point.getLongitude());
int state = locationPointsStates.get(point); int state = locationPointsStates.get(point);
if (state == NOT_ANNOUNCED && app.getRoutingHelper().getVoiceRouter().isDistanceLess(lastLocation.getSpeed(), d1, 500)){ if(state <= ANNOUNCED_ONCE && app.getRoutingHelper().getVoiceRouter().isDistanceLess(lastLocation.getSpeed(), d1, 150)) {
nameToAnnounce = (nameToAnnounce == null ? "" : ", ") + point.getName();
locationPointsStates.remove(point);
} else if (state == NOT_ANNOUNCED && app.getRoutingHelper().getVoiceRouter().isDistanceLess(lastLocation.getSpeed(), d1, 500)){
nameToAnnounce = (nameToAnnounce == null? "":", ")+point.getName(); nameToAnnounce = (nameToAnnounce == null? "":", ")+point.getName();
locationPointsStates.put(point, state + 1); locationPointsStates.put(point, state + 1);
} else if(state == ANNOUNCED_ONCE && app.getRoutingHelper().getVoiceRouter().isDistanceLess(lastLocation.getSpeed(), d1, 150)){
nameToAnnounce = (nameToAnnounce == null? "":", ")+point.getName();
locationPointsStates.remove(point);
} }
} }
if(nameToAnnounce!= null) { if(nameToAnnounce!= null) {