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

Remove unnecessary enum

Browse source
This commit is contained in:
Alexander Sytnyk 2017-09-05 17:55:43 +03:00
parent c1d0dfb383
commit c073fc509a
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
import net.osmand.data.LatLon;
import net.osmand.data.LocationPoint;
import net.osmand.data.PointDescription;
import net.osmand.plus.OsmandSettings.MapMarkersMode;
import net.osmand.util.Algorithms;
import java.util.ArrayList;
@ -38,14 +39,9 @@ public class MapMarkersHelper {
public int dist;
public long creationDate;
public long visitedDate;
public DisplayPlace displayPlace;
public MapMarkersMode displayPlace;
public long nextKey;
public enum DisplayPlace {
WIDGET,
TOPBAR
}
public MapMarker(LatLon point, PointDescription name, int colorIndex,
boolean selected, int index) {
this.point = point;

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

@ -16,8 +16,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Random;
import static net.osmand.plus.MapMarkersHelper.MapMarker.DisplayPlace.TOPBAR;
import static net.osmand.plus.MapMarkersHelper.MapMarker.DisplayPlace.WIDGET;
import static net.osmand.plus.OsmandSettings.MapMarkersMode.TOOLBAR;
import static net.osmand.plus.OsmandSettings.MapMarkersMode.WIDGETS;
public class MapMarkersDbHelper {
@ -128,7 +128,7 @@ public class MapMarkersDbHelper {
MapMarker marker = new MapMarker(ips.get(i), PointDescription.deserializeFromString(desc.get(i), ips.get(i)),
colorIndex, false, i);
marker.history = false;
marker.displayPlace = WIDGET; //fixme
marker.displayPlace = WIDGETS; //fixme
addMapMarker(marker);
}
@ -142,7 +142,7 @@ public class MapMarkersDbHelper {
MapMarker marker = new MapMarker(ips.get(i), PointDescription.deserializeFromString(desc.get(i), ips.get(i)),
colorIndex, false, i);
marker.history = true;
marker.displayPlace = WIDGET; //fixme
marker.displayPlace = WIDGETS; //fixme
addMapMarker(marker);
}
}
@ -169,7 +169,7 @@ public class MapMarkersDbHelper {
long visited = 0;
int groupKey = 0;
int colorIndex = marker.colorIndex;
int displayPlace = marker.displayPlace == WIDGET ? 0 : 1;
int displayPlace = marker.displayPlace == WIDGETS ? 0 : 1;
PointDescription pointDescription = marker.getOriginalPointDescription();
if (pointDescription != null && !pointDescription.isSearchingAddress(context)) {
@ -228,7 +228,7 @@ public class MapMarkersDbHelper {
colorIndex, false, 0);
marker.creationDate = added;
marker.visitedDate = visited;
marker.displayPlace = displayPlace == 0 ? WIDGET : TOPBAR;
marker.displayPlace = displayPlace == 0 ? WIDGETS : TOOLBAR;
marker.history = !active;
marker.nextKey = nextKey;
marker.id = id;