geojs 1.10.2 → 1.10.5

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # GeoJS Change Log
 
+## Version 1.10.5
+
+### Bug Fixes
+
+- Guard converting an empty polygon ([#1232](../../pull/1232))
+
+## Version 1.10.4
+
+### Bug Fixes
+
+- Guard accessing a quad feature ([#1231](../../pull/1231))
+
+## Version 1.10.3
+
+### Performance improvements
+
+- Reduce the time it takes to switch texture interpolation ([#1230](../../pull/1230))
+
 ## Version 1.10.2
 
 ### Improvements

package/geo.js

@@ -209,7 +209,11 @@ var annotation = function annotation(type, args) {
    */
 
 
-  this._exit = function () {};
+  this._exit = function () {
+    if (m_this.layer()) {
+      m_this.layer().geoOff(geo_event.mousemove, m_this._cursorHandleMousemove);
+    }
+  };
   /**
    * Get a unique annotation id.
    *
@@ -921,6 +925,10 @@ var annotation = function annotation(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() : gcs === undefined ? map.ingcs() : gcs;
@@ -2892,7 +2900,7 @@ var polygonAnnotation = function polygonAnnotation(args) {
       return result;
     }
 
-    if (coord.length < 3) {
+    if (coord.length < 3 || !coord.map) {
       return [];
     }
 
@@ -8555,7 +8563,10 @@ var canvas_tileLayer = function canvas_tileLayer() {
 
   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);
 
@@ -23320,6 +23331,16 @@ var object = function object() {
 
     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.
    */
@@ -27866,7 +27887,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "8a83afdb7516115b52119da8bfe845e7def699dd";
+module.exports = "7f57d37e7c28f7be33fbb0081cbd16304d8dffd5";
 
 /***/ }),
 
@@ -41026,7 +41047,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.10.2";
+module.exports = "1.10.5";
 
 /***/ }),
 
@@ -44076,7 +44097,10 @@ var webgl_pixelmapFeature = function webgl_pixelmapFeature(arg) {
 
   if (arg.quadFeature) {
     m_quadFeature = arg.quadFeature;
-    m_quadFeature.nearestPixel(true);
+
+    if (m_quadFeature.nearestPixel) {
+      m_quadFeature.nearestPixel(true);
+    }
   }
 
   this._init(arg);
@@ -45695,7 +45719,21 @@ var webgl_quadFeature = function webgl_quadFeature(arg) {
 
       m_quads.imgQuads.forEach(function (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);
+          var oldmod = quad.texture.modified;
+
+          quad.texture.modified = function () {};
+
           quad.texture.setNearestPixel(nearestPixel);
+          quad.texture.modified = oldmod;
         }
       });
     }
@@ -46092,7 +46130,10 @@ var webgl_tileLayer = function webgl_tileLayer() {
 
   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);
 

package/geo.lean.js

@@ -209,7 +209,11 @@ var annotation = function annotation(type, args) {
    */
 
 
-  this._exit = function () {};
+  this._exit = function () {
+    if (m_this.layer()) {
+      m_this.layer().geoOff(geo_event.mousemove, m_this._cursorHandleMousemove);
+    }
+  };
   /**
    * Get a unique annotation id.
    *
@@ -921,6 +925,10 @@ var annotation = function annotation(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() : gcs === undefined ? map.ingcs() : gcs;
@@ -2892,7 +2900,7 @@ var polygonAnnotation = function polygonAnnotation(args) {
       return result;
     }
 
-    if (coord.length < 3) {
+    if (coord.length < 3 || !coord.map) {
       return [];
     }
 
@@ -8555,7 +8563,10 @@ var canvas_tileLayer = function canvas_tileLayer() {
 
   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);
 
@@ -23320,6 +23331,16 @@ var object = function object() {
 
     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.
    */
@@ -27866,7 +27887,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "8a83afdb7516115b52119da8bfe845e7def699dd";
+module.exports = "7f57d37e7c28f7be33fbb0081cbd16304d8dffd5";
 
 /***/ }),
 
@@ -41026,7 +41047,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.10.2";
+module.exports = "1.10.5";
 
 /***/ }),
 
@@ -44076,7 +44097,10 @@ var webgl_pixelmapFeature = function webgl_pixelmapFeature(arg) {
 
   if (arg.quadFeature) {
     m_quadFeature = arg.quadFeature;
-    m_quadFeature.nearestPixel(true);
+
+    if (m_quadFeature.nearestPixel) {
+      m_quadFeature.nearestPixel(true);
+    }
   }
 
   this._init(arg);
@@ -45695,7 +45719,21 @@ var webgl_quadFeature = function webgl_quadFeature(arg) {
 
       m_quads.imgQuads.forEach(function (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);
+          var oldmod = quad.texture.modified;
+
+          quad.texture.modified = function () {};
+
           quad.texture.setNearestPixel(nearestPixel);
+          quad.texture.modified = oldmod;
         }
       });
     }
@@ -46092,7 +46130,10 @@ var webgl_tileLayer = function webgl_tileLayer() {
 
   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);