itowns 2.43.2-next.2 → 2.43.2-next.20

package/lib/Core/Potree2Node.js

@@ -0,0 +1,206 @@
+/*
+============
+== POTREE ==
+============
+
+http://potree.org
+
+Copyright (c) 2011-2020, Markus Schütz
+All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+    either expressed or implied, of the FreeBSD Project.
+ */
+
+import * as THREE from 'three';
+import PointCloudNode from "./PointCloudNode.js";
+
+// Create an A(xis)A(ligned)B(ounding)B(ox) for the child `childIndex` of one aabb.
+// (PotreeConverter protocol builds implicit octree hierarchy by applying the same
+// subdivision algo recursively)
+const dHalfLength = new THREE.Vector3();
+const NODE_TYPE = {
+  NORMAL: 0,
+  LEAF: 1,
+  PROXY: 2
+};
+class Potree2Node extends PointCloudNode {
+  constructor() {
+    let numPoints = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+    let childrenBitField = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    let layer = arguments.length > 2 ? arguments[2] : undefined;
+    super(numPoints, layer);
+    this.childrenBitField = childrenBitField;
+    this.id = '';
+    this.depth = 0;
+    this.baseurl = layer.source.baseurl;
+  }
+  add(node, indexChild) {
+    super.add(node, indexChild);
+    node.id = this.id + indexChild;
+    node.depth = this.depth + 1;
+  }
+  createChildAABB(node, childIndex) {
+    // Code inspired from potree
+    node.bbox.copy(this.bbox);
+    this.bbox.getCenter(node.bbox.max);
+    dHalfLength.copy(node.bbox.max).sub(this.bbox.min);
+    if (childIndex === 1) {
+      node.bbox.min.z += dHalfLength.z;
+      node.bbox.max.z += dHalfLength.z;
+    } else if (childIndex === 3) {
+      node.bbox.min.z += dHalfLength.z;
+      node.bbox.max.z += dHalfLength.z;
+      node.bbox.min.y += dHalfLength.y;
+      node.bbox.max.y += dHalfLength.y;
+    } else if (childIndex === 0) {
+      //
+    } else if (childIndex === 2) {
+      node.bbox.min.y += dHalfLength.y;
+      node.bbox.max.y += dHalfLength.y;
+    } else if (childIndex === 5) {
+      node.bbox.min.z += dHalfLength.z;
+      node.bbox.max.z += dHalfLength.z;
+      node.bbox.min.x += dHalfLength.x;
+      node.bbox.max.x += dHalfLength.x;
+    } else if (childIndex === 7) {
+      node.bbox.min.add(dHalfLength);
+      node.bbox.max.add(dHalfLength);
+    } else if (childIndex === 4) {
+      node.bbox.min.x += dHalfLength.x;
+      node.bbox.max.x += dHalfLength.x;
+    } else if (childIndex === 6) {
+      node.bbox.min.y += dHalfLength.y;
+      node.bbox.max.y += dHalfLength.y;
+      node.bbox.min.x += dHalfLength.x;
+      node.bbox.max.x += dHalfLength.x;
+    }
+  }
+  get octreeIsLoaded() {
+    return !(this.childrenBitField && this.children.length === 0);
+  }
+  get url() {
+    return `${this.baseurl}/octree.bin`;
+  }
+  networkOptions(byteOffset, byteSize) {
+    const first = byteOffset;
+    // When we specify 'multipart/byteranges' on headers request it trigger a preflight request
+    // Actually github doesn't support it https://github.com/orgs/community/discussions/24659
+    // But if we omit header parameter, github seems to know it's a 'multipart/byteranges' request (thanks to 'Range' parameter)
+    const networkOptions = {
+      ...this.layer.source.networkOptions,
+      headers: {
+        ...this.layer.source.networkOptions.headers,
+        ...(this.url.startsWith('https://raw.githubusercontent.com') ? {} : {
+          'content-type': 'multipart/byteranges'
+        }),
+        Range: `bytes=${first}-${first + byteSize - 1n}`
+      }
+    };
+    return networkOptions;
+  }
+  async load() {
+    // Query octree if we don't have children potreeNode yet.
+    if (!this.octreeIsLoaded) {
+      await this.loadOctree();
+    }
+    return this.layer.source.fetcher(this.url, this.networkOptions(this.byteOffset, this.byteSize)).then(file => this.layer.source.parser(file, {
+      in: {
+        source: this.layer.source,
+        bbox: this.bbox,
+        numPoints: this.numPoints
+      },
+      out: this.layer
+    })).then(data => {
+      this.loaded = true;
+      this.loading = false;
+      return data.geometry;
+    });
+  }
+  async loadOctree() {
+    if (this.loaded || this.loading) {
+      return;
+    }
+    this.loading = true;
+    return this.nodeType === NODE_TYPE.PROXY ? this.loadHierarchy() : Promise.resolve();
+  }
+  async loadHierarchy() {
+    const hierarchyPath = `${this.baseurl}/hierarchy.bin`;
+    const buffer = await this.layer.source.fetcher(hierarchyPath, this.networkOptions(this.hierarchyByteOffset, this.hierarchyByteSize));
+    this.parseHierarchy(buffer);
+  }
+  parseHierarchy(buffer) {
+    const view = new DataView(buffer);
+    const bytesPerNode = 22;
+    const numNodes = buffer.byteLength / bytesPerNode;
+    const stack = [];
+    stack.push(this);
+    for (let indexNode = 0; indexNode < numNodes; indexNode++) {
+      const current = stack.shift();
+      const offset = indexNode * bytesPerNode;
+      const type = view.getUint8(offset + 0);
+      const childMask = view.getUint8(offset + 1);
+      const numPoints = view.getUint32(offset + 2, true);
+      const byteOffset = view.getBigInt64(offset + 6, true);
+      const byteSize = view.getBigInt64(offset + 14, true);
+      if (current.nodeType === NODE_TYPE.PROXY) {
+        // replace proxy with real node
+        current.byteOffset = byteOffset;
+        current.byteSize = byteSize;
+        current.numPoints = numPoints;
+      } else if (type === NODE_TYPE.PROXY) {
+        // load proxy
+        current.hierarchyByteOffset = byteOffset;
+        current.hierarchyByteSize = byteSize;
+        current.numPoints = numPoints;
+      } else {
+        // load real node
+        current.byteOffset = byteOffset;
+        current.byteSize = byteSize;
+        current.numPoints = numPoints;
+      }
+      if (current.byteSize === 0n) {
+        // workaround for issue potree/potree#1125
+        // some inner nodes erroneously report >0 points even though have 0 points
+        // however, they still report a byteSize of 0, so based on that we now set node.numPoints to 0
+        current.numPoints = 0;
+      }
+      current.nodeType = type;
+      if (current.nodeType === NODE_TYPE.PROXY) {
+        continue;
+      }
+      for (let childIndex = 0; childIndex < 8; childIndex++) {
+        const childExists = (1 << childIndex & childMask) !== 0;
+        if (!childExists) {
+          continue;
+        }
+        const child = new Potree2Node(numPoints, childMask, this.layer);
+        child.spacing = current.spacing / 2;
+        current.add(child, childIndex);
+        stack.push(child);
+      }
+    }
+  }
+}
+export default Potree2Node;

package/lib/Core/Potree2PointAttributes.js

@@ -0,0 +1,139 @@
+/*
+============
+== POTREE ==
+============
+
+http://potree.org
+
+Copyright (c) 2011-2020, Markus Schütz
+All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+    either expressed or implied, of the FreeBSD Project.
+ */
+
+/**
+ * Some types of possible point attribute data formats
+ *
+ * @class
+ */
+const PointAttributeTypes = {
+  DATA_TYPE_DOUBLE: {
+    name: 'double',
+    size: 8
+  },
+  DATA_TYPE_FLOAT: {
+    name: 'float',
+    size: 4
+  },
+  DATA_TYPE_INT8: {
+    name: 'int8',
+    size: 1
+  },
+  DATA_TYPE_UINT8: {
+    name: 'uint8',
+    size: 1
+  },
+  DATA_TYPE_INT16: {
+    name: 'int16',
+    size: 2
+  },
+  DATA_TYPE_UINT16: {
+    name: 'uint16',
+    size: 2
+  },
+  DATA_TYPE_INT32: {
+    name: 'int32',
+    size: 4
+  },
+  DATA_TYPE_UINT32: {
+    name: 'uint32',
+    size: 4
+  },
+  DATA_TYPE_INT64: {
+    name: 'int64',
+    size: 8
+  },
+  DATA_TYPE_UINT64: {
+    name: 'uint64',
+    size: 8
+  }
+};
+Object.keys(PointAttributeTypes).forEach((type, index) => {
+  PointAttributeTypes[index] = PointAttributeTypes[type];
+});
+export { PointAttributeTypes };
+class PointAttribute {
+  constructor(name, type, numElements) {
+    this.name = name;
+    this.type = type;
+    this.numElements = numElements;
+    this.byteSize = this.numElements * this.type.size;
+    this.description = '';
+    this.range = [Infinity, -Infinity];
+  }
+}
+PointAttribute.POSITION_CARTESIAN = new PointAttribute('POSITION_CARTESIAN', PointAttributeTypes.DATA_TYPE_FLOAT, 3);
+PointAttribute.RGBA_PACKED = new PointAttribute('COLOR_PACKED', PointAttributeTypes.DATA_TYPE_INT8, 4);
+PointAttribute.COLOR_PACKED = PointAttribute.RGBA_PACKED;
+PointAttribute.RGB_PACKED = new PointAttribute('COLOR_PACKED', PointAttributeTypes.DATA_TYPE_INT8, 3);
+PointAttribute.NORMAL_FLOATS = new PointAttribute('NORMAL_FLOATS', PointAttributeTypes.DATA_TYPE_FLOAT, 3);
+PointAttribute.INTENSITY = new PointAttribute('INTENSITY', PointAttributeTypes.DATA_TYPE_UINT16, 1);
+PointAttribute.CLASSIFICATION = new PointAttribute('CLASSIFICATION', PointAttributeTypes.DATA_TYPE_UINT8, 1);
+PointAttribute.NORMAL_SPHEREMAPPED = new PointAttribute('NORMAL_SPHEREMAPPED', PointAttributeTypes.DATA_TYPE_UINT8, 2);
+PointAttribute.NORMAL_OCT16 = new PointAttribute('NORMAL_OCT16', PointAttributeTypes.DATA_TYPE_UINT8, 2);
+PointAttribute.NORMAL = new PointAttribute('NORMAL', PointAttributeTypes.DATA_TYPE_FLOAT, 3);
+PointAttribute.RETURN_NUMBER = new PointAttribute('RETURN_NUMBER', PointAttributeTypes.DATA_TYPE_UINT8, 1);
+PointAttribute.NUMBER_OF_RETURNS = new PointAttribute('NUMBER_OF_RETURNS', PointAttributeTypes.DATA_TYPE_UINT8, 1);
+PointAttribute.SOURCE_ID = new PointAttribute('SOURCE_ID', PointAttributeTypes.DATA_TYPE_UINT16, 1);
+PointAttribute.INDICES = new PointAttribute('INDICES', PointAttributeTypes.DATA_TYPE_UINT32, 1);
+PointAttribute.SPACING = new PointAttribute('SPACING', PointAttributeTypes.DATA_TYPE_FLOAT, 1);
+PointAttribute.GPS_TIME = new PointAttribute('GPS_TIME', PointAttributeTypes.DATA_TYPE_DOUBLE, 1);
+export { PointAttribute };
+export class Potree2PointAttributes {
+  constructor() {
+    this.attributes = [];
+    this.byteSize = 0;
+    this.size = 0;
+    this.vectors = [];
+  }
+  add(pointAttribute) {
+    this.attributes.push(pointAttribute);
+    this.byteSize += pointAttribute.byteSize;
+    this.size++;
+  }
+  addVector(vector) {
+    this.vectors.push(vector);
+  }
+  hasNormals() {
+    for (let index = 0; index < this.attributes.length; index++) {
+      const name = this.attributes[index];
+      const pointAttribute = this.attributes[name];
+      if (pointAttribute === PointAttribute.NORMAL_SPHEREMAPPED || pointAttribute === PointAttribute.NORMAL_FLOATS || pointAttribute === PointAttribute.NORMAL || pointAttribute === PointAttribute.NORMAL_OCT16) {
+        return true;
+      }
+    }
+    return false;
+  }
+}

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

@@ -140,7 +140,7 @@ Scheduler.prototype.execute = function (command) {
 
   // parse host
   const layer = command.layer;
-  const host = layer.source && layer.source.url ? new URL(URLBuilder.subDomains(layer.source.url), document.location).host : undefined;
+  const host = layer.source && layer.source.url && layer.source.url !== 'none' ? new URL(URLBuilder.subDomains(layer.source.url), document.location).host : undefined;
   command.promise = new Promise((resolve, reject) => {
     command.resolve = resolve;
     command.reject = reject;

package/lib/Core/Style.js

@@ -12,33 +12,33 @@ 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) {
-    if (property.expression) {
-      return property.expression.evaluate(ctx);
-    } else if (property.stops) {
-      for (let i = property.stops.length - 1; i >= 0; i--) {
-        const stop = property.stops[i];
-        if (ctx.zoom >= stop[0]) {
-          return stop[1];
-        }
+  if (property.expression) {
+    return property.expression.evaluate(ctx);
+  }
+  if (property.stops) {
+    const stops = property.stops;
+    property = property.stops[0][1];
+    for (let i = stops.length - 1; i >= 0; i--) {
+      const stop = stops[i];
+      if (ctx.zoom >= stop[0]) {
+        property = stop[1];
+        break;
       }
-      return property.stops[0][1];
-    }
-    if (typeof property === 'string' || property instanceof String) {
-      property = property.replace(/\{(.+?)\}/g, (a, b) => ctx.properties[b] || '').trim();
     }
-    if (property instanceof Function) {
-      // TOBREAK: Pass the current `context` as a unique parameter.
-      // In this proposal, metadata will be accessed in the callee by the
-      // `context.properties` property.
-      return property(ctx.properties, ctx);
-    }
-    return property;
   }
+  if (typeof property === 'string' || property instanceof String) {
+    return property.replace(/\{(.+?)\}/g, (a, b) => ctx.properties[b] || '').trim();
+  }
+  if (property instanceof Function) {
+    // TOBREAK: Pass the current `context` as a unique parameter.
+    // In this proposal, metadata will be accessed in the callee by the
+    // `context.properties` property.
+    return property(ctx.properties, ctx);
+  }
+  return property;
 }
 function rgba2rgb(orig) {
   if (!orig) {
@@ -49,7 +49,7 @@ function rgba2rgb(orig) {
     };
   } else if (typeof orig == 'string') {
     const result = orig.match(/(?:((hsl|rgb)a? *\(([\d.%]+(?:deg|g?rad|turn)?)[ ,]*([\d.%]+)[ ,]*([\d.%]+)[ ,/]*([\d.%]*)\))|(#((?:[\d\w]{3}){1,2})([\d\w]{1,2})?))/i);
-    if (!result) {
+    if (result === null) {
       return {
         color: orig,
         opacity: 1.0
@@ -63,10 +63,10 @@ function rgba2rgb(orig) {
         color: `#${result[8]}`,
         opacity
       };
-    } else if (result[0]) {
+    } else if (result[1]) {
       return {
         color: `${result[2]}(${result[3]},${result[4]},${result[5]})`,
-        opacity: Number(result[6]) || 1.0
+        opacity: result[6] ? Number(result[6]) : 1.0
       };
     }
   }
@@ -154,7 +154,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 +161,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);
       }
@@ -694,31 +693,6 @@ class Style {
     defineStyleProperty(this, 'icon', 'color', params.icon.color);
     defineStyleProperty(this, 'icon', 'opacity', params.icon.opacity, 1.0);
   }
-
-  /**
-   * Copies the content of the target style into this style.
-   * @param {Style} style - The style to copy.
-   *
-   * @return {Style} This style.
-   */
-  copy(style) {
-    Object.assign(this.fill, style.fill);
-    Object.assign(this.stroke, style.stroke);
-    Object.assign(this.point, style.point);
-    Object.assign(this.text, style.text);
-    Object.assign(this.icon, style.icon);
-    return this;
-  }
-
-  /**
-       * Clones this style.
-       *
-       * @return {Style} The new style, cloned from this one.
-       */
-  clone() {
-    const clone = new Style();
-    return clone.copy(this);
-  }
   setContext(ctx) {
     this.context = ctx;
   }
@@ -942,8 +916,35 @@ class Style {
       if (iconImg) {
         try {
           style.icon.id = iconImg;
+          if (iconImg.stops) {
+            const iconCropValue = {
+              ...(iconImg.base !== undefined && {
+                base: iconImg.base
+              }),
+              stops: iconImg.stops.map(stop => {
+                let cropValues = sprites[stop[1]];
+                if (stop[1].includes('{')) {
+                  cropValues = function (p) {
+                    const id = stop[1].replace(/\{(.+?)\}/g, (a, b) => p[b] || '').trim();
+                    cropValues = sprites[id];
+                    return sprites[id];
+                  };
+                }
+                return [stop[0], cropValues];
+              })
+            };
+            style.icon.cropValues = iconCropValue;
+          } else {
+            style.icon.cropValues = sprites[iconImg];
+            if (iconImg[0].includes('{')) {
+              style.icon.cropValues = function (p) {
+                const id = iconImg.replace(/\{(.+?)\}/g, (a, b) => p[b] || '').trim();
+                style.icon.cropValues = sprites[id];
+                return sprites[id];
+              };
+            }
+          }
           style.icon.source = sprites.source;
-          style.icon.cropValues = sprites[iconImg];
           style.icon.size = readVectorProperty(layer.layout['icon-size']) || 1;
           const {
             color,

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
@@ -114,8 +116,8 @@ class C3DTilesLayer extends GeometryLayer {
     this.pntsShape = PNTS_SHAPE.CIRCLE;
     this.classification = config.classification;
     this.pntsSizeMode = PNTS_SIZE_MODE.VALUE;
-    this.pntsMinAttenuatedSize = config.pntsMinAttenuatedSize || 3;
-    this.pntsMaxAttenuatedSize = config.pntsMaxAttenuatedSize || 10;
+    this.pntsMinAttenuatedSize = config.pntsMinAttenuatedSize || 1;
+    this.pntsMaxAttenuatedSize = config.pntsMaxAttenuatedSize || 7;
     if (config.pntsMode) {
       const exists = Object.values(PNTS_MODE).includes(config.pntsMode);
       if (!exists) {
@@ -184,8 +186,8 @@ class C3DTilesLayer extends GeometryLayer {
       init3dTilesLayer(view, view.mainLoop.scheduler, this, tileset.root).then(resolve);
     });
   }
-  preUpdate() {
-    return pre3dTilesUpdate.bind(this)();
+  preUpdate(context) {
+    return pre3dTilesUpdate.bind(this)(context);
   }
   update(context, layer, node) {
     return update(context, layer, node);
@@ -241,7 +243,7 @@ class C3DTilesLayer extends GeometryLayer {
     // face is a Face3 object of THREE which is a
     // triangular face. face.a is its first vertex
     const vertex = closestIntersect.face.a;
-    const batchID = closestIntersect.object.geometry.attributes._BATCHID.array[vertex];
+    const batchID = closestIntersect.object.geometry.attributes._BATCHID.getX(vertex);
     return this.tilesC3DTileFeatures.get(tileId).get(batchID);
   }
 

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;
 }
 
 /**