[core] Collision debug is now MapDebugOptions::Collision

2 files changed, 4 insertions, 23 deletions

diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
index dba17ece6a..cad1ede048 100644
--- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
@@ -1306,7 +1306,7 @@ public final class MapView extends FrameLayout {
      */
     @UiThread
     public boolean isDebugActive() {
-        return mNativeMapView.getDebug() || mNativeMapView.getCollisionDebug();
+        return mNativeMapView.getDebug();
     }
 
     /**
@@ -1319,20 +1319,19 @@ public final class MapView extends FrameLayout {
     @UiThread
     public void setDebugActive(boolean debugActive) {
         mNativeMapView.setDebug(debugActive);
-        mNativeMapView.setCollisionDebug(debugActive);
     }
 
     /**
-     * Toggles whether the map debug information is shown.
+     * Cycles through the map debug options.
      * <p/>
-     * The value of {@link MapView#isDebugActive()} is toggled.
+     * The value of {@link MapView#isDebugActive()} reflects whether there are
+     * any map debug options enabled or disabled.
      *
      * @see MapView#isDebugActive()
      */
     @UiThread
     public void cycleDebugOptions() {
         mNativeMapView.cycleDebugOptions();
-        mNativeMapView.toggleCollisionDebug();
     }
 
     // True if map has finished loading the view
diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java
index d75b83cf8d..6f34ecc843 100644
--- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java
@@ -409,18 +409,6 @@ final class NativeMapView {
         return nativeGetDebug(mNativeMapViewPtr);
     }
 
-    public void setCollisionDebug(boolean debug) {
-        nativeSetCollisionDebug(mNativeMapViewPtr, debug);
-    }
-
-    public void toggleCollisionDebug() {
-        nativeToggleCollisionDebug(mNativeMapViewPtr);
-    }
-
-    public boolean getCollisionDebug() {
-        return nativeGetCollisionDebug(mNativeMapViewPtr);
-    }
-
     public boolean isFullyLoaded() {
         return nativeIsFullyLoaded(mNativeMapViewPtr);
     }
@@ -614,12 +602,6 @@ final class NativeMapView {
 
     private native boolean nativeGetDebug(long nativeMapViewPtr);
 
-    private native void nativeSetCollisionDebug(long nativeMapViewPtr, boolean debug);
-
-    private native void nativeToggleCollisionDebug(long nativeMapViewPtr);
-
-    private native boolean nativeGetCollisionDebug(long nativeMapViewPtr);
-
     private native boolean nativeIsFullyLoaded(long nativeMapViewPtr);
 
     private native void nativeSetReachability(long nativeMapViewPtr, boolean status);