From 4a5dc37245d23805d13865f5ef9c5f26e539a9ca Mon Sep 17 00:00:00 2001 From: Molly Lloyd Date: Thu, 14 Jun 2018 14:35:39 -0700 Subject: [core] Implement CrossFadedDataDrivenProperty to add support for feature expressions in `*-pattern` properties --- src/mbgl/renderer/image_manager.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/mbgl/renderer/image_manager.cpp') diff --git a/src/mbgl/renderer/image_manager.cpp b/src/mbgl/renderer/image_manager.cpp index 2ef6be0c4f..fc1f5bb167 100644 --- a/src/mbgl/renderer/image_manager.cpp +++ b/src/mbgl/renderer/image_manager.cpp @@ -67,7 +67,7 @@ void ImageManager::getImages(ImageRequestor& requestor, ImageRequestPair&& pair) bool hasAllDependencies = true; if (!isLoaded()) { for (const auto& dependency : pair.first) { - if (images.find(dependency) == images.end()) { + if (images.find(dependency.first) == images.end()) { hasAllDependencies = false; } } @@ -84,16 +84,17 @@ void ImageManager::removeRequestor(ImageRequestor& requestor) { } void ImageManager::notify(ImageRequestor& requestor, const ImageRequestPair& pair) const { - ImageMap response; + ImageMap iconMap; + ImageMap patternMap; for (const auto& dependency : pair.first) { - auto it = images.find(dependency); + auto it = images.find(dependency.first); if (it != images.end()) { - response.emplace(*it); + dependency.second == ImageType::Pattern ? patternMap.emplace(*it) : iconMap.emplace(*it); } } - requestor.onImagesAvailable(response, pair.second); + requestor.onImagesAvailable(iconMap, patternMap, pair.second); } void ImageManager::dumpDebugLogs() const { -- cgit v1.2.1