From d735d89835fb3076e09594fce2a141fe1495e33f Mon Sep 17 00:00:00 2001
From: Chris Loer <chris.loer@gmail.com>
Date: Thu, 6 Sep 2018 14:58:37 -0700
Subject: [core] Port "collision group" plumbing to gl-native. [node] Hook up
 map-wide "crossSourceCollisions" option, defaulting to true. [test] Pass
 "crossSourceCollisions" test option through test harness; enable
 cross-source-collisions tests on native.

---
 include/mbgl/map/map.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 3aee932070..ca6c62d280 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -37,7 +37,8 @@ public:
                  Scheduler&,
                  MapMode mapMode = MapMode::Continuous,
                  ConstrainMode constrainMode = ConstrainMode::HeightOnly,
-                 ViewportMode viewportMode = ViewportMode::Default);
+                 ViewportMode viewportMode = ViewportMode::Default,
+                 bool crossSourceCollisions = true);
     ~Map();
 
     // Register a callback that will get called (on the render thread) when all resources have
-- 
cgit v1.2.1