geojs 1.10.4 → 1.10.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.10.4",
+  "version": "1.10.7",
   "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() : (
@@ -1265,8 +1271,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',

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/annotation/rectangleAnnotation.js

@@ -75,7 +75,6 @@ var rectangleAnnotation = function (args, annotationName) {
           name: 'rectangle create',
           owner: annotationActionOwner,
           input: 'left',
-          modifiers: {shift: false, ctrl: false},
           selectionRectangle: true,
           selectionConstraint: this._selectionConstraint
         }];

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/polygonFeature.js

@@ -573,9 +573,11 @@ var polygonFeature = function (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(),
@@ -633,6 +635,9 @@ var polygonFeature = function (arg) {
       }
       return elem;
     });
+    if (returnData) {
+      return data;
+    }
 
     /* Set the reduced polgons as the data and use simple accessors. */
     m_this.style('position', util.identityFunction);

package/src/webgl/quadFeature.js

@@ -372,7 +372,7 @@ var webgl_quadFeature = function (arg) {
         nearestPixel = curZoom >= nearestPixel;
       }
       m_quads.imgQuads.forEach((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