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

Update distance

Browse source
This commit is contained in:
Victor Shcherb 2012-07-15 21:43:56 +02:00
parent 81432f85a9
commit 33f19e7a95
2 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
View file

@ -258,8 +258,16 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
public void insertData(double lat, double lon, double alt, double speed, double hdop, long time, OsmandSettings settings){
if (time - lastTimeUpdated > settings.SAVE_TRACK_INTERVAL.get() * 1000) {
execWithClose(updateScript, new Object[] { lat, lon, alt, speed, hdop, time });
if (lastPoint == null || (time - lastTimeUpdated) > 180000) {
lastPoint = new LatLon(lat, lon);
}
lastTimeUpdated = time;
updateDistance(lat, lon);
if ((lastPoint.getLatitude() != lat) || (lastPoint.getLongitude() != lon)) {
float[] lastInterval = new float[1];
Location.distanceBetween(lat, lon, lastPoint.getLatitude(), lastPoint.getLongitude(), lastInterval);
distance += lastInterval[0];
lastPoint = new LatLon(lat, lon);
}
if (settings.SHOW_CURRENT_GPX_TRACK.get()) {
WptPt pt = new GPXUtilities.WptPt(lat, lon, time,
alt, speed, hdop);
@ -308,19 +316,4 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
return OsmAndFormatter.getFormattedDistance(distance, map);
}
private void updateDistance (double lat, double lon) {
if (lastPoint == null) {
lastPoint = new LatLon(lat, lon);
}
double lastLat = lastPoint.getLatitude();
double lastLon = lastPoint.getLongitude();
if ((lat == lastLat) && (lon == lastLon)) {
return;
} else {
float[] lastInterval = new float[1];
Location.distanceBetween(lat, lon, lastLat, lastLon, lastInterval);
distance += lastInterval[0];
lastPoint = new LatLon(lat, lon);
}
}
}

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

@ -671,7 +671,7 @@ public class RouteCalculationResult {
while(aInfo < alarmInfo.size()) {
AlarmInfo inf = alarmInfo.get(aInfo);
int d = dist - listDistance[inf.locationIndex];
if(d > 3000){
if(d > 700){
break;
}
float time = speed > 0 ? d / speed : 0;