geojs 1.6.1 → 1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",
@@ -27,12 +27,13 @@
   "optionalDependencies": {
     "d3": "^3.5.17",
     "hammerjs": "^2.0.8",
-    "vtk.js": "^14.3.2"
+    "vtk.js": "^21.6.1"
   },
   "devDependencies": {
     "@babel/core": "^7.16.5",
     "@babel/plugin-proposal-class-properties": "^7.16.5",
     "@babel/preset-env": "^7.16.5",
+    "@jsdevtools/coverage-istanbul-loader": "^3.0.5",
     "babel-loader": "^8.2.3",
     "babel-plugin-istanbul": "^6.1.1",
     "bootstrap": "^3.4.1",
@@ -41,12 +42,12 @@
     "colorbrewer": "^1.5.1",
     "css-loader": "^6.5.1",
     "docco": "^0.9.1",
-    "eslint": "^8.5.0",
+    "eslint": "^7.12.1",
     "eslint-config-semistandard": "^16.0.0",
     "eslint-config-standard": "^16.0.3",
     "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.0.0",
+    "eslint-plugin-promise": "^5.0.0",
     "expose-loader": "^3.1.0",
     "express": "^4.17.2",
     "fs-extra": "^10.0.0",
@@ -54,7 +55,6 @@
     "glslang-validator-prebuilt": "0.0.6",
     "imports-loader": "^3.1.1",
     "istanbul-combine": "^0.3.0",
-    "istanbul-instrumenter-loader": "^3.0.1",
     "jaguarjs-jsdoc": "^1.0.2",
     "jasmine-core": "^4.0.0",
     "js-yaml": "^4.1.0",
@@ -62,7 +62,7 @@
     "jsdoc-autoprivate": "0.0.1",
     "jsonlint-mod": "^1.7.6",
     "jstransformer-markdown-it": "^2.0.0",
-    "karma": "^6.3.9",
+    "karma": "^6.3.11",
     "karma-chrome-launcher": "^3.1.0",
     "karma-coverage": "^2.1.0",
     "karma-firefox-launcher": "^2.1.2",
@@ -70,7 +70,7 @@
     "karma-jasmine-html-reporter": "^1.7.0",
     "karma-sinon": "^1.0.5",
     "karma-sourcemap-loader": "^0.3.8",
-    "karma-spec-reporter": "^0.0.32",
+    "karma-spec-reporter": "^0.0.33",
     "karma-webpack": "^5.0.0",
     "nib": "^1.1.2",
     "pako": "^2.0.4",
@@ -79,7 +79,7 @@
     "pug-load": "^3.0.0",
     "raw-body": "^2.4.2",
     "resemblejs": "^4.0.0",
-    "semantic-release": "^18.0.0",
+    "semantic-release": "^19.0.2",
     "serve-index": "^1.9.1",
     "shader-loader": "^1.3.1",
     "sinon": "^12.0.1",
@@ -90,7 +90,7 @@
     "terser-webpack-plugin": "^5.3.0",
     "touch-emulator": "^1.0.0",
     "typeface-lato": "^1.1.13",
-    "webpack": "^5.65.0",
+    "webpack": "^5.66.0",
     "webpack-cli": "^4.9.1",
     "webpack-merge": "^5.8.0"
   },
@@ -146,6 +146,7 @@
     "ci-clean": "git clean -fxd dist -e dist/data jsdoc/tmpl jsdoc/static images lcov",
     "ci": "npm run ci-build && npm run ci-test",
     "ci-build": "bash -c '(webpack --config webpack.config.js & webpack --config webpack-lean.config.js & npm run docs & npm run get-data-files & npm run lint & npm run puglint & npm run glsllint & npm run build-examples & npm run build-tutorials & wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n)'",
+    "ci-build-wait": "bash -c '(webpack --config webpack.config.js & webpack --config webpack-lean.config.js & npm run docs & npm run get-data-files & npm run lint & npm run puglint & npm run glsllint & npm run build-examples & npm run build-tutorials & wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && FAIL=0 || FAIL=1; wait; [ \"$FAIL\" == \"0\" ])'",
     "ci-test": "npm run test-headless && npm run test-webglheadless && npm run test-headed && npm run test-tutorials && npm run combine-coverage",
     "ci-xvfb": "npm run ci-clean && npm run ci-build && TEST_SAVE_IMAGE='all' xvfb-run -s '-ac -screen 0 1280x1024x24' npm run ci-test",
     "start": "karma start karma.conf.js",

package/src/osmLayer.js

@@ -44,6 +44,8 @@ var osmLayer = function (arg) {
     this.constructor.defaults,
     osmLayer.tileSources[this.constructor.defaults.source] || {},
     osmLayer.tileSources[arg.source] || {},
+    // don't name the layer based on the source
+    {name: ''},
     arg);
   tileLayer.call(this, arg);
 

package/src/tile.js

@@ -144,7 +144,7 @@ var tile = function (spec) {
   };
 
   /**
-   * Return a unique string representation of the given tile useble as a hash
+   * Return a unique string representation of the given tile usable as a hash
    * key.  Possibly extend later to include url information to make caches
    * aware of the tile source.
    *

package/src/ui/colorLegendWidget.styl

@@ -27,7 +27,7 @@
             stroke-width 0.7
           text
             font-size 12px
-  
+
   .color-legend-popup
     position absolute
     background white

package/src/webgl/quadFeatureColor.vert

@@ -12,4 +12,3 @@ void main(void) {
   gl_Position.z += zOffset;
   iVertexColor = vertexColor;
 }
-