diff options
| author | Chris Loer <chris.loer@gmail.com> | 2018-09-06 14:58:37 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-09-12 14:10:46 -0700 |
| commit | d735d89835fb3076e09594fce2a141fe1495e33f (patch) | |
| tree | 36fb80484b3952fb730fd34a77439d303d002cdc /src/mbgl/tile/geometry_tile.hpp | |
| parent | 079ba0209ed383c15123902f0810e658c2b0abf4 (diff) | |
| download | qtlocation-mapboxgl-d735d89835fb3076e09594fce2a141fe1495e33f.tar.gz | |
[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.
Diffstat (limited to 'src/mbgl/tile/geometry_tile.hpp')
| -rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index 3d0ca03a82..c5c7cb6623 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -91,6 +91,8 @@ public: const optional<ImagePosition> getPattern(const std::string& pattern); const std::shared_ptr<FeatureIndex> getFeatureIndex() const { return latestFeatureIndex; } + const std::string sourceID; + protected: const GeometryTileData* getData() { return latestFeatureIndex ? latestFeatureIndex->getData() : nullptr; @@ -99,8 +101,6 @@ protected: private: void markObsolete(); - const std::string sourceID; - // Used to signal the worker that it should abandon parsing this tile as soon as possible. std::atomic<bool> obsolete { false }; |