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

Merge pull request #4825 from osmandapp/fix_gpx_import

Browse source 
Fix gpx import
This commit is contained in:
Pavel Ratushnyi 2017-12-04 17:57:15 +02:00 committed by GitHub
commit 7f746a6c1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDbHelper.java
View file

@ -12,12 +12,16 @@ import net.osmand.plus.api.SQLiteAPI.SQLiteConnection;
import net.osmand.plus.api.SQLiteAPI.SQLiteCursor; import net.osmand.plus.api.SQLiteAPI.SQLiteCursor;
import net.osmand.plus.helpers.SearchHistoryHelper; import net.osmand.plus.helpers.SearchHistoryHelper;
import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.HashMap; import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.Set;
public class MapMarkersDbHelper { public class MapMarkersDbHelper {
@ -406,8 +410,8 @@ public class MapMarkersDbHelper {
} }
public List<MapMarker> getActiveMarkers() { public List<MapMarker> getActiveMarkers() {
List<MapMarker> res = new LinkedList<>(); Map<String, MapMarker> markers = new LinkedHashMap<>();
HashMap<String, MapMarker> markers = new LinkedHashMap<>(); Set<String> nextKeys = new HashSet<>();
SQLiteConnection db = openConnection(true); SQLiteConnection db = openConnection(true);
if (db != null) { if (db != null) {
try { try {
@ -417,15 +421,15 @@ public class MapMarkersDbHelper {
do { do {
MapMarker marker = readItem(query); MapMarker marker = readItem(query);
markers.put(marker.id, marker); markers.put(marker.id, marker);
nextKeys.add(marker.nextKey);
} while (query.moveToNext()); } while (query.moveToNext());
} }
query.close(); query.close();
} finally { } finally {
db.close(); db.close();
} }
buildLinkedList(markers, res);
} }
return res; return buildLinkedList(markers, nextKeys);
} }
private MapMarker readItem(SQLiteCursor query) { private MapMarker readItem(SQLiteCursor query) {
@ -457,19 +461,32 @@ public class MapMarkersDbHelper {
return marker; return marker;
} }
private void buildLinkedList(HashMap<String, MapMarker> markers, List<MapMarker> res) { private List<MapMarker> buildLinkedList(Map<String, MapMarker> markers, Set<String> nextKeys) {
if (!markers.isEmpty()) { List<MapMarker> res = new ArrayList<>(markers.size());
int count = 1;
for (MapMarker marker : markers.values()) { while (!markers.isEmpty()) {
if (!markers.keySet().contains(marker.nextKey) || count == markers.size()) { MapMarker head = null;
res.add(0, marker);
markers.remove(marker.id); Iterator<MapMarker> iterator = markers.values().iterator();
while (iterator.hasNext()) {
MapMarker marker = iterator.next();
if (!nextKeys.contains(marker.id) || !iterator.hasNext()) {
head = marker;
break; break;
} }
count++;
} }
buildLinkedList(markers, res);
if (head == null) {
break;
}
do {
res.add(head);
markers.remove(head.id);
} while ((head = markers.get(head.nextKey)) != null);
} }
return res;
} }
public void updateMarker(MapMarker marker) { public void updateMarker(MapMarker marker) {