itowns 2.42.1-next.11 → 2.42.1-next.12

package/examples/source_stream_wfs_25d.html

@@ -273,7 +273,7 @@
             var wfsCartoSource = new itowns.WFSSource({
                 url: 'https://data.geopf.fr/wfs/ows?',
                 version: '2.0.0',
-                typeName: 'BDCARTO_BDD_WLD_WGS84G:zone_habitat_mairie',
+                typeName: 'BDCARTO_V5:zone_d_habitation',
                 crs: 'EPSG:3946',
                 ipr: 'IGN',
                 format: 'application/json',
@@ -284,24 +284,24 @@
                 text: {
                     field: '{toponyme}',
                     color: (p) => {
-                        switch (p.importance) {
-                            case 'Quartier de ville':
-                                return 'Cornsilk';
-                            case 'Hameau':
+                        switch (p.nature) {
+                            case 'Quartier':
                                 return 'WhiteSmoke';
-                            case 'Chef-lieu de commune':
+                            case 'Château':
+                                return 'Cornsilk';
+                            case 'Lieu-dit habité':
                             default:
                                 return 'white';
                         }
                     },
                     transform: 'uppercase',
                     size: (p) => {
-                        switch (p.importance) {
-                            case 'Quartier de ville':
-                                return 11;
-                            case 'Hameau':
+                        switch (p.nature) {
+                            case 'Quartier':
                                 return 13;
-                            case 'Chef-lieu de commune':
+                            case 'Château':
+                                return 11;
+                            case 'Lieu-dit habité':
                             default:
                                 return 18;
                         }

package/examples/source_stream_wfs_3d.html

@@ -175,7 +175,7 @@
             view.addFrameRequester(itowns.MAIN_LOOP_EVENTS.BEFORE_RENDER, scaler);
 
             var wfsBuildingSource = new itowns.WFSSource({
-                url: 'https://wxs.ign.fr/topographie/geoportail/wfs?',
+                url: 'https://data.geopf.fr/wfs/ows?',
                 version: '2.0.0',
                 typeName: 'BDTOPO_V3:batiment',
                 crs: 'EPSG:4326',

package/examples/view_25d_map.html

@@ -98,9 +98,9 @@
             view.addLayer(wmsElevationLayer);
 
             var wfsCartoSource = new itowns.WFSSource({
-                url: 'https://wxs.ign.fr/cartovecto/geoportail/wfs?',
+                url: 'https://data.geopf.fr/wfs/ows?',
                 version: '2.0.0',
-                typeName: 'BDCARTO_BDD_WLD_WGS84G:zone_habitat_mairie',
+                typeName: 'BDCARTO_V5:zone_d_habitation',
                 crs: 'EPSG:3946',
                 ipr: 'IGN',
                 format: 'application/json',

package/examples/view_3d_map.html

@@ -110,8 +110,8 @@
             // Define options for geocoding service that should be used by the searchbar.
             const geocodingOptions = {
                 url: new URL(
-                    'https://wxs.ign.fr/ayxvok72rcocdyn8xyvy32og/ols/apis/completion?text=&type=StreetAddress,' +
-                    'PositionOfInterest',
+                    'https://data.geopf.fr/geocodage/completion?' +
+                    'text=&type=StreetAddress,PositionOfInterest',
                 ),
                 parser: (response) => {
                     const map = new Map();

package/examples/view_3d_mns_map.html

@@ -109,8 +109,8 @@
             // Define options for geocoding service that should be used by the searchbar.
             const geocodingOptions = {
                 url: new URL(
-                    'https://wxs.ign.fr/ayxvok72rcocdyn8xyvy32og/ols/apis/completion?text=&type=StreetAddress,' +
-                    'PositionOfInterest',
+                    'https://data.geopf.fr/geocodage/completion?' +
+                    'text=&type=StreetAddress,PositionOfInterest',
                 ),
                 parser: (response) => {
                     const map = new Map();

package/examples/view_immersive.html

@@ -117,7 +117,7 @@
             view.addLayer(olayer, view.tileLayer).then(function addWfsLayer(orientedImageLayer) {
                 // prepare WFS source for the buildings
                 var wfsBuildingSource = new itowns.WFSSource({
-                    url: 'https://wxs.ign.fr/topographie/geoportail/wfs?',
+                    url: 'https://data.geopf.fr/wfs/ows?',
                     version: '2.0.0',
                     typeName: 'BDTOPO_V3:batiment',
                         crs: 'EPSG:4326',

package/examples/widgets_searchbar.html

@@ -88,8 +88,8 @@
             // Define options for geocoding service that should be used by the searchbar.
             const geocodingOptions = {
                 url: new URL(
-                    'https://wxs.ign.fr/ayxvok72rcocdyn8xyvy32og/ols/apis/completion?text=&type=StreetAddress,' +
-                    'PositionOfInterest',
+                    'https://data.geopf.fr/geocodage/completion?' +
+                    'text=&type=StreetAddress,PositionOfInterest',
                 ),
                 // As precised in the doc (http://www.itowns-project.org/itowns/docs/#api/Widgets/Searchbar), the parser
                 // method must parse the geocoding service response into a Map object. For each item of this Map, the

package/lib/Layer/EntwinePointTileLayer.js

@@ -55,6 +55,7 @@ class EntwinePointTileLayer extends _PointCloudLayer.default {
   constructor(id, config) {
     super(id, config);
     this.isEntwinePointTileLayer = true;
+    this.scale = new THREE.Vector3(1, 1, 1);
     const resolve = this.addInitializationStep();
     this.whenReady = this.source.whenReady.then(() => {
       this.root = new _EntwinePointTileNode.default(0, 0, 0, 0, this, -1);

package/lib/Parser/LASLoader.js

@@ -67,13 +67,16 @@ class LASLoader {
     The copc.js library does the degree convertion and stores it as a `Float32`.
     */
     const scanAngles = new Float32Array(view.pointCount);
+
+    // For precision we take the first point that will be use as origin for a local referentiel.
+    const origin = getPosition.map(f => f(0)).map(val => Math.floor(val));
     for (let i = 0; i < view.pointCount; i++) {
       // `getPosition` apply scale and offset transform to the X, Y, Z
       // values. See https://github.com/connormanning/copc.js/blob/master/src/las/extractor.ts.
       const [x, y, z] = getPosition.map(f => f(i));
-      positions[i * 3] = x;
-      positions[i * 3 + 1] = y;
-      positions[i * 3 + 2] = z;
+      positions[i * 3] = x - origin[0];
+      positions[i * 3 + 1] = y - origin[1];
+      positions[i * 3 + 2] = z - origin[2];
       intensities[i] = getIntensity(i);
       returnNumbers[i] = getReturnNumber(i);
       numberOfReturns[i] = getNumberOfReturns(i);
@@ -104,7 +107,8 @@ class LASLoader {
       classification: classifications,
       pointSourceID: pointSourceIDs,
       color: colors,
-      scanAngle: scanAngles
+      scanAngle: scanAngles,
+      origin
     };
   }
 

package/lib/Parser/LASParser.js

@@ -75,6 +75,7 @@ var _default = {
       const scanAngle = new THREE.BufferAttribute(attributes.scanAngle, 1);
       geometry.setAttribute('scanAngle', scanAngle);
       geometry.computeBoundingBox();
+      geometry.userData.origin = new THREE.Vector3().fromArray(attributes.origin);
       return geometry;
     });
   }

package/lib/Parser/PotreeBinParser.js

@@ -9,7 +9,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; }
 // See the different constants holding ordinal, name, numElements, byteSize in PointAttributes.cpp in PotreeConverter
 // elementByteSize is byteSize / numElements
-const POINT_ATTTRIBUTES = {
+const POINT_ATTRIBUTES = {
   POSITION_CARTESIAN: {
     numElements: 3,
     arrayType: Float32Array,
@@ -55,8 +55,8 @@ const POINT_ATTTRIBUTES = {
     attributeName: 'normal'
   }
 };
-for (const potreeName of Object.keys(POINT_ATTTRIBUTES)) {
-  const attr = POINT_ATTTRIBUTES[potreeName];
+for (const potreeName of Object.keys(POINT_ATTRIBUTES)) {
+  const attr = POINT_ATTRIBUTES[potreeName];
   attr.potreeName = potreeName;
   attr.numByte = attr.numByte || attr.arrayType.BYTES_PER_ELEMENT;
   attr.byteSize = attr.numElements * attr.numByte;
@@ -87,14 +87,14 @@ var _default = {
     // Format: X1,Y1,Z1,R1,G1,B1,A1,[...],XN,YN,ZN,RN,GN,BN,AN
     let pointByteSize = 0;
     for (const potreeName of options.in.pointAttributes) {
-      pointByteSize += POINT_ATTTRIBUTES[potreeName].byteSize;
+      pointByteSize += POINT_ATTRIBUTES[potreeName].byteSize;
     }
     const numPoints = Math.floor(buffer.byteLength / pointByteSize);
     const geometry = new THREE.BufferGeometry();
     let elemOffset = 0;
     let attrOffset = 0;
     for (const potreeName of options.in.pointAttributes) {
-      const attr = POINT_ATTTRIBUTES[potreeName];
+      const attr = POINT_ATTRIBUTES[potreeName];
       const arrayLength = attr.numElements * numPoints;
       const array = new attr.arrayType(arrayLength);
       for (let arrayOffset = 0; arrayOffset < arrayLength; arrayOffset += attr.numElements) {

package/lib/Provider/PointCloudProvider.js

@@ -41,10 +41,8 @@ var _default = {
       addPickingAttribute(points);
       points.frustumCulled = false;
       points.matrixAutoUpdate = false;
-      if (!layer.isEntwinePointTileLayer) {
-        points.position.copy(node.bbox.min);
-        points.scale.copy(layer.scale);
-      }
+      points.position.copy(geometry.userData.origin || node.bbox.min);
+      points.scale.copy(layer.scale);
       points.updateMatrix();
       points.tightbbox = geometry.boundingBox.applyMatrix4(points.matrix);
       points.layer = layer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.42.1-next.11",
+  "version": "2.42.1-next.12",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "main": "lib/Main.js",
   "exports": {