itowns 2.43.2-next.1 → 2.43.2-next.10

package/examples/js/plugins/COGParser.js

@@ -22,10 +22,8 @@
  * @returns {GeoTIFFLevel} The selected zoom level.
  */
 function selectLevel(source, requestExtent, requestWidth, requestHeight) {
-    // Number of images  = original + overviews if any
-    const cropped = requestExtent.clone().intersect(source.extent);
     // Dimensions of the requested extent
-    const extentDimension = cropped.planarDimensions();
+    const extentDimension = requestExtent.clone().planarDimensions();
 
     const targetResolution = Math.min(
         extentDimension.x / requestWidth,
@@ -87,70 +85,112 @@ function makeWindowFromExtent(source, extent, resolution) {
 }
 
 /**
- * Creates a texture from the pixel buffer(s).
+ * Reads raster data from the image as RGB.
+ * The result is always an interleaved typed array.
+ * Colorspaces other than RGB will be transformed to RGB, color maps expanded.
+ *
+ * @param {Source} source The COGSource.
+ * @param {GeoTIFFLevel} level The GeoTIFF level to read
+ * @param {number[]} viewport The image region to read.
+ * @returns {Promise<TypedArray[]>} The raster data
+ */
+async function readRGB(source, level, viewport) {
+    try {
+        // TODO possible optimization: instead of letting geotiff.js crop and resample
+        // the tiles into the desired region, we could use image.getTileOrStrip() to
+        // read individual tiles (aka blocks) and make a texture per block. This way,
+        // there would not be multiple concurrent reads for the same block, and we would not
+        // waste time resampling the blocks since resampling is already done in the composer.
+        // We would create more textures, but it could be worth it.
+        return await level.image.readRGB({
+            window: viewport,
+            pool: source.pool,
+            width: source.tileWidth,
+            height: source.tileHeight,
+            resampleMethod: source.resampleMethod,
+            enableAlpha: true,
+            interleave: true,
+        });
+    } catch (error) {
+        if (error.toString() === 'AggregateError: Request failed') {
+            // Problem with the source that is blocked by another fetch
+            // (request failed in readRasters). See the conversations in
+            // https://github.com/geotiffjs/geotiff.js/issues/218
+            // https://github.com/geotiffjs/geotiff.js/issues/221
+            // https://github.com/geotiffjs/geotiff.js/pull/224
+            // Retry until it is not blocked.
+            // TODO retry counter
+            await new Promise((resolve) => {
+                setTimeout(resolve, 100);
+            });
+            return readRGB(level, viewport, source);
+        }
+        throw error;
+    }
+}
+
+/**
+ * Creates a texture from the pixel buffer
  *
  * @param {Object} source The COGSource
- * @param {THREE.TypedArray | THREE.TypedArray[]} buffers The buffers (one buffer per band)
- * @param {number} buffers.width
- * @param {number} buffers.height
- * @param {number} buffers.byteLength
+ * @param {THREE.TypedArray[]} buffer The pixel buffer
+ * @param {number} buffer.width
+ * @param {number} buffer.height
+ * @param {number} buffer.byteLength
  * @returns {THREE.DataTexture} The generated texture.
  */
-function createTexture(source, buffers) {
-    const { width, height, byteLength } = buffers;
+function createTexture(source, buffer) {
+    const { byteLength } = buffer;
+    const width = source.tileWidth;
+    const height = source.tileHeight;
     const pixelCount = width * height;
     const targetDataType = source.dataType;
     const format = THREE.RGBAFormat;
     const channelCount = 4;
-    let texture;
-    let data;
-
-    // Check if it's a RGBA buffer
-    if (pixelCount * channelCount === byteLength) {
-        data = buffers;
-    }
+    const isRGBA = pixelCount * channelCount === byteLength;
+    let tmpBuffer = buffer;
 
     switch (targetDataType) {
         case THREE.UnsignedByteType: {
-            if (!data) {
-                // We convert RGB buffer to RGBA
-                const newBuffers = new Uint8ClampedArray(pixelCount * channelCount);
-                data = convertToRGBA(buffers, newBuffers, source.defaultAlpha);
+            if (!isRGBA) {
+                tmpBuffer = convertToRGBA(tmpBuffer, new Uint8ClampedArray(pixelCount * channelCount), source.defaultAlpha);
             }
-            texture = new THREE.DataTexture(data, width, height, format, THREE.UnsignedByteType);
-            break;
+            return new THREE.DataTexture(tmpBuffer, width, height, format, THREE.UnsignedByteType);
         }
         case THREE.FloatType: {
-            if (!data) {
-                // We convert RGB buffer to RGBA
-                const newBuffers = new Float32Array(pixelCount * channelCount);
-                data = convertToRGBA(buffers, newBuffers, source.defaultAlpha / 255);
+            if (!isRGBA) {
+                tmpBuffer = convertToRGBA(tmpBuffer, new Float32Array(pixelCount * channelCount), source.defaultAlpha / 255);
             }
-            texture = new THREE.DataTexture(data, width, height, format, THREE.FloatType);
-            break;
+            return new THREE.DataTexture(tmpBuffer, width, height, format, THREE.FloatType);
         }
         default:
             throw new Error('unsupported data type');
     }
-
-    return texture;
 }
 
-function convertToRGBA(buffers, newBuffers, defaultAlpha) {
-    const { width, height } = buffers;
+/**
+ * Convert RGB pixel buffer to RGBA pixel buffer
+ *
+ * @param {THREE.TypedArray[]} buffer The RGB pixel buffer
+ * @param {THREE.TypedArray[]} newBuffer The empty RGBA pixel buffer
+ * @param {number} defaultAlpha Default alpha value
+ * @returns {THREE.DataTexture} The generated texture.
+ */
+function convertToRGBA(buffer, newBuffer, defaultAlpha) {
+    const { width, height } = buffer;
 
     for (let i = 0; i < width * height; i++) {
         const oldIndex = i * 3;
         const index = i * 4;
         // Copy RGB from original buffer
-        newBuffers[index + 0] = buffers[oldIndex + 0]; // R
-        newBuffers[index + 1] = buffers[oldIndex + 1]; // G
-        newBuffers[index + 2] = buffers[oldIndex + 2]; // B
+        newBuffer[index + 0] = buffer[oldIndex + 0]; // R
+        newBuffer[index + 1] = buffer[oldIndex + 1]; // G
+        newBuffer[index + 2] = buffer[oldIndex + 2]; // B
         // Add alpha to new buffer
-        newBuffers[index + 3] = defaultAlpha; // A
+        newBuffer[index + 3] = defaultAlpha; // A
     }
 
-    return newBuffers;
+    return newBuffer;
 }
 
 /**
@@ -195,20 +235,14 @@ const COGParser = (function _() {
          */
         parse: async function _(data, options) {
             const source = options.in;
-            const nodeExtent = data.extent.as(source.crs);
-            const level = selectLevel(source, nodeExtent, source.tileWidth, source.tileHeight);
-            const viewport = makeWindowFromExtent(source, nodeExtent, level.resolution);
-
-            const buffers = await level.image.readRGB({
-                window: viewport,
-                pool: source.pool,
-                enableAlpha: true,
-                interleave: true,
-            });
+            const tileExtent = options.extent.as(source.crs);
 
-            const texture = createTexture(source, buffers);
+            const level = selectLevel(source, tileExtent, source.tileWidth, source.tileHeight);
+            const viewport = makeWindowFromExtent(source, tileExtent, level.resolution);
+            const rgbBuffer = await readRGB(source, level, viewport);
+            const texture = createTexture(source, rgbBuffer);
             texture.flipY = true;
-            texture.extent = data.extent;
+            texture.extent = options.extent;
             texture.needsUpdate = true;
             texture.magFilter = THREE.LinearFilter;
             texture.minFilter = THREE.LinearFilter;

package/examples/js/plugins/COGSource.js

@@ -15,6 +15,9 @@
  * @property {string} url - The URL of the COG.
  * @property {GeoTIFF.Pool} pool - Pool use to decode GeoTiff.
  * @property {number} defaultAlpha - Alpha byte value used if no alpha is present in COG. Default value is 255.
+ * @property {number} tileWidth - Tile width in pixels. Default value use 'geotiff.getTileWidth()'.
+ * @property {number} tileHeight - Tile height in pixels. Default value use 'geotiff.getTileHeight()'.
+ * @property {number} resampleMethod - The desired resampling method. Default is 'nearest'.
  *
  * @example
  * // Create the source
@@ -59,9 +62,9 @@ class COGSource extends itowns.Source {
                 this.firstImage = await geotiff.getImage();
                 this.origin = this.firstImage.getOrigin();
                 this.dataType = this.selectDataType(this.firstImage.getSampleFormat(), this.firstImage.getBitsPerSample());
-
-                this.tileWidth = this.firstImage.getTileWidth();
-                this.tileHeight = this.firstImage.getTileHeight();
+                this.tileWidth = source.tileWidth || this.firstImage.getTileWidth();
+                this.tileHeight = source.tileHeight || this.firstImage.getTileHeight();
+                this.resampleMethod = source.resampleMethod || 'nearest';
 
                 // Compute extent
                 const [minX, minY, maxX, maxY] = this.firstImage.getBoundingBox();
@@ -80,7 +83,7 @@ class COGSource extends itowns.Source {
                         .then(image => this.makeLevel(image, image.getResolution(this.firstImage)));
                     promises.push(promise);
                 }
-                this.levels.push(await Promise.all(promises));
+                this.levels = this.levels.concat(await Promise.all(promises));
             });
     }
 

package/examples/layers/JSONLayers/OPENSM.json

@@ -4,7 +4,7 @@
         "crs": "EPSG:3857",
         "isInverted": true,
         "format": "image/png",
-        "url": "http://osm.oslandia.io/styles/klokantech-basic/${z}/${x}/${y}.png",
+        "url": "https://maps.pole-emploi.fr/styles/klokantech-basic/${z}/${x}/${y}.png",
         "attribution": {
             "name":"OpenStreetMap",
             "url": "http://www.openstreetmap.org/"

package/examples/potree_25d_map.html

@@ -102,7 +102,7 @@
                     potreeLayer.root.bbox.getSize(size);
                     potreeLayer.root.bbox.getCenter(lookAt);
 
-                    debug.PotreeDebug.initTools(view, potreeLayer, debugGui);
+                    debug.PointCloudDebug.initTools(view, potreeLayer, debugGui);
 
                     view.camera3D.far = 2.0 * size.length();
 

package/examples/potree_3d_map.html

@@ -71,7 +71,7 @@
 
             // add potreeLayer to scene
             function onLayerReady() {
-                debug.PotreeDebug.initTools(view, potreeLayer, debugGui);
+                debug.PointCloudDebug.initTools(view, potreeLayer, debugGui);
 
                 // update stats window
                 var info = document.getElementById('info');

package/examples/source_file_cog.html

@@ -36,6 +36,7 @@
             itowns.proj4.defs('EPSG:2154', '+proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs');
 
             var viewerDiv = document.getElementById('viewerDiv');
+            var view;
 
             function readCOGURL() {
                 var url = document.getElementById('cog_url').value || new URLSearchParams(window.location.search).get('geotiff');
@@ -47,7 +48,7 @@
             }
 
             function loadRGBSample() {
-                document.getElementById('cog_url').value = 'https://cdn.jsdelivr.net/gh/bloc-in-bloc/iTowns2-sample-data@add-cog-sample/cog/orvault.tif';
+                document.getElementById('cog_url').value = 'https://cdn.jsdelivr.net/gh/iTowns/iTowns2-sample-data/cog/nantes/nantes.tif';
                 readCOGURL();
             }
 
@@ -56,17 +57,33 @@
                 readCOGURL();
             }
 
-            function loadCOG(url, crs) {
+            function removeAllChildNodes(parent) {
+                while (parent.firstChild) {
+                    parent.removeChild(parent.firstChild);
+                }
+            }
+
+            function loadCOG(url) {
                 // create a source from a Cloud Optimized GeoTiff
                 var cogSource = new COGSource({
                     url: url,
-                    crs: "EPSG:2154"
+                    crs: "EPSG:2154",
+                    // Default resample method is 'nearest', 'bilinear' looks better when zoomed
+                    resampleMethod: 'bilinear'
                 });
 
                 cogSource.whenReady.then(() => {
-                    var view = new itowns.PlanarView(viewerDiv, cogSource.extent, { disableSkirt: true, placement: { tilt: 90 } });
+                    if (view !== undefined) {
+                        view.dispose(true);
+                        removeAllChildNodes(viewerDiv);
+                    }
+                    view = new itowns.PlanarView(viewerDiv, cogSource.extent, {
+                        // Default maxSubdivisionLevel is 5, so with huge geotiff it's not enough to see details when zoomed
+                        maxSubdivisionLevel: 10,
+                        disableSkirt: true,
+                        placement: { tilt: 90 }
+                    });
                     setupLoadingScreen(viewerDiv, view);
-                    new itowns.PlanarControls(view, {});
                     var cogLayer = new itowns.ColorLayer('cog', {
                         source: cogSource,
                     });

package/lib/Controls/FirstPersonControls.js

@@ -49,7 +49,6 @@ const MOVEMENTS = {
     sign: -1
   } // DOWN: PageDown key
 };
-
 function moveCameraVerticalPlanar(value) {
   this.camera.position.z += value;
 }

package/lib/Controls/FlyControls.js

@@ -45,7 +45,6 @@ const MOVEMENTS = {
     oneshot: true
   } // WHEEL down
 };
-
 function onDocumentMouseDown(event) {
   event.preventDefault();
   this._isMouseDown = true;

package/lib/Converter/Feature2Mesh.js

@@ -416,7 +416,6 @@ function featureToExtrudedPolygon(feature, options) {
       meshColor.toArray(colors, t); // top
       meshColor.multiplyScalar(0.5).toArray(colors, i); // base is half dark
     }
-
     featureId++;
     const geomVertices = vertices.slice(startTop * 3, (end + totalVertices) * 3);
     const holesOffsets = geometry.indices.map(i => i.offset - start).slice(1);
@@ -496,14 +495,13 @@ function pointsToInstancedMeshes(feature) {
  * @return {THREE.Mesh} mesh or GROUP of THREE.InstancedMesh
  */
 function featureToMesh(feature, options) {
-  var _style$point, _style$point$model;
   if (!feature.vertices) {
     return;
   }
   let mesh;
   switch (feature.type) {
     case FEATURE_TYPES.POINT:
-      if ((_style$point = style.point) !== null && _style$point !== void 0 && (_style$point$model = _style$point.model) !== null && _style$point$model !== void 0 && _style$point$model.object) {
+      if (style.point?.model?.object) {
         try {
           mesh = pointsToInstancedMeshes(feature);
           mesh.isInstancedMesh = true;
@@ -592,7 +590,7 @@ export default {
       // style properties (@link StyleOptions) using options.style.
       // This is usually done in some tests and if you want to use Feature2Mesh.convert()
       // as in examples/source_file_gpx_3d.html.
-      style = (this === null || this === void 0 ? void 0 : this.style) || (options.style ? new Style(options.style) : defaultStyle);
+      style = this?.style || (options.style ? new Style(options.style) : defaultStyle);
       context.setCollection(collection);
       const features = collection.features;
       if (!features || features.length == 0) {

package/lib/Converter/textureConverter.js

@@ -21,7 +21,7 @@ export default {
       const backgroundLayer = layer.source.backgroundLayer;
       const backgroundColor = backgroundLayer && backgroundLayer.paint ? new THREE.Color(backgroundLayer.paint['background-color']) : undefined;
       extentDestination.as(CRS.formatToEPSG(layer.crs), extentTexture);
-      texture = Feature2Texture.createTextureFromFeature(data, extentTexture, 256, layer.style, backgroundColor);
+      texture = Feature2Texture.createTextureFromFeature(data, extentTexture, layer.subdivisionThreshold, layer.style, backgroundColor);
       texture.features = data;
       texture.extent = extentDestination;
     } else if (data.isTexture) {

package/lib/Core/3DTiles/C3DTBatchTable.js

@@ -52,7 +52,7 @@ class C3DTBatchTable {
         if (Array.isArray(propVal)) {
           continue;
         }
-        if (typeof (propVal === null || propVal === void 0 ? void 0 : propVal.byteOffset) !== 'undefined' && typeof (propVal === null || propVal === void 0 ? void 0 : propVal.componentType) !== 'undefined' && typeof (propVal === null || propVal === void 0 ? void 0 : propVal.type) !== 'undefined') {
+        if (typeof propVal?.byteOffset !== 'undefined' && typeof propVal?.componentType !== 'undefined' && typeof propVal?.type !== 'undefined') {
           jsonContent[propKey] = binaryPropertyAccessor(binaryBuffer, this.batchLength, propVal.byteOffset, propVal.componentType, propVal.type);
         } else {
           console.error('Invalid 3D Tiles batch table property that is neither a JSON array nor a valid ' + 'accessor to a binary body');

package/lib/Core/3DTiles/C3DTFeature.js

@@ -103,7 +103,6 @@ class C3DTFeature {
       console.warn(`[C3DTFeature]: No batch table found for tile ${this.tileId}.`);
       return null; // or return undefined;
     }
-
     this.#info = batchTable.getInfoById(this.batchId);
     return this.#info;
   }

package/lib/Core/Feature.js

@@ -338,10 +338,9 @@ export class FeatureCollection extends THREE.Object3D {
    * @param      {FeatureBuildingOptions|Layer}  options  The building options .
    */
   constructor(options) {
-    var _options$source;
     super();
     this.isFeatureCollection = true;
-    this.crs = CRS.formatToEPSG(options.accurate || !((_options$source = options.source) !== null && _options$source !== void 0 && _options$source.crs) ? options.crs : options.source.crs);
+    this.crs = CRS.formatToEPSG(options.accurate || !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;

package/lib/Core/Geographic/CoordStars.js

@@ -68,7 +68,6 @@ const CoordStars = {
       };
     };
   },
-
   // Return scene coordinate ({x,y,z}) of sun
   getSunPositionInScene(date, lat, lon) {
     const sun = CoordStars.getSunPosition()(date, lat, lon);

package/lib/Core/Label.js

@@ -71,7 +71,6 @@ class Label extends THREE.Object3D {
           // TODO: add smooth transition for fade in/out
         }
       },
-
       get() {
         return _visible;
       }

package/lib/Core/MainLoop.js

@@ -88,7 +88,6 @@ class MainLoop extends EventDispatcher {
     this.scheduler = scheduler;
     this.gfxEngine = engine; // TODO: remove me
   }
-
   scheduleViewUpdate(view, forceRedraw) {
     this.#needsRedraw |= forceRedraw;
     if (this.renderingState !== RENDERING_SCHEDULED) {

package/lib/Core/Prefab/Globe/Atmosphere.js

@@ -72,7 +72,6 @@ class Atmosphere extends GeometryLayer {
           value: new THREE.Vector2(window.innerWidth, window.innerHeight)
         } // Should be updated on screen resize...
       },
-
       vertexShader: GlowVS,
       fragmentShader: GlowFS,
       side: THREE.BackSide,
@@ -100,7 +99,6 @@ class Atmosphere extends GeometryLayer {
           value: new THREE.Vector2(window.innerWidth, window.innerHeight)
         } // Should be updated on screen resize...
       },
-
       vertexShader: GlowVS,
       fragmentShader: GlowFS,
       side: THREE.FrontSide,
@@ -135,7 +133,6 @@ class Atmosphere extends GeometryLayer {
       scaleDepth: 0.25
       // mieScaleDepth: 0.1,
     };
-
     this.object3d.updateMatrixWorld();
   }
   update(context, layer, node) {
@@ -288,7 +285,6 @@ class Atmosphere extends GeometryLayer {
     skyDome.material.uniforms.mieDirectionalG.value = effectController.mieDirectionalG;
     skyDome.material.uniforms.up.value = new THREE.Vector3(); // no more necessary, estimate normal from cam..
   }
-
   setRealisticOn(bool) {
     if (bool) {
       if (!this.realisticAtmosphere.children.length) {

package/lib/Core/Prefab/Globe/GlobeLayer.js

@@ -3,7 +3,6 @@ import TiledGeometryLayer from "../../../Layer/TiledGeometryLayer.js";
 import { ellipsoidSizes } from "../../Math/Ellipsoid.js";
 import { globalExtentTMS, schemeTiles } from "../../Geographic/Extent.js";
 import BuilderEllipsoidTile from "./BuilderEllipsoidTile.js";
-import { SIZE_DIAGONAL_TEXTURE } from "../../../Process/LayeredMaterialNodeProcessing.js";
 import CRS from "../../Geographic/Crs.js";
 
 // matrix to convert sphere to ellipsoid
@@ -129,7 +128,7 @@ class GlobeLayer extends TiledGeometryLayer {
     return isOccluded;
   }
   computeTileZoomFromDistanceCamera(distance, camera) {
-    const preSinus = SIZE_DIAGONAL_TEXTURE * (this.sseSubdivisionThreshold * 0.5) / camera._preSSE / ellipsoidSizes.x;
+    const preSinus = this.sizeDiagonalTexture * (this.sseSubdivisionThreshold * 0.5) / camera._preSSE / ellipsoidSizes.x;
     let sinus = distance * preSinus;
     let zoom = Math.log(Math.PI / (2.0 * Math.asin(sinus))) / Math.log(2);
     const delta = Math.PI / 2 ** zoom;
@@ -143,7 +142,8 @@ class GlobeLayer extends TiledGeometryLayer {
     const delta = Math.PI / 2 ** zoom;
     const circleChord = 2.0 * ellipsoidSizes.x * Math.sin(delta * 0.5);
     const radius = circleChord * 0.5;
-    return camera._preSSE * (radius / SIZE_DIAGONAL_TEXTURE) / (this.sseSubdivisionThreshold * 0.5) + radius;
+    const error = radius / this.sizeDiagonalTexture;
+    return camera._preSSE * error / (this.sseSubdivisionThreshold * 0.5) + radius;
   }
 }
 export default GlobeLayer;

package/lib/Core/Style.js

@@ -12,8 +12,7 @@ const matrix = document.createElementNS('http://www.w3.org/2000/svg', 'svg').cre
 const canvas = document.createElement('canvas');
 const inv255 = 1 / 255;
 function baseAltitudeDefault(properties, ctx) {
-  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;
+  return ctx?.coordinates?.z || 0;
 }
 export function readExpression(property, ctx) {
   if (property != undefined) {
@@ -154,7 +153,6 @@ function defineStyleProperty(style, category, parameter, userValue, defaultValue
   Object.defineProperty(style[category], parameter, {
     enumerable: true,
     get: () => {
-      var _style$context$featur, _style$context$featur2;
       // != to check for 'undefined' and 'null' value)
       if (property != undefined) {
         return property;
@@ -162,7 +160,7 @@ function defineStyleProperty(style, category, parameter, userValue, defaultValue
       if (userValue != undefined) {
         return readExpression(userValue, style.context);
       }
-      const dataValue = (_style$context$featur = style.context.featureStyle) === null || _style$context$featur === void 0 ? void 0 : (_style$context$featur2 = _style$context$featur[category]) === null || _style$context$featur2 === void 0 ? void 0 : _style$context$featur2[parameter];
+      const dataValue = style.context.featureStyle?.[category]?.[parameter];
       if (dataValue != undefined) {
         return readExpression(dataValue, style.context);
       }

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/C3DTilesLayer.js

@@ -92,7 +92,9 @@ class C3DTilesLayer extends GeometryLayer {
    * @param {Number} [config.cleanupDelay=1000] The time (in ms) after which a tile content (and its children) are
    * removed from the scene.
    * @param {C3DTExtensions} [config.registeredExtensions] 3D Tiles extensions managers registered for this tileset.
-   * @param {String} [config.pntsMode= PNTS_MODE.COLOR] {@link PointsMaterials} Point cloud coloring mode. Only 'COLOR' or 'CLASSIFICATION' are possible. COLOR uses RGB colors of the points, CLASSIFICATION uses a classification property of the batch table to color points.
+   * @param {String} [config.pntsMode= PNTS_MODE.COLOR] {@link PointsMaterials} Point cloud coloring mode.
+   *      Only 'COLOR' or 'CLASSIFICATION' are possible. COLOR uses RGB colors of the points,
+   *      CLASSIFICATION uses a classification property of the batch table to color points.
    * @param {String} [config.pntsShape= PNTS_SHAPE.CIRCLE] Point cloud point shape. Only 'CIRCLE' or 'SQUARE' are possible.
    * @param {String} [config.pntsSizeMode= PNTS_SIZE_MODE.VALUE] {@link PointsMaterials} Point cloud size mode. Only 'VALUE' or 'ATTENUATED' are possible. VALUE use constant size, ATTENUATED compute size depending on distance from point to camera.
    * @param {Number} [config.pntsMinAttenuatedSize=3] Minimum scale used by 'ATTENUATED' size mode

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;