diff options
author | Ansis Brammanis <ansis.brammanis@gmail.com> | 2018-01-08 12:57:03 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-08 12:57:03 -0500 |
commit | feab36a9fbc5162150de8c3e26df8585b1430318 (patch) | |
tree | 3cb44b5fc7b1679ce5cfa502413db1540c4cccdb /src/mbgl/tile | |
parent | f86c1b7d0f440b7cf0da72a3c0940715f97d709e (diff) | |
download | qtlocation-mapboxgl-feab36a9fbc5162150de8c3e26df8585b1430318.tar.gz |
[core] port minor collision changes from -js (#10764)
Diffstat (limited to 'src/mbgl/tile')
-rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 12 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/tile/tile.hpp | 2 |
3 files changed, 0 insertions, 16 deletions
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index 701e7cf2d6..7d93b61c5b 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -282,18 +282,6 @@ void GeometryTile::querySourceFeatures( } } -void GeometryTile::resetCrossTileIDs() { - for (auto& bucket : symbolBuckets) { - auto symbolBucket = dynamic_cast<SymbolBucket*>(bucket.second.get()); - if (symbolBucket && symbolBucket->bucketInstanceId) { - symbolBucket->bucketInstanceId = 0; - for (auto& symbolInstance : symbolBucket->symbolInstances) { - symbolInstance.crossTileID = 0; - } - } - } -} - bool GeometryTile::holdForFade() const { return mode == MapMode::Continuous && (fadeState == FadeState::NeedsFirstPlacement || fadeState == FadeState::NeedsSecondPlacement); diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index 6f871819a4..6667f095ed 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -95,8 +95,6 @@ public: void onError(std::exception_ptr, uint64_t correlationID); - void resetCrossTileIDs() override; - bool holdForFade() const override; void markRenderedIdeal() override; void markRenderedPreviously() override; diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp index 1186b74111..b7e200266f 100644 --- a/src/mbgl/tile/tile.hpp +++ b/src/mbgl/tile/tile.hpp @@ -109,8 +109,6 @@ public: // and will have time to finish by the second placement. virtual void performedFadePlacement() {} - virtual void resetCrossTileIDs() {}; - void dumpDebugLogs() const; const OverscaledTileID id; |