summaryrefslogtreecommitdiff
path: root/test/tile
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-04-27 15:05:11 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-05-04 07:29:08 -0700
commit89f1ffc6d29d5631dfd322834397ec2247c5c9d7 (patch)
tree277bd6ca61cbecaa9c659273992da2abbe9a431e /test/tile
parent806da5d940aed7021f921ab98b9ae8e4e364f732 (diff)
downloadqtlocation-mapboxgl-89f1ffc6d29d5631dfd322834397ec2247c5c9d7.tar.gz
[core] UpdateParameters ⇢ TileParameters
Diffstat (limited to 'test/tile')
-rw-r--r--test/tile/annotation_tile.test.cpp6
-rw-r--r--test/tile/geojson_tile.test.cpp6
-rw-r--r--test/tile/raster_tile.test.cpp12
-rw-r--r--test/tile/vector_tile.test.cpp12
4 files changed, 18 insertions, 18 deletions
diff --git a/test/tile/annotation_tile.test.cpp b/test/tile/annotation_tile.test.cpp
index 64d2c8f1f5..4d71c5b0b4 100644
--- a/test/tile/annotation_tile.test.cpp
+++ b/test/tile/annotation_tile.test.cpp
@@ -6,7 +6,7 @@
#include <mbgl/map/transform.hpp>
#include <mbgl/map/query.hpp>
#include <mbgl/style/style.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
#include <mbgl/map/query.hpp>
#include <mbgl/text/collision_tile.hpp>
#include <mbgl/geometry/feature_index.hpp>
@@ -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<AnnotationTileData>();
data->layers.emplace("test", AnnotationTileLayer("test"));
diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp
index 5d3a28c261..a0383f06c9 100644
--- a/test/tile/geojson_tile.test.cpp
+++ b/test/tile/geojson_tile.test.cpp
@@ -8,7 +8,7 @@
#include <mbgl/util/run_loop.hpp>
#include <mbgl/map/transform.hpp>
#include <mbgl/style/style.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
#include <mbgl/style/layers/circle_layer.hpp>
#include <mbgl/annotation/annotation_manager.hpp>
@@ -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<int16_t>(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 5543c3c56f..f841a82e68 100644
--- a/test/tile/raster_tile.test.cpp
+++ b/test/tile/raster_tile.test.cpp
@@ -8,7 +8,7 @@
#include <mbgl/map/transform.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/annotation/annotation_manager.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
#include <mbgl/renderer/raster_bucket.hpp>
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<RasterBucket>(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 244892f220..37bfe8512d 100644
--- a/test/tile/vector_tile.test.cpp
+++ b/test/tile/vector_tile.test.cpp
@@ -9,7 +9,7 @@
#include <mbgl/map/query.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/style/layers/symbol_layer.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
#include <mbgl/renderer/symbol_bucket.hpp>
#include <mbgl/text/collision_tile.hpp>
#include <mbgl/geometry/feature_index.hpp>
@@ -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<SymbolBucket>(
@@ -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<Feature> result;