Fix 2D/3D setting in AA

OsmAnd/src/net/osmand/plus/auto/screens/BaseAndroidAutoScreen.kt

@@ -12,19 +12,20 @@ import net.osmand.data.LatLon
 import net.osmand.data.QuadRect
 import net.osmand.plus.OsmandApplication
 import net.osmand.plus.R
-import net.osmand.plus.auto.views.CarSurfaceView
 import net.osmand.plus.views.Zoom
 import net.osmand.search.core.SearchResult
 import net.osmand.util.Algorithms
 
 abstract class BaseAndroidAutoScreen(carContext: CarContext) : Screen(carContext),
 	DefaultLifecycleObserver {
 
-	protected var prevElevationAngle = 90f
-	protected var prevRotationAngle = 0f
-	protected var prevZoom: Zoom? = null
-	protected var prevMapLinkedToLocation = false
-	protected val ANIMATION_RETURN_FROM_PREVIEW_TIME = 1500
+	private val ANIMATION_RETURN_FROM_PREVIEW_TIME = 1500
+
+	private var prevElevationAngle = 90f
+	private var prevRotationAngle = 0f
+	private var prevZoom: Zoom? = null
+	private var prevMapLinkedToLocation = false
+	private var prevStateSaved = false
 
 	protected val app: OsmandApplication
 		get() {
@@ -47,6 +48,8 @@ abstract class BaseAndroidAutoScreen(carContext: CarContext) : Screen(carContext
 		)
 	}
 
+	protected open fun shouldRestoreMapState(): Boolean = false
+
 	protected open fun getConstraintLimitType(): Int {
 		return ConstraintManager.CONTENT_LIMIT_TYPE_LIST
 	}
@@ -59,6 +62,7 @@ abstract class BaseAndroidAutoScreen(carContext: CarContext) : Screen(carContext
 			RoutePreviewScreen(carContext, settingsAction, result, true)
 		) { obj: Any? ->
 			obj?.let {
+				screenManager.popToRoot()
 				startNavigation()
 				finish()
 			}
@@ -121,14 +125,37 @@ abstract class BaseAndroidAutoScreen(carContext: CarContext) : Screen(carContext
 		session?.navigationCarSurface?.handleRecenter()
 	}
 
-	override fun onStop(owner: LifecycleOwner) {
+	override fun onCreate(owner: LifecycleOwner) {
+		if (shouldSaveMapState()) {
+			saveMapState()
+		}
+	}
+
+	override fun onDestroy(owner: LifecycleOwner) {
 		if (prevMapLinkedToLocation != app.mapViewTrackingUtilities.isMapLinkedToLocation) {
 			app.mapViewTrackingUtilities.isMapLinkedToLocation = prevMapLinkedToLocation
 		}
-		restoreMapState()
+		if (prevStateSaved) {
+			restoreMapState()
+		}
+	}
+
+	private fun shouldSaveMapState(): Boolean {
+		return shouldRestoreMapState() && screenManager.screenStack
+			.filterIsInstance<BaseAndroidAutoScreen>()
+			.none { it != this && it.shouldRestoreMapState() }
+	}
+
+	private fun saveMapState() {
+		val mapView = app.osmandMap.mapView
+		prevMapLinkedToLocation = app.mapViewTrackingUtilities.isMapLinkedToLocation
+		prevZoom = mapView.currentZoom
+		prevRotationAngle = mapView.rotate
+		prevElevationAngle = mapView.normalizeElevationAngle(mapView.elevationAngle)
+		prevStateSaved = true
 	}
 
-	protected open fun restoreMapState() {
+	private fun restoreMapState() {
 		val mapView = app.osmandMap.mapView
 		val locationProvider = app.locationProvider
 		val lastKnownLocation = locationProvider.lastKnownLocation
@@ -142,14 +169,6 @@ abstract class BaseAndroidAutoScreen(carContext: CarContext) : Screen(carContext
 			false)
 	}
 
-	override fun onStart(owner: LifecycleOwner) {
-		val mapView = app.osmandMap.mapView
-		prevMapLinkedToLocation = app.mapViewTrackingUtilities.isMapLinkedToLocation
-		prevZoom = mapView.currentZoom
-		prevRotationAngle = mapView.rotate
-		prevElevationAngle = mapView.normalizeElevationAngle(mapView.elevationAngle)
-	}
-
 	companion object {
 		private const val DEFAULT_CONTENT_LIMIT = 12
 	}

OsmAnd/src/net/osmand/plus/auto/screens/FavoritesScreen.java

@@ -65,6 +65,11 @@ public FavoritesScreen(
 		getLifecycle().addObserver(this);
 	}
 
+	@Override
+	protected boolean shouldRestoreMapState() {
+		return true;
+	}
+
 	@Override
 	public void onDestroy(@NonNull LifecycleOwner owner) {
 		super.onDestroy(owner);
@@ -73,8 +78,8 @@ public void onDestroy(@NonNull LifecycleOwner owner) {
 	}
 
 	@Override
-	public void onStart(@NonNull LifecycleOwner owner) {
-		super.onStart(owner);
+	public void onCreate(@NonNull LifecycleOwner owner) {
+		super.onCreate(owner);
 		getFavouritesLayer().customObjectsDelegate = new OsmandMapLayer.CustomMapObjects<>();
 	}
 

OsmAnd/src/net/osmand/plus/auto/screens/MapMarkersScreen.kt

@@ -38,6 +38,8 @@ class MapMarkersScreen(
         lifecycle.addObserver(this)
     }
 
+    override fun shouldRestoreMapState() = true
+
     override fun onGetTemplate(): Template {
         val listBuilder = ItemList.Builder()
         val markersSize = app.mapMarkersHelper.mapMarkers.size
@@ -105,8 +107,8 @@ class MapMarkersScreen(
 		app.osmandMap.mapLayers.mapMarkersLayer.customObjectsDelegate = null
 	}
 
-	override fun onStart(owner: LifecycleOwner) {
-		super.onStart(owner)
+	override fun onCreate(owner: LifecycleOwner) {
+		super.onCreate(owner)
 		app.osmandMap.mapLayers.mapMarkersLayer.customObjectsDelegate = CustomMapObjects()
 	}
 }

OsmAnd/src/net/osmand/plus/auto/screens/NavigationScreen.java

@@ -4,7 +4,6 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
-import android.util.Log;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
@@ -130,6 +129,7 @@ public void onPause(@NonNull LifecycleOwner owner) {
 
 	@Override
 	public void onDestroy(@NonNull LifecycleOwner owner) {
+		super.onDestroy(owner);
 		adjustMapPosition(false);
 		getApp().getRoutingHelper().removeListener(this);
 		getLifecycle().removeObserver(this);
@@ -399,11 +399,6 @@ public Template onGetTemplate() {
 		return builder.build();
 	}
 
-	@Override
-	protected void restoreMapState() {
-		//no automatic map adjust
-	}
-
 	private void updateCompass() {
 		OsmandSettings settings = getApp().getSettings();
 		boolean nightMode = getCarContext().isDarkMode();

OsmAnd/src/net/osmand/plus/auto/screens/POIScreen.kt

@@ -49,6 +49,8 @@ class POIScreen(
         lifecycle.addObserver(this)
     }
 
+    override fun shouldRestoreMapState() = true
+
     override fun onGetTemplate(): Template {
         val templateBuilder = PlaceListNavigationTemplate.Builder()
         if (loading) {
@@ -178,10 +180,8 @@ class POIScreen(
 		}
 	}
 
-	override fun onStart(owner: LifecycleOwner) {
-		super.onStart(owner)
-		app.osmandMap.mapLayers.poiMapLayer.customObjectsDelegate =
-			OsmandMapLayer.CustomMapObjects()
-
+	override fun onCreate(owner: LifecycleOwner) {
+		super.onCreate(owner)
+		app.osmandMap.mapLayers.poiMapLayer.customObjectsDelegate = OsmandMapLayer.CustomMapObjects()
 	}
 }

OsmAnd/src/net/osmand/plus/auto/screens/RoutePreviewScreen.java

@@ -2,8 +2,6 @@
 
 import static net.osmand.search.core.ObjectType.GPX_TRACK;
 
-import android.os.Handler;
-import android.os.Looper;
 import android.text.SpannableString;
 
 import androidx.annotation.NonNull;
@@ -23,11 +21,9 @@
 
 
 import net.osmand.PlatformUtil;
-import net.osmand.plus.auto.NavigationSession;
 import net.osmand.plus.auto.TripUtils;
 import net.osmand.plus.shared.SharedUtil;
 import net.osmand.StateChangedListener;
-import net.osmand.data.LatLon;
 import net.osmand.data.QuadRect;
 import net.osmand.data.ValueHolder;
 import net.osmand.plus.OsmandApplication;
@@ -36,12 +32,9 @@
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.routing.RoutingHelperUtils;
 import net.osmand.plus.search.listitems.QuickSearchListItem;
-import net.osmand.plus.settings.enums.CompassMode;
-import net.osmand.plus.shared.SharedUtil;
 import net.osmand.plus.track.data.GPXInfo;
 import net.osmand.plus.track.helpers.GpxFileLoaderTask;
 import net.osmand.plus.track.helpers.SelectedGpxFile;
-import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.search.core.SearchResult;
 import net.osmand.shared.gpx.GpxFile;
 import net.osmand.util.Algorithms;
@@ -72,7 +65,7 @@ public final class RoutePreviewScreen extends BaseAndroidAutoScreen implements I
 	private boolean calculateRoute;
 	private boolean calculating;
 
-	private final StateChangedListener<Void> stateChangedListener = new StateChangedListener<Void>() {
+	private final StateChangedListener<Void> stateChangedListener = new StateChangedListener<>() {
 		@Override
 		public void stateChanged(Void change) {
 			if (routeGpxFile != null) {
@@ -83,7 +76,6 @@ public void stateChanged(Void change) {
 		}
 	};
 
-
 	public RoutePreviewScreen(@NonNull CarContext carContext, @NonNull Action settingsAction,
 	                          @NonNull SearchResult searchResult, boolean calculateRoute) {
 		super(carContext);
@@ -94,6 +86,11 @@ public RoutePreviewScreen(@NonNull CarContext carContext, @NonNull Action settin
 		calculating = calculateRoute;
 	}
 
+	@Override
+	protected boolean shouldRestoreMapState() {
+		return true;
+	}
+
 	private void prepareRoute() {
 		if (searchResult.objectType == GPX_TRACK) {
 			GPXInfo gpxInfo = ((GPXInfo) searchResult.relatedObject);
@@ -163,6 +160,7 @@ public void onCreate(@NonNull LifecycleOwner owner) {
 
 	@Override
 	public void onDestroy(@NonNull LifecycleOwner owner) {
+		super.onDestroy(owner);
 		OsmandApplication app = getApp();
 		RoutingHelper routingHelper = app.getRoutingHelper();
 		routingHelper.removeListener(this);

OsmAnd/src/net/osmand/plus/auto/screens/SearchResultsScreen.java

@@ -28,7 +28,6 @@
 public final class SearchResultsScreen extends BaseSearchScreen implements DefaultLifecycleObserver,
 		AppInitializeListener {
 
-
 	@NonNull
 	private final Action settingsAction;
 	@NonNull
@@ -77,6 +76,7 @@ public Template onGetTemplate() {
 
 	@Override
 	public void onDestroy(@NonNull LifecycleOwner owner) {
+		super.onDestroy(owner);
 		getApp().getAppInitializer().removeListener(this);
 		getLifecycle().removeObserver(this);
 		destroyed = true;

OsmAnd/src/net/osmand/plus/auto/screens/SearchScreen.java

@@ -52,7 +52,6 @@ public final class SearchScreen extends BaseSearchScreen implements DefaultLifec
 	private static final Log LOG = PlatformUtil.getLog(SearchScreen.class);
 	private static final int MAP_MARKERS_LIMIT = 3;
 
-
 	@NonNull
 	private final Action settingsAction;
 
@@ -73,14 +72,14 @@ public SearchScreen(@NonNull CarContext carContext, @NonNull Action settingsActi
 		reloadHistory();
 	}
 
-
 	@NonNull
 	public SearchUICore getSearchUICore() {
 		return getApp().getSearchUICore().getCore();
 	}
 
 	@Override
 	public void onDestroy(@NonNull LifecycleOwner owner) {
+		super.onDestroy(owner);
 		getApp().getAppInitializer().removeListener(this);
 		getLifecycle().removeObserver(this);
 		destroyed = true;

OsmAnd/src/net/osmand/plus/auto/screens/TracksScreen.kt

@@ -51,6 +51,8 @@ class TracksScreen(
 		lifecycle.addObserver(this)
 	}
 
+	override fun shouldRestoreMapState() = true
+
 	override fun onCreate(owner: LifecycleOwner) {
 		super.onCreate(owner)
 		loadTracksTask = LoadTracksTask()