* [core] Introduce FileSourceManager and use it for default platform impl
- Add `FileSourceManager` interface that provides access to `FileSource`
instances and means of registering / unregistering `FileSource` factories
- Split `DefaultFileSource` into smaller parts
- Add `DatabaseFileSource` interface and it's default implementation
- Remove inter-dependencies between concrete `FileSource` classes
* [build] Add files to next build system
* [core] Add generic property setters / getters
* [core] Remove setOnlineStatus from OnlineFileSource interface
* [core] Hide threading implementation details from DatabaseFileSource interface
* [core] Make DB file source methods virtual
* [core] Add documentation for DatabaseFileSource and rename one method
* [core] Use simple callback instead of ActorRef
* [core] Remove ActorRef from OnlineFileSource public header
* [core] Add callback to FileSource::forward async API
* [core] Pass OfflineRegionDefinition by value
* [core] Update tests to use modular file sources
* [core] Update unit tests
* [core] Update unit tests after rebase
* [core] Backport low prio fix for cached requests
* [core] Backport pack database
* [core] Return removed factory from unRegisterFileSourceFactory
* [core] Rename shadowed args in onlinefilesource
* [core] Remove simple std::function callback aliases
* [core] Expose online file source property keys in public header file
* [test-runner] Add proxy file source test runner
* [cache] Update mbgl-cache utility to use new file source
* [metrics] Rebaseline binary size metrics
* [offline] Update offline utility
* [core] Update changelog
131 lines
4.1 KiB
C++
131 lines
4.1 KiB
C++
#include <mbgl/test/util.hpp>
|
|
#include <mbgl/test/fake_file_source.hpp>
|
|
#include <mbgl/test/stub_tile_observer.hpp>
|
|
#include <mbgl/style/sources/custom_geometry_source.hpp>
|
|
#include <mbgl/tile/custom_geometry_tile.hpp>
|
|
#include <mbgl/style/custom_tile_loader.hpp>
|
|
|
|
#include <mbgl/util/run_loop.hpp>
|
|
#include <mbgl/map/transform.hpp>
|
|
#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>
|
|
|
|
#include <memory>
|
|
|
|
using namespace mbgl;
|
|
using namespace mbgl::style;
|
|
|
|
class CustomTileTest {
|
|
public:
|
|
std::shared_ptr<FileSource> fileSource = std::make_shared<FakeFileSource>();
|
|
TransformState transformState;
|
|
util::RunLoop loop;
|
|
style::Style style{fileSource, 1};
|
|
AnnotationManager annotationManager { style };
|
|
ImageManager imageManager;
|
|
GlyphManager glyphManager;
|
|
|
|
TileParameters tileParameters {
|
|
1.0,
|
|
MapDebugOptions(),
|
|
transformState,
|
|
fileSource,
|
|
MapMode::Continuous,
|
|
annotationManager,
|
|
imageManager,
|
|
glyphManager,
|
|
0
|
|
};
|
|
};
|
|
|
|
TEST(CustomGeometryTile, InvokeFetchTile) {
|
|
CustomTileTest test;
|
|
|
|
CircleLayer layer("circle", "source");
|
|
|
|
mapbox::feature::feature_collection<double> features;
|
|
features.push_back(mapbox::feature::feature<double> {
|
|
mapbox::geometry::point<double>(0, 0)
|
|
});
|
|
CustomTileLoader loader([&](const CanonicalTileID& tileId) {
|
|
EXPECT_EQ(tileId, CanonicalTileID(0,0,0));
|
|
test.loop.stop();
|
|
}, [&](const CanonicalTileID&) {
|
|
|
|
});
|
|
auto mb =std::make_shared<Mailbox>(*Scheduler::GetCurrent());
|
|
ActorRef<CustomTileLoader> loaderActor(loader, mb);
|
|
|
|
CustomGeometryTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, CustomGeometrySource::TileOptions(),
|
|
loaderActor);
|
|
|
|
tile.setNecessity(TileNecessity::Required);
|
|
|
|
test.loop.run();
|
|
}
|
|
|
|
TEST(CustomGeometryTile, InvokeCancelTile) {
|
|
CustomTileTest test;
|
|
|
|
CircleLayer layer("circle", "source");
|
|
|
|
mapbox::feature::feature_collection<double> features;
|
|
features.push_back(mapbox::feature::feature<double> {
|
|
mapbox::geometry::point<double>(0, 0)
|
|
});
|
|
|
|
CustomTileLoader loader([&](const CanonicalTileID&) { }, [&](const CanonicalTileID& tileId) {
|
|
EXPECT_EQ(tileId, CanonicalTileID(0,0,0));
|
|
test.loop.stop();
|
|
});
|
|
auto mb =std::make_shared<Mailbox>(*Scheduler::GetCurrent());
|
|
ActorRef<CustomTileLoader> loaderActor(loader, mb);
|
|
|
|
CustomGeometryTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, CustomGeometrySource::TileOptions(),
|
|
loaderActor);
|
|
|
|
tile.setNecessity(TileNecessity::Required);
|
|
tile.setNecessity(TileNecessity::Optional);
|
|
test.loop.run();
|
|
}
|
|
|
|
TEST(CustomGeometryTile, InvokeTileChanged) {
|
|
CustomTileTest test;
|
|
|
|
CircleLayer layer("circle", "source");
|
|
|
|
mapbox::feature::feature_collection<double> features;
|
|
features.push_back(mapbox::feature::feature<double> {
|
|
mapbox::geometry::point<double>(0, 0)
|
|
});
|
|
|
|
CustomTileLoader loader(nullptr, nullptr);
|
|
auto mb =std::make_shared<Mailbox>(*Scheduler::GetCurrent());
|
|
ActorRef<CustomTileLoader> loaderActor(loader, mb);
|
|
|
|
CustomGeometryTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, CustomGeometrySource::TileOptions(),
|
|
loaderActor);
|
|
|
|
Immutable<LayerProperties> layerProperties = makeMutable<CircleLayerProperties>(staticImmutableCast<CircleLayer::Impl>(layer.baseImpl));
|
|
StubTileObserver observer;
|
|
observer.tileChanged = [&] (const Tile&) {
|
|
// Once present, the bucket should never "disappear", which would cause
|
|
// flickering.
|
|
ASSERT_TRUE(tile.layerPropertiesUpdated(layerProperties));
|
|
};
|
|
|
|
std::vector<Immutable<LayerProperties>> layers { layerProperties };
|
|
tile.setLayers(layers);
|
|
tile.setObserver(&observer);
|
|
tile.setTileData(features);
|
|
|
|
while (!tile.isComplete()) {
|
|
test.loop.runOnce();
|
|
}
|
|
}
|