WIP: Viewport collision detection port

cmake/core-files.cmake

@@ -167,8 +167,6 @@ set(MBGL_CORE_FILES
     src/mbgl/renderer/cross_faded_property_evaluator.cpp
     src/mbgl/renderer/cross_faded_property_evaluator.hpp
     src/mbgl/renderer/data_driven_property_evaluator.hpp
-    src/mbgl/renderer/frame_history.cpp
-    src/mbgl/renderer/frame_history.hpp
     src/mbgl/renderer/group_by_layout.cpp
     src/mbgl/renderer/group_by_layout.hpp
     src/mbgl/renderer/image_atlas.cpp
@@ -257,6 +255,8 @@ set(MBGL_CORE_FILES
     src/mbgl/shaders/circle.hpp
     src/mbgl/shaders/collision_box.cpp
     src/mbgl/shaders/collision_box.hpp
+    src/mbgl/shaders/collision_circle.cpp
+    src/mbgl/shaders/collision_circle.hpp
     src/mbgl/shaders/debug.cpp
     src/mbgl/shaders/debug.hpp
     src/mbgl/shaders/extrusion_texture.cpp
@@ -477,8 +477,10 @@ set(MBGL_CORE_FILES
     src/mbgl/text/check_max_angle.hpp
     src/mbgl/text/collision_feature.cpp
     src/mbgl/text/collision_feature.hpp
-    src/mbgl/text/collision_tile.cpp
-    src/mbgl/text/collision_tile.hpp
+    src/mbgl/text/collision_index.cpp
+    src/mbgl/text/collision_index.hpp
+    src/mbgl/text/cross_tile_symbol_index.cpp
+    src/mbgl/text/cross_tile_symbol_index.hpp
     src/mbgl/text/get_anchors.cpp
     src/mbgl/text/get_anchors.hpp
     src/mbgl/text/glyph.cpp
@@ -491,7 +493,8 @@ set(MBGL_CORE_FILES
     src/mbgl/text/glyph_pbf.cpp
     src/mbgl/text/glyph_pbf.hpp
     src/mbgl/text/glyph_range.hpp
-    src/mbgl/text/placement_config.hpp
+    src/mbgl/text/placement.cpp
+    src/mbgl/text/placement.hpp
     src/mbgl/text/quads.cpp
     src/mbgl/text/quads.hpp
     src/mbgl/text/shaping.cpp

cmake/test-files.cmake

@@ -111,7 +111,6 @@ set(MBGL_TEST_FILES
     test/text/quads.test.cpp
 
     # tile
-    test/tile/annotation_tile.test.cpp
     test/tile/geojson_tile.test.cpp
     test/tile/geometry_tile_data.test.cpp
     test/tile/raster_tile.test.cpp
@@ -123,6 +122,7 @@ set(MBGL_TEST_FILES
     test/util/async_task.test.cpp
     test/util/dtoa.test.cpp
     test/util/geo.test.cpp
+    test/util/grid_index.test.cpp
     test/util/http_timeout.test.cpp
     test/util/image.test.cpp
     test/util/mapbox.test.cpp

package.json

@@ -14,7 +14,7 @@
   "license": "BSD-2-Clause",
   "dependencies": {
     "nan": "^2.4.0",
-    "node-pre-gyp": "^0.6.37",
+    "node-pre-gyp": "^0.6.38",
     "npm-run-all": "^4.0.2"
   },
   "devDependencies": {

platform/node/test/ignores.json

@@ -1,12 +1,11 @@
 {
+  "query-tests/circle-stroke-width/inside": "https://github.com/mapbox/mapbox-gl-native/issues/10307",
   "query-tests/geometry/multilinestring": "needs investigation",
   "query-tests/geometry/multipolygon": "needs investigation",
   "query-tests/geometry/polygon": "needs investigation",
   "query-tests/regressions/mapbox-gl-js#3534": "https://github.com/mapbox/mapbox-gl-native/issues/8193",
-  "query-tests/regressions/mapbox-gl-js#4417": "https://github.com/mapbox/mapbox-gl-native/issues/8007",
-  "query-tests/symbol-features-in/pitched-screen": "https://github.com/mapbox/mapbox-gl-native/issues/6817",
-  "query-tests/symbol-features-in/tilted-inside": "https://github.com/mapbox/mapbox-gl-native/issues/5056",
-  "query-tests/symbol-features-in/tilted-outside": "https://github.com/mapbox/mapbox-gl-native/issues/9435",
+  "query-tests/symbol/panned-after-insert": "https://github.com/mapbox/mapbox-gl-native/issues/10408",
+  "query-tests/symbol/rotated-after-insert": "https://github.com/mapbox/mapbox-gl-native/issues/10408",
   "query-tests/world-wrapping/box": "skip - needs issue",
   "query-tests/world-wrapping/point": "skip - needs issue",
   "render-tests/debug/collision-overscaled": "https://github.com/mapbox/mapbox-gl-native/issues/3841",
@@ -16,7 +15,6 @@
   "render-tests/debug/tile-overscaled": "https://github.com/mapbox/mapbox-gl-native/issues/3841",
   "render-tests/debug/tile": "https://github.com/mapbox/mapbox-gl-native/issues/3841",
   "render-tests/extent/1024-circle": "needs investigation",
-  "render-tests/extent/1024-symbol": "needs investigation",
   "render-tests/fill-extrusion-pattern/@2x": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
   "render-tests/fill-extrusion-pattern/function-2": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
   "render-tests/fill-extrusion-pattern/function": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
@@ -27,33 +25,58 @@
   "render-tests/geojson/inline-polygon-symbol": "behavior needs reconciliation with gl-js",
   "render-tests/icon-size/composite-function-high-base-plain": "https://github.com/mapbox/mapbox-gl-native/issues/8654",
   "render-tests/icon-size/composite-function-high-base-sdf": "https://github.com/mapbox/mapbox-gl-native/issues/8654",
-  "render-tests/icon-text-fit/both-padding": "https://github.com/mapbox/mapbox-gl-native/issues/5602",
-  "render-tests/icon-text-fit/both": "https://github.com/mapbox/mapbox-gl-native/issues/5602",
-  "render-tests/icon-text-fit/height": "https://github.com/mapbox/mapbox-gl-native/issues/5602",
-  "render-tests/icon-text-fit/width-padding": "https://github.com/mapbox/mapbox-gl-native/issues/5602",
-  "render-tests/icon-text-fit/width": "https://github.com/mapbox/mapbox-gl-native/issues/5602",
   "render-tests/line-width/property-function": "https://github.com/mapbox/mapbox-gl-js/issues/3682#issuecomment-264348200",
   "render-tests/line-join/property-function": "https://github.com/mapbox/mapbox-gl-js/pull/5020",
   "render-tests/line-join/property-function-dasharray": "https://github.com/mapbox/mapbox-gl-js/pull/5020",
   "render-tests/line-opacity/step-curve": "https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/mixed-zoom/z10-z11": "https://github.com/mapbox/mapbox-gl-native/issues/10397",
   "render-tests/raster-masking/overlapping-zoom": "https://github.com/mapbox/mapbox-gl-native/issues/10195",
   "render-tests/regressions/mapbox-gl-js#2305": "https://github.com/mapbox/mapbox-gl-native/issues/6927",
   "render-tests/regressions/mapbox-gl-js#3682": "https://github.com/mapbox/mapbox-gl-js/issues/3682",
   "render-tests/regressions/mapbox-gl-js#5370": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/regressions/mapbox-gl-js#5576": "https://github.com/mapbox/mapbox-gl-native/issues/10396",
   "render-tests/regressions/mapbox-gl-native#7357": "https://github.com/mapbox/mapbox-gl-native/issues/7357",
   "render-tests/runtime-styling/image-add-sdf": "https://github.com/mapbox/mapbox-gl-native/issues/9847",
   "render-tests/runtime-styling/paint-property-fill-flat-to-extrude": "https://github.com/mapbox/mapbox-gl-native/issues/6745",
   "render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude": "https://github.com/mapbox/mapbox-gl-native/issues/6745",
-  "render-tests/symbol-placement/line": "needs issue",
+  "render-tests/runtime-styling/layout-property-default-to-property-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/layout-property-default-to-zoom-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/layout-property-literal-to-property-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/layout-property-literal-to-zoom-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/layout-property-property-expression-to-default": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/layout-property-property-expression-to-literal": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/layout-property-zoom-expression-to-default": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/layout-property-zoom-expression-to-literal": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/paint-property-default-to-property-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/paint-property-default-to-zoom-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/paint-property-literal-to-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/paint-property-literal-to-property-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/paint-property-property-expression-to-default": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/paint-property-property-expression-to-literal": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/paint-property-zoom-expression-to-default": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/paint-property-zoom-expression-to-literal": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-layout-property-default-to-property-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-layout-property-default-to-zoom-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-layout-property-literal-to-property-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-layout-property-literal-to-zoom-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-layout-property-property-expression-to-default": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-layout-property-property-expression-to-literal": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-default": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-layout-property-zoom-expression-to-literal": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-paint-property-default-to-property-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-paint-property-default-to-zoom-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-paint-property-literal-to-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-paint-property-literal-to-property-expression": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-paint-property-property-expression-to-default": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-paint-property-property-expression-to-literal": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-default": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/runtime-styling/set-style-paint-property-zoom-expression-to-literal": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439",
+  "render-tests/symbol-visibility/visible": "https://github.com/mapbox/mapbox-gl-native/issues/10409",
   "render-tests/text-font/camera-function": "https://github.com/mapbox/mapbox-gl-native/pull/9439",
   "render-tests/text-pitch-alignment/auto-text-rotation-alignment-map": "https://github.com/mapbox/mapbox-gl-native/issues/9732",
-  "render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport": "https://github.com/mapbox/mapbox-gl-native/issues/9732",
   "render-tests/text-pitch-alignment/map-text-rotation-alignment-map": "https://github.com/mapbox/mapbox-gl-native/issues/9732",
-  "render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport": "https://github.com/mapbox/mapbox-gl-native/issues/9732",
   "render-tests/text-pitch-alignment/viewport-overzoomed": "https://github.com/mapbox/mapbox-gl-js/issues/5095",
-  "render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph": "https://github.com/mapbox/mapbox-gl-js/issues/5095",
   "render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map": "https://github.com/mapbox/mapbox-gl-native/issues/9732",
-  "render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport": "https://github.com/mapbox/mapbox-gl-native/issues/9732",
   "render-tests/text-pitch-scaling/line-half": "https://github.com/mapbox/mapbox-gl-native/issues/9732",
   "render-tests/text-size/composite-expression": "https://github.com/mapbox/mapbox-gl-native/pull/9439",
   "render-tests/video/default": "skip - https://github.com/mapbox/mapbox-gl-native/issues/601",
@@ -73,5 +96,9 @@
   "render-tests/heatmap-radius/pitch30": "https://github.com/mapbox/mapbox-gl-native/issues/10146",
   "render-tests/heatmap-weight/default": "https://github.com/mapbox/mapbox-gl-native/issues/10146",
   "render-tests/heatmap-weight/identity-property-function": "https://github.com/mapbox/mapbox-gl-native/issues/10146",
-  "render-tests/heatmap-weight/literal": "https://github.com/mapbox/mapbox-gl-native/issues/10146"
+  "render-tests/heatmap-weight/literal": "https://github.com/mapbox/mapbox-gl-native/issues/10146",
+  "render-tests/debug/collision-lines-pitched": "https://github.com/mapbox/mapbox-gl-native/issues/10412",
+  "render-tests/debug/collision-lines": "https://github.com/mapbox/mapbox-gl-native/issues/10412",
+  "render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph": "https://github.com/mapbox/mapbox-gl-native/issues/10412",
+  "render-tests/text-pitch-alignment/viewport-text-depthtest": "https://github.com/mapbox/mapbox-gl-native/issues/10412"
 }

src/mbgl/annotation/render_annotation_source.cpp

@@ -63,8 +63,9 @@ std::unordered_map<std::string, std::vector<Feature>>
 RenderAnnotationSource::queryRenderedFeatures(const ScreenLineString& geometry,
                                               const TransformState& transformState,
                                               const std::vector<const RenderLayer*>& layers,
-                                              const RenderedQueryOptions& options) const {
-    return tilePyramid.queryRenderedFeatures(geometry, transformState, layers, options);
+                                              const RenderedQueryOptions& options,
+                                              const CollisionIndex& collisionIndex) const {
+    return tilePyramid.queryRenderedFeatures(geometry, transformState, layers, options, collisionIndex);
 }
 
 std::vector<Feature> RenderAnnotationSource::querySourceFeatures(const SourceQueryOptions&) const {

src/mbgl/annotation/render_annotation_source.hpp

@@ -27,7 +27,8 @@ class RenderAnnotationSource : public RenderSource {
     queryRenderedFeatures(const ScreenLineString& geometry,
                           const TransformState& transformState,
                           const std::vector<const RenderLayer*>& layers,
-                          const RenderedQueryOptions& options) const final;
+                          const RenderedQueryOptions& options,
+                          const CollisionIndex& collisionIndex) const final;
 
     std::vector<Feature>
     querySourceFeatures(const SourceQueryOptions&) const final;

src/mbgl/geometry/feature_index.cpp

@@ -2,7 +2,7 @@
 #include <mbgl/renderer/render_layer.hpp>
 #include <mbgl/renderer/query.hpp>
 #include <mbgl/renderer/layers/render_symbol_layer.hpp>
-#include <mbgl/text/collision_tile.hpp>
+#include <mbgl/text/collision_index.hpp>
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/math.hpp>
 #include <mbgl/math/minmax.hpp>
@@ -18,16 +18,17 @@
 namespace mbgl {
 
 FeatureIndex::FeatureIndex()
-    : grid(util::EXTENT, 16, 0) {
+    : grid(util::EXTENT, util::EXTENT, util::EXTENT >> 5) {
 }
 
 void FeatureIndex::insert(const GeometryCollection& geometries,
                           std::size_t index,
                           const std::string& sourceLayerName,
                           const std::string& bucketName) {
     for (const auto& ring : geometries) {
-        grid.insert(IndexedSubfeature { index, sourceLayerName, bucketName, sortIndex++ },
-                    mapbox::geometry::envelope(ring));
+        auto envelope = mapbox::geometry::envelope(ring);
+        grid.insert(IndexedSubfeature(index, sourceLayerName, bucketName, sortIndex++),
+                    {convertPoint<float>(envelope.min), convertPoint<float>(envelope.max)});
     }
 }
 
@@ -47,9 +48,10 @@ void FeatureIndex::query(
         const double scale,
         const RenderedQueryOptions& queryOptions,
         const GeometryTileData& geometryTileData,
-        const CanonicalTileID& tileID,
+        const UnwrappedTileID& tileID,
+        const std::string& sourceID,
         const std::vector<const RenderLayer*>& layers,
-        const CollisionTile* collisionTile,
+        const CollisionIndex& collisionIndex,
         const float additionalQueryRadius) const {
 
     // Determine query radius
@@ -58,7 +60,8 @@ void FeatureIndex::query(
 
     // Query the grid index
     mapbox::geometry::box<int16_t> box = mapbox::geometry::envelope(queryGeometry);
-    std::vector<IndexedSubfeature> features = grid.query({ box.min - additionalRadius, box.max + additionalRadius });
+    std::vector<IndexedSubfeature> features = grid.query({ convertPoint<float>(box.min - additionalRadius),
+                                                           convertPoint<float>(box.max + additionalRadius) });
 
 
     std::sort(features.begin(), features.end(), topDown);
@@ -69,18 +72,13 @@ void FeatureIndex::query(
         if (indexedFeature.sortIndex == previousSortIndex) continue;
         previousSortIndex = indexedFeature.sortIndex;
 
-        addFeature(result, indexedFeature, queryGeometry, queryOptions, geometryTileData, tileID, layers, bearing, pixelsToTileUnits);
+        addFeature(result, indexedFeature, queryGeometry, queryOptions, geometryTileData, tileID.canonical, layers, bearing, pixelsToTileUnits);
     }
 
-    // Query symbol features, if they've been placed.
-    if (!collisionTile) {
-        return;
-    }
-
-    std::vector<IndexedSubfeature> symbolFeatures = collisionTile->queryRenderedSymbols(queryGeometry, scale);
+    std::vector<IndexedSubfeature> symbolFeatures = collisionIndex.queryRenderedSymbols(queryGeometry, tileID, sourceID);
     std::sort(symbolFeatures.begin(), symbolFeatures.end(), topDownSymbols);
     for (const auto& symbolFeature : symbolFeatures) {
-        addFeature(result, symbolFeature, queryGeometry, queryOptions, geometryTileData, tileID, layers, bearing, pixelsToTileUnits);
+        addFeature(result, symbolFeature, queryGeometry, queryOptions, geometryTileData, tileID.canonical, layers, bearing, pixelsToTileUnits);
     }
 }