Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Update gl-js SHA + new ignores #9848

Merged
merged 1 commit into from
Aug 24, 2017
Merged

Update gl-js SHA + new ignores #9848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mapbox-gl-js
Open in desktop
Submodule mapbox-gl-js updated 47 files
+10 −2 bench/README.md
+10 −2 bench/benchmarks/frame_duration.js
+12 −0 bench/benchmarks_view.js
+0 −1 src/data/bucket/circle_bucket.js
+0 −2 src/data/bucket/fill_bucket.js
+0 −1 src/data/bucket/fill_extrusion_bucket.js
+0 −1 src/data/bucket/line_bucket.js
+0 −1 src/data/bucket/symbol_bucket.js
+3 −3 src/data/buffer.js
+5 −8 src/data/program_configuration.js
+1 −12 src/data/segment.js
+3 −3 src/render/draw_background.js
+16 −12 src/render/draw_circle.js
+17 −14 src/render/draw_collision_debug.js
+6 −6 src/render/draw_debug.js
+19 −11 src/render/draw_fill.js
+17 −13 src/render/draw_fill_extrusion.js
+29 −25 src/render/draw_line.js
+13 −13 src/render/draw_raster.js
+31 −29 src/render/draw_symbol.js
+3 −62 src/render/painter.js
+15 −15 src/render/pattern.js
+120 −0 src/render/program.js
+15 −12 src/render/vertex_array_object.js
+52 −14 src/symbol/projection.js
+2 −2 src/symbol/sprite_atlas.js
+16 −73 src/ui/control/navigation_control.js
+1 −3 src/ui/handler/drag_pan.js
+33 −32 src/ui/handler/drag_rotate.js
+2 −1 src/ui/map.js
+ − test/integration/image/line.sdf.png
+3 −1 test/integration/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/style.json
+3 −1 test/integration/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/style.json
+3 −1 test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/style.json
+3 −1 test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/style.json
+ − test/integration/render-tests/runtime-styling/image-add-nonsdf/expected.png
+41 −0 test/integration/render-tests/runtime-styling/image-add-nonsdf/style.json
+ − test/integration/render-tests/runtime-styling/image-add-sdf/expected.png
+47 −0 test/integration/render-tests/runtime-styling/image-add-sdf/style.json
+ − test/integration/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/expected.png
+56 −0 test/integration/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/style.json
+ − test/integration/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png
+56 −0 test/integration/render-tests/text-pitch-alignment/viewport-overzoomed/style.json
+ − test/integration/tiles/mapbox.mapbox-streets-v7/16-11235-26208.mvt
+26 −8 test/node_modules/mapbox-gl-js-test/simulate_interaction.js
+3 −2 test/suite_implementation.js
+314 −39 test/unit/ui/handler/drag_rotate.test.js
3 changes: 3 additions & 0 deletions platform/node/test/ignores.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
10 changes: 7 additions & 3 deletions platform/node/test/suite_implementation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down