itowns 2.35.0 → 2.37.0

package/lib/Utils/CameraUtils.js

@@ -7,9 +7,9 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports["default"] = void 0;
 exports.getLookAtFromMath = getLookAtFromMath;
 exports.getRig = getRig;
-exports["default"] = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -35,6 +35,8 @@ var _Ellipsoid = _interopRequireDefault(require("../Core/Math/Ellipsoid"));
 
 var _OBB = _interopRequireDefault(require("../Renderer/OBB"));
 
+var _View = require("../Core/View");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -173,6 +175,14 @@ var CameraRig = /*#__PURE__*/function (_THREE$Object3D) {
       } else {
         this.camera.matrixWorld.decompose(camera.position, camera.quaternion, camera.scale);
       }
+
+      view.dispatchEvent({
+        type: _View.VIEW_EVENTS.CAMERA_MOVED,
+        coord: this.coord,
+        range: this.range,
+        heading: this.heading,
+        tilt: this.tilt
+      });
     }
   }, {
     key: "setProxy",
@@ -577,7 +587,7 @@ var _default = {
       };
     } else {
       extent = extent.as(view.referenceCrs);
-      dimensions = extent.dimensions();
+      dimensions = extent.planarDimensions();
     }
 
     extent.center(cameraTransformOptions.coord);

package/lib/Utils/DEMUtils.js

@@ -7,8 +7,8 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.readTextureValueWithBilinearFiltering = readTextureValueWithBilinearFiltering;
 exports["default"] = void 0;
+exports.readTextureValueWithBilinearFiltering = readTextureValueWithBilinearFiltering;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
@@ -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/lib/Utils/FeaturesUtils.js

@@ -81,20 +81,24 @@ function getClosestPoint(point, points, epsilon, offset, count, size) {
   return closestPoint;
 }
 
-function pointIsInsidePolygon(point, polygonPoints, offset, count, size) {
+function pointIsInsidePolygon(point, polygonPoints, epsilon, offset, count, size) {
   // ray-casting algorithm based on
   // http://wrf.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
   var x = point.x;
   var y = point.y;
   var inside = false; // in first j is last point of polygon
   // for each segment of the polygon (j is i -1)
-  // debugger;
 
   for (var i = offset, j = offset + count - size; i < offset + count; j = i, i += size) {
     var xi = polygonPoints[i];
     var yi = polygonPoints[i + 1];
     var xj = polygonPoints[j];
-    var yj = polygonPoints[j + 1]; // isIntersect semi-infinite ray horizontally with polygon's edge
+    var yj = polygonPoints[j + 1];
+
+    if (pointIsOverLine(point, [xi, yi, xj, yj], epsilon, 0, 4, 2)) {
+      return true;
+    } // isIntersect semi-infinite ray horizontally with polygon's edge
+
 
     if (yi > y != yj > y && x < (xj - xi) * (y - yi) / (yj - yi) + xi) {
       inside = !inside;
@@ -107,7 +111,7 @@ function pointIsInsidePolygon(point, polygonPoints, offset, count, size) {
 function isFeatureSingleGeometryUnderCoordinate(coordinate, type, coordinates, epsilon, offset, count, size) {
   if (type == _Feature.FEATURE_TYPES.LINE && pointIsOverLine(coordinate, coordinates, epsilon, offset, count, size)) {
     return true;
-  } else if (type == _Feature.FEATURE_TYPES.POLYGON && pointIsInsidePolygon(coordinate, coordinates, offset, count, size)) {
+  } else if (type == _Feature.FEATURE_TYPES.POLYGON && pointIsInsidePolygon(coordinate, coordinates, epsilon, offset, count, size)) {
     return true;
   } else if (type == _Feature.FEATURE_TYPES.POINT) {
     var closestPoint = getClosestPoint(coordinate, coordinates, epsilon, offset, count, size);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.35.0",
+  "version": "2.37.0",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "main": "lib/Main.js",
   "scripts": {
@@ -47,8 +47,8 @@
   },
   "homepage": "https://itowns.github.io/",
   "dependencies": {
-    "@loaders.gl/las": "^3.0.9",
-    "@mapbox/mapbox-gl-style-spec": "^13.21.0",
+    "@loaders.gl/las": "^3.1.3",
+    "@mapbox/mapbox-gl-style-spec": "^13.23.0",
     "@mapbox/vector-tile": "^1.3.1",
     "@tmcw/togeojson": "^4.5.0",
     "@tweenjs/tween.js": "^18.6.4",
@@ -61,49 +61,49 @@
   },
   "peerDependencies": {
     "proj4": "^2.7.5",
-    "three": "0.131.3"
+    "three": "0.135.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.8",
-    "@babel/plugin-transform-runtime": "^7.15.0",
-    "@babel/preset-env": "^7.15.0",
-    "@babel/register": "^7.15.3",
+    "@babel/cli": "^7.16.0",
+    "@babel/plugin-transform-runtime": "^7.16.5",
+    "@babel/preset-env": "^7.16.5",
+    "@babel/register": "^7.16.5",
     "babel-inline-import-loader": "^1.0.1",
-    "babel-loader": "^8.2.2",
+    "babel-loader": "^8.2.3",
     "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.2",
-    "chart.js": "^3.5.1",
+    "chart.js": "^3.6.2",
     "compare-func": "^2.0.0",
     "conventional-changelog-cli": "^2.1.1",
     "copyfiles": "^2.4.1",
-    "core-js": "^3.16.2",
+    "core-js": "^3.20.0",
     "cross-env": "^7.0.3",
-    "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.24.1",
+    "eslint": "^8.5.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-import-resolver-webpack": "^0.13.2",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-webpack-plugin": "^3.1.1",
     "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": "^3.0.0",
-    "mocha": "^9.1.0",
-    "node-fetch": "^2.6.1",
+    "marked": "^4.0.8",
+    "mocha": "^9.1.3",
+    "node-fetch": "^2.6.6",
     "nyc": "^15.1.0",
     "proj4": "^2.7.5",
-    "puppeteer": "^10.2.0",
+    "puppeteer": "^13.0.0",
     "q": "^1.5.1",
-    "replace-in-file": "^6.2.0",
-    "three": "0.131.3",
+    "replace-in-file": "^6.3.2",
+    "three": "0.135.0",
     "url-polyfill": "^1.1.12",
-    "webpack": "^5.51.1",
-    "webpack-cli": "^4.8.0",
-    "webpack-dev-server": "^4.0.0",
+    "webpack": "^5.65.0",
+    "webpack-cli": "^4.9.1",
+    "webpack-dev-server": "^4.6.0",
     "whatwg-fetch": "^3.6.2"
   }
 }