From 031fe8e9e99ed9835279c27fe74f3443efa8d542 Mon Sep 17 00:00:00 2001 From: Lauren Budorick Date: Wed, 23 Aug 2017 16:21:42 -0700 Subject: Add ignores + update suite_implementation for addImage to mirror change to JS suite_implementation --- mapbox-gl-js | 2 +- platform/node/test/ignores.json | 3 +++ platform/node/test/suite_implementation.js | 10 +++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mapbox-gl-js b/mapbox-gl-js index f13860935a..3730e8377f 160000 --- a/mapbox-gl-js +++ b/mapbox-gl-js @@ -1 +1 @@ -Subproject commit f13860935a183bfaa9ef28bb88946b5843c2faa3 +Subproject commit 3730e8377faccd7d0b83508d2be610c4743b1dc4 diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index 4d4e0edbe4..9ffc9d30b4 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -49,6 +49,7 @@ "render-tests/regressions/mapbox-gl-js#4573": "skip - https://github.com/mapbox/mapbox-gl-native/issues/1350", "render-tests/regressions/mapbox-gl-native#7357": "https://github.com/mapbox/mapbox-gl-native/issues/7357", "render-tests/regressions/mapbox-gl-native#9792": "skip - https://github.com/mapbox/mapbox-gl-native/issues/9792", + "render-tests/runtime-styling/image-add-sdf": "skip - https://github.com/mapbox/mapbox-gl-native/issues/9847", "render-tests/runtime-styling/paint-property-fill-flat-to-extrude": "skip - https://github.com/mapbox/mapbox-gl-native/issues/6745", "render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude": "skip - needs issue", "render-tests/runtime-styling/source-add-geojson-inline": "skip - needs issue", @@ -62,6 +63,8 @@ "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-native/issues/9843", + "render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph": "https://github.com/mapbox/mapbox-gl-native/issues/9843", "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", diff --git a/platform/node/test/suite_implementation.js b/platform/node/test/suite_implementation.js index b717ecd2b2..261de632e7 100644 --- a/platform/node/test/suite_implementation.js +++ b/platform/node/test/suite_implementation.js @@ -72,12 +72,16 @@ module.exports = function (style, options, callback) { } else if (operation[0] === 'addImage' || operation[0] === 'updateImage') { var img = PNG.sync.read(fs.readFileSync(path.join(__dirname, '../../../mapbox-gl-js/test/integration', operation[2]))); + const testOpts = (operation.length > 3) ? operation[3] : {}; - map.addImage(operation[1], img.data, { + const options = { height: img.height, width: img.width, - pixelRatio: operation[3] || 1 - }); + pixelRatio: testOpts.pixelRatio || 1, + sdf: testOpts.sdf || false + } + + map.addImage(operation[1], img.data, options); applyOperations(operations.slice(1), callback); -- cgit v1.2.1