summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@users.noreply.github.com>2015-07-20 11:21:17 -0700
committerJustin R. Miller <incanus@users.noreply.github.com>2015-07-20 11:21:17 -0700
commitfad241f8cf5f84add544887a04d4ce1108031aa1 (patch)
tree2734b12afa528fa8dc137e50343e0cb877c0f107
parentf034a028be833aa7ba68f4996c35da6fe781238c (diff)
parent2bb1812ae41a99e427a3b40d4c31a9bc4d42fba9 (diff)
downloadqtlocation-mapboxgl-fad241f8cf5f84add544887a04d4ce1108031aa1.tar.gz
Merge pull request #1831 from mapbox/set-collision-debug-too
Set collision debug with -[MGLMapView setDebugActive:], too
-rw-r--r--platform/ios/MGLMapView.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
index 6cb46e28a9..c029107c48 100644
--- a/platform/ios/MGLMapView.mm
+++ b/platform/ios/MGLMapView.mm
@@ -1407,11 +1407,12 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration)
- (void)setDebugActive:(BOOL)debugActive
{
_mbglMap->setDebug(debugActive);
+ _mbglMap->setCollisionDebug(debugActive);
}
- (BOOL)isDebugActive
{
- return _mbglMap->getDebug();
+ return (_mbglMap->getDebug() || _mbglMap->getCollisionDebug());
}
- (void)resetNorth