itowns 2.36.2 → 2.38.1

package/lib/Core/Feature.js

@@ -7,7 +7,9 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FeatureCollection = exports["default"] = exports.FeatureGeometry = exports.FeatureBuildingOptions = exports.FEATURE_TYPES = void 0;
+exports["default"] = exports.FeatureGeometry = exports.FeatureCollection = exports.FeatureBuildingOptions = exports.FEATURE_TYPES = void 0;
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
 
 var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 
@@ -17,6 +19,10 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
+var _classPrivateFieldGet2 = _interopRequireDefault(require("@babel/runtime/helpers/classPrivateFieldGet"));
+
+var _classPrivateFieldSet2 = _interopRequireDefault(require("@babel/runtime/helpers/classPrivateFieldSet"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -45,6 +51,10 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+
 function defaultExtent(crs) {
   return new _Extent["default"](crs, Infinity, -Infinity, Infinity, -Infinity);
 }
@@ -71,7 +81,6 @@ function _setGeometryValues(geom, feature, _long, lat, alt, normal) {
 }
 
 var coordOut = new _Coordinates["default"]('EPSG:4326', 0, 0, 0);
-var defaultNormal = new THREE.Vector3(0, 0, 1);
 var FEATURE_TYPES = {
   POINT: 0,
   LINE: 1,
@@ -98,9 +107,9 @@ var typeToStyleProperty = ['point', 'stroke', 'fill'];
  *
 */
 
-var FeatureBuildingOptions = function FeatureBuildingOptions() {
+var FeatureBuildingOptions = /*#__PURE__*/(0, _createClass2["default"])(function FeatureBuildingOptions() {
   (0, _classCallCheck2["default"])(this, FeatureBuildingOptions);
-};
+});
 /**
  * @property {Extent} extent - The 2D extent containing all the points
  * composing the geometry.
@@ -112,22 +121,29 @@ var FeatureBuildingOptions = function FeatureBuildingOptions() {
  * anything specified in the GeoJSON under the `properties` property.
  */
 
-
 exports.FeatureBuildingOptions = FeatureBuildingOptions;
 
+var _currentExtent = /*#__PURE__*/new WeakMap();
+
 var FeatureGeometry = /*#__PURE__*/function () {
   /**
    * @param {Feature} feature geometry
    */
   function FeatureGeometry(feature) {
     (0, _classCallCheck2["default"])(this, FeatureGeometry);
+
+    _classPrivateFieldInitSpec(this, _currentExtent, {
+      writable: true,
+      value: void 0
+    });
+
     this.indices = [];
     this.properties = {};
     this.size = feature.size;
 
     if (feature.extent) {
       this.extent = defaultExtent(feature.extent.crs);
-      this._currentExtent = defaultExtent(feature.extent.crs);
+      (0, _classPrivateFieldSet2["default"])(this, _currentExtent, defaultExtent(feature.extent.crs));
     }
 
     this.altitude = {
@@ -155,7 +171,7 @@ var FeatureGeometry = /*#__PURE__*/function () {
         count: count,
         extent: extent
       });
-      this._currentExtent = extent;
+      (0, _classPrivateFieldSet2["default"])(this, _currentExtent, extent);
 
       _extendBuffer(feature, count);
     }
@@ -175,12 +191,12 @@ var FeatureGeometry = /*#__PURE__*/function () {
       this.indices.push({
         offset: offset,
         count: count,
-        extent: this._currentExtent
+        extent: (0, _classPrivateFieldGet2["default"])(this, _currentExtent)
       });
 
       if (this.extent) {
-        this.extent.union(this._currentExtent);
-        this._currentExtent = defaultExtent(this.extent.crs);
+        this.extent.union((0, _classPrivateFieldGet2["default"])(this, _currentExtent));
+        (0, _classPrivateFieldSet2["default"])(this, _currentExtent, defaultExtent(this.extent.crs));
       }
     }
   }, {
@@ -211,8 +227,8 @@ var FeatureGeometry = /*#__PURE__*/function () {
       _setGeometryValues(this, feature, coordOut.x, coordOut.y, coordOut.z, coordOut.geodesicNormal); // expand extent if present
 
 
-      if (this._currentExtent) {
-        this._currentExtent.expandByCoordinates(feature.useCrsOut ? coordOut : coordIn);
+      if ((0, _classPrivateFieldGet2["default"])(this, _currentExtent)) {
+        (0, _classPrivateFieldGet2["default"])(this, _currentExtent).expandByCoordinates(feature.useCrsOut ? coordOut : coordIn);
       }
     }
     /**
@@ -223,20 +239,19 @@ var FeatureGeometry = /*#__PURE__*/function () {
      * @param {Feature} feature - the feature containing the geometry
      * @param {number} long The longitude coordinate.
      * @param {number} lat The latitude coordinate.
-     * @param {THREE.Vector3} [normal=THREE.Vector3(0,0,1)] the normal on coordinates.
+     * @param {THREE.Vector3} [normal] the normal on coordinates (only for `EPSG:4978` projection).
      */
 
   }, {
     key: "pushCoordinatesValues",
-    value: function pushCoordinatesValues(feature, _long2, lat) {
-      var normal = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : defaultNormal;
+    value: function pushCoordinatesValues(feature, _long2, lat, normal) {
       var altitude = this.baseAltitude(feature);
 
       _setGeometryValues(this, feature, _long2, lat, altitude, normal); // expand extent if present
 
 
-      if (this._currentExtent) {
-        this._currentExtent.expandByValuesCoordinates(_long2, lat);
+      if ((0, _classPrivateFieldGet2["default"])(this, _currentExtent)) {
+        (0, _classPrivateFieldGet2["default"])(this, _currentExtent).expandByValuesCoordinates(_long2, lat);
       }
     }
     /**
@@ -325,7 +340,7 @@ var Feature = /*#__PURE__*/function () {
     this.vertices = [];
     this.crs = collection.crs;
     this.size = collection.size;
-    this.normals = collection.size == 3 ? [] : undefined;
+    this.normals = collection.crs == 'EPSG:4978' ? [] : undefined;
     this.transformToLocalSystem = collection.transformToLocalSystem.bind(collection);
 
     if (collection.extent) {
@@ -448,6 +463,10 @@ var alignYtoEast = new THREE.Quaternion();
  *
  */
 
+var _transformToLocalSystem = /*#__PURE__*/new WeakMap();
+
+var _setLocalSystem = /*#__PURE__*/new WeakMap();
+
 var FeatureCollection = /*#__PURE__*/function (_THREE$Object3D) {
   (0, _inherits2["default"])(FeatureCollection, _THREE$Object3D);
 
@@ -457,12 +476,25 @@ var FeatureCollection = /*#__PURE__*/function (_THREE$Object3D) {
    * @param      {FeatureBuildingOptions|Layer}  options  The building options .
    */
   function FeatureCollection(options) {
+    var _options$source;
+
     var _this;
 
     (0, _classCallCheck2["default"])(this, FeatureCollection);
     _this = _super.call(this);
+
+    _classPrivateFieldInitSpec((0, _assertThisInitialized2["default"])(_this), _transformToLocalSystem, {
+      writable: true,
+      value: transformToLocalSystem2D
+    });
+
+    _classPrivateFieldInitSpec((0, _assertThisInitialized2["default"])(_this), _setLocalSystem, {
+      writable: true,
+      value: doNothing
+    });
+
     _this.isFeatureCollection = true;
-    _this.crs = _Crs["default"].formatToEPSG(options.crs);
+    _this.crs = _Crs["default"].formatToEPSG(options.accurate || !((_options$source = options.source) !== null && _options$source !== void 0 && _options$source.crs) ? options.crs : options.source.crs);
     _this.features = [];
     _this.mergeFeatures = options.mergeFeatures === undefined ? true : options.mergeFeatures;
     _this.size = options.structure == '3d' ? 3 : 2;
@@ -474,8 +506,7 @@ var FeatureCollection = /*#__PURE__*/function (_THREE$Object3D) {
 
     if (_this.size == 2) {
       _this.extent = options.buildExtent === false ? undefined : defaultExtent(options.forcedExtentCrs || _this.crs);
-
-      _this._setLocalSystem = function (center) {
+      (0, _classPrivateFieldSet2["default"])((0, _assertThisInitialized2["default"])(_this), _setLocalSystem, function (center) {
         // set local system center
         center.as('EPSG:4326', _this.center); // set position to local system center
 
@@ -483,14 +514,11 @@ var FeatureCollection = /*#__PURE__*/function (_THREE$Object3D) {
 
         _this.updateMatrixWorld();
 
-        _this._setLocalSystem = doNothing;
-      };
-
-      _this._transformToLocalSystem = transformToLocalSystem2D;
+        (0, _classPrivateFieldSet2["default"])((0, _assertThisInitialized2["default"])(_this), _setLocalSystem, doNothing);
+      });
     } else {
       _this.extent = options.buildExtent ? defaultExtent(options.forcedExtentCrs || _this.crs) : undefined;
-
-      _this._setLocalSystem = function (center) {
+      (0, _classPrivateFieldSet2["default"])((0, _assertThisInitialized2["default"])(_this), _setLocalSystem, function (center) {
         // set local system center
         center.as('EPSG:4326', _this.center);
 
@@ -512,10 +540,9 @@ var FeatureCollection = /*#__PURE__*/function (_THREE$Object3D) {
         _this.normalMatrix.getNormalMatrix(_this.matrix);
 
         _this.normalMatrixInverse = new THREE.Matrix3().copy(_this.normalMatrix).invert();
-        _this._setLocalSystem = doNothing;
-      };
-
-      _this._transformToLocalSystem = transformToLocalSystem3D;
+        (0, _classPrivateFieldSet2["default"])((0, _assertThisInitialized2["default"])(_this), _setLocalSystem, doNothing);
+      });
+      (0, _classPrivateFieldSet2["default"])((0, _assertThisInitialized2["default"])(_this), _transformToLocalSystem, transformToLocalSystem3D);
     }
 
     _this.altitude = {
@@ -537,9 +564,8 @@ var FeatureCollection = /*#__PURE__*/function (_THREE$Object3D) {
   (0, _createClass2["default"])(FeatureCollection, [{
     key: "transformToLocalSystem",
     value: function transformToLocalSystem(coordinates) {
-      this._setLocalSystem(coordinates);
-
-      return this._transformToLocalSystem(coordinates, this);
+      (0, _classPrivateFieldGet2["default"])(this, _setLocalSystem).call(this, coordinates);
+      return (0, _classPrivateFieldGet2["default"])(this, _transformToLocalSystem).call(this, coordinates, this);
     }
     /**
      * Update FeatureCollection extent with `extent` or all features extent if

package/lib/Core/Geographic/Extent.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.schemeTiles = exports.globalExtentTMS = void 0;
+exports.schemeTiles = exports.globalExtentTMS = exports["default"] = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 

package/lib/Core/Geographic/GeoidGrid.js

@@ -0,0 +1,143 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var THREE = _interopRequireWildcard(require("three"));
+
+var _Coordinates = _interopRequireDefault(require("./Coordinates"));
+
+var _Crs = _interopRequireDefault(require("./Crs"));
+
+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; }
+
+var coord = new _Coordinates["default"]('EPSG:4326');
+var indexes = new THREE.Vector2();
+
+function biLinearInterpolation(indexes, getData) {
+  var j = Math.floor(indexes.x);
+  var i = Math.floor(indexes.y);
+  var u = indexes.x - j;
+  var v = indexes.y - i;
+  return (1 - u) * ((1 - v) * getData(i, j) + v * getData(i + 1, j)) + u * ((1 - v) * getData(i, j + 1) + v * getData(i + 1, j + 1));
+}
+/**
+ * An instance of `GeoidGrid` allows accessing some geoid height grid data from geographic instances (like some
+ * `{@link Coordinates}`). The geoid height grid data must contain geoid height values for a set of geographic points
+ * regularly dispatched on a planar surface.
+ *
+ * @property    {Extent}        extent      The geographic extent of the geoid height grid data.
+ * @property    {THREE.Vector2} step        The distance between two consecutive points of the geoid height grid. The
+                                            * `x` value stands for the distance along the West-East direction, and the
+                                            * `y` value stands for the distance along the South-North direction.
+ * @property    {THREE.Vector2} dimensions  The planar dimensions of the geoid height grid data extent.
+ * @property    {THREE.Vector2} dataSize    The number of values in the gridded data along the West-East direction (`x`
+                                            * axis) and the South-North direction (`y` axis).
+ *
+ * @example
+ * // Create a set of gridded data.
+ * const data = [
+ *     [1, 2, 3],
+ *     [2, 3, 4],
+ *     [3, 4, 5],
+ * ];
+ * // This set of data presents the following spatial distribution of geoid heights values :
+ * //
+ * //    Latitudes  ^
+ * //               |
+ * //         41.0  |   3  4  5
+ * //         40.5  |   2  3  4
+ * //         40.0  |   1  2  3
+ * //               |------------->
+ * //                   1  2  3     Longitudes
+ *
+ * // Create a GeoidGrid allowing to access the gridded data.
+ * const geoidGrid = new GeoidGrid(
+ *     new Extent('EPSG:4326', 1, 3, 40, 41),
+ *     new THREE.Vector2(1, 0.5),
+ *     (verticalIndex, horizontalIndex) => data[verticalIndex][horizontalIndex],
+ * );
+ *
+ * // Access a value of geoid height at some geographic coordinates.
+ * // The value is interpolated from the gridded data.
+ * const value = geoidGrid.getHeightAtCoordinates(
+ *     new Coordinates('EPSG:4326', 1.5, 40.25)
+ * );
+ * // This should return 2.0, which is the result from the bi-linear
+ * // interpolation at the center of the `[[1, 2], [2, 3]]` subsection
+ * // of the grid data.
+ */
+
+
+var GeoidGrid = /*#__PURE__*/function () {
+  /**
+   * @param   {Extent}        extent      The geographic extent of the geoid height grid data.
+   * @param   {THREE.Vector2} step        The distance between two consecutive points of the geoid height grid. The
+                                          * `x` value stands for the distance along the West-East direction, and the
+                                          * `y` value stands for the distance along the South-North direction.
+   * @param   {function}      getData     A method that allows reading a value in the geoid height grid from its
+                                          * vertical and horizontal indexes. The lower an index, the lower the
+                                          * coordinate on the corresponding axis - 0 being the index of the minimal
+                                          * coordinate of the gridded data on a given axis. In other words :
+                                          * - `getData(0, 0)` must return the geoid height value at the SOUTH-WEST
+                                          *   corner of your data extent.
+                                          * - `getData(0, j)` must return a geoid height on the southern limit of your
+                                          *   data extent.
+                                          * - `getData(i, 0)` must return a geoid height on the western limit of your
+                                          *   data extent.
+                                          * - if your gridded data has dimensions (rowNumber, colNumber),
+                                          *   `getData(rowNumber - 1, colNumber - 1)` must return the geoid height at
+                                          *   the NORTH-EAST corner of your data extent.
+   */
+  function GeoidGrid(extent, step, getData) {
+    (0, _classCallCheck2["default"])(this, GeoidGrid);
+
+    _Crs["default"].isGeographic(extent.crs);
+
+    this.extent = extent;
+    this.step = new THREE.Vector2(step.x, step.y || step.x);
+    this.dimensions = this.extent.planarDimensions();
+    this.dataSize = new THREE.Vector2().addVectors(this.step, this.dimensions).divide(this.step).round();
+    this.getData = getData;
+  }
+  /**
+   * Get the value of the geoid height at given geographic `{@link Coordinates}`. The geoid height value is
+   * bi-linearly interpolated from the gridded data accessed by the `GeoidGrid` instance.
+   *
+   * @param   {Coordinates}   coordinates     Geographic coordinates to get the geoid height value at.
+   *
+   * @returns {number}    The geoid height value at the given `{@link Coordinates}`, bi-interpolated from the gridded
+                          * data accessed by the `GeoidGrid` instance.
+   */
+
+
+  (0, _createClass2["default"])(GeoidGrid, [{
+    key: "getHeightAtCoordinates",
+    value: function getHeightAtCoordinates(coordinates) {
+      coordinates.as(this.extent.crs, coord);
+      indexes.set((this.dataSize.x - 1) * (coord.x - this.extent.west) / this.dimensions.x, (this.dataSize.y - 1) * (coord.y - this.extent.south) / this.dimensions.y); // TODO : add management for global GeoidGrid.
+
+      if (indexes.x < 0 || indexes.x >= this.dataSize.x - 1 || indexes.y < 0 || indexes.y >= this.dataSize.y - 1) {
+        return 0;
+      }
+
+      return biLinearInterpolation(indexes, this.getData);
+    }
+  }]);
+  return GeoidGrid;
+}();
+
+var _default = GeoidGrid;
+exports["default"] = _default;