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

Add gpx-sync to methods

Browse source
This commit is contained in:
Alexander Sytnyk 2017-09-18 11:03:16 +03:00
parent 6399c38bd9
commit dab8c1511d
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
View file

@ -6,13 +6,14 @@ import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import net.osmand.IProgress;
import net.osmand.plus.GPXDatabase.GpxDataItem;
import net.osmand.plus.GPXUtilities.GPXFile;
import net.osmand.plus.GPXUtilities.GPXTrackAnalysis;
import net.osmand.plus.GPXUtilities.Route;
import net.osmand.plus.GPXUtilities.Track;
import net.osmand.plus.GPXUtilities.TrkSegment;
import net.osmand.plus.GPXUtilities.WptPt;
import net.osmand.plus.GPXDatabase.GpxDataItem;
import net.osmand.plus.MapMarkersHelper.MarkersSyncGroup;
import net.osmand.plus.OsmandSettings.MetricsConstants;
import net.osmand.plus.activities.SavingTrackHelper;
import net.osmand.plus.helpers.GpxUiHelper;
@ -491,18 +492,38 @@ public class GpxSelectionHelper {
public void clearPoints(GPXFile gpxFile) {
gpxFile.clearPoints();
syncGpx(gpxFile);
}
public void addPoint(WptPt point, GPXFile gpxFile) {
gpxFile.addPoint(point);
syncGpx(gpxFile);
}
public void addPoints(Collection<? extends WptPt> collection, GPXFile gpxFile) {
gpxFile.addPoints(collection);
syncGpx(gpxFile);
}
public boolean removePoint(WptPt point, GPXFile gpxFile) {
return gpxFile.removePoint(point);
boolean res = gpxFile.removePoint(point);
syncGpx(gpxFile);
return res;
}
private void syncGpx(GPXFile gpxFile) {
File gpx = new File(gpxFile.path);
if (gpx.exists()) {
app.getMapMarkersHelper().syncGroup(new MarkersSyncGroup(gpx.getAbsolutePath(), trimExtension(gpx.getName()), MarkersSyncGroup.GPX_TYPE));
}
}
private String trimExtension(String src) {
int index = src.lastIndexOf('.');
if (index != -1) {
return src.substring(0, index);
}
return src;
}

5
OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
View file

@ -338,12 +338,12 @@ public class MapMarkersHelper {
List<MapMarker> dbMarkers = markersDbHelper.getMarkersFromGroup(group);
if (group.getType() == MarkersSyncGroup.FAVORITES_TYPE) {
FavouritesDbHelper.FavoriteGroup favGroup = ctx.getFavorites().getGroup(group.name);
FavouritesDbHelper.FavoriteGroup favGroup = ctx.getFavorites().getGroup(group.getName());
if (favGroup == null) {
return;
}
if (!favGroup.visible) {
removeActiveMarkersFromSyncGroup(group.id);
removeActiveMarkersFromSyncGroup(group.getId());
return;
}
@ -367,6 +367,7 @@ public class MapMarkersHelper {
gpx = gpxHelper.getSelectedFileByPath(group.getId()).getGpxFile();
}
if (gpx == null) {
removeActiveMarkersFromSyncGroup(group.getId());
return;
}