From 4fec8d4615ef5b76efb7d9c29164156e3e8d2094 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Sat, 16 Jul 2022 13:18:14 +0200
Subject: [PATCH 1/2] 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 c6cc734dcaf6e76afc94c519da0bc1ef80f7870d Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Mon, 18 Jul 2022 22:13:07 +0200
Subject: [PATCH 2/2] Develop on 6.15.1-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 5f1c118a64..6239cbbf15 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ol",
-  "version": "6.15.0",
+  "version": "6.15.1-dev",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ol",
-      "version": "6.15.0",
+      "version": "6.15.1-dev",
       "license": "BSD-2-Clause",
       "dependencies": {
         "geotiff": "2.0.4",
diff --git a/package.json b/package.json
index b839208958..f4749bd53c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "6.15.0",
+  "version": "6.15.1-dev",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",