itowns 2.34.0 → 2.36.2

package/lib/Utils/CameraUtils.js

@@ -143,7 +143,7 @@ var CameraRig = /*#__PURE__*/function (_THREE$Object3D) {
 
     _this.seaLevel.add(_this.target);
 
-    _this.target.add(_this.camera); // sea level's geograohic coordinate
+    _this.target.add(_this.camera); // target's geographic coordinate
 
 
     _this.coord = new _Coordinates["default"]('EPSG:4978', 0, 0); // sea level's worldPoistion
@@ -216,9 +216,9 @@ var CameraRig = /*#__PURE__*/function (_THREE$Object3D) {
   }, {
     key: "setTargetFromCoordinate",
     value: function setTargetFromCoordinate(view, coord) {
-      // clamp altitude to seaLevel
+      // compute precise coordinate (coord) altitude and clamp it above seaLevel
       coord.as(tileLayer(view).extent.crs, this.coord);
-      var altitude = Math.max(0, this.coord.z);
+      var altitude = Math.max(0, _DEMUtils["default"].getElevationValueAt(tileLayer(view), this.coord, _DEMUtils["default"].PRECISE_READ_Z) || this.coord.z);
       this.coord.z = altitude; // adjust target's position with clamped altitude
 
       this.coord.as(view.referenceCrs).toVector3(targetPosition);
@@ -482,7 +482,7 @@ var _default = {
    * @property {boolean} [proxy=true] use proxy to handling camera's transformation. if proxy == true, other camera's transformation stops rig's transformation
    * @property {Number} [easing=TWEEN.Easing.Quartic.InOut] in and out easing animation
    * @property {function} [callback] callback call each animation's frame (params are current cameraTransform and worldTargetPosition)
-   * @property {boolean} [stopPlaceOnGroundAtEnd=defaultStopPlaceOnGroundAtEnd] stop place target on the ground at animation ending
+   * @property {boolean} [stopPlaceOnGroundAtEnd=false] stop place target on the ground at animation ending
    */
 
   /**
@@ -577,7 +577,7 @@ var _default = {
       };
     } else {
       extent = extent.as(view.referenceCrs);
-      dimensions = extent.dimensions();
+      dimensions = extent.planarDimensions();
     }
 
     extent.center(cameraTransformOptions.coord);
@@ -630,15 +630,15 @@ var _default = {
     }
 
     return rig.animateCameraToLookAtTarget(view, camera, params).promise.then(function (finished) {
-      var params = rig.getParams();
       var stopPlaceOnGround = params.stopPlaceOnGroundAtEnd === undefined ? _this7.defaultStopPlaceOnGroundAtEnd : params.stopPlaceOnGroundAtEnd;
+      var newTransformation = rig.getParams();
 
       if (stopPlaceOnGround) {
         rig.stop(view);
       }
 
-      params.finished = finished;
-      return params;
+      newTransformation.finished = finished;
+      return newTransformation;
     });
   },
 

package/lib/Utils/DEMUtils.js

@@ -345,7 +345,7 @@ function offsetInExtent(point, extent) {
     throw new Error("Unsupported mix: ".concat(point.crs, " and ").concat(extent.crs));
   }
 
-  extent.dimensions(dimension);
+  extent.planarDimensions(dimension);
   var originX = (point.x - extent.west) / dimension.x;
   var originY = (extent.north - point.y) / dimension.y;
   return target.set(originX, originY);
@@ -402,7 +402,7 @@ function _readZ(layer, method, coord, nodes, cache) {
   //   - the correct one: emulate the vertex shader code
 
   if (method == PRECISE_READ_Z) {
-    pt.z = _readZCorrect(layer, src, temp.offset, tile.extent.dimensions(), tileWithValidElevationTexture.extent.dimensions());
+    pt.z = _readZCorrect(layer, src, temp.offset, tile.extent.planarDimensions(), tileWithValidElevationTexture.extent.planarDimensions());
   } else {
     pt.z = _readZFast(layer, src, temp.offset);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.34.0",
+  "version": "2.36.2",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "main": "lib/Main.js",
   "scripts": {
@@ -15,8 +15,8 @@
     "base-test-unit": "cross-env BABEL_DISABLE_CACHE=1 mocha --require @babel/register --file test/unit/bootstrap.js",
     "build": "cross-env NODE_ENV=production webpack",
     "transpile": "cross-env BABEL_DISABLE_CACHE=1 babel src --out-dir lib",
-    "start": "cross-env NODE_ENV=development webpack-dev-server -d --inline --hot",
-    "debug": "npm start -- --env.noInline=true",
+    "start": "cross-env NODE_ENV=development webpack serve",
+    "debug": "cross-env noInline=true npm start",
     "prepublishOnly": "npm run build && npm run transpile",
     "prepare": "cross-env NO_UPDATE_NOTIFIER=true node ./config/prepare.js && node ./config/replace.config.js",
     "watch": "cross-env BABEL_DISABLE_CACHE=1 babel --watch src --out-dir lib",
@@ -47,63 +47,63 @@
   },
   "homepage": "https://itowns.github.io/",
   "dependencies": {
-    "@loaders.gl/las": "^2.3.13",
-    "@mapbox/mapbox-gl-style-spec": "^13.20.0",
+    "@loaders.gl/las": "^3.0.12",
+    "@mapbox/mapbox-gl-style-spec": "^13.22.0",
     "@mapbox/vector-tile": "^1.3.1",
-    "@tmcw/togeojson": "^4.4.1",
+    "@tmcw/togeojson": "^4.5.0",
     "@tweenjs/tween.js": "^18.6.4",
-    "earcut": "^2.2.2",
+    "earcut": "^2.2.3",
     "js-priority-queue": "^0.1.5",
     "pbf": "^3.2.1",
-    "regenerator-runtime": "^0.13.7",
-    "shpjs": "^3.6.3",
+    "regenerator-runtime": "^0.13.9",
+    "shpjs": "^4.0.2",
     "text-encoding-utf-8": "^1.0.2"
   },
   "peerDependencies": {
-    "proj4": "^2.7.2",
-    "three": "0.129.0"
+    "proj4": "^2.7.5",
+    "three": "0.133.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.3",
-    "@babel/plugin-transform-runtime": "^7.14.3",
-    "@babel/preset-env": "^7.14.2",
-    "@babel/register": "^7.13.16",
+    "@babel/cli": "^7.15.7",
+    "@babel/plugin-transform-runtime": "^7.15.8",
+    "@babel/preset-env": "^7.15.8",
+    "@babel/register": "^7.15.3",
     "babel-inline-import-loader": "^1.0.1",
     "babel-loader": "^8.2.2",
     "babel-plugin-inline-import": "^3.0.0",
     "babel-plugin-minify-dead-code-elimination": "^0.5.1",
     "babel-plugin-minify-replace": "^0.5.0",
     "babel-plugin-module-resolver": "^4.1.0",
-    "chalk": "^4.1.1",
-    "chart.js": "^3.3.0",
+    "chalk": "^4.1.2",
+    "chart.js": "^3.5.1",
     "compare-func": "^2.0.0",
     "conventional-changelog-cli": "^2.1.1",
     "copyfiles": "^2.4.1",
-    "core-js": "^3.13.0",
+    "core-js": "^3.18.3",
     "cross-env": "^7.0.3",
-    "eslint": "^7.27.0",
+    "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-import-resolver-webpack": "^0.13.1",
     "eslint-loader": "^4.0.2",
-    "eslint-plugin-import": "^2.23.3",
+    "eslint-plugin-import": "^2.25.2",
     "github-url-from-git": "^1.5.0",
     "grunt": "^1.4.1",
     "grunt-bump": "^0.8.0",
     "https-proxy-agent": "^5.0.0",
     "jsdoc": "^3.6.7",
-    "marked": "^2.0.6",
-    "mocha": "^8.4.0",
-    "node-fetch": "^2.6.1",
+    "marked": "^3.0.7",
+    "mocha": "^9.1.2",
+    "node-fetch": "^2.6.2",
     "nyc": "^15.1.0",
-    "proj4": "^2.7.2",
-    "puppeteer": "^9.1.1",
+    "proj4": "^2.7.5",
+    "puppeteer": "^10.4.0",
     "q": "^1.5.1",
     "replace-in-file": "^6.2.0",
-    "three": "0.129.0",
+    "three": "0.133.1",
     "url-polyfill": "^1.1.12",
-    "webpack": "^4.46.0",
-    "webpack-cli": "^3.3.12",
-    "webpack-dev-server": "^3.11.2",
+    "webpack": "^5.58.1",
+    "webpack-cli": "^4.9.0",
+    "webpack-dev-server": "^4.3.1",
     "whatwg-fetch": "^3.6.2"
   }
 }