itowns 2.43.2-next.5 → 2.43.2-next.7

package/lib/Core/View.js

@@ -232,8 +232,7 @@ class View extends THREE.EventDispatcher {
    * @returns {THREE.WebGLRenderer} the WebGLRenderer used to render this view.
    */
   get renderer() {
-    var _this$mainLoop, _this$mainLoop$gfxEng;
-    return (_this$mainLoop = this.mainLoop) === null || _this$mainLoop === void 0 ? void 0 : (_this$mainLoop$gfxEng = _this$mainLoop.gfxEngine) === null || _this$mainLoop$gfxEng === void 0 ? void 0 : _this$mainLoop$gfxEng.getRenderer();
+    return this.mainLoop?.gfxEngine?.getRenderer();
   }
 
   /**
@@ -241,8 +240,7 @@ class View extends THREE.EventDispatcher {
    * @returns {THREE.Camera} the threejs camera of this view
    */
   get camera3D() {
-    var _this$camera;
-    return (_this$camera = this.camera) === null || _this$camera === void 0 ? void 0 : _this$camera.camera3D;
+    return this.camera?.camera3D;
   }
 
   /**

package/lib/Layer/ElevationLayer.js

@@ -60,14 +60,13 @@ class ElevationLayer extends RasterLayer {
    * view.addLayer(elevation);
    */
   constructor(id) {
-    var _config$clampValues, _config$clampValues2;
     let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     super(id, config);
     if (config.zmin || config.zmax) {
       console.warn('Config using zmin and zmax are deprecated, use {clampValues: {min, max}} structure.');
     }
-    this.zmin = ((_config$clampValues = config.clampValues) === null || _config$clampValues === void 0 ? void 0 : _config$clampValues.min) ?? config.zmin;
-    this.zmax = ((_config$clampValues2 = config.clampValues) === null || _config$clampValues2 === void 0 ? void 0 : _config$clampValues2.max) ?? config.zmax;
+    this.zmin = config.clampValues?.min ?? config.zmin;
+    this.zmax = config.clampValues?.max ?? config.zmax;
     this.isElevationLayer = true;
     this.defineLayerProperty('scale', this.scale || 1.0);
   }

package/lib/Layer/GeoidLayer.js

@@ -1,8 +1,7 @@
 import Layer from "./Layer.js";
 import LayerUpdateState from "./LayerUpdateState.js";
 export function geoidLayerIsVisible(tilelayer) {
-  var _tilelayer$attachedLa;
-  return tilelayer === null || tilelayer === void 0 ? void 0 : (_tilelayer$attachedLa = tilelayer.attachedLayers.filter(l => l.isGeoidLayer)[0]) === null || _tilelayer$attachedLa === void 0 ? void 0 : _tilelayer$attachedLa.visible;
+  return tilelayer?.attachedLayers.filter(l => l.isGeoidLayer)[0]?.visible;
 }
 
 /**

package/lib/Layer/LabelLayer.js

@@ -195,11 +195,9 @@ class LabelLayer extends GeometryLayer {
   set visible(value) {
     super.visible = value;
     if (value) {
-      var _this$domElement;
-      (_this$domElement = this.domElement) === null || _this$domElement === void 0 ? void 0 : _this$domElement.show();
+      this.domElement?.show();
     } else {
-      var _this$domElement2;
-      (_this$domElement2 = this.domElement) === null || _this$domElement2 === void 0 ? void 0 : _this$domElement2.hide();
+      this.domElement?.hide();
     }
   }
   get submittedLabelNodes() {
@@ -231,16 +229,15 @@ class LabelLayer extends GeometryLayer {
     coord.crs = data.crs;
     context.setZoom(extent.zoom);
     data.features.forEach(f => {
-      var _f$style, _f$style$text, _f$style2, _f$style2$point;
       // TODO: add support for LINE and POLYGON
       if (f.type !== FEATURE_TYPES.POINT) {
         return;
       }
       context.setFeature(f);
-      const featureField = (_f$style = f.style) === null || _f$style === void 0 ? void 0 : (_f$style$text = _f$style.text) === null || _f$style$text === void 0 ? void 0 : _f$style$text.field;
+      const featureField = f.style?.text?.field;
 
       // determine if altitude style is specified by the user
-      const altitudeStyle = (_f$style2 = f.style) === null || _f$style2 === void 0 ? void 0 : (_f$style2$point = _f$style2.point) === null || _f$style2$point === void 0 ? void 0 : _f$style2$point.base_altitude;
+      const altitudeStyle = f.style?.point?.base_altitude;
       const isDefaultElevationStyle = altitudeStyle instanceof Function && altitudeStyle.name == 'baseAltitudeDefault';
 
       // determine if the altitude needs update with ElevationLayer
@@ -292,19 +289,14 @@ class LabelLayer extends GeometryLayer {
     this.toHide.add(labelsNode);
   }
   #findClosestDomElement(node) {
-    var _node$parent;
-    if ((_node$parent = node.parent) !== null && _node$parent !== void 0 && _node$parent.isTileMesh) {
-      var _node$parent$link$thi;
-      return ((_node$parent$link$thi = node.parent.link[this.id]) === null || _node$parent$link$thi === void 0 ? void 0 : _node$parent$link$thi.domElements) || this.#findClosestDomElement(node.parent);
+    if (node.parent?.isTileMesh) {
+      return node.parent.link[this.id]?.domElements || this.#findClosestDomElement(node.parent);
     } else {
       return this.domElement;
     }
   }
   #hasLabelChildren(object) {
-    return object.children.every(c => {
-      var _c$layerUpdateState$t;
-      return c.layerUpdateState && ((_c$layerUpdateState$t = c.layerUpdateState[this.id]) === null || _c$layerUpdateState$t === void 0 ? void 0 : _c$layerUpdateState$t.hasFinished());
-    });
+    return object.children.every(c => c.layerUpdateState && c.layerUpdateState[this.id]?.hasFinished());
   }
 
   // Remove all labels invisible with pre-culling with screen grid
@@ -439,8 +431,7 @@ class LabelLayer extends GeometryLayer {
     this.removeNodeDomElement(node);
   }
   removeNodeDomElement(node) {
-    var _node$link$this$id;
-    if ((_node$link$this$id = node.link[this.id]) !== null && _node$link$this$id !== void 0 && _node$link$this$id.domElements) {
+    if (node.link[this.id]?.domElements) {
       const child = node.link[this.id].domElements.dom;
       child.parentElement.removeChild(child);
       delete node.link[this.id].domElements;

package/lib/Layer/Layer.js

@@ -100,8 +100,7 @@ class Layer extends THREE.EventDispatcher {
     super();
     this.isLayer = true;
     if (config.style && !(config.style instanceof Style)) {
-      var _config$style$fill;
-      if (typeof ((_config$style$fill = config.style.fill) === null || _config$style$fill === void 0 ? void 0 : _config$style$fill.pattern) === 'string') {
+      if (typeof config.style.fill?.pattern === 'string') {
         console.warn('Using style.fill.pattern = { source: Img|url } is adviced');
         config.style.fill.pattern = {
           source: config.style.fill.pattern

package/lib/Layer/PointCloudLayer.js

@@ -73,16 +73,13 @@ function markForDeletion(elt) {
   }
 }
 function changeIntensityRange(layer) {
-  var _layer$material$inten;
-  (_layer$material$inten = layer.material.intensityRange) === null || _layer$material$inten === void 0 ? void 0 : _layer$material$inten.set(layer.minIntensityRange, layer.maxIntensityRange);
+  layer.material.intensityRange?.set(layer.minIntensityRange, layer.maxIntensityRange);
 }
 function changeElevationRange(layer) {
-  var _layer$material$eleva;
-  (_layer$material$eleva = layer.material.elevationRange) === null || _layer$material$eleva === void 0 ? void 0 : _layer$material$eleva.set(layer.minElevationRange, layer.maxElevationRange);
+  layer.material.elevationRange?.set(layer.minElevationRange, layer.maxElevationRange);
 }
 function changeAngleRange(layer) {
-  var _layer$material$angle;
-  (_layer$material$angle = layer.material.angleRange) === null || _layer$material$angle === void 0 ? void 0 : _layer$material$angle.set(layer.minAngleRange, layer.maxAngleRange);
+  layer.material.angleRange?.set(layer.minAngleRange, layer.maxAngleRange);
 }
 
 /**

package/lib/Layer/ReferencingLayerProperties.js

@@ -43,8 +43,7 @@ function ReferLayerProperties(material, layer) {
     });
     Object.defineProperty(material, 'transparent', {
       get: () => {
-        var _material$userData$ne;
-        const needTransparency = ((_material$userData$ne = material.userData.needTransparency) === null || _material$userData$ne === void 0 ? void 0 : _material$userData$ne[material.mode]) || material.layer.opacity < 1.0;
+        const needTransparency = material.userData.needTransparency?.[material.mode] || material.layer.opacity < 1.0;
         if (transparent != needTransparency) {
           material.needsUpdate = true;
           transparent = needTransparency;

package/lib/Parser/GeoJsonParser.js

@@ -132,8 +132,7 @@ function toFeatureType(jsonType) {
 const keyProperties = ['type', 'geometry', 'properties'];
 const firstCoordinates = a => a === undefined || Array.isArray(a) && !isNaN(a[0]) ? a : firstCoordinates(a[0]);
 function jsonFeatureToFeature(crsIn, json, collection) {
-  var _json$geometry, _firstCoordinates;
-  if (!((_json$geometry = json.geometry) !== null && _json$geometry !== void 0 && _json$geometry.type)) {
+  if (!json.geometry?.type) {
     console.warn('No geometry provided');
     return null;
   }
@@ -142,7 +141,7 @@ function jsonFeatureToFeature(crsIn, json, collection) {
   const feature = collection.requestFeatureByType(featureType);
   const coordinates = jsonType != 'point' ? json.geometry.coordinates : [json.geometry.coordinates];
   const properties = json.properties || {};
-  feature.hasRawElevationData = ((_firstCoordinates = firstCoordinates(coordinates)) === null || _firstCoordinates === void 0 ? void 0 : _firstCoordinates.length) === 3;
+  feature.hasRawElevationData = firstCoordinates(coordinates)?.length === 3;
 
   // copy other properties
   for (const key of Object.keys(json)) {

package/lib/Parser/LASParser.js

@@ -89,13 +89,12 @@ export default {
    * header of the file is contained in `userData`.
    */
   parse(data) {
-    var _options$out, _options$in;
     let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    if ((_options$out = options.out) !== null && _options$out !== void 0 && _options$out.skip) {
+    if (options.out?.skip) {
       console.warn("Warning: options 'skip' not supported anymore");
     }
     return lasLoader.parseFile(data, {
-      colorDepth: (_options$in = options.in) === null || _options$in === void 0 ? void 0 : _options$in.colorDepth
+      colorDepth: options.in?.colorDepth
     }).then(parsedData => {
       const geometry = buildBufferGeometry(parsedData.attributes);
       geometry.userData.header = parsedData.header;

package/lib/Parser/deprecated/LegacyGLTFLoader.js

@@ -321,7 +321,6 @@ threeExamples.LegacyGLTFLoader = function () {
     1029: THREE.FrontSide // Culling back
     //1032: THREE.NoSide   // Culling front and back, what to do?
   };
-
   var WEBGL_DEPTH_FUNCS = {
     512: THREE.NeverDepth,
     513: THREE.LessDepth,
@@ -355,7 +354,6 @@ threeExamples.LegacyGLTFLoader = function () {
     //32771: CONSTANT_ALPHA,
     //32772: ONE_MINUS_CONSTANT_COLOR
   };
-
   var WEBGL_TYPE_SIZES = {
     'SCALAR': 1,
     'VEC2': 2,
@@ -1116,6 +1114,7 @@ threeExamples.LegacyGLTFLoader = function () {
 
         // According to COLLADA spec...
         // aspectRatio = xfov / yfov
+
         var _camera = new THREE.PerspectiveCamera(THREE.MathUtils.radToDeg(yfov * aspectRatio), aspectRatio, camera.perspective.znear || 1, camera.perspective.zfar || 2e6);
         if (camera.name !== undefined) _camera.name = camera.name;
         if (camera.extras) _camera.userData = camera.extras;

package/lib/Process/FeatureProcessing.js

@@ -17,9 +17,8 @@ export default {
     if (node.layerUpdateState[layer.id] === undefined) {
       node.layerUpdateState[layer.id] = new LayerUpdateState();
     } else if (!node.layerUpdateState[layer.id].canTryUpdate()) {
-      var _node$link$layer$id;
       // toggle visibility features
-      (_node$link$layer$id = node.link[layer.id]) === null || _node$link$layer$id === void 0 ? void 0 : _node$link$layer$id.forEach(f => {
+      node.link[layer.id]?.forEach(f => {
         f.layer.object3d.add(f);
         f.meshes.position.z = geoidLayerIsVisible(layer.parent) ? node.geoidHeight : 0;
         f.meshes.updateMatrixWorld();

package/lib/Process/LayeredMaterialNodeProcessing.js

@@ -62,14 +62,12 @@ export function updateLayeredMaterialNodeImagery(context, layer, node, parent) {
         return;
       } // ok, we're going to inherit our parent's texture
     }
-
     if (!nodeLayer) {
-      var _parent$material;
       // Create new raster node
       nodeLayer = layer.setupRasterNode(node);
 
       // Init the node by parent
-      const parentLayer = (_parent$material = parent.material) === null || _parent$material === void 0 ? void 0 : _parent$material.getLayer(layer.id);
+      const parentLayer = parent.material?.getLayer(layer.id);
       nodeLayer.initFromParent(parentLayer, extentsDestination);
     }
 
@@ -158,9 +156,8 @@ export function updateLayeredMaterialNodeElevation(context, layer, node, parent)
     nodeLayer = layer.setupRasterNode(node);
   }
   if (node.layerUpdateState[layer.id] === undefined) {
-    var _parent$material2;
     node.layerUpdateState[layer.id] = new LayerUpdateState();
-    const parentLayer = (_parent$material2 = parent.material) === null || _parent$material2 === void 0 ? void 0 : _parent$material2.getLayer(layer.id);
+    const parentLayer = parent.material?.getLayer(layer.id);
     nodeLayer.initFromParent(parentLayer, extentsDestination);
     if (nodeLayer.level >= layer.source.zoom.min) {
       context.view.notifyChange(node, false);
@@ -210,8 +207,7 @@ export function removeLayeredMaterialNodeLayer(layerId) {
    * @param {TileMesh} node - The node to udpate.
    */
   return function (node) {
-    var _node$material;
-    if ((_node$material = node.material) !== null && _node$material !== void 0 && _node$material.removeLayer) {
+    if (node.material?.removeLayer) {
       if (node.material.elevationLayerIds.indexOf(layerId) > -1) {
         node.setBBoxZ({
           min: 0,

package/lib/Process/ObjectRemovalHelper.js

@@ -28,7 +28,6 @@ export default {
         // see https://github.com/iTowns/itowns/issues/869
         // obj.geometry = null;
       }
-
       if (obj.material) {
         if (Array.isArray(obj.material)) {
           for (const material of obj.material) {
@@ -82,7 +81,7 @@ export default {
     // of the objects which have their own removal logic
     let toRemove = obj.children.filter(c => c.layer && c.layer.id === layer.id);
     const linked = obj.link && obj.link[layer.id];
-    if (linked !== null && linked !== void 0 && linked.children.length) {
+    if (linked?.children.length) {
       toRemove = toRemove.concat(linked.children);
       delete obj.link[layer.id];
     }

package/lib/Renderer/ColorLayersOrdering.js

@@ -2,8 +2,7 @@ import { ImageryLayers } from "../Layer/Layer.js";
 function updateLayersOrdering(geometryLayer, imageryLayers) {
   const sequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
   const cO = function (object) {
-    var _object$material;
-    if ((_object$material = object.material) !== null && _object$material !== void 0 && _object$material.setSequence) {
+    if (object.material?.setSequence) {
       object.material.setSequence(sequence);
     }
   };

package/lib/Renderer/Label2DRenderer.js

@@ -157,10 +157,7 @@ class Label2DRenderer {
       }
     });
     labelLayers.forEach(labelLayer => {
-      labelLayer.toHide.children.forEach(labelsNode => {
-        var _labelsNode$domElemen;
-        return (_labelsNode$domElemen = labelsNode.domElements) === null || _labelsNode$domElemen === void 0 ? void 0 : _labelsNode$domElemen.labels.hide();
-      });
+      labelLayer.toHide.children.forEach(labelsNode => labelsNode.domElements?.labels.hide());
       labelLayer.toHide.clear();
     });
   }

package/lib/Renderer/PointsMaterial.js

@@ -390,7 +390,7 @@ class PointsMaterial extends THREE.ShaderMaterial {
     }
   }
   recomputeClassification() {
-    const needTransparency = recomputeTexture(this.classificationScheme, this.classificationTexture, 32);
+    const needTransparency = recomputeTexture(this.classificationScheme, this.classificationTexture, 256);
     this.userData.needTransparency[PNTS_MODE.CLASSIFICATION] = needTransparency;
     this.dispatchEvent({
       type: 'material_property_changed',

package/lib/Renderer/RenderMode.js

@@ -5,7 +5,6 @@ const MODES = {
   // depth buffer
   ID: 2 // id object
 };
-
 function push(object3d, mode) {
   const _mode = object3d.mode ?? MODES.FINAL;
   if (_mode == mode) {

package/lib/ThreeExtended/loaders/DDSLoader.js

@@ -17,23 +17,29 @@ class DDSLoader extends CompressedTextureLoader {
 
     // All values and structures referenced from:
     // http://msdn.microsoft.com/en-us/library/bb943991.aspx/
+
     // const DDSD_CAPS = 0x1;
     // const DDSD_HEIGHT = 0x2;
     // const DDSD_WIDTH = 0x4;
     // const DDSD_PITCH = 0x8;
     // const DDSD_PIXELFORMAT = 0x1000;
+
     // const DDSD_LINEARSIZE = 0x80000;
     // const DDSD_DEPTH = 0x800000;
+
     // const DDSCAPS_COMPLEX = 0x8;
     // const DDSCAPS_MIPMAP = 0x400000;
     // const DDSCAPS_TEXTURE = 0x1000;
+
     // const DDSCAPS2_VOLUME = 0x200000;
+
     // const DDPF_ALPHAPIXELS = 0x1;
     // const DDPF_ALPHA = 0x2;
     // const DDPF_FOURCC = 0x4;
     // const DDPF_RGB = 0x40;
     // const DDPF_YUV = 0x200;
     // const DDPF_LUMINANCE = 0x20000;
+
     function fourCCToInt32(value) {
       return value.charCodeAt(0) + (value.charCodeAt(1) << 8) + (value.charCodeAt(2) << 16) + (value.charCodeAt(3) << 24);
     }
@@ -66,7 +72,6 @@ class DDSLoader extends CompressedTextureLoader {
           dst++; //a
         }
       }
-
       return byteArray;
     }
     const FOURCC_DXT1 = fourCCToInt32('DXT1');
@@ -78,11 +83,16 @@ class DDSLoader extends CompressedTextureLoader {
     const extendedHeaderLengthInt = 5; // The extended header length in 32 bit ints
 
     // Offsets into the header array
+
     // const off_pfFlags = 20;
+
     // const off_caps = 27;
+
     // const off_caps3 = 29;
     // const off_caps4 = 30;
+
     // If fourCC = DX10, the extended header starts after 32
+
     // Parse header
 
     const header = new Int32Array(buffer, 0, headerLengthInt);

package/lib/ThreeExtended/loaders/DRACOLoader.js

@@ -261,7 +261,6 @@ function DRACOWorker() {
           };
           DracoDecoderModule(decoderConfig); // eslint-disable-line no-undef
         });
-
         break;
       case 'decode':
         const buffer = message.buffer;

package/lib/ThreeExtended/loaders/GLTFLoader.js

@@ -2627,6 +2627,7 @@ class GLTFParser {
 
       // Removes dangling associations, associations that reference a node that
       // didn't make it into the scene.
+
       parser.associations = (node => {
         const reducedAssociations = new Map();
         for (const [key, value] of parser.associations) {

package/lib/Utils/DEMUtils.js

@@ -255,6 +255,7 @@ function _readZCorrect(layer, texture, uv, tileDimensions, tileOwnerDimensions)
 
   // Determine if we're going to read the vertices from the top-left or lower-right triangle
   // (low-right = on the line 21-22 or under the diagonal lu = 1 - lv)
+
   const tri = new THREE.Triangle(new THREE.Vector3(u1, v2), new THREE.Vector3(u2, v1), lv == 1 || lu / (1 - lv) >= 1 ? new THREE.Vector3(u2, v2) : new THREE.Vector3(u1, v1));
 
   // bary holds the respective weight of each vertices of the triangles
@@ -287,11 +288,10 @@ function offsetInExtent(point, extent) {
   return target.set(originX, originY);
 }
 function _readZ(layer, method, coord, nodes, cache) {
-  var _cache$tile;
   const pt = coord.as(layer.extent.crs, temp.coord1);
   let tileWithValidElevationTexture = null;
   // first check in cache
-  if (cache !== null && cache !== void 0 && (_cache$tile = cache.tile) !== null && _cache$tile !== void 0 && _cache$tile.material) {
+  if (cache?.tile?.material) {
     tileWithValidElevationTexture = tileAt(pt, cache.tile);
   }
   for (let i = 0; !tileWithValidElevationTexture && i < nodes.length; i++) {

package/lib/Utils/OrientationUtils.js

@@ -71,7 +71,6 @@ export default {
     // return this.setFromEuler(euler.set(pitch, roll, heading , 'ZXY')).conjugate();
     return target.setFromEuler(euler.set(-pitch, -roll, -heading, 'YXZ')); // optimized version of above
   },
-
   /**
    * From
    * [DocMicMac](https://github.com/micmacIGN/Documentation/raw/master/DocMicMac.pdf),

package/lib/Utils/gui/Searchbar.js

@@ -9,7 +9,6 @@ const DEFAULT_OPTIONS = {
   placeholder: 'Search location'
 };
 function addActive(htmlElements, index) {
-  var _htmlElements$index;
   if (!htmlElements) {
     return index;
   }
@@ -19,7 +18,7 @@ function addActive(htmlElements, index) {
   } else if (index < 0) {
     index = htmlElements.length - 1;
   }
-  (_htmlElements$index = htmlElements[index]) === null || _htmlElements$index === void 0 ? void 0 : _htmlElements$index.classList.add('active');
+  htmlElements[index]?.classList.add('active');
   return index;
 }
 function removeAllActives(htmlElements) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.43.2-next.5",
+  "version": "2.43.2-next.7",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",
@@ -72,10 +72,11 @@
     "three": "^0.159.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.22.5",
-    "@babel/plugin-transform-runtime": "^7.22.5",
-    "@babel/preset-env": "^7.22.5",
-    "@babel/register": "^7.22.5",
+    "@babel/cli": "^7.24.6",
+    "@babel/core": "^7.24.6",
+    "@babel/plugin-transform-runtime": "^7.24.6",
+    "@babel/preset-env": "^7.24.6",
+    "@babel/register": "^7.24.6",
     "@types/three": "^0.159.0",
     "@xmldom/xmldom": "^0.8.10",
     "babel-inline-import-loader": "^1.0.1",