[core] Initial implementation of 'format' expression

1 files changed, 16 insertions, 10 deletions

diff --git a/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp
index c9032894a4..e16b805f6b 100644
--- a/src/mbgl/tile/geometry_tile_worker.cpp
+++ b/src/mbgl/tile/geometry_tile_worker.cpp
@@ -252,18 +252,24 @@ void GeometryTileWorker::coalesce() {
 
 void GeometryTileWorker::onGlyphsAvailable(GlyphMap newGlyphMap) {
     for (auto& newFontGlyphs : newGlyphMap) {
-        const FontStack& fontStack = newFontGlyphs.first;
+        FontStackHash fontStack = newFontGlyphs.first;
         Glyphs& newGlyphs = newFontGlyphs.second;
 
         Glyphs& glyphs = glyphMap[fontStack];
-        GlyphIDs& pendingGlyphIDs = pendingGlyphDependencies[fontStack];
-
-        for (auto& newGlyph : newGlyphs) {
-            const GlyphID& glyphID = newGlyph.first;
-            optional<Immutable<Glyph>>& glyph = newGlyph.second;
-
-            if (pendingGlyphIDs.erase(glyphID)) {
-                glyphs.emplace(glyphID, std::move(glyph));
+        for (auto& pendingGlyphDependency : pendingGlyphDependencies) {
+            // Linear lookup here to handle reverse of FontStackHash -> FontStack,
+            // since dependencies need the full font stack name to make a request
+            // There should not be many fontstacks to look through
+            if (FontStackHasher()(pendingGlyphDependency.first) == fontStack) {
+                GlyphIDs& pendingGlyphIDs = pendingGlyphDependency.second;
+                for (auto& newGlyph : newGlyphs) {
+                    const GlyphID& glyphID = newGlyph.first;
+                    optional<Immutable<Glyph>>& glyph = newGlyph.second;
+
+                    if (pendingGlyphIDs.erase(glyphID)) {
+                        glyphs.emplace(glyphID, std::move(glyph));
+                    }
+                }
             }
         }
     }
@@ -282,7 +288,7 @@ void GeometryTileWorker::onImagesAvailable(ImageMap newIconMap, ImageMap newPatt
 
 void GeometryTileWorker::requestNewGlyphs(const GlyphDependencies& glyphDependencies) {
     for (auto& fontDependencies : glyphDependencies) {
-        auto fontGlyphs = glyphMap.find(fontDependencies.first);
+        auto fontGlyphs = glyphMap.find(FontStackHasher()(fontDependencies.first));
         for (auto glyphID : fontDependencies.second) {
             if (fontGlyphs == glyphMap.end() || fontGlyphs->second.find(glyphID) == fontGlyphs->second.end()) {
                 pendingGlyphDependencies[fontDependencies.first].insert(glyphID);