geojs 1.12.2 → 1.12.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.12.2",
+  "version": "1.12.4",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",
@@ -12,9 +12,10 @@
     "url": "https://github.com/OpenGeoscience/geojs"
   },
   "dependencies": {
+    "canvas": "^2.11.2",
     "color-name": "^2.0.0",
     "docdash": "^2.0.1",
-    "earcut": "^2.2.3",
+    "earcut": "^3.0.0",
     "gl-mat3": "^2.0.0",
     "gl-mat4": "^1.2.0",
     "gl-vec3": "^1.1.3",
@@ -37,23 +38,23 @@
     "@babel/preset-env": "^7.16.5",
     "@jsdevtools/coverage-istanbul-loader": "^3.0.5",
     "babel-loader": "^9.0.1",
-    "babel-plugin-istanbul": "^6.1.1",
+    "babel-plugin-istanbul": "^7.0.0",
     "bootstrap": "^3.4.1",
     "bootswatch": "^3.4.1",
     "codemirror": "^5.65.0",
     "colorbrewer": "^1.5.1",
-    "css-loader": "^6.6.0",
+    "css-loader": "^7.1.0",
     "docco": "^0.9.1",
-    "eslint": "^8.20.0",
+    "eslint": "^8.57.1",
     "eslint-config-semistandard": "^17.0.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-n": "^15.2.4",
-    "eslint-plugin-promise": "^6.0.0",
+    "eslint-plugin-n": "^15.7.0",
+    "eslint-plugin-promise": "^6.6.0",
     "expose-loader": "^5.0.0",
     "express": "^4.17.2",
     "fs-extra": "^11.0.0",
-    "glob": "^10.1.0",
+    "glob": "^11.0.0",
     "imports-loader": "^5.0.0",
     "jasmine-core": "^5.0.0",
     "js-yaml": "^4.1.0",
@@ -77,23 +78,23 @@
     "pug": "^3.0.2",
     "pug-lint": "^2.6.0",
     "pug-load": "^3.0.0",
-    "raw-body": "^2.4.2",
+    "raw-body": "^3.0.0",
     "resemblejs": "^5.0.0",
     "serve-index": "^1.9.1",
     "shader-loader": "git+https://github.com/Makio64/shader-loader",
-    "sinon": "^17.0.0",
-    "style-loader": "^3.3.1",
+    "sinon": "^19.0.2",
+    "style-loader": "^4.0.0",
     "stylelint": "<16.3.0 || >16.3.0",
     "stylelint-stylus": "^1.0.0",
-    "stylus": "^0.62.0",
+    "stylus": "^0.64.0",
     "stylus-loader": "^8.0.0",
-    "tar": "^6.1.13",
+    "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-merge": "^5.8.0",
+    "webpack-merge": "^6.0.1",
     "webpack-string-replacer": "^0.0.20"
   },
   "release": {

package/src/annotationLayer.js

@@ -96,6 +96,7 @@ var annotationLayer = function (arg) {
       m_options,
       m_mode = null,
       m_annotations = [],
+      m_annotationIds = {},
       m_features = [],
       m_labelFeature,
       m_labelLayer,
@@ -504,6 +505,7 @@ var annotationLayer = function (arg) {
         annotation: annotation
       });
       m_annotations.push(annotation);
+      m_annotationIds[annotation.id()] = annotation;
       annotation.layer(m_this);
       var map = m_this.map();
       gcs = (gcs === null ? map.gcs() : (
@@ -537,6 +539,9 @@ var annotationLayer = function (arg) {
       if (annotation === m_this.currentAnnotation) {
         m_this.currentAnnotation = null;
       }
+      if (m_annotationIds[annotation.id()] !== undefined) {
+        delete m_annotationIds[annotation.id()];
+      }
       annotation._exit();
       m_annotations.splice(pos, 1);
       if (update !== false) {
@@ -597,12 +602,7 @@ var annotationLayer = function (arg) {
     if (id !== undefined && id !== null) {
       id = +id;  /* Cast to int */
     }
-    var annotations = m_annotations.filter(function (annotation) {
-      return annotation.id() === id;
-    });
-    if (annotations.length) {
-      return annotations[0];
-    }
+    return m_annotationIds[id];
   };
 
   /* A list of special modes */
@@ -1434,6 +1434,7 @@ var annotationLayer = function (arg) {
     // Call super class exit
     s_exit.call(m_this);
     m_annotations = [];
+    m_annotationIds = {};
     m_features = [];
     return m_this;
   };

package/src/map.js

@@ -1594,10 +1594,10 @@ var map = function (arg) {
   this.layers = this.children;
 
   /**
-   * Comapare two layers by zIndex.  If the zIndex is the same, the order in
-   * the parent element is used.  If the two layers don't have the same parent
-   * (for instance, one layer isn't attached to the map), layers in the map
-   * are sorted below detached layers.
+   * Compare two layers by zIndex.  If the zIndex is the same, the order in the
+   * parent element is used.  If the two layers don't have the same parent (for
+   * instance, one layer isn't attached to the map), layers in the map are
+   * sorted below detached layers.
    *
    * @param {geo.layer} a First layer to compare.
    * @param {geo.layer} b Second layer to compare.

package/src/mapInteractor.js

@@ -45,7 +45,7 @@ var Mousetrap = require('mousetrap');
  * @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
- *      visuallly desirabel.
+ *      visually desirable.
  * @property {boolean} [alwaysTouch=false] If true, add touch support even if
  *      the browser doesn't apepar to be touch-aware.
  * @property {number} [wheelScaleX=1] A scale multiplier for horizontal wheel

package/src/pointFeature.js

@@ -156,7 +156,7 @@ var pointFeature = function (arg) {
     m_allData.forEach(function (d, i) {
 
       // for each point in the data set normalize the coordinate
-      // representation and add the point to the cluster treee
+      // representation and add the point to the cluster tree
       var pt = util.normalizeCoordinates(position(d, i));
       pt.index = i;
       m_clusterTree.addPoint(pt);

package/src/polygonFeature.js

@@ -639,7 +639,7 @@ var polygonFeature = function (arg) {
       return data;
     }
 
-    /* Set the reduced polgons as the data and use simple accessors. */
+    /* Set the reduced polygons as the data and use simple accessors. */
     m_this.style('position', util.identityFunction);
     m_this.style('polygon', util.identityFunction);
     m_this.data(data);

package/src/ui/scaleWidget.js

@@ -49,7 +49,7 @@ require('./scaleWidget.styl');
  *   that determine what round values are displayed.
  * @property {number} multiples.multiple The value that is selected for display.
  * @property {number} multiples.digit The number of significant digits in
- *   `mutliple`.
+ *   `multiple`.
  */
 
 /**

package/src/util/common.js

@@ -971,11 +971,22 @@ var util = {
    * @memberof geo.util
    */
   escapeUnicodeHTML: function (text) {
-    return text.replace(/./g, function (k) {
+    return text.replace(/[^- 0-9A-Za-z~`!@#$%^&*()_+={}|[\]\\:";'<>?,./]/g, function (k, pos) {
       var code = k.charCodeAt(0);
       if (code < 127) {
         return k;
       }
+      /* decode utf016 surrogate pairs */
+      if (code >= 0xD800 && code <= 0xE000) {
+        if (code < 0xDC00 || pos) {
+          return '';
+        }
+        var code0 = text.charCodeAt(pos - 1);
+        if (code0 < 0xD800 || code0 >= 0xDC00) {
+          return '';
+        }
+        code = (code0 - 0xD800) * 0x400 + (code - 0xDC00);
+      }
       return '&#' + code.toString(10) + ';';
     });
   },

package/src/vtkjs/vtkjsRenderer.js

@@ -105,7 +105,7 @@ var vtkjsRenderer = function (arg) {
     /* If we are already scheduled to render, don't schedule again.  Rather,
      * mark that we should render after other animation frame requests occur.
      * It would be nice if we could just reschedule the call by removing and
-     * readding the animation frame request, but this doesn't work for if the
+     * re-adding the animation frame request, but this doesn't work for if the
      * reschedule occurs during another animation frame callback (it then waits
      * until a subsequent frame). */
     m_this.layer().map().scheduleAnimationFrame(m_this._renderFrame, true);

package/src/webgl/polygonFeature.js

@@ -21,6 +21,7 @@ var webgl_polygonFeature = function (arg) {
 
   var vgl = require('../vgl');
   var earcut = require('earcut');
+  earcut = earcut.__esModule ? earcut.default : earcut;
   var transform = require('../transform');
   var util = require('../util');
   var object = require('./object');