f659aa4eda
Previously, when we started a worker operation that eventually throws an exception (e.g. due to the tile not being parseable), and then enqueue another worker operation while the first one is processing, we treated the worker as idle once the first operation's error callback fired, even though the second operation was still in progress. Due to our use of coalescing, I was unable to come up with a reliable test since we'd need to reproduce the behavior described above, which is timing dependent.
110 lines
3.3 KiB
C++
110 lines
3.3 KiB
C++
#include <mbgl/test/util.hpp>
|
|
#include <mbgl/test/fake_file_source.hpp>
|
|
#include <mbgl/tile/vector_tile.hpp>
|
|
#include <mbgl/tile/tile_loader_impl.hpp>
|
|
|
|
#include <mbgl/util/default_thread_pool.hpp>
|
|
#include <mbgl/util/run_loop.hpp>
|
|
#include <mbgl/map/transform.hpp>
|
|
#include <mbgl/style/style.hpp>
|
|
#include <mbgl/style/layers/symbol_layer.hpp>
|
|
#include <mbgl/renderer/tile_parameters.hpp>
|
|
#include <mbgl/renderer/buckets/symbol_bucket.hpp>
|
|
#include <mbgl/renderer/query.hpp>
|
|
#include <mbgl/text/collision_tile.hpp>
|
|
#include <mbgl/geometry/feature_index.hpp>
|
|
#include <mbgl/annotation/annotation_manager.hpp>
|
|
#include <mbgl/renderer/image_manager.hpp>
|
|
#include <mbgl/text/glyph_manager.hpp>
|
|
|
|
#include <memory>
|
|
|
|
using namespace mbgl;
|
|
|
|
class VectorTileTest {
|
|
public:
|
|
FakeFileSource fileSource;
|
|
TransformState transformState;
|
|
util::RunLoop loop;
|
|
ThreadPool threadPool { 1 };
|
|
style::Style style { loop, fileSource, 1 };
|
|
AnnotationManager annotationManager { style };
|
|
ImageManager imageManager;
|
|
GlyphManager glyphManager { fileSource };
|
|
Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
|
|
|
|
TileParameters tileParameters {
|
|
1.0,
|
|
MapDebugOptions(),
|
|
transformState,
|
|
threadPool,
|
|
fileSource,
|
|
MapMode::Continuous,
|
|
annotationManager,
|
|
imageManager,
|
|
glyphManager,
|
|
0
|
|
};
|
|
};
|
|
|
|
TEST(VectorTile, setError) {
|
|
VectorTileTest test;
|
|
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());
|
|
EXPECT_TRUE(tile.isComplete());
|
|
}
|
|
|
|
TEST(VectorTile, onError) {
|
|
VectorTileTest test;
|
|
VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset);
|
|
tile.onError(std::make_exception_ptr(std::runtime_error("test")), 0);
|
|
|
|
EXPECT_FALSE(tile.isRenderable());
|
|
EXPECT_TRUE(tile.isLoaded());
|
|
EXPECT_TRUE(tile.isComplete());
|
|
}
|
|
|
|
TEST(VectorTile, Issue7615) {
|
|
VectorTileTest test;
|
|
VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset);
|
|
|
|
style::SymbolLayer symbolLayer("symbol", "source");
|
|
auto symbolBucket = std::make_shared<SymbolBucket>(
|
|
style::SymbolLayoutProperties::PossiblyEvaluated(),
|
|
std::map<
|
|
std::string,
|
|
std::pair<style::IconPaintProperties::PossiblyEvaluated, style::TextPaintProperties::PossiblyEvaluated>>(),
|
|
16.0f, 1.0f, 0.0f, false, false);
|
|
|
|
// Simulate placement of a symbol layer.
|
|
tile.onPlacement(GeometryTile::PlacementResult {
|
|
{{
|
|
symbolLayer.getID(),
|
|
symbolBucket
|
|
}},
|
|
nullptr,
|
|
{},
|
|
{},
|
|
}, 0);
|
|
|
|
// Subsequent onLayout should not cause the existing symbol bucket to be discarded.
|
|
tile.onLayout(GeometryTile::LayoutResult {
|
|
std::unordered_map<std::string, std::shared_ptr<Bucket>>(),
|
|
nullptr,
|
|
nullptr,
|
|
}, 0);
|
|
|
|
EXPECT_EQ(symbolBucket.get(), tile.getBucket(*symbolLayer.baseImpl));
|
|
}
|
|
|
|
TEST(VectorTile, Issue8542) {
|
|
VectorTileTest test;
|
|
VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset);
|
|
|
|
// Query before data is set
|
|
std::vector<Feature> result;
|
|
tile.querySourceFeatures(result, { { {"layer"} }, {} });
|
|
}
|