From 89f1ffc6d29d5631dfd322834397ec2247c5c9d7 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 27 Apr 2017 15:05:11 -0700 Subject: [PATCH] =?UTF-8?q?[core]=20UpdateParameters=20=E2=87=A2=20TilePar?= =?UTF-8?q?ameters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/core-files.cmake | 2 +- src/mbgl/annotation/annotation_tile.cpp | 4 ++-- src/mbgl/annotation/annotation_tile.hpp | 4 ++-- .../annotation/render_annotation_source.cpp | 2 +- .../annotation/render_annotation_source.hpp | 2 +- src/mbgl/map/map.cpp | 18 +++++++-------- src/mbgl/renderer/render_source.hpp | 4 ++-- .../sources/render_geojson_source.cpp | 2 +- .../sources/render_geojson_source.hpp | 2 +- .../renderer/sources/render_raster_source.cpp | 2 +- .../renderer/sources/render_raster_source.hpp | 2 +- .../renderer/sources/render_vector_source.cpp | 2 +- .../renderer/sources/render_vector_source.hpp | 2 +- ...ate_parameters.hpp => tile_parameters.hpp} | 18 +++++++-------- src/mbgl/renderer/tile_pyramid.cpp | 4 ++-- src/mbgl/renderer/tile_pyramid.hpp | 4 ++-- src/mbgl/style/style.cpp | 4 ++-- src/mbgl/style/style.hpp | 4 ++-- src/mbgl/tile/geojson_tile.cpp | 4 ++-- src/mbgl/tile/geojson_tile.hpp | 4 ++-- src/mbgl/tile/geometry_tile.cpp | 4 ++-- src/mbgl/tile/geometry_tile.hpp | 4 ++-- src/mbgl/tile/raster_tile.cpp | 4 ++-- src/mbgl/tile/raster_tile.hpp | 4 ++-- src/mbgl/tile/tile_loader.hpp | 4 ++-- src/mbgl/tile/tile_loader_impl.hpp | 4 ++-- src/mbgl/tile/vector_tile.cpp | 4 ++-- src/mbgl/tile/vector_tile.hpp | 4 ++-- test/style/source.test.cpp | 22 +++++++++---------- test/tile/annotation_tile.test.cpp | 6 ++--- test/tile/geojson_tile.test.cpp | 6 ++--- test/tile/raster_tile.test.cpp | 12 +++++----- test/tile/vector_tile.test.cpp | 12 +++++----- 33 files changed, 90 insertions(+), 90 deletions(-) rename src/mbgl/renderer/{update_parameters.hpp => tile_parameters.hpp} (63%) diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 9513c0181..153126fde 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -227,10 +227,10 @@ set(MBGL_CORE_FILES src/mbgl/renderer/render_tile.hpp src/mbgl/renderer/symbol_bucket.cpp src/mbgl/renderer/symbol_bucket.hpp + src/mbgl/renderer/tile_parameters.hpp src/mbgl/renderer/tile_pyramid.cpp src/mbgl/renderer/tile_pyramid.hpp src/mbgl/renderer/transitioning_property.hpp - src/mbgl/renderer/update_parameters.hpp # renderer/sources src/mbgl/renderer/sources/render_geojson_source.cpp diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp index 796ca04ba..125368141 100644 --- a/src/mbgl/annotation/annotation_tile.cpp +++ b/src/mbgl/annotation/annotation_tile.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include @@ -10,7 +10,7 @@ namespace mbgl { AnnotationTile::AnnotationTile(const OverscaledTileID& overscaledTileID, - const UpdateParameters& parameters) + const TileParameters& parameters) : GeometryTile(overscaledTileID, AnnotationManager::SourceID, parameters, *parameters.style.glyphAtlas, parameters.annotationManager.spriteAtlas), diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp index 6ca9079f9..ea4ff5ebd 100644 --- a/src/mbgl/annotation/annotation_tile.hpp +++ b/src/mbgl/annotation/annotation_tile.hpp @@ -7,12 +7,12 @@ namespace mbgl { class AnnotationManager; -class UpdateParameters; +class TileParameters; class AnnotationTile : public GeometryTile { public: AnnotationTile(const OverscaledTileID&, - const UpdateParameters&); + const TileParameters&); ~AnnotationTile() override; void setNecessity(Necessity) final; diff --git a/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp index f926b6ce9..a62d2d51d 100644 --- a/src/mbgl/annotation/render_annotation_source.cpp +++ b/src/mbgl/annotation/render_annotation_source.cpp @@ -35,7 +35,7 @@ std::map& RenderAnnotationSource::getRenderTiles() return tilePyramid.getRenderTiles(); } -void RenderAnnotationSource::updateTiles(const UpdateParameters& parameters) { +void RenderAnnotationSource::updateTiles(const TileParameters& parameters) { tilePyramid.updateTiles(parameters, SourceType::Annotations, util::tileSize, diff --git a/src/mbgl/annotation/render_annotation_source.hpp b/src/mbgl/annotation/render_annotation_source.hpp index ae0a43c5c..9ae934047 100644 --- a/src/mbgl/annotation/render_annotation_source.hpp +++ b/src/mbgl/annotation/render_annotation_source.hpp @@ -14,7 +14,7 @@ public: // Called when the camera has changed. May load new tiles, unload obsolete tiles, or // trigger re-placement of existing complete tiles. - void updateTiles(const UpdateParameters&) final; + void updateTiles(const TileParameters&) final; // Removes all tiles (by putting them into the cache). void removeTiles() final; diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 4bd370eff..d28869bd6 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -255,14 +255,14 @@ void Map::Impl::render(View& view) { style->relayout(); } - UpdateParameters parameters(pixelRatio, - debugOptions, - transform.getState(), - scheduler, - fileSource, - mode, - *annotationManager, - *style); + TileParameters parameters(pixelRatio, + debugOptions, + transform.getState(), + scheduler, + fileSource, + mode, + *annotationManager, + *style); style->updateTiles(parameters); diff --git a/src/mbgl/renderer/render_source.hpp b/src/mbgl/renderer/render_source.hpp index bec1d24d0..d31347579 100644 --- a/src/mbgl/renderer/render_source.hpp +++ b/src/mbgl/renderer/render_source.hpp @@ -21,7 +21,7 @@ class RenderedQueryOptions; class SourceQueryOptions; class Tile; class RenderSourceObserver; -class UpdateParameters; +class TileParameters; namespace algorithm { class ClipIDGenerator; @@ -36,7 +36,7 @@ public: // Called when the camera has changed. May load new tiles, unload obsolete tiles, or // trigger re-placement of existing complete tiles. - virtual void updateTiles(const UpdateParameters&) = 0; + virtual void updateTiles(const TileParameters&) = 0; // Removes all tiles (by putting them into the cache). virtual void removeTiles() = 0; diff --git a/src/mbgl/renderer/sources/render_geojson_source.cpp b/src/mbgl/renderer/sources/render_geojson_source.cpp index 7e36b44ea..2b1eeea73 100644 --- a/src/mbgl/renderer/sources/render_geojson_source.cpp +++ b/src/mbgl/renderer/sources/render_geojson_source.cpp @@ -36,7 +36,7 @@ std::map& RenderGeoJSONSource::getRenderTiles() { return tilePyramid.getRenderTiles(); } -void RenderGeoJSONSource::updateTiles(const UpdateParameters& parameters) { +void RenderGeoJSONSource::updateTiles(const TileParameters& parameters) { GeoJSONData* data_ = impl.getData(); if (!data_) { diff --git a/src/mbgl/renderer/sources/render_geojson_source.hpp b/src/mbgl/renderer/sources/render_geojson_source.hpp index 502df0f1c..262ab2927 100644 --- a/src/mbgl/renderer/sources/render_geojson_source.hpp +++ b/src/mbgl/renderer/sources/render_geojson_source.hpp @@ -18,7 +18,7 @@ public: // Called when the camera has changed. May load new tiles, unload obsolete tiles, or // trigger re-placement of existing complete tiles. - void updateTiles(const UpdateParameters&) final; + void updateTiles(const TileParameters&) final; // Removes all tiles (by putting them into the cache). void removeTiles() final; diff --git a/src/mbgl/renderer/sources/render_raster_source.cpp b/src/mbgl/renderer/sources/render_raster_source.cpp index 75a218905..c5a29eebf 100644 --- a/src/mbgl/renderer/sources/render_raster_source.cpp +++ b/src/mbgl/renderer/sources/render_raster_source.cpp @@ -32,7 +32,7 @@ std::map& RenderRasterSource::getRenderTiles() { return tilePyramid.getRenderTiles(); } -void RenderRasterSource::updateTiles(const UpdateParameters& parameters) { +void RenderRasterSource::updateTiles(const TileParameters& parameters) { optional tileset = impl.getTileset(); if (!tileset) { diff --git a/src/mbgl/renderer/sources/render_raster_source.hpp b/src/mbgl/renderer/sources/render_raster_source.hpp index ebb7b6215..5690ba80e 100644 --- a/src/mbgl/renderer/sources/render_raster_source.hpp +++ b/src/mbgl/renderer/sources/render_raster_source.hpp @@ -14,7 +14,7 @@ public: // Called when the camera has changed. May load new tiles, unload obsolete tiles, or // trigger re-placement of existing complete tiles. - void updateTiles(const UpdateParameters&) final; + void updateTiles(const TileParameters&) final; // Removes all tiles (by putting them into the cache). void removeTiles() final; diff --git a/src/mbgl/renderer/sources/render_vector_source.cpp b/src/mbgl/renderer/sources/render_vector_source.cpp index 3d7e09fd2..0db4698a8 100644 --- a/src/mbgl/renderer/sources/render_vector_source.cpp +++ b/src/mbgl/renderer/sources/render_vector_source.cpp @@ -36,7 +36,7 @@ std::map& RenderVectorSource::getRenderTiles() { return tilePyramid.getRenderTiles(); } -void RenderVectorSource::updateTiles(const UpdateParameters& parameters) { +void RenderVectorSource::updateTiles(const TileParameters& parameters) { optional tileset = impl.getTileset(); if (!tileset) { diff --git a/src/mbgl/renderer/sources/render_vector_source.hpp b/src/mbgl/renderer/sources/render_vector_source.hpp index c435db6f0..36d75e098 100644 --- a/src/mbgl/renderer/sources/render_vector_source.hpp +++ b/src/mbgl/renderer/sources/render_vector_source.hpp @@ -14,7 +14,7 @@ public: // Called when the camera has changed. May load new tiles, unload obsolete tiles, or // trigger re-placement of existing complete tiles. - void updateTiles(const UpdateParameters&) final; + void updateTiles(const TileParameters&) final; // Removes all tiles (by putting them into the cache). void removeTiles() final; diff --git a/src/mbgl/renderer/update_parameters.hpp b/src/mbgl/renderer/tile_parameters.hpp similarity index 63% rename from src/mbgl/renderer/update_parameters.hpp rename to src/mbgl/renderer/tile_parameters.hpp index a00e01b97..8f04baaec 100644 --- a/src/mbgl/renderer/update_parameters.hpp +++ b/src/mbgl/renderer/tile_parameters.hpp @@ -13,16 +13,16 @@ namespace style { class Style; } // namespace style -class UpdateParameters { +class TileParameters { public: - UpdateParameters(float pixelRatio_, - MapDebugOptions debugOptions_, - const TransformState& transformState_, - Scheduler& workerScheduler_, - FileSource& fileSource_, - const MapMode mode_, - AnnotationManager& annotationManager_, - style::Style& style_) + TileParameters(float pixelRatio_, + MapDebugOptions debugOptions_, + const TransformState& transformState_, + Scheduler& workerScheduler_, + FileSource& fileSource_, + const MapMode mode_, + AnnotationManager& annotationManager_, + style::Style& style_) : pixelRatio(pixelRatio_), debugOptions(debugOptions_), transformState(transformState_), diff --git a/src/mbgl/renderer/tile_pyramid.cpp b/src/mbgl/renderer/tile_pyramid.cpp index 97f9f3193..144afcb4f 100644 --- a/src/mbgl/renderer/tile_pyramid.cpp +++ b/src/mbgl/renderer/tile_pyramid.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include @@ -67,7 +67,7 @@ std::map& TilePyramid::getRenderTiles() { return renderTiles; } -void TilePyramid::updateTiles(const UpdateParameters& parameters, +void TilePyramid::updateTiles(const TileParameters& parameters, const SourceType type, const uint16_t tileSize, const Range zoomRange, diff --git a/src/mbgl/renderer/tile_pyramid.hpp b/src/mbgl/renderer/tile_pyramid.hpp index b8ffbfb2b..b51c5342d 100644 --- a/src/mbgl/renderer/tile_pyramid.hpp +++ b/src/mbgl/renderer/tile_pyramid.hpp @@ -22,7 +22,7 @@ class TransformState; class RenderTile; class RenderedQueryOptions; class SourceQueryOptions; -class UpdateParameters; +class TileParameters; class TilePyramid { public: @@ -33,7 +33,7 @@ public: // Called when the camera has changed. May load new tiles, unload obsolete tiles, or // trigger re-placement of existing complete tiles. - void updateTiles(const UpdateParameters&, + void updateTiles(const TileParameters&, SourceType type, uint16_t tileSize, Range zoomRange, diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 7f21d81b0..5180f440c 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -327,7 +327,7 @@ double Style::getDefaultPitch() const { return defaultPitch; } -void Style::updateTiles(const UpdateParameters& parameters) { +void Style::updateTiles(const TileParameters& parameters) { for (const auto& renderSource : renderSources) { if (renderSource->enabled) { renderSource->updateTiles(parameters); diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index c7528483e..e07a4fda7 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -36,7 +36,7 @@ class RenderedQueryOptions; class Scheduler; class RenderLayer; class RenderSource; -class UpdateParameters; +class TileParameters; namespace style { @@ -61,7 +61,7 @@ public: // Fetch the tiles needed by the current viewport and emit a signal when // a tile is ready so observers can render the tile. - void updateTiles(const UpdateParameters&); + void updateTiles(const TileParameters&); void relayout(); void cascade(const TimePoint&, MapMode); diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp index 21c29f3eb..3c4939a0a 100644 --- a/src/mbgl/tile/geojson_tile.cpp +++ b/src/mbgl/tile/geojson_tile.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include @@ -84,7 +84,7 @@ public: GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID, std::string sourceID_, - const UpdateParameters& parameters, + const TileParameters& parameters, mapbox::geometry::feature_collection features) : GeometryTile(overscaledTileID, sourceID_, parameters, *parameters.style.glyphAtlas, diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp index 8bb0cb01b..d8a0a379d 100644 --- a/src/mbgl/tile/geojson_tile.hpp +++ b/src/mbgl/tile/geojson_tile.hpp @@ -5,13 +5,13 @@ namespace mbgl { -class UpdateParameters; +class TileParameters; class GeoJSONTile : public GeometryTile { public: GeoJSONTile(const OverscaledTileID&, std::string sourceID, - const UpdateParameters&, + const TileParameters&, mapbox::geometry::feature_collection); void updateData(mapbox::geometry::feature_collection); diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index e995347f7..a8eda3828 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include @@ -28,7 +28,7 @@ using namespace style; GeometryTile::GeometryTile(const OverscaledTileID& id_, std::string sourceID_, - const UpdateParameters& parameters, + const TileParameters& parameters, GlyphAtlas& glyphAtlas_, SpriteAtlas& spriteAtlas_) : Tile(id_), diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index c54e48a5b..594952d32 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -20,7 +20,7 @@ class FeatureIndex; class CollisionTile; class RenderLayer; class SourceQueryOptions; -class UpdateParameters; +class TileParameters; namespace style { class Style; @@ -30,7 +30,7 @@ class GeometryTile : public Tile, public GlyphRequestor, IconRequestor { public: GeometryTile(const OverscaledTileID&, std::string sourceID, - const UpdateParameters&, + const TileParameters&, GlyphAtlas&, SpriteAtlas&); diff --git a/src/mbgl/tile/raster_tile.cpp b/src/mbgl/tile/raster_tile.cpp index d670a142f..b1a901e56 100644 --- a/src/mbgl/tile/raster_tile.cpp +++ b/src/mbgl/tile/raster_tile.cpp @@ -6,14 +6,14 @@ #include #include #include -#include +#include #include #include namespace mbgl { RasterTile::RasterTile(const OverscaledTileID& id_, - const UpdateParameters& parameters, + const TileParameters& parameters, const Tileset& tileset) : Tile(id_), loader(*this, id_, parameters, tileset), diff --git a/src/mbgl/tile/raster_tile.hpp b/src/mbgl/tile/raster_tile.hpp index c2ece70ab..e04743048 100644 --- a/src/mbgl/tile/raster_tile.hpp +++ b/src/mbgl/tile/raster_tile.hpp @@ -8,7 +8,7 @@ namespace mbgl { class Tileset; -class UpdateParameters; +class TileParameters; namespace style { class Layer; @@ -17,7 +17,7 @@ class Layer; class RasterTile : public Tile { public: RasterTile(const OverscaledTileID&, - const UpdateParameters&, + const TileParameters&, const Tileset&); ~RasterTile() final; diff --git a/src/mbgl/tile/tile_loader.hpp b/src/mbgl/tile/tile_loader.hpp index 125f82f0f..bc408ebaf 100644 --- a/src/mbgl/tile/tile_loader.hpp +++ b/src/mbgl/tile/tile_loader.hpp @@ -10,14 +10,14 @@ class FileSource; class AsyncRequest; class Response; class Tileset; -class UpdateParameters; +class TileParameters; template class TileLoader : private util::noncopyable { public: TileLoader(T&, const OverscaledTileID&, - const UpdateParameters&, + const TileParameters&, const Tileset&); ~TileLoader(); diff --git a/src/mbgl/tile/tile_loader_impl.hpp b/src/mbgl/tile/tile_loader_impl.hpp index 7d7839f80..899cbaf9b 100644 --- a/src/mbgl/tile/tile_loader_impl.hpp +++ b/src/mbgl/tile/tile_loader_impl.hpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include @@ -12,7 +12,7 @@ namespace mbgl { template TileLoader::TileLoader(T& tile_, const OverscaledTileID& id, - const UpdateParameters& parameters, + const TileParameters& parameters, const Tileset& tileset) : tile(tile_), necessity(Necessity::Optional), diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp index d43ab7400..46914e5f5 100644 --- a/src/mbgl/tile/vector_tile.cpp +++ b/src/mbgl/tile/vector_tile.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include @@ -83,7 +83,7 @@ private: VectorTile::VectorTile(const OverscaledTileID& id_, std::string sourceID_, - const UpdateParameters& parameters, + const TileParameters& parameters, const Tileset& tileset) : GeometryTile(id_, sourceID_, parameters, *parameters.style.glyphAtlas, diff --git a/src/mbgl/tile/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp index 175b71c21..566cde4f3 100644 --- a/src/mbgl/tile/vector_tile.hpp +++ b/src/mbgl/tile/vector_tile.hpp @@ -6,13 +6,13 @@ namespace mbgl { class Tileset; -class UpdateParameters; +class TileParameters; class VectorTile : public GeometryTile { public: VectorTile(const OverscaledTileID&, std::string sourceID, - const UpdateParameters&, + const TileParameters&, const Tileset&); void setNecessity(Necessity) final; diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp index a651fd896..c60a47358 100644 --- a/test/style/source.test.cpp +++ b/test/style/source.test.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -23,7 +24,6 @@ #include #include -#include #include #include #include @@ -46,7 +46,7 @@ public: AnnotationManager annotationManager { 1.0 }; style::Style style { threadPool, fileSource, 1.0 }; - UpdateParameters updateParameters { + TileParameters tileParameters { 1.0, MapDebugOptions(), transformState, @@ -150,7 +150,7 @@ TEST(Source, RasterTileEmpty) { RenderRasterSource renderSource(*source.impl); renderSource.setObserver(&test.renderSourceObserver); - renderSource.updateTiles(test.updateParameters); + renderSource.updateTiles(test.tileParameters); test.run(); } @@ -181,7 +181,7 @@ TEST(Source, VectorTileEmpty) { RenderVectorSource renderSource(*source.impl); renderSource.setObserver(&test.renderSourceObserver); - renderSource.updateTiles(test.updateParameters); + renderSource.updateTiles(test.tileParameters); test.run(); } @@ -212,7 +212,7 @@ TEST(Source, RasterTileFail) { RenderRasterSource renderSource(*source.impl); renderSource.setObserver(&test.renderSourceObserver); - renderSource.updateTiles(test.updateParameters); + renderSource.updateTiles(test.tileParameters); test.run(); } @@ -243,7 +243,7 @@ TEST(Source, VectorTileFail) { RenderVectorSource renderSource(*source.impl); renderSource.setObserver(&test.renderSourceObserver); - renderSource.updateTiles(test.updateParameters); + renderSource.updateTiles(test.tileParameters); test.run(); } @@ -273,7 +273,7 @@ TEST(Source, RasterTileCorrupt) { RenderRasterSource renderSource(*source.impl); renderSource.setObserver(&test.renderSourceObserver); - renderSource.updateTiles(test.updateParameters); + renderSource.updateTiles(test.tileParameters); test.run(); } @@ -307,7 +307,7 @@ TEST(Source, VectorTileCorrupt) { RenderVectorSource renderSource(*source.impl); renderSource.setObserver(&test.renderSourceObserver); - renderSource.updateTiles(test.updateParameters); + renderSource.updateTiles(test.tileParameters); test.run(); } @@ -336,7 +336,7 @@ TEST(Source, RasterTileCancel) { RenderRasterSource renderSource(*source.impl); renderSource.setObserver(&test.renderSourceObserver); - renderSource.updateTiles(test.updateParameters); + renderSource.updateTiles(test.tileParameters); test.run(); } @@ -365,7 +365,7 @@ TEST(Source, VectorTileCancel) { RenderVectorSource renderSource(*source.impl); renderSource.setObserver(&test.renderSourceObserver); - renderSource.updateTiles(test.updateParameters); + renderSource.updateTiles(test.tileParameters); test.run(); } @@ -402,7 +402,7 @@ TEST(Source, RasterTileAttribution) { source.baseImpl->loadDescription(test.fileSource); RenderRasterSource renderSource(*source.impl); - renderSource.updateTiles(test.updateParameters); + renderSource.updateTiles(test.tileParameters); test.run(); } diff --git a/test/tile/annotation_tile.test.cpp b/test/tile/annotation_tile.test.cpp index 64d2c8f1f..4d71c5b0b 100644 --- a/test/tile/annotation_tile.test.cpp +++ b/test/tile/annotation_tile.test.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include @@ -26,7 +26,7 @@ public: AnnotationManager annotationManager { 1.0 }; style::Style style { threadPool, fileSource, 1.0 }; - UpdateParameters updateParameters { + TileParameters tileParameters { 1.0, MapDebugOptions(), transformState, @@ -41,7 +41,7 @@ public: // Don't query stale collision tile TEST(AnnotationTile, Issue8289) { AnnotationTileTest test; - AnnotationTile tile(OverscaledTileID(0, 0, 0), test.updateParameters); + AnnotationTile tile(OverscaledTileID(0, 0, 0), test.tileParameters); auto data = std::make_unique(); data->layers.emplace("test", AnnotationTileLayer("test")); diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp index 5d3a28c26..a0383f06c 100644 --- a/test/tile/geojson_tile.test.cpp +++ b/test/tile/geojson_tile.test.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include @@ -27,7 +27,7 @@ public: style::Style style { threadPool, fileSource, 1.0 }; Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" }; - UpdateParameters updateParameters { + TileParameters tileParameters { 1.0, MapDebugOptions(), transformState, @@ -49,7 +49,7 @@ TEST(GeoJSONTile, Issue7648) { mapbox::geometry::point(0, 0) }); - GeoJSONTile tile(OverscaledTileID(0, 0, 0), "source", test.updateParameters, features); + GeoJSONTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, features); StubTileObserver observer; observer.tileChanged = [&] (const Tile&) { diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp index 5543c3c56..f841a82e6 100644 --- a/test/tile/raster_tile.test.cpp +++ b/test/tile/raster_tile.test.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include using namespace mbgl; @@ -23,7 +23,7 @@ public: style::Style style { threadPool, fileSource, 1.0 }; Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" }; - UpdateParameters updateParameters { + TileParameters tileParameters { 1.0, MapDebugOptions(), transformState, @@ -37,7 +37,7 @@ public: TEST(RasterTile, setError) { RasterTileTest test; - RasterTile tile(OverscaledTileID(0, 0, 0), test.updateParameters, test.tileset); + RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset); tile.setError(std::make_exception_ptr(std::runtime_error("test"))); EXPECT_FALSE(tile.isRenderable()); EXPECT_TRUE(tile.isLoaded()); @@ -46,7 +46,7 @@ TEST(RasterTile, setError) { TEST(RasterTile, onError) { RasterTileTest test; - RasterTile tile(OverscaledTileID(0, 0, 0), test.updateParameters, test.tileset); + RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset); tile.onError(std::make_exception_ptr(std::runtime_error("test"))); EXPECT_FALSE(tile.isRenderable()); EXPECT_TRUE(tile.isLoaded()); @@ -55,7 +55,7 @@ TEST(RasterTile, onError) { TEST(RasterTile, onParsed) { RasterTileTest test; - RasterTile tile(OverscaledTileID(0, 0, 0), test.updateParameters, test.tileset); + RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset); tile.onParsed(std::make_unique(UnassociatedImage{})); EXPECT_TRUE(tile.isRenderable()); EXPECT_TRUE(tile.isLoaded()); @@ -64,7 +64,7 @@ TEST(RasterTile, onParsed) { TEST(RasterTile, onParsedEmpty) { RasterTileTest test; - RasterTile tile(OverscaledTileID(0, 0, 0), test.updateParameters, test.tileset); + RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset); tile.onParsed(nullptr); EXPECT_FALSE(tile.isRenderable()); EXPECT_TRUE(tile.isLoaded()); diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp index 244892f22..37bfe8512 100644 --- a/test/tile/vector_tile.test.cpp +++ b/test/tile/vector_tile.test.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include @@ -29,7 +29,7 @@ public: style::Style style { threadPool, fileSource, 1.0 }; Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" }; - UpdateParameters updateParameters { + TileParameters tileParameters { 1.0, MapDebugOptions(), transformState, @@ -43,7 +43,7 @@ public: TEST(VectorTile, setError) { VectorTileTest test; - VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.updateParameters, test.tileset); + VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset); tile.setError(std::make_exception_ptr(std::runtime_error("test"))); EXPECT_FALSE(tile.isRenderable()); EXPECT_TRUE(tile.isLoaded()); @@ -52,7 +52,7 @@ TEST(VectorTile, setError) { TEST(VectorTile, onError) { VectorTileTest test; - VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.updateParameters, test.tileset); + VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset); tile.onError(std::make_exception_ptr(std::runtime_error("test"))); EXPECT_FALSE(tile.isRenderable()); EXPECT_TRUE(tile.isLoaded()); @@ -61,7 +61,7 @@ TEST(VectorTile, onError) { TEST(VectorTile, Issue7615) { VectorTileTest test; - VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.updateParameters, test.tileset); + VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset); style::SymbolLayer symbolLayer("symbol", "source"); auto symbolBucket = std::make_shared( @@ -94,7 +94,7 @@ TEST(VectorTile, Issue7615) { TEST(VectorTile, Issue8542) { VectorTileTest test; - VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.updateParameters, test.tileset); + VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset); // Query before data is set std::vector result;