1 files changed, 3 insertions, 12 deletions
diff --git a/src/mbgl/map/map_data.hpp b/src/mbgl/map/map_data.hpp
index 9b02d372de..d8c1e5cb0d 100644
--- a/src/mbgl/map/map_data.hpp
+++ b/src/mbgl/map/map_data.hpp
@@ -55,8 +55,10 @@ public:
     }
 
     inline void cycleDebugOptions() {
-        if (debugOptions & MapDebugOptions::Timestamps)
+        if (debugOptions & MapDebugOptions::Collision)
             debugOptions = MapDebugOptions::NoDebug;
+        else if (debugOptions & MapDebugOptions::Timestamps)
+            debugOptions = debugOptions | MapDebugOptions::Collision;
         else if (debugOptions & MapDebugOptions::ParseStatus)
             debugOptions = debugOptions | MapDebugOptions::Timestamps;
         else if (debugOptions & MapDebugOptions::TileBorders)
@@ -69,16 +71,6 @@ public:
         debugOptions = debugOptions_;
     }
 
-    inline bool getCollisionDebug() const {
-        return collisionDebug;
-    }
-    inline bool toggleCollisionDebug() {
-        return collisionDebug ^= 1u;
-    }
-    inline void setCollisionDebug(bool value) {
-        collisionDebug = value;
-    }
-
     inline TimePoint getAnimationTime() const {
         // We're casting the TimePoint to and from a Duration because libstdc++
         // has a bug that doesn't allow TimePoints to be atomic.
@@ -147,7 +139,6 @@ private:
 
     std::vector<std::string> classes;
     std::atomic<MapDebugOptions> debugOptions { MapDebugOptions::NoDebug };
-    std::atomic<uint8_t> collisionDebug { false };
     std::atomic<Duration> animationTime;
     std::atomic<Duration> defaultFadeDuration;
     std::atomic<Duration> defaultTransitionDuration;