diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2016-07-16 14:19:14 -0700 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2016-07-18 14:43:44 -0700 |
commit | 74fe96d2617f870206ff358d7dfcafccf4e109bc (patch) | |
tree | d47bf21a14a6bd5625f6fac416591e11f50c0675 /src | |
parent | da35ef9f49139f4dfc7eb5ea2a04f800e895a65f (diff) | |
download | qtlocation-mapboxgl-74fe96d2617f870206ff358d7dfcafccf4e109bc.tar.gz |
[core] Restored shape annotation z-order
Shapes are once again always added to the top z-index.
Fixes #5691.
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/annotation/annotation_manager.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mbgl/annotation/annotation_manager.hpp b/src/mbgl/annotation/annotation_manager.hpp index bdce1a8c3a..ffe6cd163a 100644 --- a/src/mbgl/annotation/annotation_manager.hpp +++ b/src/mbgl/annotation/annotation_manager.hpp @@ -67,8 +67,10 @@ private: AnnotationID nextID = 0; using SymbolAnnotationTree = boost::geometry::index::rtree<std::shared_ptr<const SymbolAnnotationImpl>, boost::geometry::index::rstar<16, 4>>; - using SymbolAnnotationMap = std::unordered_map<AnnotationID, std::shared_ptr<SymbolAnnotationImpl>>; - using ShapeAnnotationMap = std::unordered_map<AnnotationID, std::unique_ptr<ShapeAnnotationImpl>>; + // Unlike std::unordered_map, std::map is guaranteed to sort by AnnotationID, ensuring that older annotations are below newer annotations. + // <https://github.com/mapbox/mapbox-gl-native/issues/5691> + using SymbolAnnotationMap = std::map<AnnotationID, std::shared_ptr<SymbolAnnotationImpl>>; + using ShapeAnnotationMap = std::map<AnnotationID, std::unique_ptr<ShapeAnnotationImpl>>; SymbolAnnotationTree symbolTree; SymbolAnnotationMap symbolAnnotations; |