Merge pull request #1231 from OpenGeoscience/guard-shutdown

fix: Guard accessing a quad feature.
OpenGeoscience · Jun 27, 2022 · 3e924c6 · 3e924c6
2 parents 8d01f4a + 7a7bf3c
commit 3e924c6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/canvas/tileLayer.js b/src/canvas/tileLayer.js
@@ -69,7 +69,9 @@ var canvas_tileLayer = function () {
    */
   this._update = function (request) {
     s_update.call(m_this, request);
-    m_quadFeature.nearestPixel(m_this.nearestPixel());
+    if (m_quadFeature && m_quadFeature.nearestPixel) {
+      m_quadFeature.nearestPixel(m_this.nearestPixel());
+    }
     m_this._addBaseQuadToTiles(m_quadFeature, m_tiles);
     return m_this;
   };

diff --git a/src/webgl/pixelmapFeature.js b/src/webgl/pixelmapFeature.js
@@ -184,7 +184,9 @@ var webgl_pixelmapFeature = function (arg) {
 
   if (arg.quadFeature) {
     m_quadFeature = arg.quadFeature;
-    m_quadFeature.nearestPixel(true);
+    if (m_quadFeature.nearestPixel) {
+      m_quadFeature.nearestPixel(true);
+    }
   }
   this._init(arg);
   return this;

diff --git a/src/webgl/tileLayer.js b/src/webgl/tileLayer.js
@@ -171,7 +171,9 @@ var webgl_tileLayer = function () {
    */
   this._update = function (request) {
     s_update.call(m_this, request);
-    m_quadFeature.nearestPixel(m_this.nearestPixel());
+    if (m_quadFeature && m_quadFeature.nearestPixel) {
+      m_quadFeature.nearestPixel(m_this.nearestPixel());
+    }
     m_this._addBaseQuadToTiles(m_quadFeature, m_tiles);
     return m_this;
   };