Fix #21453 Map goes to the ocean

osmandapp · Dec 19, 2024 · 5f2a311 · 5f2a311
1 parent 8836ef2
commit 5f2a311
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/OsmAnd/src/net/osmand/plus/plugins/rastermaps/DownloadTilesFragment.java b/OsmAnd/src/net/osmand/plus/plugins/rastermaps/DownloadTilesFragment.java
@@ -110,8 +110,8 @@ public class DownloadTilesFragment extends BaseOsmAndFragment implements IMapLoc
 	private LockableScrollView scrollView;
 	private IMapLocationListener mapLocationListener;
 	private TouchListener touchListener;
-	private double lat;
-	private double lon;
+	private Double lat = null;
+	private Double lon = null;
 	private boolean portraitMode;
 
 	@Override
@@ -183,6 +183,9 @@ public void onGlobalLayout() {
 				updateTileSourceContent();
 			}
 		});
+		if (lat == null || lon == null) {
+			updateLatLon();
+		}
 		setupDownloadButton();
 		showHideMapControls(false);
 		setupScrollableMapView();
@@ -222,12 +225,14 @@ private void setupScrollableMapView() {
 
 	@NonNull
 	private IMapLocationListener getMapLocationListener() {
-		return (v, v1, o) -> {
-			QuadRect rect = getLatLonRectOfMapWindow();
-			LatLon mapWindowCenter = new LatLon(rect.centerY(), rect.centerX());
-			lat = mapWindowCenter.getLatitude();
-			lon = mapWindowCenter.getLongitude();
-		};
+		return (v, v1, o) -> updateLatLon();
+	}
+
+	private void updateLatLon(){
+		QuadRect rect = getLatLonRectOfMapWindow();
+		LatLon mapWindowCenter = new LatLon(rect.centerY(), rect.centerX());
+		lat = mapWindowCenter.getLatitude();
+		lon = mapWindowCenter.getLongitude();
 	}
 
 	@NonNull