From 1bffad23f1f928fadfedf7c7708cdd27c333e651 Mon Sep 17 00:00:00 2001
From: veliymolfar <veliymolfar@gmailcom>
Date: Mon, 23 Mar 2020 14:43:48 +0200
Subject: [PATCH] fix remove TerrainFragment from dashboard

---
 .../osmand/plus/dashboard/DashboardOnMap.java | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index c22e9d9070..32b2703ef4 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -565,7 +565,8 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
 		DashboardOnMap.staticVisible = visible;
 		DashboardOnMap.staticVisibleType = type;
 		mapActivity.enableDrawer();
-		removeMapillaryFiltersFragment();
+		removeFragment(MapillaryFiltersFragment.TAG);
+		removeFragment(TerrainFragment.TAG);
 
 		if (visible) {
 			mapActivity.dismissCardDialog();
@@ -782,6 +783,14 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
 			int top = (v == null) ? 0 : (v.getTop() - listView.getPaddingTop());
 			updateListAdapter();
 			((ListView) listView).setSelectionFromTop(index, top);
+		} else if (visibleType == DashboardType.TERRAIN) {
+			Fragment terrainFragment = mapActivity.getSupportFragmentManager().findFragmentByTag(TerrainFragment.TAG);
+			if (terrainFragment != null) {
+				mapActivity.getSupportFragmentManager().beginTransaction()
+						.detach(terrainFragment)
+						.attach(terrainFragment)
+						.commit();
+			}
 		} else {
 			listAdapter.notifyDataSetChanged();
 		}
@@ -982,14 +991,14 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
 				.getFragmentTransaction().commit();
 	}
 
-	private void removeMapillaryFiltersFragment() {
+	private void removeFragment(String tag) {
 		FragmentManager manager = mapActivity.getSupportFragmentManager();
-		Fragment mapillaryFragment = manager.findFragmentByTag(MapillaryFiltersFragment.TAG);
-		if (mapillaryFragment != null) {
+		Fragment fragment = manager.findFragmentByTag(tag);
+		if (fragment != null) {
 			OsmandSettings settings = getMyApplication().getSettings();
 			TransactionBuilder builder = new TransactionBuilder(manager, settings, mapActivity);
 			builder.getFragmentTransaction()
-					.remove(mapillaryFragment)
+					.remove(fragment)
 					.commit();
 		}
 	}