Merge branch 'master' of github.com:mapbox/llmr-native

src/map/map.cpp

@@ -20,6 +20,7 @@ Map::Map(View& view)
       texturepool(),
       style(),
       glyphAtlas(1024, 1024),
+      spriteAtlas(512, 512),
       painter(*this),
       loop(uv_loop_new()) {
 
@@ -175,7 +176,16 @@ void Map::resize(uint16_t width, uint16_t height, float ratio) {
 }
 
 void Map::resize(uint16_t width, uint16_t height, float ratio, uint16_t fb_width, uint16_t fb_height) {
+    bool changed = false;
+
     if (transform.resize(width, height, ratio, fb_width, fb_height)) {
+        changed = true;
+    }
+    if (spriteAtlas.resize(ratio)) {
+        changed = true;
+    }
+
+    if (changed) {
         update();
     }
 }
@@ -393,6 +403,11 @@ void Map::prepare() {
         style.sprite->load(kSpriteURL);
     }
 
+    // Allow the sprite atlas to potentially pull new sprite images if needed.
+    if (style.sprite && style.sprite->isLoaded()) {
+        spriteAtlas.update(*style.sprite);
+    }
+
     updateTiles();
 
     updateClippingIDs();

src/map/tile_parser.cpp

@@ -14,11 +14,12 @@
 using namespace llmr;
 
 
-TileParser::TileParser(const std::string& data, VectorTileData& tile, const Style& style, GlyphAtlas& glyphAtlas)
+TileParser::TileParser(const std::string& data, VectorTileData& tile, const Style& style, GlyphAtlas& glyphAtlas, SpriteAtlas &spriteAtlas)
     : vector_data(pbf((const uint8_t *)data.data(), data.size())),
       tile(tile),
       style(style),
       glyphAtlas(glyphAtlas),
+      spriteAtlas(spriteAtlas),
       placement(tile.id.z) {
     parseGlyphs();
     parseStyleLayers(style.layers);
@@ -120,6 +121,15 @@ void TileParser::addBucketFeatures(Bucket& bucket, const VectorTileLayer& layer,
     }
 }
 
+template <class Bucket, typename ...Args>
+void TileParser::addBucketFeatures(Bucket& bucket, const VectorTileLayer& layer, const BucketDescription& bucket_desc, Args&& ...args) {
+    FilteredVectorTileLayer filtered_layer(layer, bucket_desc);
+    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 BucketDescription& bucket_desc) {
     std::unique_ptr<FillBucket> bucket = std::make_unique<FillBucket>(
         tile.fillVertexBuffer, tile.triangleElementsBuffer, tile.lineElementsBuffer, bucket_desc);
@@ -137,7 +147,7 @@ std::unique_ptr<Bucket> TileParser::createLineBucket(const VectorTileLayer& laye
 std::unique_ptr<Bucket> TileParser::createIconBucket(const VectorTileLayer& layer, const BucketDescription& bucket_desc) {
     std::unique_ptr<IconBucket> bucket = std::make_unique<IconBucket>(
         tile.iconVertexBuffer, bucket_desc);
-    addBucketFeatures(bucket, layer, bucket_desc);
+    addBucketFeatures(bucket, layer, bucket_desc, spriteAtlas);
     return obsolete() ? nullptr : std::move(bucket);
 }
 
@@ -165,12 +175,6 @@ std::unique_ptr<Bucket> TileParser::createTextBucket(const VectorTileLayer& laye
 
     std::unique_ptr<TextBucket> bucket = std::make_unique<TextBucket>(
         tile.textVertexBuffer, tile.triangleElementsBuffer, bucket_desc, placement);
-
-    FilteredVectorTileLayer filtered_layer(layer, bucket_desc);
-    for (const pbf& feature_pbf : filtered_layer) {
-        if (obsolete()) return nullptr;
-        bucket->addFeature({ feature_pbf, layer }, faces, shaping);
-    }
-
+    addBucketFeatures(bucket, layer, bucket_desc, faces, shaping);
     return std::move(bucket);
 }

src/map/vector_tile_data.cpp

@@ -22,7 +22,7 @@ void VectorTileData::parse() {
         // Parsing creates state that is encapsulated in TileParser. While parsing,
         // the TileParser object writes results into this objects. All other state
         // is going to be discarded afterwards.
-        TileParser parser(data, *this, map.getStyle(), map.getGlyphAtlas());
+        TileParser parser(data, *this, map.getStyle(), map.getGlyphAtlas(), map.getSpriteAtlas());
     } catch (const std::exception& ex) {
         fprintf(stderr, "[%p] exception [%d/%d/%d]... failed: %s\n", this, id.z, id.x, id.y, ex.what());
         cancel();