geojs 1.9.2 → 1.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "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/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
@@ -1261,8 +1272,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) {

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.

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/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) {