Fixes after review

osmandapp · Nov 20, 2024 · d8aa5ec · d8aa5ec
1 parent b11117b
commit d8aa5ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/OsmAnd/src/net/osmand/plus/auto/screens/BaseAndroidAutoScreen.kt b/OsmAnd/src/net/osmand/plus/auto/screens/BaseAndroidAutoScreen.kt
@@ -12,6 +12,7 @@ import net.osmand.data.LatLon
 import net.osmand.data.QuadRect
 import net.osmand.plus.OsmandApplication
 import net.osmand.plus.R
+import net.osmand.plus.views.Zoom
 import net.osmand.search.core.SearchResult
 import net.osmand.util.Algorithms
 
@@ -20,7 +21,7 @@ abstract class BaseAndroidAutoScreen(carContext: CarContext) : Screen(carContext
 
 	protected var prevElevationAngle = 90f
 	protected var prevRotationAngle = 0f
-	protected var prevZoom = 15
+	protected var prevZoom: Zoom? = null
 	protected var prevMapLinkedToLocation = false
 	protected val ANIMATION_RETURN_FROM_PREVIEW_TIME = 1500
 
@@ -100,7 +101,6 @@ abstract class BaseAndroidAutoScreen(carContext: CarContext) : Screen(carContext
 		app.carNavigationSession?.navigationCarSurface?.let { surfaceRenderer ->
 			if (!mapRect.hasInitialState()) {
 				val mapView = app.osmandMap.mapView
-				mapView.elevationAngle = 90f
 				val tb = mapView.rotatedTileBox
 				tb.setCenterLocation(tb.centerPixelX.toFloat() / tb.pixWidth, 0.5f)
 				tb.rotate = 0f;
@@ -132,7 +132,7 @@ abstract class BaseAndroidAutoScreen(carContext: CarContext) : Screen(carContext
 		mapView.animateToState(
 			lastKnownLocation?.latitude ?: mapView.latitude,
 			lastKnownLocation?.longitude ?: mapView.longitude,
-			prevZoom.toFloat(),
+			prevZoom ?: mapView.currentZoom,
 			prevRotationAngle,
 			prevElevationAngle,
 			ANIMATION_RETURN_FROM_PREVIEW_TIME.toLong(),
@@ -142,7 +142,7 @@ abstract class BaseAndroidAutoScreen(carContext: CarContext) : Screen(carContext
 	override fun onStart(owner: LifecycleOwner) {
 		val mapView = app.osmandMap.mapView
 		prevMapLinkedToLocation = app.mapViewTrackingUtilities.isMapLinkedToLocation
-		prevZoom = mapView.baseZoom
+		prevZoom = mapView.currentZoom
 		prevRotationAngle = mapView.rotate
 		prevElevationAngle = mapView.normalizeElevationAngle(mapView.elevationAngle)
 	}

diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -1744,8 +1744,6 @@ public void fitRectToMap(RotatedTileBox tb, double left, double right, double to
 		clat = tb.getLatFromPixel(x, y);
 		clon = tb.getLonFromPixel(x, y);
 		if (rotate) {
-//			animatedDraggingThread.startMoving(clat, clon, zoom.getBaseZoom(), zoom.getZoomFloatPart());
-//			LOG.debug("Target animation - " + zoom.getBaseZoom() + " " + zoom.getZoomFloatPart());
 			animateToState(clat, clon,
 					zoom, 0f, 90f, ANIMATION_PREVIEW_TIME, false);
 		} else {
@@ -1754,13 +1752,6 @@ public void fitRectToMap(RotatedTileBox tb, double left, double right, double to
 
 	}
 
-	public void animateToState(double clat, double clon, float zoom,
-	                           float finalRotation, float elevationAngle, long animationDuration, boolean notifyListener) {
-		Zoom z = new Zoom((int)zoom, zoom - (int)zoom, getMinZoom(), getMaxZoom());
-		animatedDraggingThread.animateToPreview(clat, clon,
-				z, finalRotation, elevationAngle, animationDuration, notifyListener);
-	}
-
 	public void animateToState(double clat, double clon, @NonNull Zoom zoom,
 	                           float finalRotation, float elevationAngle, long animationDuration, boolean notifyListener) {
 		animatedDraggingThread.animateToPreview(clat, clon,