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

Optimize adding disabled groups

Browse source
This commit is contained in:
PavelRatushny 2017-11-13 10:39:29 +02:00
parent e4efd112f0
commit 9a1f029b81
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -489,9 +489,7 @@ public class MapMarkersHelper {
markersDbHelper.addMarkers(markers); markersDbHelper.addMarkers(markers);
mapMarkers.addAll(markers); mapMarkers.addAll(markers);
reorderActiveMarkersIfNeeded(); reorderActiveMarkersIfNeeded();
for (MapMarker marker : markers) { addMarkersToGroups(markers, true);
addMarkerToGroup(marker, true);
}
refresh(); refresh();
} }
} }
@ -506,7 +504,7 @@ public class MapMarkersHelper {
mapMarkers.add(marker); mapMarkers.add(marker);
reorderActiveMarkersIfNeeded(); reorderActiveMarkersIfNeeded();
} }
addMarkerToGroup(marker, true); addMarkerToGroup(marker);
refresh(); refresh();
} }
} }
@ -763,6 +761,7 @@ public class MapMarkersHelper {
private void addMarkers(List<LatLon> points, List<PointDescription> historyNames, @Nullable MarkersSyncGroup group, boolean enabled) { private void addMarkers(List<LatLon> points, List<PointDescription> historyNames, @Nullable MarkersSyncGroup group, boolean enabled) {
if (points.size() > 0) { if (points.size() > 0) {
int colorIndex = -1; int colorIndex = -1;
List<MapMarker> mapMarkers = new ArrayList<>();
for (int i = 0; i < points.size(); i++) { for (int i = 0; i < points.size(); i++) {
LatLon point = points.get(i); LatLon point = points.get(i);
PointDescription historyName = historyNames.get(i); PointDescription historyName = historyNames.get(i);
@ -800,10 +799,11 @@ public class MapMarkersHelper {
if (enabled) { if (enabled) {
mapMarkers.add(0, marker); mapMarkers.add(0, marker);
} }
addMarkerToGroup(marker, enabled); mapMarkers.add(marker);
reorderActiveMarkersIfNeeded(); reorderActiveMarkersIfNeeded();
lookupAddress(marker); lookupAddress(marker);
} }
addMarkersToGroups(mapMarkers, enabled);
} }
} }
@ -997,7 +997,23 @@ public class MapMarkersHelper {
} }
} }
private void addMarkerToGroup(MapMarker marker, boolean enabled) { private void addMarkersToGroups(List<MapMarker> markers, boolean enabled) {
List<MapMarkersGroup> groups = new ArrayList<>();
for (int i = 0; i < markers.size(); i++) {
MapMarkersGroup group = addMarkerToGroup(markers.get(i));
if (group != null && !groups.contains(group)) {
groups.add(group);
}
}
if (!enabled) {
for (MapMarkersGroup mapMarkersGroup : groups) {
mapMarkersGroup.setDisabled(true);
updateGroupDisabled(mapMarkersGroup, true);
}
}
}
private MapMarkersGroup addMarkerToGroup(MapMarker marker) {
if (marker != null) { if (marker != null) {
MapMarkersGroup mapMarkersGroup = getMapMarkerGroupByName(marker.groupName); MapMarkersGroup mapMarkersGroup = getMapMarkerGroupByName(marker.groupName);
if (mapMarkersGroup != null) { if (mapMarkersGroup != null) {
@ -1011,11 +1027,9 @@ public class MapMarkersHelper {
mapMarkersGroup.getMarkers().add(marker); mapMarkersGroup.getMarkers().add(marker);
createHeaderAndHistoryButtonInGroup(mapMarkersGroup); createHeaderAndHistoryButtonInGroup(mapMarkersGroup);
} }
if (!enabled) { return mapMarkersGroup;
mapMarkersGroup.setDisabled(true);
updateGroupDisabled(mapMarkersGroup, true);
}
} }
return null;
} }
private MapMarkersGroup createMapMarkerGroup(MapMarker marker) { private MapMarkersGroup createMapMarkerGroup(MapMarker marker) {