From f610e9bef969dc8d7ec1ea545e93919a03d98882 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 7 Jun 2017 16:49:11 -0700 Subject: [PATCH] [tests] Test updating icon and pattern images --- mapbox-gl-js | 2 +- platform/node/test/suite_implementation.js | 2 +- src/mbgl/renderer/render_style.cpp | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mapbox-gl-js b/mapbox-gl-js index 943dc3917..0ee15860e 160000 --- a/mapbox-gl-js +++ b/mapbox-gl-js @@ -1 +1 @@ -Subproject commit 943dc3917b28ec8712d08afbcc1ef9a277c6c93a +Subproject commit 0ee15860e3ffb25a535ae374f44b3007b765c6fc diff --git a/platform/node/test/suite_implementation.js b/platform/node/test/suite_implementation.js index 8ac372b7c..cae5d1215 100644 --- a/platform/node/test/suite_implementation.js +++ b/platform/node/test/suite_implementation.js @@ -70,7 +70,7 @@ module.exports = function (style, options, callback) { applyOperations(operations.slice(1), callback); }); - } else if (operation[0] === 'addImage') { + } 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]))); map.addImage(operation[1], img.data, { diff --git a/src/mbgl/renderer/render_style.cpp b/src/mbgl/renderer/render_style.cpp index f76d1f48d..9b0b512bf 100644 --- a/src/mbgl/renderer/render_style.cpp +++ b/src/mbgl/renderer/render_style.cpp @@ -207,7 +207,10 @@ void RenderStyle::update(const UpdateParameters& parameters) { needsRendering = true; } - if (hasLayoutDifference(layerDiff, layer->id) || !imageDiff.changed.empty()) { + if (hasLayoutDifference(layerDiff, layer->id) || + !imageDiff.added.empty() || + !imageDiff.removed.empty() || + !imageDiff.changed.empty()) { needsRelayout = true; }