itowns 2.42.1-next.3 → 2.42.1-next.5

package/examples/source_file_gpx_3d.html

@@ -59,8 +59,6 @@
                 this.updateMatrixWorld();
             }
 
-            var waypointGeometry = new itowns.THREE.BoxGeometry(1, 1, 80);
-            var waypointMaterial = new itowns.THREE.MeshBasicMaterial({ color: 0xffffff });
             const style = {
                 stroke: {
                     color: 'red',
@@ -70,6 +68,8 @@
                     color: 'white',
                 }
             };
+            var waypointGeometry = new itowns.THREE.BoxGeometry(1, 1, 80);
+            var waypointMaterial = new itowns.THREE.MeshBasicMaterial({ color: 0xffffff });
             // Listen for globe full initialisation event
             view.addEventListener(itowns.GLOBE_VIEW_EVENTS.GLOBE_INITIALIZED, function () {
                 console.info('Globe initialized');

package/lib/Converter/Feature2Mesh.js

@@ -24,8 +24,8 @@ let style;
 const dim_ref = new THREE.Vector2();
 const dim = new THREE.Vector2();
 const normal = new THREE.Vector3();
-const base = new THREE.Vector3();
-const extrusion = new THREE.Vector3();
+const baseCoord = new THREE.Vector3();
+const topCoord = new THREE.Vector3();
 const inverseScale = new THREE.Vector3();
 const extent = new _Extent.default('EPSG:4326', 0, 0, 0, 0);
 const _color = new THREE.Color();
@@ -44,13 +44,6 @@ class FeatureMesh extends THREE.Group {
     this.#collection = new THREE.Group().add(this.meshes);
     this.#collection.quaternion.copy(collection.quaternion);
     this.#collection.position.copy(collection.position);
-    if (collection.crs == 'EPSG:4978') {
-      normal.copy(collection.center.geodesicNormal);
-    } else {
-      normal.set(0, 0, 1);
-    }
-    normal.multiplyScalar(collection.center.z);
-    this.#collection.position.sub(normal);
     this.#collection.scale.copy(collection.scale);
     this.#collection.updateMatrix();
     this.#originalCrs = collection.crs;
@@ -194,21 +187,27 @@ function featureToPoint(feature, options) {
       if (feature.normals) {
         normal.fromArray(feature.normals, v).multiply(inverseScale);
       }
-      coord.copy(context.setLocalCoordinatesFromArray(feature.vertices, v));
+      const localCoord = context.setLocalCoordinatesFromArray(feature.vertices, v);
       style.setContext(context);
       const {
         base_altitude,
         color,
         radius
       } = style.point;
-      coord.z = 0;
-      if (!pointMaterialSize.includes(radius)) {
-        pointMaterialSize.push(radius);
+      coord.copy(localCoord).applyMatrix4(context.collection.matrixWorld);
+      if (coord.crs == 'EPSG:4978') {
+        // altitude convertion from geocentered to elevation (from ground)
+        coord.as('EPSG:4326', coord);
       }
 
-      // populate vertices
-      base.copy(normal).multiplyScalar(base_altitude).add(coord).toArray(vertices, v);
+      // Calculate the new coordinates using the elevation shift (baseCoord)
+      baseCoord.copy(normal).multiplyScalar(base_altitude - coord.z).add(localCoord)
+      // and update the geometry buffer (vertices).
+      .toArray(vertices, v);
       toColor(color).multiplyScalar(255).toArray(colors, v);
+      if (!pointMaterialSize.includes(radius)) {
+        pointMaterialSize.push(radius);
+      }
       batchIds[j] = id;
     }
     featureId++;
@@ -233,7 +232,6 @@ function featureToLine(feature, options) {
   let featureId = 0;
   const vertices = new Float32Array(ptsIn.length);
   const geom = new THREE.BufferGeometry();
-  geom.setAttribute('position', new THREE.BufferAttribute(vertices, 3));
   const lineMaterialWidth = [];
   context.setFeature(feature);
   const countIndices = (count - feature.geometries.length) * 2;
@@ -265,21 +263,27 @@ function featureToLine(feature, options) {
       if (feature.normals) {
         normal.fromArray(feature.normals, v).multiply(inverseScale);
       }
-      coord.copy(context.setLocalCoordinatesFromArray(feature.vertices, v));
+      const localCoord = context.setLocalCoordinatesFromArray(feature.vertices, v);
       style.setContext(context);
       const {
         base_altitude,
         color,
         width
       } = style.stroke;
-      coord.z = 0;
-      if (!lineMaterialWidth.includes(width)) {
-        lineMaterialWidth.push(width);
+      coord.copy(localCoord).applyMatrix4(context.collection.matrixWorld);
+      if (coord.crs == 'EPSG:4978') {
+        // altitude convertion from geocentered to elevation (from ground)
+        coord.as('EPSG:4326', coord);
       }
 
-      // populate geometry buffers
-      base.copy(normal).multiplyScalar(base_altitude).add(coord).toArray(vertices, v);
+      // Calculate the new coordinates using the elevation shift (baseCoord)
+      baseCoord.copy(normal).multiplyScalar(base_altitude - coord.z).add(localCoord)
+      // and update the geometry buffer (vertices).
+      .toArray(vertices, v);
       toColor(color).multiplyScalar(255).toArray(colors, v);
+      if (!lineMaterialWidth.includes(width)) {
+        lineMaterialWidth.push(width);
+      }
       batchIds[j] = id;
     }
     featureId++;
@@ -289,6 +293,7 @@ function featureToLine(feature, options) {
     // TODO CREATE material for each feature
     console.warn('Too many differents stroke.width, only the first one will be used');
   }
+  geom.setAttribute('position', new THREE.BufferAttribute(vertices, 3));
   geom.setAttribute('color', new THREE.BufferAttribute(colors, 3, true));
   geom.setAttribute('batchId', new THREE.BufferAttribute(batchIds, 1));
   geom.setIndex(new THREE.BufferAttribute(indices, 1));
@@ -320,18 +325,24 @@ function featureToPolygon(feature, options) {
       if (feature.normals) {
         normal.fromArray(feature.normals, i).multiply(inverseScale);
       }
-      coord.copy(context.setLocalCoordinatesFromArray(feature.vertices, i));
+      const localCoord = context.setLocalCoordinatesFromArray(feature.vertices, i);
       style.setContext(context);
       const {
         base_altitude,
         color
       } = style.fill;
-      coord.z = 0;
+      coord.copy(localCoord).applyMatrix4(context.collection.matrixWorld);
+      if (coord.crs == 'EPSG:4978') {
+        // altitude convertion from geocentered to elevation (from ground)
+        coord.as('EPSG:4326', coord);
+      }
 
-      // populate geometry buffers
-      base.copy(normal).multiplyScalar(base_altitude).add(coord).toArray(vertices, i);
-      batchIds[b] = id;
+      // Calculate the new coordinates using the elevation shift (baseCoord)
+      baseCoord.copy(normal).multiplyScalar(base_altitude - coord.z).add(localCoord)
+      // and update the geometry buffer (vertices).
+      .toArray(vertices, i);
       toColor(color).multiplyScalar(255).toArray(colors, i);
+      batchIds[b] = id;
     }
     featureId++;
     const geomVertices = vertices.slice(start * 3, end * 3);
@@ -386,21 +397,27 @@ function featureToExtrudedPolygon(feature, options) {
       if (feature.normals) {
         normal.fromArray(feature.normals, i).multiply(inverseScale);
       }
-      coord.copy(context.setLocalCoordinatesFromArray(ptsIn, i));
+      const localCoord = context.setLocalCoordinatesFromArray(ptsIn, i);
       style.setContext(context);
       const {
         base_altitude,
         extrusion_height,
         color
       } = style.fill;
-      coord.z = 0;
+      coord.copy(localCoord).applyMatrix4(context.collection.matrixWorld);
+      if (coord.crs == 'EPSG:4978') {
+        // altitude convertion from geocentered to elevation (from ground)
+        coord.as('EPSG:4326', coord);
+      }
 
-      // populate base geometry buffers
-      base.copy(normal).multiplyScalar(base_altitude).add(coord).toArray(vertices, i);
+      // Calculate the new base coordinates using the elevation shift (baseCoord)
+      baseCoord.copy(normal).multiplyScalar(base_altitude - coord.z).add(localCoord)
+      // and update the geometry buffer (vertices).
+      .toArray(vertices, i);
       batchIds[b] = id;
 
       // populate top geometry buffers
-      extrusion.copy(normal).multiplyScalar(extrusion_height).add(base).toArray(vertices, t);
+      topCoord.copy(normal).multiplyScalar(extrusion_height).add(baseCoord).toArray(vertices, t);
       batchIds[b + totalVertices] = id;
 
       // coloring base and top mesh

package/lib/Core/Style.js

@@ -24,8 +24,8 @@ const matrix = svg.createSVGMatrix();
 const inv255 = 1 / 255;
 const canvas = typeof document !== 'undefined' ? document.createElement('canvas') : {};
 function baseAltitudeDefault(properties, ctx) {
-  var _ctx$coordinates, _ctx$collection, _ctx$collection$cente;
-  return (ctx === null || ctx === void 0 ? void 0 : (_ctx$coordinates = ctx.coordinates) === null || _ctx$coordinates === void 0 ? void 0 : _ctx$coordinates.z) || (ctx === null || ctx === void 0 ? void 0 : (_ctx$collection = ctx.collection) === null || _ctx$collection === void 0 ? void 0 : (_ctx$collection$cente = _ctx$collection.center) === null || _ctx$collection$cente === void 0 ? void 0 : _ctx$collection$cente.z) || 0;
+  var _ctx$coordinates;
+  return (ctx === null || ctx === void 0 ? void 0 : (_ctx$coordinates = ctx.coordinates) === null || _ctx$coordinates === void 0 ? void 0 : _ctx$coordinates.z) || 0;
 }
 function readExpression(property, ctx) {
   if (property != undefined) {

package/lib/Renderer/RasterTile.js

@@ -75,7 +75,8 @@ class RasterTile extends THREE.EventDispatcher {
       }
     }
   }
-  dispose(removeEvent) {
+  dispose() {
+    let removeEvent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     if (removeEvent) {
       this.layer.removeEventListener('visible-property-changed', this._handlerCBEvent);
       this.layer.removeEventListener('opacity-property-changed', this._handlerCBEvent);

package/package.json

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