diff options
Diffstat (limited to 'test/tile')
-rw-r--r-- | test/tile/custom_geometry_tile.test.cpp | 5 | ||||
-rw-r--r-- | test/tile/geojson_tile.test.cpp | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/test/tile/custom_geometry_tile.test.cpp b/test/tile/custom_geometry_tile.test.cpp index dc6aaab1ac..7a627bad88 100644 --- a/test/tile/custom_geometry_tile.test.cpp +++ b/test/tile/custom_geometry_tile.test.cpp @@ -11,6 +11,7 @@ #include <mbgl/renderer/tile_parameters.hpp> #include <mbgl/style/style.hpp> #include <mbgl/style/layers/circle_layer.hpp> +#include <mbgl/style/layers/circle_layer_impl.hpp> #include <mbgl/annotation/annotation_manager.hpp> #include <mbgl/renderer/image_manager.hpp> #include <mbgl/text/glyph_manager.hpp> @@ -120,7 +121,9 @@ TEST(CustomGeometryTile, InvokeTileChanged) { ASSERT_NE(nullptr, tile.getBucket(*layer.baseImpl)); }; - tile.setLayers({{ layer.baseImpl }}); + Immutable<LayerProperties> layerProperties = makeMutable<CircleLayerProperties>(staticImmutableCast<CircleLayer::Impl>(layer.baseImpl)); + std::vector<Immutable<LayerProperties>> layers { layerProperties }; + tile.setLayers(layers); tile.setObserver(&observer); tile.setTileData(features); diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp index fb5f3ca6d7..772590efb2 100644 --- a/test/tile/geojson_tile.test.cpp +++ b/test/tile/geojson_tile.test.cpp @@ -10,6 +10,7 @@ #include <mbgl/renderer/tile_parameters.hpp> #include <mbgl/style/style.hpp> #include <mbgl/style/layers/circle_layer.hpp> +#include <mbgl/style/layers/circle_layer_impl.hpp> #include <mbgl/annotation/annotation_manager.hpp> #include <mbgl/renderer/image_manager.hpp> #include <mbgl/text/glyph_manager.hpp> @@ -61,8 +62,9 @@ TEST(GeoJSONTile, Issue7648) { // flickering. ASSERT_NE(nullptr, tile.getBucket(*layer.baseImpl)); }; - - tile.setLayers({{ layer.baseImpl }}); + Immutable<LayerProperties> layerProperties = makeMutable<CircleLayerProperties>(staticImmutableCast<CircleLayer::Impl>(layer.baseImpl)); + std::vector<Immutable<LayerProperties>> layers { layerProperties }; + tile.setLayers(layers); tile.setObserver(&observer); while (!tile.isComplete()) { @@ -87,7 +89,9 @@ TEST(GeoJSONTile, Issue9927) { GeoJSONTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, features); - tile.setLayers({{ layer.baseImpl }}); + Immutable<LayerProperties> layerProperties = makeMutable<CircleLayerProperties>(staticImmutableCast<CircleLayer::Impl>(layer.baseImpl)); + std::vector<Immutable<LayerProperties>> layers { layerProperties }; + tile.setLayers(layers); while (!tile.isComplete()) { test.loop.runOnce(); |