summaryrefslogtreecommitdiff
path: root/src/mbgl/geometry
diff options
context:
space:
mode:
authorChris Loer <chris.loer@gmail.com>2018-06-26 15:05:37 -0700
committerChris Loer <chris.loer@mapbox.com>2018-07-03 15:28:00 -0700
commitd734f670e8127c7600beb6dad7b7f08b1401e7c0 (patch)
tree0f37564d1c5034639bfdfb259e3f9c3a1f51be52 /src/mbgl/geometry
parentcfd436c287f4209d0d994042452ccbb552a6bd28 (diff)
downloadqtlocation-mapboxgl-d734f670e8127c7600beb6dad7b7f08b1401e7c0.tar.gz
[core] Fix sort order for queryRenderedFeatures when features are filtered.
Fixes issue #12104.
Diffstat (limited to 'src/mbgl/geometry')
-rw-r--r--src/mbgl/geometry/feature_index.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mbgl/geometry/feature_index.cpp b/src/mbgl/geometry/feature_index.cpp
index cc69a60ca0..651e3b9c56 100644
--- a/src/mbgl/geometry/feature_index.cpp
+++ b/src/mbgl/geometry/feature_index.cpp
@@ -77,11 +77,12 @@ void FeatureIndex::query(
}
}
-std::unordered_map<std::string, std::vector<Feature>> FeatureIndex::lookupSymbolFeatures(const std::vector<IndexedSubfeature>& symbolFeatures,
- const RenderedQueryOptions& queryOptions,
- const std::vector<const RenderLayer*>& layers,
- const OverscaledTileID& tileID,
- const std::shared_ptr<std::vector<size_t>>& featureSortOrder) const {
+std::unordered_map<std::string, std::vector<Feature>>
+FeatureIndex::lookupSymbolFeatures(const std::vector<IndexedSubfeature>& symbolFeatures,
+ const RenderedQueryOptions& queryOptions,
+ const std::vector<const RenderLayer*>& layers,
+ const OverscaledTileID& tileID,
+ const std::shared_ptr<std::vector<size_t>>& featureSortOrder) const {
std::unordered_map<std::string, std::vector<Feature>> result;
if (!tileData) {
return result;