geojs 1.9.1 → 1.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.9.1",
+  "version": "1.9.4",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",
@@ -67,7 +67,7 @@
     "karma-coverage": "^2.1.1",
     "karma-firefox-launcher": "^2.1.2",
     "karma-jasmine": "^5.0.0",
-    "karma-jasmine-html-reporter": "^1.7.0",
+    "karma-jasmine-html-reporter": "^2.0.0",
     "karma-sinon": "^1.0.5",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-spec-reporter": "^0.0.34",
@@ -85,7 +85,7 @@
     "shader-loader": "^1.3.1",
     "sinon": "^14.0.0",
     "style-loader": "^3.3.1",
-    "stylus": "^0.57.0",
+    "stylus": "^0.58.1",
     "stylus-loader": "^7.0.0",
     "terser-webpack-plugin": "^5.3.1",
     "touch-emulator": "^1.0.0",

package/src/action.js

@@ -16,10 +16,7 @@ var geo_action = {
   zoomrotate: 'geo_action_zoom_rotate',
   zoomselect: 'geo_action_zoomselect',
 
-  // annotation actions
-  annotation_line: 'geo_annotation_line',
-  annotation_polygon: 'geo_annotation_polygon',
-  annotation_rectangle: 'geo_annotation_rectangle',
+  // annotation actions -- some are also added by the registry
   annotation_edit_handle: 'geo_annotation_edit_handle'
 };
 

package/src/annotation/annotation.js

@@ -151,6 +151,14 @@ var annotation = function (type, args) {
     return m_id;
   };
 
+  /**
+   * Assign a new id to this annotation.
+   */
+  this.newId = function () {
+    annotationId += 1;
+    m_id = annotationId;
+  };
+
   /**
    * Get or set the name of this annotation.
    *

package/src/annotationLayer.js

@@ -49,6 +49,17 @@ var textFeature = require('./textFeature');
  *    style object.
  */
 
+/**
+ * @typedef {geo.util.polyop.spec} geo.util.polyop.annotationLayerSpec
+ * @extends {geo.util.polyop.spec}
+ * @property {string} [keepAnnotations='exact'] Determine which annotations are
+ *   present after a boolean operation.  `'exact'` replaces modified
+ *   annotations with the results; unmodified annotations are left as is.
+ *   `'all'` replaces all annotations, so unchanged annotations may be
+ *   converted to polygonAnnotations.  `'none'` discards all existing
+ *   annotations and only keeps modified results.
+ */
+
 /**
  * Layer to handle direct interactions with different features.  Annotations
  * (features) can be created by calling mode(<name of feature>) or cancelled
@@ -470,6 +481,9 @@ var annotationLayer = function (arg) {
   this.addAnnotation = function (annotation, gcs, update) {
     var pos = $.inArray(annotation, m_annotations);
     if (pos < 0) {
+      while (m_this.annotationById(annotation.id())) {
+        annotation.newId();
+      }
       m_this.geoTrigger(geo_event.annotation.add_before, {
         annotation: annotation
       });
@@ -1247,11 +1261,15 @@ var annotationLayer = function (arg) {
   this.toPolygonList = function (opts) {
     const poly = [];
     opts = opts || {};
-    opts.annotationIndices = [];
+    const indices = [];
+    if (!opts.annotationIndices) {
+      opts.annotationIndices = {};
+    }
+    opts.annotationIndices[m_this.id()] = indices;
     m_annotations.forEach((annotation, idx) => {
       if (annotation.toPolygonList) {
         annotation.toPolygonList(opts).forEach((p) => poly.push(p));
-        opts.annotationIndices.push(idx);
+        indices.push(idx);
       }
     });
     return poly;
@@ -1261,8 +1279,8 @@ var annotationLayer = function (arg) {
    * Replace appropriate annotations with a list of polygons.
    *
    * @param {geo.polygonList} poly A list of polygons.
-   * @param {geo.util.polyop.spec} [opts] This contains annotationIndices and
-   *   correspondence used to track annotations.
+   * @param {geo.util.polyop.annotationLayerSpec} [opts] This contains
+   *   annotationIndices and correspondence used to track annotations.
    * @returns {this}
    */
   this.fromPolygonList = function (poly, opts) {
@@ -1274,14 +1292,15 @@ var annotationLayer = function (arg) {
     const keepIds = {};
     const reusedIds = {};
     let correspond, exact, annot;
-    if (opts.annotationIndices && opts.correspond && opts.correspond.poly1 && opts.annotationIndices.length === opts.correspond.poly1.length) {
+    const indices = (opts.annotationIndices || {})[m_this.id()];
+    if (indices && opts.correspond && opts.correspond.poly1 && indices.length === opts.correspond.poly1.length) {
       correspond = opts.correspond.poly1;
       exact = opts.correspond.exact1;
       annot = m_this.annotations();
     }
-    if (keep !== 'all' && keep !== 'none') {
+    if (keep !== 'all' && keep !== 'none' && annot) {
       annot.forEach((oldAnnot, idx) => {
-        if (opts.annotationIndices.indexOf(idx) < 0) {
+        if (indices.indexOf(idx) < 0) {
           keepIds[oldAnnot.id()] = true;
         }
       });
@@ -1295,7 +1314,7 @@ var annotationLayer = function (arg) {
       if (correspond) {
         for (let i = 0; i < correspond.length; i += 1) {
           if (correspond[i] && correspond[i].indexOf(idx) >= 0) {
-            const orig = annot[opts.annotationIndices[i]];
+            const orig = annot[indices[i]];
             if (keep !== 'all' && keep !== 'none' && exact && exact[i] && exact[i].indexOf(idx) >= 0) {
               keepIds[orig.id()] = true;
               return;
@@ -1332,7 +1351,7 @@ var annotationLayer = function (arg) {
     }
     // add new annotations
     polyAnnot.forEach((p) => {
-      m_this.addAnnotation(registry.createAnnotation('polygon', p), m_this.gcs(), false);
+      m_this.addAnnotation(registry.createAnnotation('polygon', p), m_this.map().gcs(), false);
       update = true;
     });
     if (update) {

package/src/lineFeature.js

@@ -46,9 +46,12 @@ var util = require('./util');
  *   divided by the sine of half the angle between segments, then a bevel join
  *   is used instead.  This is a single value that applies to all lines.  If a
  *   function, it is called with `(data)`.
- * @property {boolean|function} [uniformLine=false] Boolean indicating if each
- *   line has a uniform style (uniform stroke color, opacity, and width).  Can
- *   vary by line.
+ * @property {boolean|string|function} [uniformLine=false] Boolean indicating
+ *   if each line has a uniform style (uniform stroke color, opacity, and
+ *   width).  Can vary by line.  A value of `'drop'` will modify rendered
+ *   vertex order by dropping duplicates and setting later values to zero
+ *   opacity.  This can be faster but makes it so updating the style array
+ *   can no longer be used.
  * @property {number|function} [antialiasing] Antialiasing distance in pixels.
  *   Values must be non-negative.  A value greater than 1 will produce a
  *   visible gradient.  This is a single value that applies to all lines.
@@ -182,7 +185,7 @@ var lineFeature = function (arg) {
         const current = lineRecord[j];
         let p = posFunc(current, j, d, index);
         if (onlyInvertedY) {
-          p.y = -p.y;
+          p = {x: p.x, y: -p.y};
         } else if (gcs !== mapgcs) {
           p = transform.transformCoordinates(gcs, mapgcs, p);
         }

package/src/mapInteractor.js

@@ -25,8 +25,8 @@ var Mousetrap = require('mousetrap');
  *      event must occur within this time in milliseconds of the mouse down
  *      event for it to be considered a click.
  * @property {boolean|number} [click.cancelOnMove=true] If true, don't generate
- *      click events if the mouse moved at all.  If a positive number, the distance
- *      at which to cancel click events when the mouse moves.
+ *      click events if the mouse moved at all.  If a positive number, the
+ *      distance at which to cancel click events when the mouse moves.
  * @property {object} [keyboard] An object describing which keyboard events are
  *      handled.
  * @property {object} [keyboard.actions] An object with different actions that
@@ -39,6 +39,9 @@ var Mousetrap = require('mousetrap');
  *      an object with keys of the meta keys that are required to be down or
  *      up for that scale action to trigger.  If the value of the meta key is
  *      truthy, it must be down.  If `false`, it must be up.
+ * @property {string[]} [keyboard.metakeyMouseEvents] A list of meta keys
+ * *    that, when typed singly, trigger a repeat of the last mousemove or
+ *      actionmove event so that listeners can  update metakey information.
  * @property {boolean} [keyboard.focusHighlight=true] If truthy, when the map
  *      gains focus, a highlight style is shown around it.  This gives an
  *      indicator that keyboard events will affect the map, but may not be
@@ -294,6 +297,10 @@ var mapInteractor = function (args) {
           1: {shift: true, ctrl: true},
           2: {shift: true, ctrl: false}
         },
+        /* This is a list of meta keys that when typed singly trigger a repeat
+         * of the last mousemove or actionmove event so that listeners can
+         * update metakey information. */
+        metakeyMouseEvents: ['shift', 'ctrl', 'shift+ctrl', 'shift+alt', 'shift+meta'],
         /* if focusHighlight is truthy, then a class is added to the map such
          * that when the map gets focus, it is indicated inside the border of
          * the map -- browsers usually show focus on the outside, which isn't
@@ -648,6 +655,35 @@ var mapInteractor = function (args) {
     }
   };
 
+  /**
+   * Repeat a mousemove or actionmove event with new metakey information.
+   *
+   * @param {event} [evt] A Mousetrap event with the key change.
+   * @fires geo.event.mousemove
+   * @fires geo.event.actionmove
+   */
+  this._repeatMouseMoveEvent = function (evt) {
+    if (!m_mouse || !m_mouse.modifiers) {
+      return;
+    }
+    const old = {
+      alt: m_mouse.modifiers.alt,
+      ctrl: m_mouse.modifiers.ctrl,
+      meta: m_mouse.modifiers.meta,
+      shift: m_mouse.modifiers.shift
+    };
+    m_this._getMouseModifiers(evt);
+    if (m_mouse.modifiers.alt === old.alt && m_mouse.modifiers.ctrl === old.ctrl && m_mouse.modifiers.meta === old.meta && m_mouse.modifiers.shift === old.shift) {
+      return;
+    }
+    if (m_state.boundDocumentHandlers) {
+      m_this.map().geoTrigger(geo_event.actionmove, {
+        state: m_this.state(), mouse: m_this.mouse(), event: evt});
+    } else {
+      m_this.map().geoTrigger(geo_event.mousemove, m_this.mouse());
+    }
+  };
+
   /**
    * Retrigger a mouse movement with the current mouse state.
    * @fires geo.event.mousemove
@@ -711,6 +747,13 @@ var mapInteractor = function (args) {
           bound = bound.concat(m_options.keyboard.actions[keyAction]);
         }
       }
+      if (m_options.keyboard.metakeyMouseEvents) {
+        m_options.keyboard.metakeyMouseEvents.forEach((meta) => {
+          m_keyHandler.bind(meta, m_this._repeatMouseMoveEvent, 'keydown');
+          m_keyHandler.bind(meta, m_this._repeatMouseMoveEvent, 'keyup');
+          bound.push(meta);
+        });
+      }
       m_boundKeys = bound;
     }
     $node.toggleClass(
@@ -2095,7 +2138,7 @@ var mapInteractor = function (args) {
         preventDefault: function () {},
         simulated: true
       };
-      m_keyHandler.trigger(keys);
+      m_keyHandler.trigger(keys, options.event);
       return;
     }
 

package/src/registry.js

@@ -1,4 +1,6 @@
 var $ = require('jquery');
+var geo_action = require('./action');
+
 var widgets = {
   dom: {}
 };
@@ -398,6 +400,7 @@ util.registerAnnotation = function (name, func, features) {
     console.warn('The ' + name + ' annotation is already registered');
   }
   annotations[name] = {func: func, features: features || {}};
+  geo_action['annotation_' + name] = 'geo_annotation_' + name;
   return old;
 };
 

package/src/trackFeature.js

@@ -816,7 +816,9 @@ var trackFeature = function (arg) {
       {
         track: util.identityFunction,
         position: util.identityFunction,
-        time: (d, i) => (d.t !== undefined ? d.t : i)
+        time: (d, i) => (d.t !== undefined ? d.t : i),
+        uniformLine: 'drop',
+        closed: false
       },
       arg.style === undefined ? {} : arg.style
     );

package/src/util/polyops.js

@@ -327,16 +327,19 @@ function generateCorrespondence(poly1, poly2, newpoly, results) {
     results[ekey] = Array(poly.length);
     poly.forEach((p, idx) => {
       const found = {};
+      let missed = 0;
       p.forEach((h) => h.forEach((pt) => {
         const key = '_' + pt[0] + '_' + pt[1];
         if (pts[key]) {
           pts[key].forEach((val) => {
             found[val] = (found[val] || 0) + 1;
           });
+        } else {
+          missed += 1;
         }
       }));
       Object.keys(found).forEach((nidx) => {
-        if (found[nidx] === counts[+nidx]) {
+        if (found[nidx] === counts[+nidx] && !missed && p.length === newpoly[+nidx].length) {
           if (!results[ekey][idx]) {
             results[ekey][idx] = [];
           }

package/src/webgl/lineFeature.js

@@ -269,6 +269,7 @@ var webgl_lineFeature = function (arg) {
       closedVal = closed[i];
       firstPosIdx3 = posIdx3;
       maxj = lineItem.length + (closedVal === 2 ? 1 : 0);
+      let skipped = 0;
       for (j = 0; j < maxj; j += 1, posIdx3 += 3) {
         lidx = j;
         if (j === lineItem.length) {
@@ -329,9 +330,17 @@ var webgl_lineFeature = function (arg) {
         }
 
         if (j) {
+          if (uniform === 'drop' && j > 1 && position[vert[0].pos] === position[vert[1].pos] && position[vert[0].pos + 1] === position[vert[1].pos + 1]) {
+            skipped += 1;
+            continue;
+          }
           /* zero out the z position.  This can be changed if we handle it in
            * the shader. */
           for (k = 0; k < orderLen; k += 1, dest += 1, dest3 += 3) {
+            if (uniform === 'drop' && vert[0].strokeOpacity <= 0 && vert[1].strokeOpacity <= 0) {
+              strokeOpacityBuf[dest] = -1;
+              continue;
+            }
             orderk0 = order[k][0];
             v1 = vert[orderk0];
             v2 = vert[1 - orderk0];
@@ -370,6 +379,11 @@ var webgl_lineFeature = function (arg) {
           }
         }
       }
+      if (skipped) {
+        for (k = 0; k < skipped * orderLen; k += 1, dest += 1, dest3 += 3) {
+          strokeOpacityBuf[dest] = -1;
+        }
+      }
     }
 
     if (!onlyStyle) {