geojs 1.10.4 → 1.10.7

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # GeoJS Change Log
 
+## Version 1.10.5
+
+### Improvements
+
+- Allow using the rdp functions on non-feature polygons ([#1234](../../pull/1234))
+- Allow annotations to be created regardless of metakeys ([#1235](../../pull/1235))
+
+## Version 1.10.5
+
+### Bug Fixes
+
+- Guard texture update calls ([#1233](../../pull/1233))
+
+## 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

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;
@@ -1532,11 +1540,7 @@ function continuousVerticesActions(m_this, s_actions, state, name, originalArgs)
         action: geo_action['annotation_' + name],
         name: name + ' create',
         owner: annotationActionOwner,
-        input: 'left',
-        modifiers: {
-          shift: false,
-          ctrl: false
-        }
+        input: 'left'
       }, {
         action: geo_action['annotation_' + name],
         name: name + ' create',
@@ -2892,7 +2896,7 @@ var polygonAnnotation = function polygonAnnotation(args) {
       return result;
     }
 
-    if (coord.length < 3) {
+    if (coord.length < 3 || !coord.map) {
       return [];
     }
 
@@ -3260,10 +3264,6 @@ var rectangleAnnotation = function rectangleAnnotation(args, annotationName) {
           name: 'rectangle create',
           owner: annotationActionOwner,
           input: 'left',
-          modifiers: {
-            shift: false,
-            ctrl: false
-          },
           selectionRectangle: true,
           selectionConstraint: this._selectionConstraint
         }];
@@ -23323,6 +23323,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.
    */
@@ -25681,11 +25691,13 @@ var polygonFeature = function polygonFeature(arg) {
    *    get the position of each vertex.
    * @param {function} [polyFunc=this.style.get('polygon')] The function to
    *    get each polygon.
-   * @returns {this}
+   * @param {boolean} [returnData=false] If truthy, return the new data array
+   *    rather than modifying the feature.
+   * @returns {this|array}
    */
 
 
-  this.rdpSimplifyData = function (data, tolerance, posFunc, polyFunc) {
+  this.rdpSimplifyData = function (data, tolerance, posFunc, polyFunc, returnData) {
     var map = m_this.layer().map(),
         mapgcs = map.gcs(),
         featuregcs = m_this.gcs(),
@@ -25749,8 +25761,13 @@ var polygonFeature = function polygonFeature(arg) {
 
       return elem;
     });
+
+    if (returnData) {
+      return data;
+    }
     /* Set the reduced polgons as the data and use simple accessors. */
 
+
     m_this.style('position', util.identityFunction);
     m_this.style('polygon', util.identityFunction);
     m_this.data(data);
@@ -27869,7 +27886,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "3e924c64da3ad1b47324b2d5106e85db1bf1d809";
+module.exports = "e8aceeb82b2e0af20e6c4483678c951f410bedbf";
 
 /***/ }),
 
@@ -41029,7 +41046,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.10.4";
+module.exports = "1.10.7";
 
 /***/ }),
 
@@ -45700,7 +45717,7 @@ var webgl_quadFeature = function webgl_quadFeature(arg) {
       }
 
       m_quads.imgQuads.forEach(function (quad) {
-        if (quad.image && quad.texture && quad.texture.nearestPixel() !== nearestPixel) {
+        if (quad.image && quad.texture && quad.texture.nearestPixel() !== nearestPixel && quad.texture.textureHandle()) {
           /* This could just be
            *   quad.texture.setNearestPixel(nearestPixel);
            * but that needlessly redecodes the image.  Instead, just change the

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;
@@ -1532,11 +1540,7 @@ function continuousVerticesActions(m_this, s_actions, state, name, originalArgs)
         action: geo_action['annotation_' + name],
         name: name + ' create',
         owner: annotationActionOwner,
-        input: 'left',
-        modifiers: {
-          shift: false,
-          ctrl: false
-        }
+        input: 'left'
       }, {
         action: geo_action['annotation_' + name],
         name: name + ' create',
@@ -2892,7 +2896,7 @@ var polygonAnnotation = function polygonAnnotation(args) {
       return result;
     }
 
-    if (coord.length < 3) {
+    if (coord.length < 3 || !coord.map) {
       return [];
     }
 
@@ -3260,10 +3264,6 @@ var rectangleAnnotation = function rectangleAnnotation(args, annotationName) {
           name: 'rectangle create',
           owner: annotationActionOwner,
           input: 'left',
-          modifiers: {
-            shift: false,
-            ctrl: false
-          },
           selectionRectangle: true,
           selectionConstraint: this._selectionConstraint
         }];
@@ -23323,6 +23323,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.
    */
@@ -25681,11 +25691,13 @@ var polygonFeature = function polygonFeature(arg) {
    *    get the position of each vertex.
    * @param {function} [polyFunc=this.style.get('polygon')] The function to
    *    get each polygon.
-   * @returns {this}
+   * @param {boolean} [returnData=false] If truthy, return the new data array
+   *    rather than modifying the feature.
+   * @returns {this|array}
    */
 
 
-  this.rdpSimplifyData = function (data, tolerance, posFunc, polyFunc) {
+  this.rdpSimplifyData = function (data, tolerance, posFunc, polyFunc, returnData) {
     var map = m_this.layer().map(),
         mapgcs = map.gcs(),
         featuregcs = m_this.gcs(),
@@ -25749,8 +25761,13 @@ var polygonFeature = function polygonFeature(arg) {
 
       return elem;
     });
+
+    if (returnData) {
+      return data;
+    }
     /* Set the reduced polgons as the data and use simple accessors. */
 
+
     m_this.style('position', util.identityFunction);
     m_this.style('polygon', util.identityFunction);
     m_this.data(data);
@@ -27869,7 +27886,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "3e924c64da3ad1b47324b2d5106e85db1bf1d809";
+module.exports = "e8aceeb82b2e0af20e6c4483678c951f410bedbf";
 
 /***/ }),
 
@@ -41029,7 +41046,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.10.4";
+module.exports = "1.10.7";
 
 /***/ }),
 
@@ -45700,7 +45717,7 @@ var webgl_quadFeature = function webgl_quadFeature(arg) {
       }
 
       m_quads.imgQuads.forEach(function (quad) {
-        if (quad.image && quad.texture && quad.texture.nearestPixel() !== nearestPixel) {
+        if (quad.image && quad.texture && quad.texture.nearestPixel() !== nearestPixel && quad.texture.textureHandle()) {
           /* This could just be
            *   quad.texture.setNearestPixel(nearestPixel);
            * but that needlessly redecodes the image.  Instead, just change the