Merge pull request #856 from gtt-project/fix/check-ol-ext-input-and-i…

…mageloader Check existence of "ol.ext" before initializing "ol.ext.input" and "ol.ext.imageLoader"
Viglino · Sep 19, 2022 · ad1012d · ad1012d
2 parents e5fb88e + e77312c
commit ad1012d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/util/imagesLoader.js b/src/util/imagesLoader.js
@@ -2,7 +2,9 @@ import { asArray as ol_color_asArray } from 'ol/color'
 
 /** @namespace ol.ext.imageLoader
  */
-if (window.ol) window.ol.ext.imageLoader = {};
+if (window.ol && ol.ext && !ol.ext.imageLoader) {
+  ol.ext.imageLoader = {};
+}
 
 /** Helper for loading BIL-32 (Band Interleaved by Line) image
  * @param {string} src

diff --git a/src/util/input/Base.js b/src/util/input/Base.js
@@ -6,7 +6,7 @@ import ol_Object from 'ol/Object'
 /** @namespace  ol.ext.input
  */
 /*global ol*/
-if (window.ol) {
+if (window.ol && ol.ext && !ol.ext.input) {
   ol.ext.input = {};
 }