diff options
author | Fabian Guerra Soto <fabian.guerra@mapbox.com> | 2018-09-26 15:17:30 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-26 15:17:30 -0700 |
commit | 57837443bbef1b71a60e69ed9359c76ac7ab5949 (patch) | |
tree | 742fd3f17188acb098000f21e31eb02b5dd8951f /platform/ios/src/MGLMapView.mm | |
parent | 1ce31af2899e8e8526e968f908b75ec949d8ffeb (diff) | |
download | qtlocation-mapboxgl-57837443bbef1b71a60e69ed9359c76ac7ab5949.tar.gz |
[ios, macos] Add crossSourceCollissions property. (#12941)
* [ios, macos] Add crossSourceCollissions property.
* [ios, macos] Add perSourceCollisions property.
* [ios, macos] Update changelogs.
Diffstat (limited to 'platform/ios/src/MGLMapView.mm')
-rw-r--r-- | platform/ios/src/MGLMapView.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index d550a086cb..869a5ae55c 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -437,8 +437,9 @@ public: _mbglThreadPool = mbgl::sharedThreadPool(); auto renderer = std::make_unique<mbgl::Renderer>(*_mbglView, config.scaleFactor, *config.fileSource, *_mbglThreadPool, config.contextMode, config.cacheDir, config.localFontFamilyName); + BOOL enableCrossSourceCollisions = !config.perSourceCollisions; _rendererFrontend = std::make_unique<MGLRenderFrontend>(std::move(renderer), self, *_mbglView); - _mbglMap = new mbgl::Map(*_rendererFrontend, *_mbglView, self.size, config.scaleFactor, *[config fileSource], *_mbglThreadPool, mbgl::MapMode::Continuous, mbgl::ConstrainMode::None, mbgl::ViewportMode::Default); + _mbglMap = new mbgl::Map(*_rendererFrontend, *_mbglView, self.size, config.scaleFactor, *[config fileSource], *_mbglThreadPool, mbgl::MapMode::Continuous, mbgl::ConstrainMode::None, mbgl::ViewportMode::Default, enableCrossSourceCollisions); // start paused if in IB if (_isTargetingInterfaceBuilder || background) { |