diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2017-06-20 12:17:07 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2017-06-21 17:18:08 -0700 |
commit | 7b90af5d3580bd57cd4280173c1d2b0ee542b89d (patch) | |
tree | 157ce600a1f6397c09ffcd39918e7347e0c70b39 /src/mbgl/tile/vector_tile_data.cpp | |
parent | 2cc330463d11a9767cbee4a028804e026c76d63b (diff) | |
download | qtlocation-mapboxgl-7b90af5d3580bd57cd4280173c1d2b0ee542b89d.tar.gz |
[core] always return owning pointers for GeometryTileData::getLayer()
Diffstat (limited to 'src/mbgl/tile/vector_tile_data.cpp')
-rw-r--r-- | src/mbgl/tile/vector_tile_data.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mbgl/tile/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp index bb8392f6d9..2d4a01bda3 100644 --- a/src/mbgl/tile/vector_tile_data.cpp +++ b/src/mbgl/tile/vector_tile_data.cpp @@ -67,19 +67,17 @@ std::unique_ptr<GeometryTileData> VectorTileData::clone() const { return std::make_unique<VectorTileData>(data); } -const GeometryTileLayer* VectorTileData::getLayer(const std::string& name) const { +std::unique_ptr<GeometryTileLayer> VectorTileData::getLayer(const std::string& name) const { if (!parsed) { // We're parsing this lazily so that we can construct VectorTileData objects on the main // thread without incurring the overhead of parsing immediately. - for (const auto& pair : mapbox::vector_tile::buffer(*data).getLayers()) { - layers.emplace(pair.first, VectorTileLayer{ data, pair.second }); - } + layers = mapbox::vector_tile::buffer(*data).getLayers(); parsed = true; } auto it = layers.find(name); if (it != layers.end()) { - return &it->second; + return std::make_unique<VectorTileLayer>(data, it->second); } return nullptr; } |