diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-01-21 18:41:17 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-01-21 18:41:17 -0800 |
| commit | 8e23e3a3e844867bdcd8d485cf121a93905db256 (patch) | |
| tree | ca1dfdcad415e5027478b5a61d19c15bac328ad6 /src/mbgl/map | |
| parent | b6ef236d85f329ecf39e51aab2338038c1066d8d (diff) | |
| download | qtlocation-mapboxgl-8e23e3a3e844867bdcd8d485cf121a93905db256.tar.gz | |
Remove support for prerendered layers
https://github.com/mapbox/mapbox-gl-style-spec/issues/232
Diffstat (limited to 'src/mbgl/map')
| -rw-r--r-- | src/mbgl/map/map.cpp | 8 | ||||
| -rw-r--r-- | src/mbgl/map/tile_parser.cpp | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index a7c1636f01..2ec9018a8e 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -575,12 +575,8 @@ void Map::updateSources(const util::ptr<StyleLayerGroup> &group) { } for (const util::ptr<StyleLayer> &layer : group->layers) { if (!layer) continue; - if (layer->bucket) { - if (layer->bucket->style_source) { - (*activeSources.emplace(layer->bucket->style_source).first)->enabled = true; - } - } else if (layer->layers) { - updateSources(layer->layers); + if (layer->bucket && layer->bucket->style_source) { + (*activeSources.emplace(layer->bucket->style_source).first)->enabled = true; } } } diff --git a/src/mbgl/map/tile_parser.cpp b/src/mbgl/map/tile_parser.cpp index 1e12e5fc16..e72bb79dcf 100644 --- a/src/mbgl/map/tile_parser.cpp +++ b/src/mbgl/map/tile_parser.cpp @@ -70,10 +70,8 @@ void TileParser::parseStyleLayers(util::ptr<StyleLayerGroup> group) { if (layer_desc->isBackground()) { // background is a special, fake bucket continue; - } else if (layer_desc->layers) { - // This is a layer group. - parseStyleLayers(layer_desc->layers); } + if (layer_desc->bucket) { // This is a singular layer. Check if this bucket already exists. If not, // parse this bucket. @@ -88,7 +86,7 @@ void TileParser::parseStyleLayers(util::ptr<StyleLayerGroup> group) { } } } else { - fprintf(stderr, "[WARNING] layer '%s' does not have child layers or buckets\n", layer_desc->id.c_str()); + fprintf(stderr, "[WARNING] layer '%s' does not have buckets\n", layer_desc->id.c_str()); } } } @@ -117,8 +115,6 @@ std::unique_ptr<Bucket> TileParser::createBucket(util::ptr<StyleBucket> bucket_d } else { fprintf(stderr, "[WARNING] unknown bucket render type for layer '%s' (source layer '%s')\n", bucket_desc->name.c_str(), bucket_desc->source_layer.c_str()); } - } else if (bucket_desc->render.is<StyleBucketRaster>() && bucket_desc->render.get<StyleBucketRaster>().prerendered == true) { - return createRasterBucket(bucket_desc->render.get<StyleBucketRaster>()); } else { // The layer specified in the bucket does not exist. Do nothing. if (debug::tileParseWarnings) { |