From ac5b80a0df533bdf83830f1be48f2b248a641f41 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Mon, 18 Jul 2022 22:42:58 +0200 Subject: [PATCH 1/3] Merge pull request #13835 from ahocevar/source-state Recover from incorrect rebase after removal of string enums --- src/ol/renderer/Layer.js | 2 +- test/browser/spec/ol/renderer/layer.test.js | 23 ++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/ol/renderer/Layer.js b/src/ol/renderer/Layer.js index 97358ff622..a1b73dea0e 100644 --- a/src/ol/renderer/Layer.js +++ b/src/ol/renderer/Layer.js @@ -195,7 +195,7 @@ class LayerRenderer extends Observable { */ renderIfReadyAndVisible() { const layer = this.getLayer(); - if (layer && layer.getVisible() && 'ready') { + if (layer && layer.getVisible() && layer.getSourceState() === 'ready') { layer.changed(); } } diff --git a/test/browser/spec/ol/renderer/layer.test.js b/test/browser/spec/ol/renderer/layer.test.js index 44ed7d2950..ddaaa0f767 100644 --- a/test/browser/spec/ol/renderer/layer.test.js +++ b/test/browser/spec/ol/renderer/layer.test.js @@ -7,15 +7,32 @@ import View from '../../../../../src/ol/View.js'; import XYZ from '../../../../../src/ol/source/XYZ.js'; import {fromKey} from '../../../../../src/ol/tilecoord.js'; -describe('ol.renderer.Layer', function () { - let renderer; +describe('ol/renderer/Layer', function () { + let layer, renderer; const eventType = 'change'; beforeEach(function () { - const layer = new Layer({}); + layer = new Layer({}); renderer = new LayerRenderer(layer); }); + describe('#renderIfReadyAndVisible', function () { + it('updates revision when data is ready and layer is visible', function () { + layer.setVisible(true); + let state; + layer.getSourceState = function () { + return state; + }; + const revision = layer.getRevision(); + state = 'foo'; + renderer.renderIfReadyAndVisible(); + expect(layer.getRevision()).to.be(revision); + state = 'ready'; + renderer.renderIfReadyAndVisible(); + expect(layer.getRevision()).to.be(revision + 1); + }); + }); + describe('#loadImage', function () { let image; let imageLoadFunction; From 9613cb97617ce2e3af082c236d5f63a9dc7e93f3 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Mon, 18 Jul 2022 22:55:49 +0200 Subject: [PATCH 2/3] Updates for the 6.15.1 release --- changelog/v6.15.1.md | 4 ++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 changelog/v6.15.1.md diff --git a/changelog/v6.15.1.md b/changelog/v6.15.1.md new file mode 100644 index 0000000000..84be7ee142 --- /dev/null +++ b/changelog/v6.15.1.md @@ -0,0 +1,4 @@ +# 6.15.1 + +The 6.15.1 release is a patch to ensure that a layer gets rendered when its source has completed loading. See the [changelog for 6.15.0](https://github.com/openlayers/openlayers/releases/tag/v6.15.0) for new features and fixes since 6.14. + diff --git a/package-lock.json b/package-lock.json index 5f1c118a64..9d705af9c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ol", - "version": "6.15.0", + "version": "6.15.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ol", - "version": "6.15.0", + "version": "6.15.1", "license": "BSD-2-Clause", "dependencies": { "geotiff": "2.0.4", diff --git a/package.json b/package.json index b839208958..dc37930243 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ol", - "version": "6.15.0", + "version": "6.15.1", "description": "OpenLayers mapping library", "keywords": [ "map", From e8ff6656d3d0fb4150d07c535622c6cd26a059db Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Mon, 18 Jul 2022 23:04:35 +0200 Subject: [PATCH 3/3] Develop on 6.15.2-dev --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9d705af9c3..74f92a5b66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ol", - "version": "6.15.1", + "version": "6.15.2-dev", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ol", - "version": "6.15.1", + "version": "6.15.2-dev", "license": "BSD-2-Clause", "dependencies": { "geotiff": "2.0.4", diff --git a/package.json b/package.json index dc37930243..6c456e61f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ol", - "version": "6.15.1", + "version": "6.15.2-dev", "description": "OpenLayers mapping library", "keywords": [ "map",