diff --git a/OsmAnd/src/net/osmand/data/FavouritePoint.java b/OsmAnd/src/net/osmand/data/FavouritePoint.java index 414299e575..1bff8ca51d 100644 --- a/OsmAnd/src/net/osmand/data/FavouritePoint.java +++ b/OsmAnd/src/net/osmand/data/FavouritePoint.java @@ -16,10 +16,10 @@ import net.osmand.ResultMatcher; import net.osmand.binary.RouteDataObject; import net.osmand.plus.FavouritesDbHelper; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.settings.backend.BooleanPreference; -import net.osmand.plus.settings.backend.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.parkingpoint.ParkingPositionPlugin; +import net.osmand.plus.settings.backend.BooleanPreference; +import net.osmand.plus.settings.backend.OsmandPreference; import net.osmand.util.Algorithms; import java.io.Serializable; @@ -333,7 +333,7 @@ public class FavouritePoint implements Serializable, LocationPoint { result = prime * result + (int) Math.floor(latitude * 10000); result = prime * result + (int) Math.floor(longitude * 10000); result = prime * result + (int) Math.floor(altitude * 10000); - result = prime * result + (int) Math.floor(timestamp * 10000); + result = prime * result + (int) (timestamp ^ (timestamp >>> 32)); result = prime * result + ((name == null) ? 0 : name.hashCode()); result = prime * result + ((category == null) ? 0 : category.hashCode()); result = prime * result + ((description == null) ? 0 : description.hashCode()); @@ -454,8 +454,7 @@ public class FavouritePoint implements Serializable, LocationPoint { if (name == null) { name = ""; } - FavouritePoint fp; - fp = new FavouritePoint(pt.lat, pt.lon, name, categoryName, pt.ele, pt.time); + FavouritePoint fp = new FavouritePoint(pt.lat, pt.lon, name, categoryName, pt.ele, pt.time); fp.setDescription(pt.desc); if (pt.comment != null) { fp.setOriginObjectName(pt.comment); diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroup.java b/OsmAnd/src/net/osmand/plus/mapmarkers/ItineraryGroup.java similarity index 91% rename from OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroup.java rename to OsmAnd/src/net/osmand/plus/mapmarkers/ItineraryGroup.java index 35a4585501..9b4e7f9ad8 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroup.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/ItineraryGroup.java @@ -10,20 +10,17 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -public class MapMarkersGroup { - - public static final int ANY_TYPE = -1; - public static final int FAVORITES_TYPE = 0; - public static final int GPX_TYPE = 1; +public class ItineraryGroup { public static final String MARKERS_SYNC_GROUP_ID = "markers_sync_group_id"; private String id; private String name; - private int type = ANY_TYPE; + private ItineraryType type = ItineraryType.MARKERS; private Set wptCategories; - private long creationDate; private boolean disabled; + + private long creationDate; private boolean visible = true; private boolean wasShown = false; private boolean visibleUntilRestart; @@ -33,11 +30,11 @@ public class MapMarkersGroup { private GroupHeader header; private ShowHideHistoryButton showHideHistoryButton; - public MapMarkersGroup() { + public ItineraryGroup() { } - public MapMarkersGroup(@NonNull String id, @NonNull String name, int type) { + public ItineraryGroup(@NonNull String id, @NonNull String name, @NonNull ItineraryType type) { this.id = id; this.name = name; this.type = type; @@ -95,7 +92,7 @@ public class MapMarkersGroup { return name; } - public int getType() { + public ItineraryType getType() { return type; } diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/mapmarkers/ItineraryHelper.java similarity index 92% rename from OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java rename to OsmAnd/src/net/osmand/plus/mapmarkers/ItineraryHelper.java index 729a7f3cfd..9fd582ca03 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/ItineraryHelper.java @@ -139,14 +139,14 @@ public class MapMarkersHelper { } private void loadGroups() { - Map groupsMap = markersDbHelper.getAllGroupsMap(); + Map groupsMap = markersDbHelper.getAllGroupsMap(); List allMarkers = new ArrayList<>(mapMarkers); allMarkers.addAll(mapMarkersHistory); - Iterator> iterator = groupsMap.entrySet().iterator(); + Iterator> iterator = groupsMap.entrySet().iterator(); while (iterator.hasNext()) { - MapMarkersGroup group = iterator.next().getValue(); - if (group.getType() == MapMarkersGroup.GPX_TYPE && !new File(group.getId()).exists()) { + ItineraryGroup group = iterator.next().getValue(); + if (group.getType() == ItineraryType.TRACK && !new File(group.getId()).exists()) { markersDbHelper.removeMarkersGroup(group.getId()); iterator.remove(); } @@ -316,16 +316,16 @@ public class MapMarkersHelper { if (gpx == null || gpx.path == null) { return null; } - return getMapMarkerGroupById(getMarkerGroupId(new File(gpx.path)), MapMarkersGroup.GPX_TYPE); + return getMapMarkerGroupById(getMarkerGroupId(new File(gpx.path)), ItineraryType.TRACK); } - public MapMarkersGroup getMarkersGroup(FavoriteGroup favGroup) { - return getMapMarkerGroupById(getMarkerGroupId(favGroup), MapMarkersGroup.FAVORITES_TYPE); + public ItineraryGroup getMarkersGroup(FavoriteGroup favGroup) { + return getMapMarkerGroupById(getMarkerGroupId(favGroup), ItineraryType.FAVOURITES); } - public MapMarkersGroup addOrEnableGpxGroup(@NonNull File file) { + public ItineraryGroup addOrEnableGpxGroup(@NonNull File file) { updateGpxShowAsMarkers(file); - MapMarkersGroup gr = getMapMarkerGroupById(getMarkerGroupId(file), MapMarkersGroup.GPX_TYPE); + ItineraryGroup gr = getMapMarkerGroupById(getMarkerGroupId(file), ItineraryType.TRACK); if (gr == null) { gr = createGPXMarkerGroup(file); addGroupInternally(gr); @@ -460,29 +460,29 @@ public class MapMarkersHelper { private void addMarkerToGroup(MapMarker marker) { if (marker != null) { - MapMarkersGroup mapMarkersGroup = getMapMarkerGroupById(marker.groupKey, marker.getType()); - if (mapMarkersGroup != null) { - mapMarkersGroup.getMarkers().add(marker); - updateGroup(mapMarkersGroup); - if (mapMarkersGroup.getName() == null) { - sortMarkers(mapMarkersGroup.getMarkers(), false, BY_DATE_ADDED_DESC); + ItineraryGroup itineraryGroup = getMapMarkerGroupById(marker.groupKey, marker.getType()); + if (itineraryGroup != null) { + itineraryGroup.getMarkers().add(marker); + updateGroup(itineraryGroup); + if (itineraryGroup.getName() == null) { + sortMarkers(itineraryGroup.getMarkers(), false, BY_DATE_ADDED_DESC); } } else { - mapMarkersGroup = new MapMarkersGroup(marker.groupKey, marker.groupName, MapMarkersGroup.ANY_TYPE); - mapMarkersGroup.setCreationDate(Long.MAX_VALUE); - mapMarkersGroup.getMarkers().add(marker); - addToGroupsList(mapMarkersGroup); + itineraryGroup = new ItineraryGroup(marker.groupKey, marker.groupName, ItineraryType.MARKERS); + itineraryGroup.setCreationDate(Long.MAX_VALUE); + itineraryGroup.getMarkers().add(marker); + addToGroupsList(itineraryGroup); sortGroups(); - updateGroup(mapMarkersGroup); + updateGroup(itineraryGroup); } } } - private void createHeadersInGroup(@NonNull MapMarkersGroup group) { - int type = group.getType(); + private void createHeadersInGroup(@NonNull ItineraryGroup group) { + ItineraryType type = group.getType(); int headerIconId = 0; - if (type != -1) { - headerIconId = type == MapMarkersGroup.FAVORITES_TYPE + if (type != ItineraryType.MARKERS) { + headerIconId = type == ItineraryType.FAVOURITES ? R.drawable.ic_action_favorite : R.drawable.ic_action_polygom_dark; } GroupHeader header = new GroupHeader(headerIconId, group); @@ -491,10 +491,10 @@ public class MapMarkersHelper { private void removeMarkerFromGroup(MapMarker marker) { if (marker != null) { - MapMarkersGroup mapMarkersGroup = getMapMarkerGroupById(marker.groupKey, marker.getType()); - if (mapMarkersGroup != null) { - mapMarkersGroup.getMarkers().remove(marker); - updateGroup(mapMarkersGroup); + ItineraryGroup itineraryGroup = getMapMarkerGroupById(marker.groupKey, marker.getType()); + if (itineraryGroup != null) { + itineraryGroup.getMarkers().remove(marker); + updateGroup(itineraryGroup); } } } @@ -513,11 +513,11 @@ public class MapMarkersHelper { } @Nullable - public MapMarkersGroup getMapMarkerGroupById(String id, int type) { - for (MapMarkersGroup group : mapMarkersGroups) { + public ItineraryGroup getMapMarkerGroupById(String id, ItineraryType type) { + for (ItineraryGroup group : itineraryGroups) { if ((id == null && group.getId() == null) || (group.getId() != null && group.getId().equals(id))) { - if (type == MapMarkersGroup.ANY_TYPE || type == group.getType()) { + if (type == ItineraryType.MARKERS || type == group.getType()) { return group; } } @@ -525,14 +525,14 @@ public class MapMarkersHelper { return null; } - private MapMarkersGroup createGPXMarkerGroup(File fl) { - return new MapMarkersGroup(getMarkerGroupId(fl), + private ItineraryGroup createGPXMarkerGroup(File fl) { + return new ItineraryGroup(getMarkerGroupId(fl), Algorithms.getFileNameWithoutExtension(fl.getName()), - MapMarkersGroup.GPX_TYPE); + ItineraryType.TRACK); } - private MapMarkersGroup createFavMarkerGroup(FavoriteGroup favGroup) { - return new MapMarkersGroup(favGroup.getName(), favGroup.getName(), MapMarkersGroup.FAVORITES_TYPE); + private ItineraryGroup createFavMarkerGroup(FavoriteGroup favGroup) { + return new ItineraryGroup(favGroup.getName(), favGroup.getName(), ItineraryType.FAVOURITES); } private String getMarkerGroupId(File gpx) { @@ -560,17 +560,17 @@ public class MapMarkersHelper { } @NonNull - public List getGroupsForSavedArticlesTravelBook() { - List res = new ArrayList<>(); - TravelHelper travelHelper = ctx.getTravelHelper(); + public List getGroupsForSavedArticlesTravelBook() { + List res = new ArrayList<>(); + TravelHelper travelHelper = app.getTravelHelper(); if (travelHelper.isAnyTravelBookPresent()) { List savedArticles = travelHelper.getBookmarksHelper().getSavedArticles(); for (TravelArticle art : savedArticles) { String gpxName = travelHelper.getGPXName(art); - File path = ctx.getAppPath(IndexConstants.GPX_TRAVEL_DIR + gpxName); - MapMarkersGroup search = getMapMarkerGroupById(getMarkerGroupId(path), MapMarkersGroup.GPX_TYPE); + File path = app.getAppPath(IndexConstants.GPX_TRAVEL_DIR + gpxName); + ItineraryGroup search = getMapMarkerGroupById(getMarkerGroupId(path), ItineraryType.TRACK); if (search == null) { - MapMarkersGroup group = createGPXMarkerGroup(path); + ItineraryGroup group = createGPXMarkerGroup(path); group.setDisabled(true); createHeadersInGroup(group); res.add(group); @@ -1007,8 +1007,8 @@ public class MapMarkersHelper { public List getMapMarkersFromDefaultGroups(boolean history) { List mapMarkers = new ArrayList<>(); - for (MapMarkersGroup group : mapMarkersGroups) { - if (group.getType() == MapMarkersGroup.ANY_TYPE) { + for (ItineraryGroup group : itineraryGroups) { + if (group.getType() == ItineraryType.MARKERS) { for (MapMarker marker : group.getMarkers()) { if (history && marker.history || !history && !marker.history) { mapMarkers.add(marker); @@ -1221,8 +1221,8 @@ public class MapMarkersHelper { // TODO extract method from Asynctask to Helper directly private void runGroupSynchronization() { List groupMarkers = new ArrayList<>(group.getMarkers()); - if (group.getType() == MapMarkersGroup.FAVORITES_TYPE) { - FavoriteGroup favGroup = ctx.getFavorites().getGroup(group.getName()); + if (group.getType() == ItineraryType.FAVOURITES) { + FavoriteGroup favGroup = app.getFavorites().getGroup(group.getName()); if (favGroup == null) { return; } @@ -1235,8 +1235,8 @@ public class MapMarkersHelper { for (FavouritePoint fp : points) { addNewMarkerIfNeeded(group, groupMarkers, new LatLon(fp.getLatitude(), fp.getLongitude()), fp.getName(), fp, null); } - } else if (group.getType() == MapMarkersGroup.GPX_TYPE) { - GpxSelectionHelper gpxHelper = ctx.getSelectedGpxHelper(); + } else if (group.getType() == ItineraryType.TRACK) { + GpxSelectionHelper gpxHelper = app.getSelectedGpxHelper(); File file = new File(group.getId()); if (!file.exists()) { return; diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/ItineraryType.java b/OsmAnd/src/net/osmand/plus/mapmarkers/ItineraryType.java new file mode 100644 index 0000000000..18cdeb6646 --- /dev/null +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/ItineraryType.java @@ -0,0 +1,43 @@ +package net.osmand.plus.mapmarkers; + +import androidx.annotation.NonNull; + +public enum ItineraryType { + MARKERS("markers", -1), + FAVOURITES("favourites", 0), + TRACK("track", 1); + + private int typeId; + private String typeName; + + ItineraryType(@NonNull String typeName, int typeId) { + this.typeName = typeName; + this.typeId = typeId; + } + + public int getTypeId() { + return typeId; + } + + public String getTypeName() { + return typeName; + } + + public static ItineraryType findTypeForId(int typeId) { + for (ItineraryType type : values()) { + if (type.getTypeId() == typeId) { + return type; + } + } + return ItineraryType.MARKERS; + } + + public static ItineraryType findTypeForName(String typeName) { + for (ItineraryType type : values()) { + if (type.getTypeName().equalsIgnoreCase(typeName)) { + return type; + } + } + return ItineraryType.MARKERS; + } +} diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarker.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarker.java index 498c36f93c..c7bd2e5778 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarker.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarker.java @@ -44,10 +44,10 @@ public class MapMarker implements LocationPoint { this.index = index; } - public int getType() { + public ItineraryType getType() { return favouritePoint == null ? - (wptPt == null ? MapMarkersGroup.ANY_TYPE : MapMarkersGroup.GPX_TYPE) : - MapMarkersGroup.FAVORITES_TYPE; + (wptPt == null ? ItineraryType.MARKERS : ItineraryType.TRACK) : + ItineraryType.FAVOURITES; } public PointDescription getPointDescription(Context ctx) { diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDbHelper.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDbHelper.java index 0b2ba5ab0c..d3f7219422 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDbHelper.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDbHelper.java @@ -161,27 +161,27 @@ public class MapMarkersDbHelper { } } - public void addGroup(MapMarkersGroup group) { + public void addGroup(ItineraryGroup group) { SQLiteConnection db = openConnection(false); if (db != null) { try { db.execSQL("INSERT INTO " + GROUPS_TABLE_NAME + " VALUES (?, ?, ?, ?, ?)", - new Object[]{group.getId(), group.getName(), group.getType(), group.isDisabled(), group.getWptCategoriesString()}); + new Object[]{group.getId(), group.getName(), group.getType().getTypeId(), group.isDisabled(), group.getWptCategoriesString()}); } finally { db.close(); } } } - public Map getAllGroupsMap() { - Map res = new LinkedHashMap<>(); + public Map getAllGroupsMap() { + Map res = new LinkedHashMap<>(); SQLiteConnection db = openConnection(true); if (db != null) { try { SQLiteCursor query = db.rawQuery(GROUPS_TABLE_SELECT, null); if (query != null && query.moveToFirst()) { do { - MapMarkersGroup group = readGroup(query); + ItineraryGroup group = readGroup(query); res.put(group.getId(), group); } while (query.moveToNext()); } @@ -195,14 +195,14 @@ public class MapMarkersDbHelper { return res; } - private MapMarkersGroup readGroup(SQLiteCursor query) { + private ItineraryGroup readGroup(SQLiteCursor query) { String id = query.getString(0); String name = query.getString(1); int type = query.getInt(2); boolean disabled = query.getInt(3) == 1; String categories = query.getString(4); - MapMarkersGroup res = new MapMarkersGroup(id, name, type); + ItineraryGroup res = new ItineraryGroup(id, name, ItineraryType.findTypeForId(type)); res.setDisabled(disabled); res.setWptCategories(categories == null ? null : Algorithms.decodeStringSet(categories));