diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-20 07:47:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-20 07:47:42 -0700 |
| commit | c3a583cdd59c4ed8e67468caa7d2af74791c01b7 (patch) | |
| tree | 11ca3cdfae0f3897178051ac5fe7584b06ffdbce /src/mbgl/geometry/feature_index.cpp | |
| parent | a8032b5c6ae2dc33fa35e89e1cf45b7c7aebf05e (diff) | |
| download | qtlocation-mapboxgl-c3a583cdd59c4ed8e67468caa7d2af74791c01b7.tar.gz | |
[core] Allow queryRenderedFeatures prior to symbol placement (#6376)
Diffstat (limited to 'src/mbgl/geometry/feature_index.cpp')
| -rw-r--r-- | src/mbgl/geometry/feature_index.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mbgl/geometry/feature_index.cpp b/src/mbgl/geometry/feature_index.cpp index 6d6521917e..62db3b478d 100644 --- a/src/mbgl/geometry/feature_index.cpp +++ b/src/mbgl/geometry/feature_index.cpp @@ -78,8 +78,11 @@ void FeatureIndex::query( addFeature(result, indexedFeature, queryGeometry, filterLayerIDs, geometryTileData, tileID, style, bearing, pixelsToTileUnits); } - // query symbol features - assert(collisionTile); + // Query symbol features, if they've been placed. + if (!collisionTile) { + return; + } + std::vector<IndexedSubfeature> symbolFeatures = collisionTile->queryRenderedSymbols(box, scale); std::sort(symbolFeatures.begin(), symbolFeatures.end(), topDownSymbols); for (const auto& symbolFeature : symbolFeatures) { |