address PR comments

mapbox · Aug 3, 2018 · 9fdc873 · 9fdc873
1 parent 3dc22c5
commit 9fdc873
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...on-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java b/...on-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java
@@ -15,6 +15,7 @@
 import com.mapbox.api.directions.v5.models.DirectionsRoute;
 import com.mapbox.geojson.Point;
 import com.mapbox.mapboxsdk.Mapbox;
+import com.mapbox.services.android.navigation.ui.v5.camera.DynamicCamera;
 import com.mapbox.services.android.navigation.ui.v5.feedback.FeedbackItem;
 import com.mapbox.services.android.navigation.ui.v5.instruction.BannerInstructionModel;
 import com.mapbox.services.android.navigation.ui.v5.instruction.InstructionModel;
@@ -35,6 +36,7 @@
 import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions;
 import com.mapbox.services.android.navigation.v5.navigation.NavigationEventListener;
 import com.mapbox.services.android.navigation.v5.navigation.NavigationTimeFormat;
+import com.mapbox.services.android.navigation.v5.navigation.camera.Camera;
 import com.mapbox.services.android.navigation.v5.navigation.metrics.FeedbackEvent;
 import com.mapbox.services.android.navigation.v5.offroute.OffRouteListener;
 import com.mapbox.services.android.navigation.v5.route.FasterRouteListener;
@@ -97,7 +99,11 @@ public void onDestroy(boolean isChangingConfigurations) {
       deactivateInstructionPlayer();
       endNavigation();
     }
-    navigation.setCameraEngine(null);
+    Camera cameraEngine = navigation.getCameraEngine();
+    boolean isDynamicCamera = cameraEngine instanceof DynamicCamera;
+    if (isDynamicCamera) {
+      ((DynamicCamera) cameraEngine).clearMap();
+    }
     navigationViewEventDispatcher = null;
   }
 

diff --git a/...n-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/DynamicCamera.java b/...n-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/DynamicCamera.java
@@ -77,6 +77,10 @@ public void forceResetZoomLevel() {
     forceUpdateZoom = true;
   }
 
+  public void clearMap() {
+    mapboxMap = null;
+  }
+
   /**
    * Creates a tilt value based on the distance remaining for the current {@link LegStep}.
    * <p>