geojs 1.14.0 → 1.14.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.14.0",
+  "version": "1.14.2",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",
@@ -12,7 +12,7 @@
     "url": "https://github.com/OpenGeoscience/geojs"
   },
   "dependencies": {
-    "canvas": "^2.11.2",
+    "canvas": "^3.0.0",
     "color-name": "^2.0.0",
     "docdash": "^2.0.1",
     "earcut": "^3.0.0",
@@ -30,12 +30,13 @@
     "@egjs/hammerjs": "^2.0.8",
     "d3": "^7.8.5",
     "glslang-validator-prebuilt-predownloaded": "^0.0.2",
-    "vtk.js": "*"
+    "vtk.js": "<32.10.0 || >32.10.0"
   },
   "devDependencies": {
     "@babel/core": "^7.17.0",
     "@babel/plugin-proposal-class-properties": "^7.16.5",
     "@babel/preset-env": "^7.16.5",
+    "@fontsource/lato": "^5.1.1",
     "@jsdevtools/coverage-istanbul-loader": "^3.0.5",
     "babel-loader": "^9.0.1",
     "babel-plugin-istanbul": "^7.0.0",
@@ -91,9 +92,8 @@
     "tar": "^7.4.3",
     "terser-webpack-plugin": "^5.3.1",
     "touch-emulator": "^1.0.0",
-    "typeface-lato": "^1.1.13",
     "webpack": "^5.68.0",
-    "webpack-cli": "^5.0.0",
+    "webpack-cli": "^6.0.1",
     "webpack-merge": "^6.0.1",
     "webpack-string-replacer": "^0.0.20"
   },

package/src/quadFeature.js

@@ -237,6 +237,11 @@ var quadFeature = function (arg) {
             coordbasis.y = 1 - coordbasis.y;
           }
           if (coordbasis) {
+            if (quad.crop && quad.crop.x !== undefined && quad.crop.y !== undefined && (coordbasis.x >= quad.crop.x || coordbasis.y >= quad.crop.y)) {
+              indices.pop();
+              found.pop();
+              return;
+            }
             extra[quad.idx] = {basis: coordbasis, _quad: quad};
           }
         }

package/src/trackFeature.js

@@ -216,6 +216,8 @@ var trackFeature = function (arg) {
           highidx = testidx;
         }
       }
+      // todo: if we want non-linear travel between points, we would adjust
+      // fl and fh here
       var fh = (time - lowt) / (hight - lowt), fl = 1 - fh;
       return {posidx0: lowidx, posidx1: highidx, factor0: fl, factor1: fh, angidx0: lowidx, angidx1: highidx};
     });

package/src/webgl/lineFeature.vert

@@ -62,6 +62,29 @@ void main(void)
     gl_Position = vec4(2.0, 2.0, 0.0, 1.0);
     return;
   }
+  float lineLength = length(vec2(deltaCB.x, deltaCB.y / aspect)) / pixelWidth;
+  // if lines reverse upon themselves and are not nearly the same length, skip
+  // joins.  This is a heuristic; the correct method would to be to pass some
+  // sort of length of the adjacent line to the fragment renderer and adjust
+  // which fragments are rendered, but this is much more complex.
+  float abLimit = length(vec2(A.x - B.x, (A.y - B.y) / aspect)) / pixelWidth;
+  float dcLimit = length(vec2(D.x - C.x, (D.y - C.y) / aspect)) / pixelWidth;
+  if (abLimit >= lineLength - antialiasing - strokeWidth * 0.5 && abLimit <= lineLength + antialiasing + strokeWidth * 0.5) {
+    abLimit = 0.0001;
+  } else {
+    if (abLimit < lineLength)  abLimit = lineLength;
+    abLimit = (strokeWidth - antialiasing) / (abLimit + antialiasing);
+    if (abLimit < 0.0001) abLimit = 0.0001;
+    if (abLimit > 0.1) abLimit = 0.1;
+  }
+  if (dcLimit >= lineLength - antialiasing - strokeWidth * 0.5 && dcLimit <= lineLength + antialiasing + strokeWidth * 0.5) {
+    dcLimit = 0.0001;
+  } else {
+    if (dcLimit < lineLength)  dcLimit = lineLength;
+    dcLimit = (strokeWidth - antialiasing) / (dcLimit + antialiasing);
+    if (dcLimit < 0.0001) dcLimit = 0.0001;
+    if (dcLimit > 0.1) dcLimit = 0.1;
+  }
   float angleCB = atan2(deltaCB.y, deltaCB.x * aspect);
   // values we need to pass along
   strokeColorVar = vec4(strokeColor, strokeOpacity);
@@ -78,7 +101,7 @@ void main(void)
   // by default, offset by the width and don't extend lines.  Later,
   // calculate line extensions based on end cap and end join modes
   float yOffset = strokeWidth + antialiasing;
-  if (vertex == 0 || vertex == 2)  yOffset *= -1.0;
+  if (vertex == 0)  yOffset *= -1.0;
   yOffset += strokeWidth * offset;
   float xOffset = 0.0;
   // end caps
@@ -105,7 +128,7 @@ void main(void)
     angleABC = (mod(angleABC + 3.0 * PI, 2.0 * PI) - PI) / 2.0;
     cosABC = cos(angleABC);  sinABC = sin(angleABC);
     // if this angle is close to flat, pass-through the join
-    if (nearMode >= 4 && cosABC > 0.999999) {
+    if (nearMode >= 4 && (cosABC > 0.999999 || cosABC < abLimit)) {
       nearMode = 3;
     }
     // miter, miter-clip
@@ -138,7 +161,7 @@ void main(void)
     angleBCD = (mod(angleBCD + 3.0 * PI, 2.0 * PI) - PI) / 2.0;
     cosBCD = cos(angleBCD);  sinBCD = sin(angleBCD);
     // if this angle is close to flat, pass-through the join
-    if (farMode >= 4 && cosBCD > 0.999999) {
+    if (farMode >= 4 && (cosBCD > 0.999999 || cosBCD < dcLimit)) {
       farMode = 3;
     }
     // miter, miter-clip
@@ -159,8 +182,6 @@ void main(void)
     B.y + (xOffset * sin(angleCB) + yOffset * cos(angleCB)) * pixelWidth * aspect,
     B.z, 1.0);
   // store other values needed to determine which pixels to plot.
-  float lineLength = length(vec2(deltaCB.x, deltaCB.y / aspect)) / pixelWidth;
-
   if (vertex == 0 || vertex == 1) {
     subpos = vec4(xOffset, yOffset, lineLength - xOffset, strokeWidth);
     info = vec4(float(nearMode), float(farMode), offset, 0.0);