Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Restore shape annotation z-order #5710

Merged
merged 1 commit into from
Jul 18, 2016
Merged

Restore shape annotation z-order #5710

merged 1 commit into from
Jul 18, 2016

Conversation

1ec5
Copy link
Contributor

@1ec5 1ec5 commented Jul 16, 2016 •
edited
Loading

Shapes are once again always added to the top z-index.

fixed

Fixes #5691.

  • Cherry-pick to release-ios-v3.3.0 branch

@1ec5 1ec5 added bug Core The cross-platform C++ core, aka mbgl annotations Annotations on iOS and macOS or markers on Android labels Jul 16, 2016
@1ec5 1ec5 added this to the ios-v3.3.1 milestone Jul 16, 2016
@1ec5 1ec5 self-assigned this Jul 16, 2016
@mention-bot
Copy link

@1ec5, thanks for your PR! By analyzing the annotation information on this pull request, we identified @jfirebaugh, @bleege and @incanus to be potential reviewers

jfirebaugh
jfirebaugh reviewed Jul 18, 2016
View reviewed changes
test/api/annotations.cpp
test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
test.map.addAnnotation(underlaidAnnotation);
test.map.addAnnotation(overlaidAnnotation);
test.checkRendering("fill_annotation");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"fill_annotation" here ends up being the base name of the file used for comparison / written to disk if the test fails. Let's use a different name than the prior test.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 I copied the fixture to decouple the two tests.

@jfirebaugh
Copy link
Contributor

👍

Whether the test fails if the annotation_manager.hpp change is reverted depends on implementation details of unordered_map, right? To be safe, can you also add a comment in annotation_manager.hpp explaining why unordered_map isn't used?

Then 🚢 on 🍏 .

@1ec5
[core] Restored shape annotation z-order
74fe96d 
Shapes are once again always added to the top z-index.

Fixes #5691.
@1ec5 1ec5 merged commit 74fe96d into master Jul 18, 2016
@1ec5
Copy link
Contributor Author

1ec5 commented Jul 18, 2016

Cherry-picked into the release-ios-v3.3.0 branch as 8179f2f.

@1ec5 1ec5 deleted the 1ec5-shape-z-order-5691 branch July 18, 2016 22:22
@1ec5 1ec5 mentioned this pull request Sep 18, 2016
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@1ec5 1ec5

Labels
annotations Annotations on iOS and macOS or markers on Android bug Core The cross-platform C++ core, aka mbgl
Projects
None yet
Milestone
ios-v3.3.1
Development

Successfully merging this pull request may close these issues.

Shape annotation z-order is reversed
3 participants
@1ec5 @mention-bot @jfirebaugh