geojs 1.7.1 → 1.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",
@@ -30,7 +30,7 @@
     "vtk.js": "*"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.5",
+    "@babel/core": "^7.17.0",
     "@babel/plugin-proposal-class-properties": "^7.16.5",
     "@babel/preset-env": "^7.16.5",
     "@jsdevtools/coverage-istanbul-loader": "^3.0.5",
@@ -40,7 +40,7 @@
     "bootswatch": "^3.4.1",
     "codemirror": "^5.65.0",
     "colorbrewer": "^1.5.1",
-    "css-loader": "^6.5.1",
+    "css-loader": "^6.6.0",
     "docco": "^0.9.1",
     "eslint": "^7.12.1",
     "eslint-config-semistandard": "^16.0.0",
@@ -57,13 +57,13 @@
     "jaguarjs-jsdoc": "^1.0.2",
     "jasmine-core": "^4.0.0",
     "js-yaml": "^4.1.0",
-    "jsdoc": "^3.6.7",
+    "jsdoc": "^3.6.10",
     "jsdoc-autoprivate": "0.0.1",
     "jsonlint-mod": "^1.7.6",
     "jstransformer-markdown-it": "^2.0.0",
-    "karma": "^6.3.13",
+    "karma": "^6.3.15",
     "karma-chrome-launcher": "^3.1.0",
-    "karma-coverage": "^2.1.0",
+    "karma-coverage": "^2.1.1",
     "karma-firefox-launcher": "^2.1.2",
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-html-reporter": "^1.7.0",
@@ -72,6 +72,7 @@
     "karma-spec-reporter": "^0.0.33",
     "karma-webpack": "^5.0.0",
     "nib": "^1.1.2",
+    "npm-run-all": "^4.1.5",
     "pako": "^2.0.4",
     "pug": "^3.0.2",
     "pug-lint": "^2.6.0",
@@ -124,7 +125,9 @@
     ]
   },
   "scripts": {
-    "build": "webpack --config webpack.config.js && webpack --config webpack-lean.config.js",
+    "build": "npm-run-all -p build-full build-lean",
+    "build-full": "webpack --config webpack.config.js",
+    "build-lean": "webpack --config webpack-lean.config.js",
     "build-examples": "node examples/build.js && webpack --config webpack-examples.config.js",
     "build-website-examples": "node examples/build-website.js && webpack --config webpack-website-examples.config.js",
     "build-tutorials": "node tutorials/build.js && webpack --config webpack-tutorials.config.js",
@@ -143,19 +146,18 @@
     "test-tutorialsci-all": "GEOJS_TEST_CASE=tests/tutorials.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch,FirefoxHeadlessTouch",
     "get-data-files": "node scripts/datastore.js dist/data",
     "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",
-    "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",
+    "ci": "npm-run-all ci-build ci-test",
+    "ci-build": "npm-run-all -c -p build-full build-lean docs get-data-files lint puglint glsllint build-examples build-tutorials",
+    "ci-test": "npm-run-all test-headless test-webglheadless test-headed test-tutorials",
+    "ci-xvfb": "npm-run-all ci-clean ci-build && TEST_SAVE_IMAGE='all' xvfb-run -s '-ac -screen 0 1280x1024x24' npm run ci-test",
     "start": "karma start karma.conf.js",
-    "examples": "node examples/build.js && webpack --config webpack-examples.config.js && node tutorials/build.js && webpack --config webpack-tutorials.config.js && node ./tests/runners/server.js --host \"${HOST-}\" --port ${PORT-8082} --dist",
+    "examples": "npm-run-all -p build-examples build-tutorials && node ./tests/runners/server.js --host \"${HOST-}\" --port ${PORT-8082} --dist",
     "docs": "jsdoc --pedantic -d dist/apidocs -r src package.json -c jsdoc.conf.json",
     "website": "cd website && npx hexo server",
     "setup-website": "cd website && npm install",
-    "build-website": "npm run ci-build && npm run ci-build-website",
+    "build-website": "npm-run-all ci-build ci-build-website",
     "ci-build-website": "cp -a dist/built/. website/source/built && bash -c '(npm run build-website-examples & npm run build-website-tutorials & wait -n && wait -n)' && cd dist && cp -ar data ../website/source/. && rm -rf ../website/source/data/tiles && rm -rf ../website/source/data/tiles.tgz && rm -rf ../website/source/data/base-images && rm -rf ../website/source/data/base-images.tgz && cp -ar apidocs/. ../website/source/apidocs && cd ../website && npm install && rm -f db.json && npx hexo generate",
-    "prepublishOnly": "webpack --config webpack.config.js && webpack --config webpack-lean.config.js && cp dist/built/*.js .",
+    "prepublishOnly": "npm run build && cp dist/built/*.js .",
     "semantic-release": "semantic-release"
   },
   "keywords": [

package/src/tileLayer.js

@@ -676,7 +676,10 @@ var tileLayer = function (arg) {
   this._getTiles = function (maxLevel, bounds, sorted, onlyIfChanged) {
     var i, j, tiles = [], index, nTilesLevel,
         start, end, indexRange, source, center, changed = false, old, level,
-        minLevel = (m_this._options.keepLower ? m_this._options.minLevel : Math.max(maxLevel, m_this._options.minLevel));
+        minLevel = (
+          m_this._options.keepLower ?
+            m_this._options.minLevel :
+            Math.min(Math.max(maxLevel, m_this._options.minLevel), m_this._options.maxLevel));
     if (maxLevel < minLevel) {
       maxLevel = minLevel;
     }
@@ -1533,7 +1536,9 @@ var tileLayer = function (arg) {
        * semi-transparent layers. */
       if ((doneLoading || m_this._isCovered(tile)) &&
           zoom !== tile.index.level &&
-          (zoom >= m_this._options.minLevel || tile.index.level !== m_this._options.minLevel)) {
+          (zoom >= m_this._options.minLevel || tile.index.level !== m_this._options.minLevel) &&
+          (zoom < m_this._options.maxLevel || tile.index.level !== m_this._options.maxLevel)
+      ) {
         return true;
       }
     }