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

Remove export of GPX and favorite markers

Browse source
This commit is contained in:
Vitaliy 2020-11-12 14:21:56 +02:00
parent ec4684b8e9
commit 6fb592bde1
4 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java
View file

@ -1011,6 +1011,20 @@ public class MapMarkersHelper {
});
}
public List<MapMarker> getMapMarkersFromDefaultGroups(boolean history) {
List<MapMarker> mapMarkers = new ArrayList<>();
for (MapMarkersGroup group : mapMarkersGroups) {
if (group.getType() == MapMarkersGroup.ANY_TYPE) {
for (MapMarker marker : group.getMarkers()) {
if (history && marker.history || !history && !marker.history) {
mapMarkers.add(marker);
}
}
}
}
return mapMarkers;
}
public String saveMarkersToFile(String fileName) {
GPXFile gpxFile = generateGpx();
String dirName = IndexConstants.GPX_INDEX_DIR + IndexConstants.MAP_MARKERS_INDEX_DIR;

2
OsmAnd/src/net/osmand/plus/settings/backend/backup/HistoryMarkersSettingsItem.java
View file

@ -46,7 +46,7 @@ public class HistoryMarkersSettingsItem extends CollectionSettingsItem<MapMarker
protected void init() {
super.init();
markersHelper = app.getMapMarkersHelper();
existingItems = new ArrayList<>(markersHelper.getMapMarkersHistory());
existingItems = new ArrayList<>(markersHelper.getMapMarkersFromDefaultGroups(true));
}
@NonNull

2
OsmAnd/src/net/osmand/plus/settings/backend/backup/MarkersSettingsItem.java
View file

@ -46,7 +46,7 @@ public class MarkersSettingsItem extends CollectionSettingsItem<MapMarker> {
protected void init() {
super.init();
markersHelper = app.getMapMarkersHelper();
existingItems = new ArrayList<>(markersHelper.getMapMarkers());
existingItems = new ArrayList<>(markersHelper.getMapMarkersFromDefaultGroups(false));
}
@NonNull

4
OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java
View file

@ -597,7 +597,7 @@ public class SettingsHelper {
if (!files.isEmpty()) {
dataList.put(ExportSettingsType.VOICE, files);
}
List<MapMarker> mapMarkers = app.getMapMarkersHelper().getMapMarkers();
List<MapMarker> mapMarkers = app.getMapMarkersHelper().getMapMarkersFromDefaultGroups(false);
if (!mapMarkers.isEmpty()) {
String name = app.getString(R.string.map_markers);
String groupId = ExportSettingsType.ACTIVE_MARKERS.name();
@ -605,7 +605,7 @@ public class SettingsHelper {
markersGroup.setMarkers(mapMarkers);
dataList.put(ExportSettingsType.ACTIVE_MARKERS, Collections.singletonList(markersGroup));
}
List<MapMarker> markersHistory = app.getMapMarkersHelper().getMapMarkersHistory();
List<MapMarker> markersHistory = app.getMapMarkersHelper().getMapMarkersFromDefaultGroups(true);
if (!markersHistory.isEmpty()) {
String name = app.getString(R.string.shared_string_history);
String groupId = ExportSettingsType.HISTORY_MARKERS.name();