geojs 1.10.6 → 1.10.9

package/.github/workflows/commitlint.yml

@@ -0,0 +1,11 @@
+name: Lint Commit Messages
+on: [pull_request, push]
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: wagoid/commitlint-github-action@v5

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/commitlint.config.js

@@ -0,0 +1,24 @@
+module.exports = {
+  extends: ['@commitlint/config-conventional'],
+  rules: {
+    'subject-case': [0],
+    // These are the standard values, but are listed here for easier reference
+    'type-enum': [
+      2,
+      'always',
+      [
+        'build',
+        'chore',
+        'ci',
+        'docs',
+        'feat',
+        'fix',
+        'perf',
+        'refactor',
+        'revert',
+        'style',
+        'test'
+      ]
+    ]
+  }
+};

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
         }];
@@ -9331,7 +9374,7 @@ module.exports = domRenderer;
  *
  * @namespace
  * @alias geo.event
- * @type {geo.event.base}
+ * @type {object}
  *
  * @example
  * map.geoOn(geo.event.layerAdd, function (event) {
@@ -13707,6 +13750,15 @@ if (window && !window.jQuery) {
   window.jQuery = $;
 }
 
+if (window && !window.geojsMap) {
+  window.geojsMap = function () {
+    var maps = $('.geojs-map').map(function (idx, m) {
+      return $(m).data('data-geojs-map');
+    });
+    return maps.length === 0 ? undefined : maps.length === 1 ? maps[0] : maps;
+  };
+}
+
 /***/ }),
 
 /***/ 5699:
@@ -18656,6 +18708,9 @@ var map = function map(arg) {
 
 
   this._version = __webpack_require__(2978);
+  /* Link to the main library */
+
+  this._geo = __webpack_require__(6062);
   /**
    * Draw a layer image to a canvas context.  The layer's opacity and transform
    * are applied.  This is used as part of making a screenshot.
@@ -19317,6 +19372,28 @@ var Mousetrap = __webpack_require__(3345);
  *      The default is `(2 - t) * t`.
  */
 
+/**
+ * The state of the mouse.
+ *
+ * @typedef {object} geo.mouseState
+ * @property {geo.screenPosition} page Mouse position relative to the page.
+ * @property {geo.geoPosition} map Mouse position relative to the map.
+ * @property {geo.geoPosition} geo Mouse position in map interface gcs.
+ * @property {geo.geoPosition} mapgcs Mouse position in map gcs
+ * @property {object} buttons Which mouse buttons are down.
+ * @property {boolean} buttons.left State of the left mouse button.
+ * @property {boolean} buttons.right State of the right mouse button.
+ * @property {boolean} buttons.middle State of the middle mouse button.
+ * @property {object} modifiers Which modifier keys are down.
+ * @property {boolean} modifiers.alt State of the alt key.
+ * @property {boolean} modifiers.ctrl State of the ctrl key.
+ * @property {boolean} modifiers.shift State of the shift key.
+ * @property {boolean} modifiers.meta State of the meta key.
+ * @property {number} time Time (epoch ms) the event was captured.
+ * @property {number} deltaTime Time elapsed (ms) since the last mouse event.
+ * @property {geo.screenPosition} velocity Mouse speed in pixels/ms.
+ */
+
 /**
  * The mapInteractor class is responsible for handling raw events from the
  * browser and interpreting them as map navigation interactions.  This class
@@ -25699,11 +25776,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 +25846,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 +27971,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "52900ff9b31db04903654e968c3bf6e7bcc3bffb";
+module.exports = "66ce1a660f334ca97248cb10af94935e6f8b204b";
 
 /***/ }),
 
@@ -40100,6 +40184,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 var PolyBool = __webpack_require__(3291);
 
 var geo_map = __webpack_require__(2804);
+
+var util = __webpack_require__(8340);
 /**
  * A list of flat polygon lists.
  *
@@ -40179,29 +40265,95 @@ var AlternateOpNames = {
  * Convert a segment list to a polygon list.
  *
  * @param {object[]} seglist A PolyBool segment list.
- * @returns {geo.polygonList} A polygon list.
+ * @returns {geo.polygonList|undefined} A polygon list.
  */
 
 function seglistToPolygonList(seglist) {
   // This single line doesn't arrange holes correctly
   // return seglist.map((s) => PolyBool.polygon(s).regions);
-  var polys = [];
-  seglist.forEach(function (s) {
-    var geojson = PolyBool.polygonToGeoJSON(PolyBool.polygon(s));
 
+  /* This uses PolyBools' operations (mostly), but is much slower than needed
+   * since it goes through geojson.
+  const polys = [];
+  seglist.forEach((s) => {
+    const geojson = PolyBool.polygonToGeoJSON(PolyBool.polygon(s));
     if (geojson.type === 'MultiPolygon') {
-      geojson.coordinates.forEach(function (p) {
-        polys.push(p.map(function (h) {
-          return h.slice(0, h.length - 1);
-        }));
+      geojson.coordinates.forEach((p) => {
+        polys.push(p.map((h) => h.slice(0, h.length - 1)));
       });
     } else if (geojson.type === 'Polygon') {
-      polys.push(geojson.coordinates.map(function (h) {
-        return h.slice(0, h.length - 1);
-      }));
+      polys.push(geojson.coordinates.map((h) => h.slice(0, h.length - 1)));
     }
   });
   return polys;
+   */
+  var polys = []; // end result
+
+  var borders = []; // polygons in format needed for util.pointInPolygon
+
+  var regions = []; // polygons in end result format
+
+  var parents = []; // list of parents of each polygon
+
+  seglist.forEach(function (s) {
+    return PolyBool.polygon(s).regions.forEach(function (r) {
+      var border = r.map(function (pt) {
+        return {
+          x: pt[0],
+          y: pt[1]
+        };
+      });
+
+      if (border.length < 3) {
+        return;
+      }
+
+      parents.push([]);
+      borders.forEach(function (b, i) {
+        if (util.pointInPolygon(border[0], b)) {
+          parents[borders.length].push(i);
+        } else if (util.pointInPolygon(b[0], border)) {
+          parents[i].push(borders.length);
+        }
+      });
+      regions.push(r);
+      borders.push(border);
+    });
+  });
+  /* find nested polygons */
+
+  var dest = Array(regions.length);
+  var used = 0;
+
+  while (used < regions.length) {
+    for (var i = 0; i < regions.length; i += 1) {
+      if (dest[i] === undefined && !parents[i].length) {
+        dest[i] = polys.length;
+        /* reverse the outer polygons for consistency with how PolyBool
+         * generates geojson */
+
+        polys.push([regions[i].reverse()]);
+        used += 1;
+      }
+    }
+
+    for (var _i = 0; _i < regions.length; _i += 1) {
+      if (dest[_i] === undefined && parents[_i].length === 1 && dest[parents[_i][0]] !== undefined) {
+        polys[dest[parents[_i][0]]].push(regions[_i]);
+
+        dest[_i] = dest[parents[_i][0]];
+        used += 1;
+      }
+    }
+
+    for (var _i2 = 0; _i2 < regions.length; _i2 += 1) {
+      parents[_i2] = parents[_i2].filter(function (d) {
+        return dest[d] === undefined;
+      });
+    }
+  }
+
+  return polys.length ? polys : [[]];
 }
 /**
  * Perform an boolean operation on a seglist from polygons.
@@ -41047,7 +41199,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.10.6";
+module.exports = "1.10.9";
 
 /***/ }),
 

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
         }];
@@ -9331,7 +9374,7 @@ module.exports = domRenderer;
  *
  * @namespace
  * @alias geo.event
- * @type {geo.event.base}
+ * @type {object}
  *
  * @example
  * map.geoOn(geo.event.layerAdd, function (event) {
@@ -13707,6 +13750,15 @@ if (window && !window.jQuery) {
   window.jQuery = $;
 }
 
+if (window && !window.geojsMap) {
+  window.geojsMap = function () {
+    var maps = $('.geojs-map').map(function (idx, m) {
+      return $(m).data('data-geojs-map');
+    });
+    return maps.length === 0 ? undefined : maps.length === 1 ? maps[0] : maps;
+  };
+}
+
 /***/ }),
 
 /***/ 5699:
@@ -18656,6 +18708,9 @@ var map = function map(arg) {
 
 
   this._version = __webpack_require__(2978);
+  /* Link to the main library */
+
+  this._geo = __webpack_require__(6062);
   /**
    * Draw a layer image to a canvas context.  The layer's opacity and transform
    * are applied.  This is used as part of making a screenshot.
@@ -19317,6 +19372,28 @@ var Mousetrap = __webpack_require__(3345);
  *      The default is `(2 - t) * t`.
  */
 
+/**
+ * The state of the mouse.
+ *
+ * @typedef {object} geo.mouseState
+ * @property {geo.screenPosition} page Mouse position relative to the page.
+ * @property {geo.geoPosition} map Mouse position relative to the map.
+ * @property {geo.geoPosition} geo Mouse position in map interface gcs.
+ * @property {geo.geoPosition} mapgcs Mouse position in map gcs
+ * @property {object} buttons Which mouse buttons are down.
+ * @property {boolean} buttons.left State of the left mouse button.
+ * @property {boolean} buttons.right State of the right mouse button.
+ * @property {boolean} buttons.middle State of the middle mouse button.
+ * @property {object} modifiers Which modifier keys are down.
+ * @property {boolean} modifiers.alt State of the alt key.
+ * @property {boolean} modifiers.ctrl State of the ctrl key.
+ * @property {boolean} modifiers.shift State of the shift key.
+ * @property {boolean} modifiers.meta State of the meta key.
+ * @property {number} time Time (epoch ms) the event was captured.
+ * @property {number} deltaTime Time elapsed (ms) since the last mouse event.
+ * @property {geo.screenPosition} velocity Mouse speed in pixels/ms.
+ */
+
 /**
  * The mapInteractor class is responsible for handling raw events from the
  * browser and interpreting them as map navigation interactions.  This class
@@ -25699,11 +25776,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 +25846,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 +27971,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "52900ff9b31db04903654e968c3bf6e7bcc3bffb";
+module.exports = "66ce1a660f334ca97248cb10af94935e6f8b204b";
 
 /***/ }),
 
@@ -40100,6 +40184,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 var PolyBool = __webpack_require__(3291);
 
 var geo_map = __webpack_require__(2804);
+
+var util = __webpack_require__(8340);
 /**
  * A list of flat polygon lists.
  *
@@ -40179,29 +40265,95 @@ var AlternateOpNames = {
  * Convert a segment list to a polygon list.
  *
  * @param {object[]} seglist A PolyBool segment list.
- * @returns {geo.polygonList} A polygon list.
+ * @returns {geo.polygonList|undefined} A polygon list.
  */
 
 function seglistToPolygonList(seglist) {
   // This single line doesn't arrange holes correctly
   // return seglist.map((s) => PolyBool.polygon(s).regions);
-  var polys = [];
-  seglist.forEach(function (s) {
-    var geojson = PolyBool.polygonToGeoJSON(PolyBool.polygon(s));
 
+  /* This uses PolyBools' operations (mostly), but is much slower than needed
+   * since it goes through geojson.
+  const polys = [];
+  seglist.forEach((s) => {
+    const geojson = PolyBool.polygonToGeoJSON(PolyBool.polygon(s));
     if (geojson.type === 'MultiPolygon') {
-      geojson.coordinates.forEach(function (p) {
-        polys.push(p.map(function (h) {
-          return h.slice(0, h.length - 1);
-        }));
+      geojson.coordinates.forEach((p) => {
+        polys.push(p.map((h) => h.slice(0, h.length - 1)));
       });
     } else if (geojson.type === 'Polygon') {
-      polys.push(geojson.coordinates.map(function (h) {
-        return h.slice(0, h.length - 1);
-      }));
+      polys.push(geojson.coordinates.map((h) => h.slice(0, h.length - 1)));
     }
   });
   return polys;
+   */
+  var polys = []; // end result
+
+  var borders = []; // polygons in format needed for util.pointInPolygon
+
+  var regions = []; // polygons in end result format
+
+  var parents = []; // list of parents of each polygon
+
+  seglist.forEach(function (s) {
+    return PolyBool.polygon(s).regions.forEach(function (r) {
+      var border = r.map(function (pt) {
+        return {
+          x: pt[0],
+          y: pt[1]
+        };
+      });
+
+      if (border.length < 3) {
+        return;
+      }
+
+      parents.push([]);
+      borders.forEach(function (b, i) {
+        if (util.pointInPolygon(border[0], b)) {
+          parents[borders.length].push(i);
+        } else if (util.pointInPolygon(b[0], border)) {
+          parents[i].push(borders.length);
+        }
+      });
+      regions.push(r);
+      borders.push(border);
+    });
+  });
+  /* find nested polygons */
+
+  var dest = Array(regions.length);
+  var used = 0;
+
+  while (used < regions.length) {
+    for (var i = 0; i < regions.length; i += 1) {
+      if (dest[i] === undefined && !parents[i].length) {
+        dest[i] = polys.length;
+        /* reverse the outer polygons for consistency with how PolyBool
+         * generates geojson */
+
+        polys.push([regions[i].reverse()]);
+        used += 1;
+      }
+    }
+
+    for (var _i = 0; _i < regions.length; _i += 1) {
+      if (dest[_i] === undefined && parents[_i].length === 1 && dest[parents[_i][0]] !== undefined) {
+        polys[dest[parents[_i][0]]].push(regions[_i]);
+
+        dest[_i] = dest[parents[_i][0]];
+        used += 1;
+      }
+    }
+
+    for (var _i2 = 0; _i2 < regions.length; _i2 += 1) {
+      parents[_i2] = parents[_i2].filter(function (d) {
+        return dest[d] === undefined;
+      });
+    }
+  }
+
+  return polys.length ? polys : [[]];
 }
 /**
  * Perform an boolean operation on a seglist from polygons.
@@ -41047,7 +41199,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.10.6";
+module.exports = "1.10.9";
 
 /***/ }),