From 40605d7c53461848e81741da174cae1c2861d3e2 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Thu, 14 Feb 2019 13:45:49 +0100
Subject: [PATCH] Don't use loadImage function to avoid infinite loading loop

---
 src/ol/renderer/canvas/VectorImageLayer.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/ol/renderer/canvas/VectorImageLayer.js b/src/ol/renderer/canvas/VectorImageLayer.js
index 33d6568b7a..fbf052bfad 100644
--- a/src/ol/renderer/canvas/VectorImageLayer.js
+++ b/src/ol/renderer/canvas/VectorImageLayer.js
@@ -8,6 +8,9 @@ import {getHeight, getWidth, isEmpty, scaleFromCenter} from '../../extent.js';
 import {assign} from '../../obj.js';
 import CanvasImageLayerRenderer from './ImageLayer.js';
 import CanvasVectorLayerRenderer from './VectorLayer.js';
+import {listen} from '../../events.js';
+import EventType from '../../events/EventType.js';
+import ImageState from '../../ImageState.js';
 
 /**
  * @classdesc
@@ -89,10 +92,14 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
           callback();
         }
       });
-      if (this.loadImage(image)) {
-        this.image_ = image;
-        this.skippedFeatures_ = skippedFeatures;
-      }
+
+      listen(image, EventType.CHANGE, function() {
+        if (image.getState() === ImageState.LOADED) {
+          this.image_ = image;
+          this.skippedFeatures_ = skippedFeatures;
+        }
+      }, this);
+      image.load();
     }
 
     if (this.image_) {