diff options
author | Ivo van Dongen <info@ivovandongen.nl> | 2017-03-13 12:58:09 +0200 |
---|---|---|
committer | Jesse Bounds <jesse@rebounds.net> | 2017-03-14 13:28:32 -0700 |
commit | 7a13bee72e7c31185219dc0e1fb97b80a155ca11 (patch) | |
tree | d769bb875884f7832054403def1d050457f1521f /src/mbgl | |
parent | e8f6c758965fb18845f27948906e8a766ed8ba12 (diff) | |
download | qtlocation-mapboxgl-7a13bee72e7c31185219dc0e1fb97b80a155ca11.tar.gz |
[core] don’t query rendered features until all data is available
Diffstat (limited to 'src/mbgl')
-rw-r--r-- | src/mbgl/annotation/annotation_tile.hpp | 6 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp index bf73075992..2c100ed50a 100644 --- a/src/mbgl/annotation/annotation_tile.hpp +++ b/src/mbgl/annotation/annotation_tile.hpp @@ -45,7 +45,11 @@ public: AnnotationTileLayer(std::string); std::size_t featureCount() const override { return features.size(); } - std::unique_ptr<GeometryTileFeature> getFeature(std::size_t i) const override { return std::make_unique<AnnotationTileFeature>(features[i]); } + + std::unique_ptr<GeometryTileFeature> getFeature(std::size_t i) const override { + return std::make_unique<AnnotationTileFeature>(features.at(i)); + } + std::string getName() const override { return name; }; std::vector<AnnotationTileFeature> features; diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index 37787df9ea..5f1fc5de66 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -113,6 +113,7 @@ void GeometryTile::onLayout(LayoutResult result) { nonSymbolBuckets = std::move(result.nonSymbolBuckets); featureIndex = std::move(result.featureIndex); data = std::move(result.tileData); + collisionTile.reset(); observer->onTileChanged(*this); } |