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

Store favourite point and waypoint in marker when sync

Browse source
This commit is contained in:
PavelRatushny 2017-11-15 19:06:20 +02:00
parent 956281db89
commit e97c85cf95
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,6 +75,8 @@ public class MapMarkersHelper {
public String nextKey; public String nextKey;
public String groupKey; public String groupKey;
public String groupName; public String groupName;
public WptPt wptPt;
public FavouritePoint favouritePoint;
public MapMarker(LatLon point, PointDescription name, int colorIndex, public MapMarker(LatLon point, PointDescription name, int colorIndex,
boolean selected, int index) { boolean selected, int index) {
@ -516,7 +518,7 @@ public class MapMarkersHelper {
} }
for (FavouritePoint fp : favGroup.points) { for (FavouritePoint fp : favGroup.points) {
addNewMarkerIfNeeded(group, dbMarkers, new LatLon(fp.getLatitude(), fp.getLongitude()), fp.getName(), enabled); addNewMarkerIfNeeded(group, dbMarkers, new LatLon(fp.getLatitude(), fp.getLongitude()), fp.getName(), enabled, fp, null);
} }
favouritesDbHelper.removeSyncedGroup(favGroup); favouritesDbHelper.removeSyncedGroup(favGroup);
favouritesDbHelper.addSyncedGroup(favGroup); favouritesDbHelper.addSyncedGroup(favGroup);
@ -541,7 +543,7 @@ public class MapMarkersHelper {
int defColor = ContextCompat.getColor(ctx, R.color.marker_red); int defColor = ContextCompat.getColor(ctx, R.color.marker_red);
for (WptPt pt : gpxPoints) { for (WptPt pt : gpxPoints) {
group.setColor(pt.getColor(defColor)); group.setColor(pt.getColor(defColor));
addNewMarkerIfNeeded(group, dbMarkers, new LatLon(pt.lat, pt.lon), pt.name, enabled); addNewMarkerIfNeeded(group, dbMarkers, new LatLon(pt.lat, pt.lon), pt.name, enabled, null, pt);
} }
gpx.setSynced(true); gpx.setSynced(true);
@ -561,7 +563,7 @@ public class MapMarkersHelper {
} }
} }
private void addNewMarkerIfNeeded(MarkersSyncGroup group, List<MapMarker> markers, LatLon latLon, String name, boolean enabled) { private void addNewMarkerIfNeeded(MarkersSyncGroup group, List<MapMarker> markers, LatLon latLon, String name, boolean enabled, FavouritePoint favouritePoint, WptPt wptPt) {
boolean exists = false; boolean exists = false;
for (MapMarker marker : markers) { for (MapMarker marker : markers) {
@ -583,7 +585,8 @@ public class MapMarkersHelper {
if (!exists) { if (!exists) {
addMarkers(Collections.singletonList(latLon), addMarkers(Collections.singletonList(latLon),
Collections.singletonList(new PointDescription(POINT_TYPE_MAP_MARKER, name)), group, enabled); Collections.singletonList(new PointDescription(POINT_TYPE_MAP_MARKER, name)),
group, enabled, Collections.singletonList(favouritePoint), Collections.singletonList(wptPt));
} }
} }
@ -896,12 +899,19 @@ 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) {
addMarkers(points, historyNames, group, enabled, new ArrayList<FavouritePoint>(), new ArrayList<WptPt>());
}
private void addMarkers(List<LatLon> points, List<PointDescription> historyNames, @Nullable MarkersSyncGroup group,
boolean enabled, List<FavouritePoint> favouritePoints, List<WptPt> wptPts) {
if (points.size() > 0) { if (points.size() > 0) {
int colorIndex = -1; int colorIndex = -1;
List<MapMarker> addedMarkers = new ArrayList<>(); List<MapMarker> addedMarkers = 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);
FavouritePoint favouritePoint = favouritePoints.get(i);
WptPt wptPt = wptPts.get(i);
final PointDescription pointDescription; final PointDescription pointDescription;
if (historyName == null) { if (historyName == null) {
pointDescription = new PointDescription(PointDescription.POINT_TYPE_LOCATION, ""); pointDescription = new PointDescription(PointDescription.POINT_TYPE_LOCATION, "");
@ -932,6 +942,8 @@ public class MapMarkersHelper {
} }
marker.history = false; marker.history = false;
marker.nextKey = MapMarkersDbHelper.TAIL_NEXT_VALUE; marker.nextKey = MapMarkersDbHelper.TAIL_NEXT_VALUE;
marker.favouritePoint = favouritePoint;
marker.wptPt = wptPt;
markersDbHelper.addMarker(marker); markersDbHelper.addMarker(marker);
if (enabled) { if (enabled) {
addToMapMarkersList(0, marker); addToMapMarkersList(0, marker);