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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-07-13 09:17:03 +02:00
commit d0d541acb6
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/net/osmand/osm/io/OsmBaseStorage.java
View file

@ -136,6 +136,10 @@ public class OsmBaseStorage extends DefaultHandler {
}
}
public boolean isOsmChange() {
return osmChange;
}
protected Long parseId(Attributes a, String name, long defId){
long id = defId;
String value = a.getValue(name);

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

@ -178,14 +178,12 @@ public class WaypointHelper {
LocationPointWrapper lwp = lp.get(kIterator);
if (lp.get(kIterator).routeIndex < route.getCurrentRoute()) {
// skip
} else if (route.getDistanceToPoint(lwp.routeIndex) > LONG_ANNOUNCE_RADIUS / 2) {
break;
} else {
AlarmInfo inf = (AlarmInfo) lwp.point;
int d = route.getDistanceToPoint(lwp.routeIndex);
if (d > LONG_ANNOUNCE_RADIUS) {
break;
}
AlarmInfo inf = (AlarmInfo) lwp.point;
float speed = lastProjection != null && lastProjection.hasSpeed() ? lastProjection.getSpeed() : 0;
float time = speed > 0 ? d / speed : Integer.MAX_VALUE;
int vl = inf.updateDistanceAndGetPriority(time, d);