From cbe2bbdb729929241bd0c3d026771abe9c75f64e Mon Sep 17 00:00:00 2001 From: PavelRatushny Date: Tue, 21 Nov 2017 11:13:46 +0200 Subject: [PATCH] Refactor --- OsmAnd/src/net/osmand/plus/MapMarkersHelper.java | 2 -- OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java index dbc92cf3d4..9c59ed0224 100644 --- a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java +++ b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java @@ -42,7 +42,6 @@ public class MapMarkersHelper { private OsmandSettings settings; private List listeners = new ArrayList<>(); private OsmandApplication ctx; - private FavouritesDbHelper favouritesDbHelper; private MapMarkersDbHelper markersDbHelper; private boolean startFromMyLocation; private ExecutorService executorService = Executors.newSingleThreadExecutor(); @@ -243,7 +242,6 @@ public class MapMarkersHelper { public MapMarkersHelper(OsmandApplication ctx) { this.ctx = ctx; settings = ctx.getSettings(); - favouritesDbHelper = ctx.getFavorites(); markersDbHelper = ctx.getMapMarkersDbHelper(); planRouteContext = new MarkersPlanRouteContext(ctx); startFromMyLocation = settings.ROUTE_MAP_MARKERS_START_MY_LOC.get(); diff --git a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java index 37b98a25d2..e7ac032995 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java @@ -498,7 +498,7 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi int r = getRadiusPoi(tileBox); for (int i = 0; i < markers.size(); i++) { MapMarker marker = markers.get(i); - if (marker.wptPt == null && marker.favouritePoint == null) { + if (!isSynced(marker)) { LatLon latLon = marker.point; if (latLon != null) { int ex = (int) point.x;