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

Simplify code

Browse source
This commit is contained in:
Alexander Sytnyk 2017-11-28 11:51:38 +02:00
parent 74c7607b3c
commit 57b7081c68
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -406,7 +406,6 @@ public class MapMarkersDbHelper {
} }
public List<MapMarker> getActiveMarkers() { public List<MapMarker> getActiveMarkers() {
List<MapMarker> res = new LinkedList<>();
HashMap<String, MapMarker> markers = new LinkedHashMap<>(); HashMap<String, MapMarker> markers = new LinkedHashMap<>();
SQLiteConnection db = openConnection(true); SQLiteConnection db = openConnection(true);
if (db != null) { if (db != null) {
@ -423,9 +422,8 @@ public class MapMarkersDbHelper {
} finally { } finally {
db.close(); db.close();
} }
buildLinkedList(markers, res);
} }
return res; return buildLinkedList(markers);
} }
private MapMarker readItem(SQLiteCursor query) { private MapMarker readItem(SQLiteCursor query) {
@ -457,12 +455,13 @@ public class MapMarkersDbHelper {
return marker; return marker;
} }
private void buildLinkedList(HashMap<String, MapMarker> markers, List<MapMarker> res) { private List<MapMarker> buildLinkedList(HashMap<String, MapMarker> markers) {
List<MapMarker> res = new LinkedList<>();
int markersCount = markers.size(); int markersCount = markers.size();
for (int i = 0; i < markersCount; i++) { for (int i = 0; i < markersCount; i++) {
int count = 1; int count = 1;
for (MapMarker marker : markers.values()) { for (MapMarker marker : markers.values()) {
if (!markers.keySet().contains(marker.nextKey) || count == markers.size()) { if (!markers.containsKey(marker.nextKey) || count == markers.size()) {
res.add(0, marker); res.add(0, marker);
markers.remove(marker.id); markers.remove(marker.id);
break; break;
@ -470,6 +469,7 @@ public class MapMarkersDbHelper {
count++; count++;
} }
} }
return res;
} }
public void updateMarker(MapMarker marker) { public void updateMarker(MapMarker marker) {