[core] Custom Geometry Sources

4 files changed, 238 insertions, 0 deletions

diff --git a/test/api/custom_geometry_source.test.cpp b/test/api/custom_geometry_source.test.cpp
new file mode 100644
index 0000000000..83d1543a0a
--- /dev/null
+++ b/test/api/custom_geometry_source.test.cpp
@@ -0,0 +1,71 @@
+#include <mbgl/test/util.hpp>
+
+#include <mbgl/gl/gl.hpp>
+#include <mbgl/map/map.hpp>
+#include <mbgl/util/shared_thread_pool.hpp>
+#include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/gl/headless_frontend.hpp>
+#include <mbgl/style/style.hpp>
+#include <mbgl/style/sources/custom_geometry_source.hpp>
+#include <mbgl/style/layers/fill_layer.hpp>
+#include <mbgl/style/layers/line_layer.hpp>
+#include <mbgl/util/geojson.hpp>
+#include <mbgl/util/io.hpp>
+#include <mbgl/util/mat4.hpp>
+#include <mbgl/util/run_loop.hpp>
+
+using namespace mbgl;
+using namespace mbgl::style;
+
+TEST(CustomGeometrySource, Grid) {
+    util::RunLoop loop;
+
+    DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets");
+    auto threadPool = sharedThreadPool();
+    float pixelRatio { 1 };
+    HeadlessFrontend frontend { pixelRatio, fileSource, *threadPool };
+    Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio, fileSource,
+            *threadPool, MapMode::Static);
+    map.getStyle().loadJSON(util::read_file("test/fixtures/api/water.json"));
+    map.setLatLngZoom({ 37.8, -122.5 }, 10);
+
+    CustomGeometrySource::Options options;
+    options.fetchTileFunction = [&map](const mbgl::CanonicalTileID& tileID) {
+        double gridSpacing = 0.1;
+        FeatureCollection features;
+        const LatLngBounds bounds(tileID);
+        for (double y = ceil(bounds.north() / gridSpacing) * gridSpacing; y >= floor(bounds.south() / gridSpacing) * gridSpacing; y -= gridSpacing) {
+
+            mapbox::geojson::line_string gridLine;
+            gridLine.emplace_back(bounds.west(), y);
+            gridLine.emplace_back(bounds.east(), y);
+
+            features.emplace_back(gridLine);
+        }
+
+        for (double x = floor(bounds.west() / gridSpacing) * gridSpacing; x <= ceil(bounds.east() / gridSpacing) * gridSpacing; x += gridSpacing) {
+            mapbox::geojson::line_string gridLine;
+            gridLine.emplace_back(x, bounds.south());
+            gridLine.emplace_back(x, bounds.north());
+            
+            features.emplace_back(gridLine);
+        }
+        auto source = static_cast<CustomGeometrySource *>(map.getStyle().getSource("custom"));
+        if (source) {
+            source->setTileData(tileID, features);
+        }
+    };
+
+    map.getStyle().addSource(std::make_unique<CustomGeometrySource>("custom", options));
+
+    auto fillLayer = std::make_unique<FillLayer>("landcover", "mapbox");
+    fillLayer->setSourceLayer("landcover");
+    fillLayer->setFillColor(Color{ 1.0, 1.0, 0.0, 1.0 });
+    map.getStyle().addLayer(std::move(fillLayer));
+
+    auto layer = std::make_unique<LineLayer>("grid", "custom");
+    layer->setLineColor(Color{ 1.0, 1.0, 1.0, 1.0 });
+    map.getStyle().addLayer(std::move(layer));
+
+    test::checkImage("test/fixtures/custom_geometry_source/grid", frontend.render(map), 0.0006, 0.1);
+}
diff --git a/test/fixtures/custom_geometry_source/grid/expected.png b/test/fixtures/custom_geometry_source/grid/expected.png
new file mode 100644
index 0000000000..628a3b11fb
--- /dev/null
+++ b/test/fixtures/custom_geometry_source/grid/expected.png
diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp
index bee1b867b8..6a2122161d 100644
--- a/test/style/source.test.cpp
+++ b/test/style/source.test.cpp
@@ -9,6 +9,7 @@
 #include <mbgl/style/sources/vector_source.hpp>
 #include <mbgl/style/sources/geojson_source.hpp>
 #include <mbgl/style/sources/image_source.hpp>
+#include <mbgl/style/sources/custom_geometry_source.hpp>
 #include <mbgl/style/layers/raster_layer.cpp>
 #include <mbgl/style/layers/line_layer.hpp>
 
@@ -548,3 +549,39 @@ TEST(Source, ImageSourceImageUpdate) {
 
     test.run();
 }
+
+TEST(Source, CustomGeometrySourceSetTileData) {
+    SourceTest test;
+
+    CustomGeometrySource source("source", CustomGeometrySource::Options());
+    source.loadDescription(test.fileSource);
+
+    LineLayer layer("id", "source");
+    layer.setSourceLayer("water");
+    std::vector<Immutable<Layer::Impl>> layers {{ layer.baseImpl }};
+
+    test.renderSourceObserver.tileChanged = [&] (RenderSource& source_, const OverscaledTileID&) {
+        EXPECT_EQ("source", source_.baseImpl->id);
+        test.end();
+    };
+
+    test.renderSourceObserver.tileError = [&] (RenderSource&, const OverscaledTileID&, std::exception_ptr) {
+        FAIL() << "Should never be called";
+    };
+
+    auto renderSource = RenderSource::create(source.baseImpl);
+    renderSource->setObserver(&test.renderSourceObserver);
+    renderSource->update(source.baseImpl,
+                         layers,
+                         true,
+                         true,
+                         test.tileParameters);
+
+    test.loop.invoke([&] () {
+        // Set Tile Data
+        source.setTileData(CanonicalTileID(0, 0, 0), GeoJSON{ FeatureCollection{} });
+    });
+
+    test.run();
+}
+
diff --git a/test/tile/custom_geometry_tile.test.cpp b/test/tile/custom_geometry_tile.test.cpp
new file mode 100644
index 0000000000..21a3dd7953
--- /dev/null
+++ b/test/tile/custom_geometry_tile.test.cpp
@@ -0,0 +1,130 @@
+#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/default_thread_pool.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/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:
+    FakeFileSource fileSource;
+    TransformState transformState;
+    util::RunLoop loop;
+    ThreadPool threadPool { 1 };
+    style::Style style { loop, fileSource, 1 };
+    AnnotationManager annotationManager { style };
+    ImageManager imageManager;
+    GlyphManager glyphManager { fileSource };
+
+    TileParameters tileParameters {
+        1.0,
+        MapDebugOptions(),
+        transformState,
+        threadPool,
+        fileSource,
+        MapMode::Continuous,
+        annotationManager,
+        imageManager,
+        glyphManager,
+        0
+    };
+};
+
+TEST(CustomGeometryTile, InvokeFetchTile) {
+    CustomTileTest test;
+
+    CircleLayer layer("circle", "source");
+
+    mapbox::geometry::feature_collection<double> features;
+    features.push_back(mapbox::geometry::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::geometry::feature_collection<double> features;
+    features.push_back(mapbox::geometry::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::geometry::feature_collection<double> features;
+    features.push_back(mapbox::geometry::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);
+
+    StubTileObserver observer;
+    observer.tileChanged = [&] (const Tile&) {
+        // Once present, the bucket should never "disappear", which would cause
+        // flickering.
+        ASSERT_NE(nullptr, tile.getBucket(*layer.baseImpl));
+    };
+
+    tile.setLayers({{ layer.baseImpl }});
+    tile.setObserver(&observer);
+    tile.setTileData(features);
+
+    while (!tile.isComplete()) {
+        test.loop.runOnce();
+    }
+}