1 files changed, 9 insertions, 110 deletions
diff --git a/src/map/tile_parser.cpp b/src/map/tile_parser.cpp
index 807e827972..6be9bcb32c 100644
--- a/src/map/tile_parser.cpp
+++ b/src/map/tile_parser.cpp
@@ -6,8 +6,7 @@
 #include <mbgl/style/style_layer_group.hpp>
 #include <mbgl/renderer/fill_bucket.hpp>
 #include <mbgl/renderer/line_bucket.hpp>
-#include <mbgl/renderer/icon_bucket.hpp>
-#include <mbgl/renderer/text_bucket.hpp>
+#include <mbgl/renderer/symbol_bucket.hpp>
 #include <mbgl/renderer/raster_bucket.hpp>
 #include <mbgl/util/raster.hpp>
 #include <mbgl/util/constants.hpp>
@@ -51,21 +50,6 @@ void TileParser::parse() {
 
 bool TileParser::obsolete() const { return tile.state == TileData::State::obsolete; }
 
-void TileParser::addGlyph(uint64_t tileid, const std::string stackname,
-                          const std::u32string &string, const FontStack &fontStack,
-                          GlyphAtlas &glyphAtlas, GlyphPositions &face) {
-    const std::map<uint32_t, SDFGlyph> &sdfs = fontStack.getSDFs();
-    // Loop through all characters and add glyph to atlas, positions.
-    for (uint32_t chr : string) {
-        auto sdf_it = sdfs.find(chr);
-        if (sdf_it != sdfs.end()) {
-            const SDFGlyph& sdf = sdf_it->second;
-            const Rect<uint16_t> rect = glyphAtlas.addGlyph(tileid, stackname, sdf);
-            face.emplace(chr, Glyph{rect, sdf.metrics});
-        }
-    }
-}
-
 void TileParser::parseStyleLayers(std::shared_ptr<StyleLayerGroup> group) {
     if (!group) {
         return;
@@ -119,10 +103,8 @@ std::unique_ptr<Bucket> TileParser::createBucket(std::shared_ptr<StyleBucket> bu
             return createFillBucket(layer, bucket_desc->filter, bucket_desc->render.get<StyleBucketFill>());
         } else if (bucket_desc->render.is<StyleBucketLine>()) {
             return createLineBucket(layer, bucket_desc->filter, bucket_desc->render.get<StyleBucketLine>());
-        } else if (bucket_desc->render.is<StyleBucketIcon>()) {
-            return createIconBucket(layer, bucket_desc->filter, bucket_desc->render.get<StyleBucketIcon>());
-        } else if (bucket_desc->render.is<StyleBucketText>()) {
-            return createTextBucket(layer, bucket_desc->filter, bucket_desc->render.get<StyleBucketText>());
+        } else if (bucket_desc->render.is<StyleBucketSymbol>()) {
+            return createSymbolBucket(layer, bucket_desc->filter, bucket_desc->render.get<StyleBucketSymbol>());
         } else if (bucket_desc->render.is<StyleBucketRaster>()) {
             return nullptr;
         } else {
@@ -140,7 +122,7 @@ std::unique_ptr<Bucket> TileParser::createBucket(std::shared_ptr<StyleBucket> bu
 }
 
 template <class Bucket>
-void TileParser::addBucketFeatures(Bucket& bucket, const VectorTileLayer& layer, const FilterExpression &filter) {
+void TileParser::addBucketGeometries(Bucket& bucket, const VectorTileLayer& layer, const FilterExpression &filter) {
     FilteredVectorTileLayer filtered_layer(layer, filter);
     for (pbf feature : filtered_layer) {
         if (obsolete())
@@ -157,103 +139,20 @@ void TileParser::addBucketFeatures(Bucket& bucket, const VectorTileLayer& layer,
     }
 }
 
-template <class Bucket, typename... Args>
-void TileParser::addBucketFeatures(Bucket& bucket, const VectorTileLayer& layer, const FilterExpression &filter, Args&& ...args) {
-    FilteredVectorTileLayer filtered_layer(layer, filter);
-    for (const pbf &feature_pbf : filtered_layer) {
-        if (obsolete()) {
-            return;
-        }
-        bucket->addFeature({feature_pbf, layer}, std::forward<Args>(args)...);
-    }
-}
-
-
 std::unique_ptr<Bucket> TileParser::createFillBucket(const VectorTileLayer& layer, const FilterExpression &filter, const StyleBucketFill &fill) {
     std::unique_ptr<FillBucket> bucket = std::make_unique<FillBucket>(tile.fillVertexBuffer, tile.triangleElementsBuffer, tile.lineElementsBuffer, fill);
-    addBucketFeatures(bucket, layer, filter);
+    addBucketGeometries(bucket, layer, filter);
     return obsolete() ? nullptr : std::move(bucket);
 }
 
 std::unique_ptr<Bucket> TileParser::createLineBucket(const VectorTileLayer& layer, const FilterExpression &filter, const StyleBucketLine &line) {
     std::unique_ptr<LineBucket> bucket = std::make_unique<LineBucket>(tile.lineVertexBuffer, tile.triangleElementsBuffer, tile.pointElementsBuffer, line);
-    addBucketFeatures(bucket, layer, filter);
+    addBucketGeometries(bucket, layer, filter);
     return obsolete() ? nullptr : std::move(bucket);
 }
 
-std::unique_ptr<Bucket> TileParser::createIconBucket(const VectorTileLayer& layer, const FilterExpression &filter, const StyleBucketIcon &icon) {
-    std::unique_ptr<IconBucket> bucket = std::make_unique<IconBucket>(tile.iconVertexBuffer, icon);
-    addBucketFeatures(bucket, layer, filter, *spriteAtlas);
+std::unique_ptr<Bucket> TileParser::createSymbolBucket(const VectorTileLayer& layer, const FilterExpression &filter, const StyleBucketSymbol &symbol) {
+    std::unique_ptr<SymbolBucket> bucket = std::make_unique<SymbolBucket>(tile.textVertexBuffer, tile.iconVertexBuffer, tile.triangleElementsBuffer, symbol, placement);
+    bucket->addFeatures(layer, filter, tile.id, *spriteAtlas, *glyphAtlas, *glyphStore);
     return obsolete() ? nullptr : std::move(bucket);
 }
-
-std::unique_ptr<Bucket> TileParser::createTextBucket(const VectorTileLayer& layer, const FilterExpression &filter, const StyleBucketText &text) {
-
-    // Make sure that we always have a valid glyph store. If this is not set, the stylesheet
-    // doesn't specify a glyph URL.
-    if (!glyphStore) {
-        return nullptr;
-    }
-
-    const StyleBucketText &properties = text;
-
-    std::unique_ptr<TextBucket> bucket = std::make_unique<TextBucket>(
-        tile.textVertexBuffer, tile.triangleElementsBuffer, properties, placement);
-
-    util::utf8_to_utf32 ucs4conv;
-
-    std::vector<std::pair<std::u32string, pbf>> labels;
-
-    // Determine and load glyph ranges
-    {
-        std::set<GlyphRange> ranges;
-
-        FilteredVectorTileLayer filtered_layer(layer, filter);
-        for (const pbf &feature_pbf : filtered_layer) {
-            if (obsolete())
-                return nullptr;
-            VectorTileFeature feature{feature_pbf, layer};
-
-            std::string u8string = util::replaceTokens(properties.field, feature.properties);
-
-            auto& convert = std::use_facet<std::ctype<char>>(std::locale());
-            if (properties.transform == TextTransformType::Uppercase) {
-                convert.toupper(&u8string[0], &u8string[0] + u8string.size());
-            } else if (properties.transform == TextTransformType::Lowercase) {
-                convert.tolower(&u8string[0], &u8string[0] + u8string.size());
-            }
-
-            std::u32string string = ucs4conv.convert(u8string);
-
-            // Loop through all characters of this text and collect unique codepoints.
-            for (char32_t chr : string) {
-                ranges.insert(getGlyphRange(chr));
-            }
-
-            labels.emplace_back(string, feature.geometry);
-        }
-
-        glyphStore->waitForGlyphRanges(properties.font, ranges);
-    }
-
-    // Create a copy!
-    const FontStack &fontStack = glyphStore->getFontStack(properties.font);
-    GlyphPositions face;
-
-    // Shape and place all labels.
-    for (const std::pair<std::u32string, pbf> &label : labels) {
-
-        // Shape labels.
-        const Shaping shaping = fontStack.getShaping(label.first, properties.max_width,
-                properties.line_height, properties.alignment,
-                properties.vertical_alignment, properties.letter_spacing);
-
-        // Place labels.
-        addGlyph(tile.id.to_uint64(), properties.font, label.first, fontStack, *glyphAtlas,
-                 face);
-
-        bucket->addFeature(label.second, face, shaping);
-    }
-
-    return std::move(bucket);
-}