From af45d87e54e36f9899507d31c4b79669a254350e Mon Sep 17 00:00:00 2001 From: Romain Quidet Date: Mon, 30 Nov 2015 14:18:10 +0100 Subject: [PATCH] 2210: Sprites can be removed / updated correctly --- platform/ios/MGLMapView.mm | 2 +- src/mbgl/annotation/annotation_manager.cpp | 5 +++++ src/mbgl/annotation/annotation_manager.hpp | 1 + src/mbgl/map/map.cpp | 2 +- src/mbgl/map/map_context.cpp | 7 ++++++- src/mbgl/map/map_context.hpp | 1 + src/mbgl/sprite/sprite_atlas.cpp | 11 +++++++++-- 7 files changed, 24 insertions(+), 5 deletions(-) diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index fc4a655e6..5d944e81f 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -2718,7 +2718,7 @@ std::chrono::steady_clock::duration MGLDurationInSeconds(float duration) { // remove sprite NSString *symbolName = [MGLAnnotationSpritePrefix stringByAppendingString:annotationImage.reuseIdentifier]; - _mbglMap->removeSprite(symbolName.UTF8String); + _mbglMap->removeAnnotationIcon(symbolName.UTF8String); [self installAnnotationImage:annotationImage]; _mbglMap->update(mbgl::Update::Annotations); } diff --git a/src/mbgl/annotation/annotation_manager.cpp b/src/mbgl/annotation/annotation_manager.cpp index a85021b77..6538cb8e9 100644 --- a/src/mbgl/annotation/annotation_manager.cpp +++ b/src/mbgl/annotation/annotation_manager.cpp @@ -159,6 +159,11 @@ void AnnotationManager::addIcon(const std::string& name, std::shared_ptr); + void removeIcon(const std::string& name); double getTopOffsetPixelsForIcon(const std::string& name); SpriteAtlas& getSpriteAtlas() { return spriteAtlas; } diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 3c585a8ae..c07eda6b4 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -392,7 +392,7 @@ void Map::addAnnotationIcon(const std::string& name, std::shared_ptraddIcon(name, sprite); } + +void MapContext::removeAnnotationIcon(const std::string& name) { + assert(util::ThreadContext::currentlyOn(util::ThreadType::Map)); + data.getAnnotationManager()->removeIcon(name); +} double MapContext::getTopOffsetPixelsForAnnotationIcon(const std::string& name) { assert(util::ThreadContext::currentlyOn(util::ThreadType::Map)); @@ -298,7 +303,7 @@ void MapContext::onLowMemory() { style->onLowMemory(); asyncInvalidate.send(); } - + void MapContext::onTileDataChanged() { assert(util::ThreadContext::currentlyOn(util::ThreadType::Map)); updateFlags |= Update::Repaint; diff --git a/src/mbgl/map/map_context.hpp b/src/mbgl/map/map_context.hpp index 8e0dbd80c..554765eac 100644 --- a/src/mbgl/map/map_context.hpp +++ b/src/mbgl/map/map_context.hpp @@ -52,6 +52,7 @@ public: // Annotations void addAnnotationIcon(const std::string&, std::shared_ptr); + void removeAnnotationIcon(const std::string&); double getTopOffsetPixelsForAnnotationIcon(const std::string&); void updateAnnotations(); diff --git a/src/mbgl/sprite/sprite_atlas.cpp b/src/mbgl/sprite/sprite_atlas.cpp index 6ebebb950..b04d8edc5 100644 --- a/src/mbgl/sprite/sprite_atlas.cpp +++ b/src/mbgl/sprite/sprite_atlas.cpp @@ -187,8 +187,15 @@ void SpriteAtlas::updateDirty() { // The two names match; Holder& holder = imageIterator->second; holder.texture = spriteIterator->second; - copy(holder, imageIterator->first.second); - + if (holder.texture != nullptr) + { + copy(holder, imageIterator->first.second); + } + else + { + images.erase(imageIterator); + } + ++imageIterator; // Don't advance the spriteIterator because there might be another sprite with the same // name, but a different wrap value.