itowns 2.36.1 → 2.36.2

package/examples/js/plugins/CSVnVRTParser.js

@@ -18,7 +18,6 @@
  * }).then(function _(res) {
  *     res.csv = Papa.parse(res.csv.trim()).data;
  *     return CSVnVRTParser.parse(res, { out: {
- *              buildExtent: true,
  *              crs: 'EPSG:4326'
  *          }
  *     });

package/examples/layers/JSONLayers/Administrative.json

@@ -6,7 +6,7 @@
   "transparent": true,
   "source": {
     "crs": "EPSG:3857",
-    "url": "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+    "url": "https://wxs.ign.fr/administratif/geoportail/wmts",
     "format": "image/png",
     "name": "LIMITES_ADMINISTRATIVES_EXPRESS.LATEST",
     "style": "normal",

package/examples/layers/JSONLayers/Cada.json

@@ -5,7 +5,7 @@
   "opacity": 1,
   "transparent": true,
   "source": {
-    "url": "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+    "url": "https://wxs.ign.fr/parcellaire/geoportail/wmts",
     "crs": "EPSG:3857",
     "networkOptions": {
       "crossOrigin": "omit"

package/examples/layers/JSONLayers/EtatMajor.json

@@ -4,7 +4,7 @@
     "transparent": true,
     "source": {
         "crs": "EPSG:3857",
-        "url":        "http://wxs.ign.fr/va5orxd0pgzvq3jxutqfuy0b/geoportail/wmts",
+        "url":        "http://wxs.ign.fr/cartes/geoportail/wmts",
         "networkOptions": {
             "crossOrigin": "anonymous"
         },

package/examples/layers/JSONLayers/IGN_MNT.json

@@ -8,7 +8,7 @@
         }
     },
     "source": {
-        "url":        "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+        "url":        "https://wxs.ign.fr/altimetrie/geoportail/wmts",
         "crs": "EPSG:4326",
         "format": "image/x-bil;bits=32",
         "attribution" : {

package/examples/layers/JSONLayers/IGN_MNT_HIGHRES.json

@@ -8,7 +8,7 @@
 		}
 	},
 	"source": {
-		"url":        "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+		"url":        "https://wxs.ign.fr/altimetrie/geoportail/wmts",
         "crs": "EPSG:4326",
 		"format": "image/x-bil;bits=32",
 		"attribution" : {

package/examples/layers/JSONLayers/WORLD_DTM.json

@@ -11,7 +11,7 @@
     "source": {
         "format": "image/x-bil;bits=32",
         "crs": "EPSG:4326",
-        "url":        "https://wxs.ign.fr/3ht7xcw6f7nciopo16etuqp2/geoportail/wmts",
+        "url":        "https://wxs.ign.fr/altimetrie/geoportail/wmts",
         "name": "ELEVATION.ELEVATIONGRIDCOVERAGE.SRTM3",
         "tileMatrixSet": "WGS84G",
         "tileMatrixSetLimits": {

package/examples/misc_custom_label.html

@@ -124,8 +124,6 @@
         // create new featureCollection
         const collection = new itowns.FeatureCollection({
             crs: view.tileLayer.extent.crs,
-            buildExtent: true,
-            structure: '2d',
         });
 
         // create new feature

package/examples/plugins_vrt.html

@@ -50,7 +50,6 @@
             }).then(function _(res) {
                 res.csv = Papa.parse(res.csv.trim()).data;
                 return CSVnVRTParser.parse(res, { out: {
-                    buildExtent: true,
                     crs: view.tileLayer.extent.crs,
                 }});
             }).then(function _(features) {

package/examples/source_file_geojson_raster.html

@@ -109,9 +109,6 @@
                     // Here, we pass a FeatureBuildingOptions (http://www.itowns-project.org/itowns/docs/#api/Base/FeatureBuildingOptions)
                     out: {
                         crs: view.tileLayer.extent.crs,
-                        buildExtent: true,
-                        mergeFeatures: true,
-                        structure: '2d',
                     },
                 });
             }).then(function _(features) {

package/examples/source_file_shapefile.html

@@ -50,7 +50,6 @@
                 return itowns.ShapefileParser.parse(res, {
                     out: {
                         crs: view.tileLayer.extent.crs,
-                        buildExtent: true,
                     }
                 });
             }).then(function _(features) {

package/lib/Core/Feature.js

@@ -81,17 +81,18 @@ exports.FEATURE_TYPES = FEATURE_TYPES;
 var typeToStyleProperty = ['point', 'stroke', 'fill'];
 /**
  * @property {string} crs - The CRS to convert the input coordinates to.
+ * @property {string} [structure='2d'] - data structure type : 2d or 3d.
+ * If the structure is 3d, the feature have 3 dimensions by vertices positions and
+ * a normal for each vertices.
  * @property {Extent|boolean} [filteringExtent=undefined] - Optional filter to reject
- * features outside of extent. Extent filetring is file extent if filteringExtent is true.
- * @property {boolean} [buildExtent=false] - If true the geometry will
+ * features outside of extent. Extent filtering is file extent if filteringExtent is true.
+ * @property {boolean} [buildExtent] - If true the geometry will
  * have an extent property containing the area covered by the geometry.
+ * Default value is false if `structure` parameter is set to '3d', and true otherwise.
  * True if the layer does not inherit from {@link GeometryLayer}.
  * @property {string} forcedExtentCrs - force feature extent crs if buildExtent is true.
  * @property {function} [filter] - Filter function to remove features
- * @property {boolean} [mergeFeatures=true] - If true all geometries are merged by type and multi-type
- * @property {string} [structure='2d'] - data structure type : 2d or 3d.
- * If the structure is 3d, the feature have 3 dimensions by vertices positions and
- * a normal for each vertices.
+ * @property {boolean} [mergeFeatures=true] - If true all geometries are merged by type and multi-type.
  * @property {Style} style - The style to inherit when creating
  * style for all new features.
  *
@@ -464,7 +465,6 @@ var FeatureCollection = /*#__PURE__*/function (_THREE$Object3D) {
     _this.crs = _Crs["default"].formatToEPSG(options.crs);
     _this.features = [];
     _this.mergeFeatures = options.mergeFeatures === undefined ? true : options.mergeFeatures;
-    _this.extent = options.buildExtent ? defaultExtent(options.forcedExtentCrs || _this.crs) : undefined;
     _this.size = options.structure == '3d' ? 3 : 2;
     _this.filterExtent = options.filterExtent;
     _this.style = options.style;
@@ -473,6 +473,8 @@ var FeatureCollection = /*#__PURE__*/function (_THREE$Object3D) {
     _this.center = new _Coordinates["default"]('EPSG:4326', 0, 0);
 
     if (_this.size == 2) {
+      _this.extent = options.buildExtent === false ? undefined : defaultExtent(options.forcedExtentCrs || _this.crs);
+
       _this._setLocalSystem = function (center) {
         // set local system center
         center.as('EPSG:4326', _this.center); // set position to local system center
@@ -486,6 +488,8 @@ var FeatureCollection = /*#__PURE__*/function (_THREE$Object3D) {
 
       _this._transformToLocalSystem = transformToLocalSystem2D;
     } else {
+      _this.extent = options.buildExtent ? defaultExtent(options.forcedExtentCrs || _this.crs) : undefined;
+
       _this._setLocalSystem = function (center) {
         // set local system center
         center.as('EPSG:4326', _this.center);

package/lib/Core/Geographic/Coordinates.js

@@ -263,20 +263,20 @@ var Coordinates = /*#__PURE__*/function () {
       return v0.distanceTo(v1);
     }
     /**
-     * Calculate geodesic distance between this coordinates and `coord`.
-     * **Geodesic distance** is calculated in an ellispoid space as the distance
+     * Calculate geodetic distance between this coordinates and `coord`.
+     * **Geodetic distance** is calculated in an ellispoid space as the shortest distance
      * across the curved surface of the world.
      *
      * => As the crow flies/ Orthodromy
      *
      * @param  {Coordinates}  coord  The coordinate
-     * @return {number} geodesic distance
+     * @return {number} geodetic distance
      *
      */
 
   }, {
-    key: "geodesicDistanceTo",
-    value: function geodesicDistanceTo(coord) {
+    key: "geodeticDistanceTo",
+    value: function geodeticDistanceTo(coord) {
       this.as('EPSG:4326', coord0);
       coord.as('EPSG:4326', coord1);
       return ellipsoid.geodesicDistance(coord0, coord1);
@@ -290,8 +290,8 @@ var Coordinates = /*#__PURE__*/function () {
      */
 
   }, {
-    key: "earthEuclideanDistanceTo",
-    value: function earthEuclideanDistanceTo(coord) {
+    key: "spatialEuclideanDistanceTo",
+    value: function spatialEuclideanDistanceTo(coord) {
       this.as('EPSG:4978', coord0).toVector3(v0);
       coord.as('EPSG:4978', coord1).toVector3(v1);
       return v0.distanceTo(v1);

package/lib/Core/Geographic/Extent.js

@@ -326,7 +326,7 @@ var Extent = /*#__PURE__*/function () {
     key: "dimensions",
     value: function dimensions() {
       var target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new THREE.Vector2();
-      console.warn('Extent.dimensions is deprecated, use planarDimensions, geodesicDimensions or geodesicChordDimensions');
+      console.warn('Extent.dimensions is deprecated, use planarDimensions, geodeticDimensions or spatialEuclideanDimensions');
       target.x = Math.abs(this.east - this.west);
       target.y = Math.abs(this.north - this.south);
       return target;
@@ -347,17 +347,17 @@ var Extent = /*#__PURE__*/function () {
       return target.set(Math.abs(this.east - this.west), Math.abs(this.north - this.south));
     }
     /**
-     *  Geodesic dimensions are two planar distances west/east and south/north.
-     *  Geodesic distance is calculated in an ellispoid space as the distance
+     *  Geodetic dimensions are two planar distances west/east and south/north.
+     *  Geodetic distance is calculated in an ellispoid space as the distance
      *  across the curved surface of the world.
      *
      * @param      {THREE.Vector2}  [target=new THREE.Vector2()]  The target
-     * @return     {THREE.Vector2}  Planar dimensions
+     * @return     {THREE.Vector2}  geodetic dimensions
      */
 
   }, {
-    key: "geodesicDimensions",
-    value: function geodesicDimensions() {
+    key: "geodeticDimensions",
+    value: function geodeticDimensions() {
       var target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new THREE.Vector2();
       // set 3 corners extent
       cNorthWest.crs = this.crs;
@@ -365,21 +365,21 @@ var Extent = /*#__PURE__*/function () {
       cNorthEast.crs = this.crs;
       cNorthWest.setFromValues(this.west, this.north, 0);
       cSouthWest.setFromValues(this.west, this.south, 0);
-      cNorthEast.setFromValues(this.east, this.north, 0); // calcul geodesic distance northWest/northEast and northWest/southWest
+      cNorthEast.setFromValues(this.east, this.north, 0); // calcul geodetic distance northWest/northEast and northWest/southWest
 
-      return target.set(cNorthWest.geodesicDistanceTo(cNorthEast), cNorthWest.geodesicDistanceTo(cSouthWest));
+      return target.set(cNorthWest.geodeticDistanceTo(cNorthEast), cNorthWest.geodeticDistanceTo(cSouthWest));
     }
     /**
-     *  Earth euclidean dimensions are two earth euclidean distances between west/east and south/north.
-     *  Earth euclidean distance chord is calculated in a ellispoid space.
+     *  Spatial euclidean dimensions are two spatial euclidean distances between west/east corner and south/north corner.
+     *  Spatial euclidean distance chord is calculated in a ellispoid space.
      *
      * @param      {THREE.Vector2}  [target=new THREE.Vector2()]  The target
-     * @return     {THREE.Vector2}  Earth euclidean dimensions
+     * @return     {THREE.Vector2}  spatial euclidean dimensions
      */
 
   }, {
-    key: "earthEuclideanDimensions",
-    value: function earthEuclideanDimensions() {
+    key: "spatialEuclideanDimensions",
+    value: function spatialEuclideanDimensions() {
       var target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new THREE.Vector2();
       // set 3 corners extent
       cNorthWest.crs = this.crs;
@@ -389,7 +389,7 @@ var Extent = /*#__PURE__*/function () {
       cSouthWest.setFromValues(this.west, this.south, 0);
       cNorthEast.setFromValues(this.east, this.north, 0); // calcul chord distance northWest/northEast and northWest/southWest
 
-      return target.set(cNorthWest.earthEuclideanDistanceTo(cNorthEast), cNorthWest.earthEuclideanDistanceTo(cSouthWest));
+      return target.set(cNorthWest.spatialEuclideanDistanceTo(cNorthEast), cNorthWest.spatialEuclideanDistanceTo(cSouthWest));
     }
     /**
      * Return true if `coord` is inside the bounding box.

package/lib/Main.js

@@ -690,7 +690,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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 conf = {
-  version: '2.36.1'
+  version: '2.36.2'
 };
 var REVISION = conf.version; // Geographic tools
 

package/lib/Parser/ShapefileParser.js

@@ -44,7 +44,6 @@ var _Undeprecator = require("../Core/Deprecated/Undeprecator");
  *         },
  *         out: {
  *             crs: view.tileLayer.extent.crs,
- *             buildExtent: true,
  *         }
  *     });
  * }).then(function _(geojson) {

package/lib/Source/FileSource.js

@@ -106,13 +106,8 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
  * itowns.Fetcher.json('https://raw.githubusercontent.com/gregoiredavid/france-geojson/master/departements/09-ariege/departement-09-ariege.geojson')
  *     .then(function _(geojson) {
  *         return itowns.GeoJsonParser.parse(geojson, {
- *             in: { in: 'EPSG:4326' },
- *             out: {
-     *             crs: view.tileLayer.extent.crs,
-     *             buildExtent: true,
-     *             mergeFeatures: true,
-     *             structure: '2d',
- *             },
+ *             in: { crs: 'EPSG:4326' },
+ *             out: { crs: view.tileLayer.extent.crs },
  *         });
  *     }).then(function _(features) {
  *         ariege.source = new itowns.FileSource({

package/lib/Source/VectorTilesSource.js

@@ -182,10 +182,13 @@ var VectorTilesSource = /*#__PURE__*/function (_TMSSource) {
       var _this2 = this;
 
       (0, _get2["default"])((0, _getPrototypeOf2["default"])(VectorTilesSource.prototype), "onLayerAdded", this).call(this, options);
-      var keys = Object.keys(this.styles);
-      keys.forEach(function (k) {
-        _this2.styles[k].parent = options.out.style;
-      });
+
+      if (options.out.style) {
+        var keys = Object.keys(this.styles);
+        keys.forEach(function (k) {
+          _this2.styles[k].parent = options.out.style;
+        });
+      }
     }
   }]);
   return VectorTilesSource;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.36.1",
+  "version": "2.36.2",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "main": "lib/Main.js",
   "scripts": {