diff options
Diffstat (limited to 'src/mbgl/renderer/sources')
7 files changed, 8 insertions, 9 deletions
diff --git a/src/mbgl/renderer/sources/render_geojson_source.cpp b/src/mbgl/renderer/sources/render_geojson_source.cpp index 2c6935b273..c45a62498d 100644 --- a/src/mbgl/renderer/sources/render_geojson_source.cpp +++ b/src/mbgl/renderer/sources/render_geojson_source.cpp @@ -68,7 +68,7 @@ void RenderGeoJSONSource::finishRender(Painter& painter) { tilePyramid.finishRender(painter); } -std::map<UnwrappedTileID, RenderTile>& RenderGeoJSONSource::getRenderTiles() { +std::vector<std::reference_wrapper<RenderTile>> RenderGeoJSONSource::getRenderTiles() { return tilePyramid.getRenderTiles(); } diff --git a/src/mbgl/renderer/sources/render_geojson_source.hpp b/src/mbgl/renderer/sources/render_geojson_source.hpp index b7c5a3fa7f..8d4154112f 100644 --- a/src/mbgl/renderer/sources/render_geojson_source.hpp +++ b/src/mbgl/renderer/sources/render_geojson_source.hpp @@ -25,7 +25,7 @@ public: void startRender(Painter&) final; void finishRender(Painter&) final; - std::map<UnwrappedTileID, RenderTile>& getRenderTiles() final; + std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final; std::unordered_map<std::string, std::vector<Feature>> queryRenderedFeatures(const ScreenLineString& geometry, diff --git a/src/mbgl/renderer/sources/render_image_source.hpp b/src/mbgl/renderer/sources/render_image_source.hpp index 88f1c56567..41c4bd5483 100644 --- a/src/mbgl/renderer/sources/render_image_source.hpp +++ b/src/mbgl/renderer/sources/render_image_source.hpp @@ -30,8 +30,8 @@ public: bool needsRelayout, const TileParameters&) final; - std::map<UnwrappedTileID, RenderTile>& getRenderTiles() final { - return tiles; + std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final { + return {}; } std::unordered_map<std::string, std::vector<Feature>> @@ -48,7 +48,6 @@ public: private: const style::ImageSource::Impl& impl() const; - std::map<UnwrappedTileID, RenderTile> tiles; std::vector<UnwrappedTileID> tileIds; std::unique_ptr<RasterBucket> bucket; diff --git a/src/mbgl/renderer/sources/render_raster_source.cpp b/src/mbgl/renderer/sources/render_raster_source.cpp index 20c148870e..2006e31628 100644 --- a/src/mbgl/renderer/sources/render_raster_source.cpp +++ b/src/mbgl/renderer/sources/render_raster_source.cpp @@ -64,7 +64,7 @@ void RenderRasterSource::finishRender(Painter& painter) { tilePyramid.finishRender(painter); } -std::map<UnwrappedTileID, RenderTile>& RenderRasterSource::getRenderTiles() { +std::vector<std::reference_wrapper<RenderTile>> RenderRasterSource::getRenderTiles() { return tilePyramid.getRenderTiles(); } diff --git a/src/mbgl/renderer/sources/render_raster_source.hpp b/src/mbgl/renderer/sources/render_raster_source.hpp index 7d0c245e45..73a2ac3b22 100644 --- a/src/mbgl/renderer/sources/render_raster_source.hpp +++ b/src/mbgl/renderer/sources/render_raster_source.hpp @@ -21,7 +21,7 @@ public: void startRender(Painter&) final; void finishRender(Painter&) final; - std::map<UnwrappedTileID, RenderTile>& getRenderTiles() final; + std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final; std::unordered_map<std::string, std::vector<Feature>> queryRenderedFeatures(const ScreenLineString& geometry, diff --git a/src/mbgl/renderer/sources/render_vector_source.cpp b/src/mbgl/renderer/sources/render_vector_source.cpp index 4302fb21ee..0f44a64b63 100644 --- a/src/mbgl/renderer/sources/render_vector_source.cpp +++ b/src/mbgl/renderer/sources/render_vector_source.cpp @@ -69,7 +69,7 @@ void RenderVectorSource::finishRender(Painter& painter) { tilePyramid.finishRender(painter); } -std::map<UnwrappedTileID, RenderTile>& RenderVectorSource::getRenderTiles() { +std::vector<std::reference_wrapper<RenderTile>> RenderVectorSource::getRenderTiles() { return tilePyramid.getRenderTiles(); } diff --git a/src/mbgl/renderer/sources/render_vector_source.hpp b/src/mbgl/renderer/sources/render_vector_source.hpp index 5e15fee533..231a9071ab 100644 --- a/src/mbgl/renderer/sources/render_vector_source.hpp +++ b/src/mbgl/renderer/sources/render_vector_source.hpp @@ -21,7 +21,7 @@ public: void startRender(Painter&) final; void finishRender(Painter&) final; - std::map<UnwrappedTileID, RenderTile>& getRenderTiles() final; + std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final; std::unordered_map<std::string, std::vector<Feature>> queryRenderedFeatures(const ScreenLineString& geometry, |