diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-13 17:37:30 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-19 14:51:32 +0300 |
commit | f997ae00ae960f38d6920a625fcb7237e5909f9c (patch) | |
tree | 4478f9e94c4181f68a1d76128e9514800f586d31 /src/mbgl/geometry | |
parent | 80e8d7a2fcb9f75e585bb7dd26c2f2a893b6f560 (diff) | |
download | qtlocation-mapboxgl-f997ae00ae960f38d6920a625fcb7237e5909f9c.tar.gz |
[core] Fix Placement constness
Update buckets methods do not mutate placement, placement methods do not mutate buckets.
Diffstat (limited to 'src/mbgl/geometry')
-rw-r--r-- | src/mbgl/geometry/feature_index.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/geometry/feature_index.hpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mbgl/geometry/feature_index.cpp b/src/mbgl/geometry/feature_index.cpp index 20026dd117..982c492469 100644 --- a/src/mbgl/geometry/feature_index.cpp +++ b/src/mbgl/geometry/feature_index.cpp @@ -79,7 +79,7 @@ FeatureIndex::lookupSymbolFeatures(const std::vector<IndexedSubfeature>& symbolF const RenderedQueryOptions& queryOptions, const std::unordered_map<std::string, const RenderLayer*>& layers, const OverscaledTileID& tileID, - const std::shared_ptr<std::vector<size_t>>& featureSortOrder) const { + const FeatureSortOrder& featureSortOrder) const { std::unordered_map<std::string, std::vector<Feature>> result; if (!tileData) { return result; diff --git a/src/mbgl/geometry/feature_index.hpp b/src/mbgl/geometry/feature_index.hpp index 5a006a51bc..69897b1f4b 100644 --- a/src/mbgl/geometry/feature_index.hpp +++ b/src/mbgl/geometry/feature_index.hpp @@ -51,6 +51,8 @@ public: uint16_t collisionGroupId; }; +using FeatureSortOrder = std::shared_ptr<const std::vector<size_t>>; + class FeatureIndex { public: FeatureIndex(std::unique_ptr<const GeometryTileData> tileData_); @@ -79,7 +81,7 @@ public: const RenderedQueryOptions& options, const std::unordered_map<std::string, const RenderLayer*>& layers, const OverscaledTileID& tileID, - const std::shared_ptr<std::vector<size_t>>& featureSortOrder) const; + const FeatureSortOrder& featureSortOrder) const; private: void addFeature(std::unordered_map<std::string, std::vector<Feature>>& result, const IndexedSubfeature&, |