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

Merge pull request #10899 from osmandapp/extend_track_auto_record

Browse source 
Extend track auto-record during navigation
This commit is contained in:
Vitaliy 2021-02-16 10:39:35 +02:00 committed by GitHub
commit 1ebed2c091
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmAndLocationProvider;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.Version; import net.osmand.plus.Version;
import net.osmand.plus.monitoring.OsmandMonitoringPlugin; import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
@ -79,6 +80,8 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
private int points; private int points;
private int trkPoints = 0; private int trkPoints = 0;
private ApplicationMode lastRoutingApplicationMode;
public SavingTrackHelper(OsmandApplication ctx) { public SavingTrackHelper(OsmandApplication ctx) {
super(ctx, DATABASE_NAME, null, DATABASE_VERSION); super(ctx, DATABASE_NAME, null, DATABASE_VERSION);
this.ctx = ctx; this.ctx = ctx;
@ -440,12 +443,15 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
} else { } else {
heading = NO_HEADING; heading = NO_HEADING;
} }
if (ctx.getRoutingHelper().isFollowingMode()) {
lastRoutingApplicationMode = settings.getApplicationMode();
}
boolean record = false; boolean record = false;
if (location != null && OsmAndLocationProvider.isNotSimulatedLocation(location) if (location != null && OsmAndLocationProvider.isNotSimulatedLocation(location)
&& OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null) { && OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null) {
if (settings.SAVE_TRACK_TO_GPX.get() if (settings.SAVE_TRACK_TO_GPX.get()
&& locationTime - lastTimeUpdated > settings.SAVE_TRACK_INTERVAL.get() && locationTime - lastTimeUpdated > settings.SAVE_TRACK_INTERVAL.get()
&& ctx.getRoutingHelper().isFollowingMode()) { && lastRoutingApplicationMode == settings.getApplicationMode()) {
record = true; record = true;
} else if (settings.SAVE_GLOBAL_TRACK_TO_GPX.get() } else if (settings.SAVE_GLOBAL_TRACK_TO_GPX.get()
&& locationTime - lastTimeUpdated > settings.SAVE_GLOBAL_TRACK_INTERVAL.get()) { && locationTime - lastTimeUpdated > settings.SAVE_GLOBAL_TRACK_INTERVAL.get()) {
@ -705,9 +711,10 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
} }
public boolean getIsRecording() { public boolean getIsRecording() {
OsmandSettings settings = ctx.getSettings();
return OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null return OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null
&& ctx.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.get() && settings.SAVE_GLOBAL_TRACK_TO_GPX.get() || settings.SAVE_TRACK_TO_GPX.get()
|| (ctx.getSettings().SAVE_TRACK_TO_GPX.get() && ctx.getRoutingHelper().isFollowingMode()); && lastRoutingApplicationMode == settings.getApplicationMode();
} }
public float getDistance() { public float getDistance() {