diff options
| author | Chris Loer <chris.loer@gmail.com> | 2018-09-06 14:58:37 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-09-12 14:10:46 -0700 |
| commit | d735d89835fb3076e09594fce2a141fe1495e33f (patch) | |
| tree | 36fb80484b3952fb730fd34a77439d303d002cdc /platform/node/test | |
| parent | 079ba0209ed383c15123902f0810e658c2b0abf4 (diff) | |
| download | qtlocation-mapboxgl-d735d89835fb3076e09594fce2a141fe1495e33f.tar.gz | |
[core] Port "collision group" plumbing to gl-native.
[node] Hook up map-wide "crossSourceCollisions" option, defaulting to true.
[test] Pass "crossSourceCollisions" test option through test harness; enable cross-source-collisions tests on native.
Diffstat (limited to 'platform/node/test')
| -rw-r--r-- | platform/node/test/ignores.json | 2 | ||||
| -rw-r--r-- | platform/node/test/suite_implementation.js | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index d2ec3644d9..67f0ff9a72 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -95,7 +95,6 @@ "render-tests/geojson/inline-linestring-fill": "current behavior is arbitrary", "render-tests/geojson/inline-polygon-symbol": "behavior needs reconciliation with gl-js", "render-tests/icon-rotate/with-offset": "https://github.com/mapbox/mapbox-gl-native/issues/11872", - "render-tests/icon-no-cross-source-collision/default": "skip - gl-js only", "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/real-world/bangkok": "https://github.com/mapbox/mapbox-gl-native/issues/10412", @@ -122,7 +121,6 @@ "render-tests/text-field/formatted-arabic": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624", "render-tests/text-field/formatted-line": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624", "render-tests/text-field/formatted": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624", - "render-tests/text-no-cross-source-collision/default": "skip - gl-js only", "render-tests/text-pitch-alignment/auto-text-rotation-alignment-map": "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/viewport-text-rotation-alignment-map": "https://github.com/mapbox/mapbox-gl-native/issues/9732", diff --git a/platform/node/test/suite_implementation.js b/platform/node/test/suite_implementation.js index 704cab8940..f868af8ece 100644 --- a/platform/node/test/suite_implementation.js +++ b/platform/node/test/suite_implementation.js @@ -16,7 +16,7 @@ export default function (style, options, callback) { let map; if (options.recycleMap) { - const key = options.pixelRatio + '/' + tileMode; + const key = options.pixelRatio + '/' + tileMode + '/' + options.crossSourceCollisions; if (maps.has(key)) { map = maps.get(key); map.request = mapRequest; @@ -24,7 +24,8 @@ export default function (style, options, callback) { maps.set(key, new mbgl.Map({ ratio: options.pixelRatio, request: mapRequest, - mode: options.mapMode + mode: options.mapMode, + crossSourceCollisions: typeof options.crossSourceCollisions === "undefined" ? true : options.crossSourceCollisions })); map = maps.get(key); } @@ -32,7 +33,8 @@ export default function (style, options, callback) { map = new mbgl.Map({ ratio: options.pixelRatio, request: mapRequest, - mode: options.mapMode + mode: options.mapMode, + crossSourceCollisions: typeof options.crossSourceCollisions === "undefined" ? true : options.crossSourceCollisions }); } |