geojs 1.10.8 → 1.10.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.10.8",
+  "version": "1.10.9",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",

package/src/event.js

@@ -7,7 +7,7 @@
  *
  * @namespace
  * @alias geo.event
- * @type {geo.event.base}
+ * @type {object}
  *
  * @example
  * map.geoOn(geo.event.layerAdd, function (event) {

package/src/index.js

@@ -108,3 +108,9 @@ if (window && !window.$) {
 if (window && !window.jQuery) {
   window.jQuery = $;
 }
+if (window && !window.geojsMap) {
+  window.geojsMap = () => {
+    const maps = $('.geojs-map').map((idx, m) => $(m).data('data-geojs-map'));
+    return maps.length === 0 ? undefined : maps.length === 1 ? maps[0] : maps;
+  };
+}

package/src/map.js

@@ -1966,6 +1966,8 @@ var map = function (arg) {
 
   /* Report the current version on the map object. */
   this._version = require('./version');
+  /* Link to the main library */
+  this._geo = require('./index');
 
   /**
    * Draw a layer image to a canvas context.  The layer's opacity and transform

package/src/mapInteractor.js

@@ -100,6 +100,28 @@ var Mousetrap = require('mousetrap');
  *      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

package/src/util/polyops.js

@@ -1,5 +1,6 @@
 var PolyBool = require('polybooljs');
 var geo_map = require('../map');
+var util = require('../util/common');
 
 /**
  * A list of flat polygon lists.
@@ -80,11 +81,13 @@ const 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);
+  /* 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));
@@ -97,6 +100,52 @@ function seglistToPolygonList(seglist) {
     }
   });
   return polys;
+   */
+  const polys = []; // end result
+  const borders = []; // polygons in format needed for util.pointInPolygon
+  const regions = []; // polygons in end result format
+  const parents = []; // list of parents of each polygon
+  seglist.forEach((s) => PolyBool.polygon(s).regions.forEach((r) => {
+    const border = r.map((pt) => ({x: pt[0], y: pt[1]}));
+    if (border.length < 3) {
+      return;
+    }
+    parents.push([]);
+    borders.forEach((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 */
+  const dest = Array(regions.length);
+  let used = 0;
+  while (used < regions.length) {
+    for (let 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 (let 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 (let i = 0; i < regions.length; i += 1) {
+      parents[i] = parents[i].filter((d) => dest[d] === undefined);
+    }
+  }
+  return polys.length ? polys : [[]];
 }
 
 /**