geojs 1.10.5 → 1.10.8

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # GeoJS Change Log
 
+## Version 1.10.6
+
+### Improvements
+
+- Uncross polygon annotations ([#1236](../../pull/1236))
+
+## 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

package/geo.js

@@ -1540,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',
@@ -2821,7 +2817,8 @@ var polygonAnnotation = function polygonAnnotation(args) {
   delete args.coordinates;
   annotation.call(this, 'polygon', args);
   var m_this = this,
-      s_actions = this.actions;
+      s_actions = this.actions,
+      s_state = this.state;
   /**
    * Get a list of renderable features for this annotation.  When the polygon
    * is done, this is just a single polygon.  During creation this can be a
@@ -3029,6 +3026,56 @@ var polygonAnnotation = function polygonAnnotation(args) {
   this.actions = function (state) {
     return continuousVerticesActions(m_this, s_actions, state, 'polygon', arguments);
   };
+  /**
+   * Get or set the state of this annotation.
+   *
+   * @param {string|undefined} [arg] If `undefined`, return the state,
+   *    otherwise change it.  This should be one of the
+   *    {@link geo.annotation.state} values.
+   * @returns {this|string} The current state or this annotation.
+   * @fires geo.event.annotation.state
+   */
+
+
+  this.state = function (arg) {
+    var oldState = s_state();
+
+    if (arg && arg !== oldState && (oldState === annotationState.create || oldState === annotationState.edit) && arg === annotationState.done) {
+      /* Uncross polygons when they are complete. */
+      var opts = {
+        style: 'object-listlist-outer-list'
+      };
+      var polys = util.polyops.union(m_this.options('vertices'), [], opts);
+      var merged = true;
+
+      while (polys.length > 1 && merged) {
+        merged = false;
+
+        for (var i = 0; !merged && i < polys[0].outer.length; i += 1) {
+          var pt1 = polys[0].outer[i];
+
+          for (var p = 1; !merged && p < polys.length; p += 1) {
+            for (var j = 0; !merged && j < polys[p].outer.length; j += 1) {
+              var pt2 = polys[p].outer[j];
+
+              if (pt1.x === pt2.x && pt1.y === pt2.y) {
+                polys[0].inner = polys[0].inner.concat(polys[p].inner);
+                polys[0].outer = polys[0].outer.slice(0, i).concat(polys[p].outer.slice(j)).concat(polys[p].outer.slice(0, j)).concat(polys[0].outer.slice(i));
+                polys.splice(p, 1);
+                merged = true;
+              }
+            }
+          }
+        }
+      }
+
+      if (polys.length === 1) {
+        m_this.options('vertices', polys[0].inner.length ? polys[0] : polys[0].outer);
+      }
+    }
+
+    return s_state(arg);
+  };
   /**
    * Process any actions for this annotation.
    *
@@ -3268,10 +3315,6 @@ var rectangleAnnotation = function rectangleAnnotation(args, annotationName) {
           name: 'rectangle create',
           owner: annotationActionOwner,
           input: 'left',
-          modifiers: {
-            shift: false,
-            ctrl: false
-          },
           selectionRectangle: true,
           selectionConstraint: this._selectionConstraint
         }];
@@ -25699,11 +25742,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(),
@@ -25767,8 +25812,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);
@@ -27887,7 +27937,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "7f57d37e7c28f7be33fbb0081cbd16304d8dffd5";
+module.exports = "6d3d1ea33e76f663157a1b49805c119f55b634ed";
 
 /***/ }),
 
@@ -41047,7 +41097,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.10.5";
+module.exports = "1.10.8";
 
 /***/ }),
 
@@ -45718,7 +45768,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

@@ -1540,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',
@@ -2821,7 +2817,8 @@ var polygonAnnotation = function polygonAnnotation(args) {
   delete args.coordinates;
   annotation.call(this, 'polygon', args);
   var m_this = this,
-      s_actions = this.actions;
+      s_actions = this.actions,
+      s_state = this.state;
   /**
    * Get a list of renderable features for this annotation.  When the polygon
    * is done, this is just a single polygon.  During creation this can be a
@@ -3029,6 +3026,56 @@ var polygonAnnotation = function polygonAnnotation(args) {
   this.actions = function (state) {
     return continuousVerticesActions(m_this, s_actions, state, 'polygon', arguments);
   };
+  /**
+   * Get or set the state of this annotation.
+   *
+   * @param {string|undefined} [arg] If `undefined`, return the state,
+   *    otherwise change it.  This should be one of the
+   *    {@link geo.annotation.state} values.
+   * @returns {this|string} The current state or this annotation.
+   * @fires geo.event.annotation.state
+   */
+
+
+  this.state = function (arg) {
+    var oldState = s_state();
+
+    if (arg && arg !== oldState && (oldState === annotationState.create || oldState === annotationState.edit) && arg === annotationState.done) {
+      /* Uncross polygons when they are complete. */
+      var opts = {
+        style: 'object-listlist-outer-list'
+      };
+      var polys = util.polyops.union(m_this.options('vertices'), [], opts);
+      var merged = true;
+
+      while (polys.length > 1 && merged) {
+        merged = false;
+
+        for (var i = 0; !merged && i < polys[0].outer.length; i += 1) {
+          var pt1 = polys[0].outer[i];
+
+          for (var p = 1; !merged && p < polys.length; p += 1) {
+            for (var j = 0; !merged && j < polys[p].outer.length; j += 1) {
+              var pt2 = polys[p].outer[j];
+
+              if (pt1.x === pt2.x && pt1.y === pt2.y) {
+                polys[0].inner = polys[0].inner.concat(polys[p].inner);
+                polys[0].outer = polys[0].outer.slice(0, i).concat(polys[p].outer.slice(j)).concat(polys[p].outer.slice(0, j)).concat(polys[0].outer.slice(i));
+                polys.splice(p, 1);
+                merged = true;
+              }
+            }
+          }
+        }
+      }
+
+      if (polys.length === 1) {
+        m_this.options('vertices', polys[0].inner.length ? polys[0] : polys[0].outer);
+      }
+    }
+
+    return s_state(arg);
+  };
   /**
    * Process any actions for this annotation.
    *
@@ -3268,10 +3315,6 @@ var rectangleAnnotation = function rectangleAnnotation(args, annotationName) {
           name: 'rectangle create',
           owner: annotationActionOwner,
           input: 'left',
-          modifiers: {
-            shift: false,
-            ctrl: false
-          },
           selectionRectangle: true,
           selectionConstraint: this._selectionConstraint
         }];
@@ -25699,11 +25742,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(),
@@ -25767,8 +25812,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);
@@ -27887,7 +27937,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "7f57d37e7c28f7be33fbb0081cbd16304d8dffd5";
+module.exports = "6d3d1ea33e76f663157a1b49805c119f55b634ed";
 
 /***/ }),
 
@@ -41047,7 +41097,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.10.5";
+module.exports = "1.10.8";
 
 /***/ }),
 
@@ -45718,7 +45768,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