geojs 1.10.2 → 1.10.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.10.2",
+  "version": "1.10.5",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",

package/src/annotation/annotation.js

@@ -141,6 +141,9 @@ var annotation = function (type, args) {
    * Clean up any resources that the annotation is using.
    */
   this._exit = function () {
+    if (m_this.layer()) {
+      m_this.layer().geoOff(geo_event.mousemove, m_this._cursorHandleMousemove);
+    }
   };
 
   /**
@@ -754,6 +757,9 @@ var annotation = function (type, args) {
    */
   this.coordinates = function (gcs) {
     var coord = m_this._coordinates() || [];
+    if (!coord.length && (!coord.outer || !coord.outer.length)) {
+      coord = [];
+    }
     if (m_this.layer()) {
       var map = m_this.layer().map();
       gcs = (gcs === null ? map.gcs() : (

package/src/annotation/polygonAnnotation.js

@@ -134,7 +134,7 @@ var polygonAnnotation = function (args) {
       (coord.inner || []).forEach((h) => result[0].push(h.map((pt) => [pt.x, pt.y])));
       return result;
     }
-    if (coord.length < 3) {
+    if (coord.length < 3 || !coord.map) {
       return [];
     }
     return [[coord.map((pt) => [pt.x, pt.y])]];

package/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;
   };

package/src/object.js

@@ -273,6 +273,15 @@ var object = function () {
     return m_this;
   };
 
+  /**
+   * Report the current event handlers.
+   *
+   * @returns {object} An object with all of the event handlers.
+   */
+  this._eventHandlers = function () {
+    return m_eventHandlers;
+  };
+
   /**
    * Free all resources and destroy the object.
    */

package/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;

package/src/webgl/quadFeature.js

@@ -373,7 +373,19 @@ var webgl_quadFeature = function (arg) {
       }
       m_quads.imgQuads.forEach((quad) => {
         if (quad.image && quad.texture && quad.texture.nearestPixel() !== nearestPixel) {
+          /* This could just be
+           *   quad.texture.setNearestPixel(nearestPixel);
+           * but that needlessly redecodes the image.  Instead, just change the
+           * the interpolation flags, then change the nearestPixel value
+           * without triggering a complete re-setup. */
+          renderState.m_context.bindTexture(vgl.GL.TEXTURE_2D, quad.texture.textureHandle());
+          renderState.m_context.texParameteri(vgl.GL.TEXTURE_2D, vgl.GL.TEXTURE_MIN_FILTER, nearestPixel ? vgl.GL.NEAREST : vgl.GL.LINEAR);
+          renderState.m_context.texParameteri(vgl.GL.TEXTURE_2D, vgl.GL.TEXTURE_MAG_FILTER, nearestPixel ? vgl.GL.NEAREST : vgl.GL.LINEAR);
+          renderState.m_context.bindTexture(vgl.GL.TEXTURE_2D, null);
+          const oldmod = quad.texture.modified;
+          quad.texture.modified = () => {};
           quad.texture.setNearestPixel(nearestPixel);
+          quad.texture.modified = oldmod;
         }
       });
     }

package/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;
   };