tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Don't crash when removing a shape annotation whose layer was never created

Browse Source
This commit is contained in:
John Firebaugh
2015-10-30 14:36:07 -07:00
parent 557b8afb7c
commit a7219a77aa
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mbgl/annotation/annotation_manager.cpp
View File

@@ -131,7 +131,9 @@ void AnnotationManager::updateStyle(Style& style) {
}
for (const auto& layer : obsoleteShapeAnnotationLayers) {
style.removeLayer(layer);
if (style.getLayer(layer)) {
style.removeLayer(layer);
}
}
obsoleteShapeAnnotationLayers.clear();

12
test/api/annotations.cpp
View File

@@ -164,6 +164,18 @@ TEST(Annotations, RemoveShape) {
util::write_file("test/output/remove_shape.png", renderPNG(map));
}
TEST(Annotations, ImmediateRemoveShape) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
DefaultFileSource fileSource(nullptr);
Map map(view, fileSource, MapMode::Still);
map.removeAnnotation(map.addShapeAnnotation(ShapeAnnotation({}, {})));
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
renderPNG(map);
}
TEST(Annotations, SwitchStyle) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);