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

changed customLocation to be only fingerLocation

Browse source
This commit is contained in:
Chumva 2018-03-01 13:16:31 +02:00
parent ff2989a16e
commit d14b2477fc
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
View file

@ -314,9 +314,7 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
@Override @Override
public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) { public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
Location myLoc = map.getMyApplication().getLocationProvider().getLastStaleKnownLocation(); widgetsFactory.updateInfo(useFingerLocation ? fingerLocation : null, tileBox.getZoom());
widgetsFactory.updateInfo(useFingerLocation ? fingerLocation : (myLoc == null
? tileBox.getCenterLatLon() : new LatLon(myLoc.getLatitude(), myLoc.getLongitude())), tileBox.getZoom());
OsmandSettings settings = map.getMyApplication().getSettings(); OsmandSettings settings = map.getMyApplication().getSettings();
if (tileBox.getZoom() < 3 || !settings.USE_MAP_MARKERS.get()) { if (tileBox.getZoom() < 3 || !settings.USE_MAP_MARKERS.get()) {

4
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidgetsFactory.java
View file

@ -192,11 +192,11 @@ public class MapMarkersWidgetsFactory {
if (customLocation != null) { if (customLocation != null) {
loc = customLocation; loc = customLocation;
} else { } else {
Location l = map.getMapViewTrackingUtilities().getMyLocation(); Location l = map.getMyApplication().getLocationProvider().getLastStaleKnownLocation();
if (l != null) { if (l != null) {
loc = new LatLon(l.getLatitude(), l.getLongitude()); loc = new LatLon(l.getLatitude(), l.getLongitude());
} else { } else {
loc = null; loc = map.getMapLocation();
} }
} }