itowns 2.44.3-next.3 → 2.44.3-next.30

package/lib/Core/TileGeometry.js

@@ -1,40 +1,124 @@
 import * as THREE from 'three';
-import computeBuffers, { getBufferIndexSize } from "./Prefab/computeBufferTileGeometry.js";
-function defaultBuffers(params) {
-  params.buildIndexAndUv_0 = true;
-  params.center = params.builder.center(params.extent).clone();
-  const buffers = computeBuffers(params);
-  buffers.index = new THREE.BufferAttribute(buffers.index, 1);
-  buffers.uvs[0] = new THREE.BufferAttribute(buffers.uvs[0], 2);
-  buffers.position = new THREE.BufferAttribute(buffers.position, 3);
-  buffers.normal = new THREE.BufferAttribute(buffers.normal, 3);
-  for (let i = 1; i < params.builder.uvCount; i++) {
-    buffers.uvs[1] = new THREE.BufferAttribute(buffers.uvs[1], 1);
-  }
-  return buffers;
+import { computeBuffers, getBufferIndexSize } from "./Prefab/computeBufferTileGeometry.js";
+import Coordinates from "./Geographic/Coordinates.js";
+function defaultBuffers(builder, params) {
+  const fullParams = {
+    disableSkirt: false,
+    hideSkirt: false,
+    buildIndexAndUv_0: true,
+    segments: 16,
+    coordinates: new Coordinates(builder.crs),
+    center: builder.center(params.extent).clone(),
+    ...params
+  };
+  const buffers = computeBuffers(builder, fullParams);
+  const bufferAttributes = {
+    index: buffers.index ? new THREE.BufferAttribute(buffers.index, 1) : null,
+    uvs: [...(buffers.uvs[0] ? [new THREE.BufferAttribute(buffers.uvs[0], 2)] : []), ...(buffers.uvs[1] ? [new THREE.BufferAttribute(buffers.uvs[1], 1)] : [])],
+    position: new THREE.BufferAttribute(buffers.position, 3),
+    normal: new THREE.BufferAttribute(buffers.normal, 3)
+  };
+  return bufferAttributes;
 }
-class TileGeometry extends THREE.BufferGeometry {
-  constructor(params) {
-    let buffers = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultBuffers(params);
+export class TileGeometry extends THREE.BufferGeometry {
+  /** Oriented Bounding Box of the tile geometry. */
+
+  /** Ground area covered by this tile geometry. */
+
+  /** Resolution of the tile geometry in segments per side. */
+
+  /**
+   * [TileGeometry] instances are shared between tiles. Since a geometry
+   * handles its own GPU resource, it needs a reference counter to dispose of
+   * that resource only when it is discarded by every single owner of a
+   * reference to the geometry.
+   */
+  // https://github.com/iTowns/itowns/pull/2440#discussion_r1860743294
+  // TODO: Remove nullability by reworking OBB:setFromExtent
+
+  constructor(builder, params) {
+    let bufferAttributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : defaultBuffers(builder, params);
     super();
-    this.center = params.center;
     this.extent = params.extent;
     this.segments = params.segments;
-    this.setIndex(buffers.index);
-    this.setAttribute('position', buffers.position);
-    this.setAttribute('normal', buffers.normal);
-    this.setAttribute('uv', buffers.uvs[0]);
-    for (let i = 1; i < buffers.uvs.length; i++) {
-      this.setAttribute(`uv_${i}`, buffers.uvs[i]);
+    this.setIndex(bufferAttributes.index);
+    this.setAttribute('position', bufferAttributes.position);
+    this.setAttribute('normal', bufferAttributes.normal);
+    this.setAttribute('uv', bufferAttributes.uvs[0]);
+    for (let i = 1; i < bufferAttributes.uvs.length; i++) {
+      this.setAttribute(`uv_${i}`, bufferAttributes.uvs[i]);
     }
     this.computeBoundingBox();
-    this.OBB = {};
+    this.OBB = null;
     if (params.hideSkirt) {
       this.hideSkirt = params.hideSkirt;
     }
+    this._refCount = null;
   }
-  set hideSkirt(value) {
-    this.setDrawRange(0, getBufferIndexSize(this.segments, value));
+
+  /**
+   * Enables or disables skirt rendering.
+   *
+   * @param toggle - Whether to hide the skirt; true hides, false shows.
+   */
+  set hideSkirt(toggle) {
+    this.setDrawRange(0, getBufferIndexSize(this.segments, toggle));
   }
-}
-export default TileGeometry;
+
+  /**
+   * Initialize reference count for this geometry if it is currently null.
+   *
+   * @param cacheTile - The [Cache] used to store this geometry.
+   * @param keys - The [south, level, epsg] key of this geometry.
+   */
+  initRefCount(cacheTile, keys) {
+    if (this._refCount !== null) {
+      return;
+    }
+    this._refCount = {
+      count: 0,
+      fn: () => {
+        this._refCount.count--;
+        if (this._refCount.count <= 0) {
+          // To avoid remove index buffer and attribute buffer uv
+          //  error un-bound buffer in webgl with VAO rendering.
+          // Could be removed if the attribute buffer deleting is
+          //  taken into account in the buffer binding state
+          //  (in THREE.WebGLBindingStates code).
+          this.index = null;
+          delete this.attributes.uv;
+          cacheTile.delete(...keys);
+          super.dispose();
+          // THREE.BufferGeometry.prototype.dispose.call(this);
+        }
+      }
+    };
+  }
+
+  /**
+   * Increase reference count.
+   *
+   * @throws If reference count has not been initialized.
+   */
+  increaseRefCount() {
+    if (this._refCount === null) {
+      throw new Error('[TileGeometry::increaseRefCount] ' + 'Tried to increment an unitialized reference count.');
+    }
+    this._refCount.count++;
+  }
+
+  /**
+   * The current reference count of this [TileGeometry] if it has been
+   * initialized.
+   */
+  get refCount() {
+    return this._refCount?.count;
+  }
+  dispose() {
+    if (this._refCount == null) {
+      super.dispose();
+    } else {
+      this._refCount.fn();
+    }
+  }
+}

package/lib/Core/TileMesh.js

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
-import CRS from "./Geographic/Crs.js";
 import { geoidLayerIsVisible } from "../Layer/GeoidLayer.js";
+import { tiledCovering } from "./Tile/Tile.js";
 
 /**
  * A TileMesh is a THREE.Mesh with a geometricError and an OBB
@@ -29,7 +29,7 @@ class TileMesh extends THREE.Mesh {
     this.boundingSphere = new THREE.Sphere();
     this.obb.box3D.getBoundingSphere(this.boundingSphere);
     for (const tms of layer.tileMatrixSets) {
-      this.#_tms.set(tms, this.extent.tiledCovering(tms));
+      this.#_tms.set(tms, tiledCovering(this.extent, tms));
     }
     this.frustumCulled = false;
     this.matrixAutoUpdate = false;
@@ -70,7 +70,7 @@ class TileMesh extends THREE.Mesh {
     this.obb.box3D.getBoundingSphere(this.boundingSphere);
   }
   getExtentsByProjection(crs) {
-    return this.#_tms.get(CRS.formatToTms(crs));
+    return this.#_tms.get(crs);
   }
 
   /**

package/lib/Core/View.js

@@ -1,4 +1,5 @@
 import * as THREE from 'three';
+import * as CRS from "./Geographic/Crs.js";
 import Camera from "../Renderer/Camera.js";
 import initializeWebXR from "../Renderer/WebXR.js";
 import MainLoop, { MAIN_LOOP_EVENTS, RENDERING_PAUSED } from "./MainLoop.js";
@@ -6,7 +7,6 @@ import Capabilities from "./System/Capabilities.js";
 import { COLOR_LAYERS_ORDER_CHANGED } from "../Renderer/ColorLayersOrdering.js";
 import c3DEngine from "../Renderer/c3DEngine.js";
 import RenderMode from "../Renderer/RenderMode.js";
-import CRS from "./Geographic/Crs.js";
 import Coordinates from "./Geographic/Coordinates.js";
 import FeaturesUtils from "../Utils/FeaturesUtils.js";
 import { getMaxColorSamplerUnitsCount } from "../Renderer/LayeredMaterial.js";
@@ -30,7 +30,8 @@ export const VIEW_EVENTS = {
   LAYER_ADDED: 'layer-added',
   INITIALIZED: 'initialized',
   COLOR_LAYERS_ORDER_CHANGED,
-  CAMERA_MOVED: 'camera-moved'
+  CAMERA_MOVED: 'camera-moved',
+  DISPOSED: 'disposed'
 };
 
 /**
@@ -52,7 +53,7 @@ function _preprocessLayer(view, layer, parentLayer) {
     // Find crs projection layer, this is projection destination
     layer.crs = view.referenceCrs;
   } else if (!layer.crs) {
-    if (parentLayer && parentLayer.tileMatrixSets && parentLayer.tileMatrixSets.includes(CRS.formatToTms(source.crs))) {
+    if (parentLayer && parentLayer.tileMatrixSets && parentLayer.tileMatrixSets.includes(source.crs)) {
       layer.crs = source.crs;
     } else {
       layer.crs = parentLayer && parentLayer.extent.crs;
@@ -109,9 +110,11 @@ const coordinates = new Coordinates('EPSG:4326');
 const viewers = [];
 // Size of the camera frustrum, in meters
 let screenMeters;
+let id = 0;
 
 /**
- * @property {HTMLElement} domElement - Thhe domElement holding the canvas where the view is displayed
+ * @property {number} id - The id of the view. It's incremented at each new view instance, starting at 0.
+ * @property {HTMLElement} domElement - The domElement holding the canvas where the view is displayed
  * @property {String} referenceCrs - The coordinate reference system of the view
  * @property {MainLoop} mainLoop - itowns mainloop scheduling the operations
  * @property {THREE.Scene} scene - threejs scene of the view
@@ -136,10 +139,10 @@ class View extends THREE.EventDispatcher {
    * var view = itowns.View('EPSG:4326', viewerDiv, { camera: { type: itowns.CAMERA_TYPE.ORTHOGRAPHIC } });
    * var customControls = itowns.THREE.OrbitControls(view.camera3D, viewerDiv);
    *
-   * @param {string} crs - The default CRS of Three.js coordinates. Should be a cartesian CRS.
+   * @param {String} crs - The default CRS of Three.js coordinates. Should be a cartesian CRS.
    * @param {HTMLElement} viewerDiv - Where to instanciate the Three.js scene in the DOM
    * @param {Object} [options] - Optional properties.
-   * @param {object} [options.camera] - Options for the camera associated to the view. See {@link Camera} options.
+   * @param {Object} [options.camera] - Options for the camera associated to the view. See {@link Camera} options.
    * @param {MainLoop} [options.mainLoop] - {@link MainLoop} instance to use, otherwise a default one will be constructed
    * @param {WebGLRenderer|Object} [options.renderer] - {@link WebGLRenderer} instance to use, otherwise
    * a default one will be constructed. In this case, if options.renderer is an object, it will be used to
@@ -159,6 +162,7 @@ class View extends THREE.EventDispatcher {
     }
     super();
     this.domElement = viewerDiv;
+    this.id = id++;
     this.referenceCrs = crs;
     let engine;
     // options.renderer can be 2 separate things:
@@ -272,8 +276,6 @@ class View extends THREE.EventDispatcher {
     }
     // remove alls frameRequester
     this.removeAllFrameRequesters();
-    // remove alls events
-    this.removeAllEvents();
     // remove all layers
     const layers = this.getLayers(l => !l.isTiledGeometryLayer && !l.isAtmosphere);
     for (const layer of layers) {
@@ -290,6 +292,11 @@ class View extends THREE.EventDispatcher {
     viewers.splice(id, 1);
     // Remove remaining objects in the scene (e.g. helpers, debug, etc.)
     this.scene.traverse(ObjectRemovalHelper.cleanup);
+    this.dispatchEvent({
+      type: VIEW_EVENTS.DISPOSED
+    });
+    // remove alls events
+    this.removeAllEvents();
   }
 
   /**

package/lib/Layer/C3DTilesLayer.js

@@ -51,11 +51,14 @@ function findTileID(object) {
 function object3DHasFeature(object3d) {
   return object3d.geometry && object3d.geometry.attributes._BATCHID;
 }
+
+/**
+ * @extends GeometryLayer
+ */
 class C3DTilesLayer extends GeometryLayer {
   #fillColorMaterialsBuffer;
   /**
    * @deprecated Deprecated 3D Tiles layer. Use {@link OGC3DTilesLayer} instead.
-   * @extends GeometryLayer
    *
    * @example
    * // Create a new 3d-tiles layer from a web server
@@ -83,7 +86,7 @@ class C3DTilesLayer extends GeometryLayer {
    * {@link View} that already has a layer going by that id.
    * @param      {object}  config   configuration, all elements in it
    * will be merged as is in the layer.
-   * @param {C3TilesSource} config.source The source of 3d Tiles.
+   * @param {C3DTilesSource} config.source The source of 3d Tiles.
    *
    * name.
    * @param {Number} [config.sseThreshold=16] The [Screen Space Error](https://github.com/CesiumGS/3d-tiles/blob/main/specification/README.md#geometric-error)
@@ -102,6 +105,7 @@ class C3DTilesLayer extends GeometryLayer {
    * @param  {View}  view  The view
    */
   constructor(id, config, view) {
+    console.warn('C3DTilesLayer is deprecated and will be removed in iTowns 3.0 version. Use OGC3DTilesLayer instead.');
     super(id, new THREE.Group(), {
       source: config.source
     });
@@ -142,7 +146,7 @@ class C3DTilesLayer extends GeometryLayer {
       }
     }
 
-    /** @type {Style} */
+    /** @type {Style | null} */
     this._style = config.style || null;
 
     /** @type {Map<string, THREE.MeshStandardMaterial>} */
@@ -368,21 +372,15 @@ class C3DTilesLayer extends GeometryLayer {
           if (c3DTileFeature.object3d != object3d) {
             continue; // this feature do not belong to object3d
           }
+          this._style.context.setGeometry({
+            properties: c3DTileFeature
+          });
+
           /** @type {THREE.Color} */
-          let color = null;
-          if (typeof this._style.fill.color === 'function') {
-            color = new THREE.Color(this._style.fill.color(c3DTileFeature));
-          } else {
-            color = new THREE.Color(this._style.fill.color);
-          }
+          const color = new THREE.Color(this._style.fill.color);
 
           /** @type {number} */
-          let opacity = null;
-          if (typeof this._style.fill.opacity === 'function') {
-            opacity = this._style.fill.opacity(c3DTileFeature);
-          } else {
-            opacity = this._style.fill.opacity;
-          }
+          const opacity = this._style.fill.opacity;
           const materialId = color.getHexString() + opacity;
           let material = null;
           if (this.#fillColorMaterialsBuffer.has(materialId)) {
@@ -445,7 +443,13 @@ class C3DTilesLayer extends GeometryLayer {
     return this.#fillColorMaterialsBuffer.size;
   }
   set style(value) {
-    this._style = value;
+    if (value instanceof Style) {
+      this._style = value;
+    } else if (!value) {
+      this._style = null;
+    } else {
+      this._style = new Style(value);
+    }
     this.updateStyle();
   }
   get style() {

package/lib/Layer/ColorLayer.js

@@ -44,6 +44,8 @@ import { deprecatedColorLayerOptions } from "../Core/Deprecated/Undeprecator.js"
  * * `1`: used to amplify the transparency effect.
  * * `2`: unused.
  * * `3`: could be used by your own glsl code.
+ *
+ * @extends RasterLayer
  */
 class ColorLayer extends RasterLayer {
   /**
@@ -51,8 +53,6 @@ class ColorLayer extends RasterLayer {
    * it can be an aerial view of the ground or a simple transparent layer with the
    * roads displayed.
    *
-   * @extends Layer
-   *
    * @param {string} id - The id of the layer, that should be unique. It is
    * not mandatory, but an error will be emitted if this layer is added a
    * {@link View} that already has a layer going by that id.
@@ -92,15 +92,41 @@ class ColorLayer extends RasterLayer {
   constructor(id) {
     let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     deprecatedColorLayerOptions(config);
-    super(id, config);
+    const {
+      effect_type = 0,
+      effect_parameter = 1.0,
+      transparent,
+      ...rasterConfig
+    } = config;
+    super(id, rasterConfig);
+
+    /**
+     * @type {boolean}
+     * @readonly
+     */
     this.isColorLayer = true;
-    this.defineLayerProperty('visible', true);
-    this.defineLayerProperty('opacity', 1.0);
-    this.defineLayerProperty('sequence', 0);
-    this.transparent = config.transparent || this.opacity < 1.0;
+
+    /**
+     * @type {boolean}
+     */
+    this.visible = true;
+    this.defineLayerProperty('visible', this.visible);
+
+    /**
+     * @type {number}
+     */
+    this.opacity = 1.0;
+    this.defineLayerProperty('opacity', this.opacity);
+
+    /**
+     * @type {number}
+     */
+    this.sequence = 0;
+    this.defineLayerProperty('sequence', this.sequence);
+    this.transparent = transparent || this.opacity < 1.0;
     this.noTextureParentOutsideLimit = config.source ? config.source.isFileSource : false;
-    this.effect_type = config.effect_type ?? 0;
-    this.effect_parameter = config.effect_parameter ?? 1.0;
+    this.effect_type = effect_type;
+    this.effect_parameter = effect_parameter;
 
     // Feature options
     this.buildExtent = true;

package/lib/Layer/CopcLayer.js

@@ -30,6 +30,11 @@ class CopcLayer extends PointCloudLayer {
    */
   constructor(id, config) {
     super(id, config);
+
+    /**
+     * @type {boolean}
+     * @readonly
+     */
     this.isCopcLayer = true;
     const resolve = () => this;
     this.whenReady = this.source.whenReady.then((/** @type {CopcSource} */source) => {

package/lib/Layer/ElevationLayer.js

@@ -22,14 +22,14 @@ import { RasterElevationTile } from "../Renderer/RasterTile.js";
  * ```
  * @property {number} colorTextureElevationMinZ - elevation minimum in `useColorTextureElevation` mode.
  * @property {number} colorTextureElevationMaxZ - elevation maximum in `useColorTextureElevation` mode.
+ *
+ * @extends RasterLayer
  */
 class ElevationLayer extends RasterLayer {
   /**
    * A simple layer, managing an elevation texture to add some reliefs on the
    * plane or globe view for example.
    *
-   * @extends Layer
-   *
    * @param {string} id - The id of the layer, that should be unique. It is
    * not mandatory, but an error will be emitted if this layer is added a
    * {@link View} that already has a layer going by that id.
@@ -60,14 +60,46 @@ class ElevationLayer extends RasterLayer {
    */
   constructor(id) {
     let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    super(id, config);
+    const {
+      scale = 1.0,
+      noDataValue,
+      clampValues,
+      useRgbaTextureElevation,
+      useColorTextureElevation,
+      colorTextureElevationMinZ,
+      colorTextureElevationMaxZ,
+      bias,
+      mode,
+      ...rasterConfig
+    } = config;
+    super(id, rasterConfig);
+
+    /**
+     * @type {boolean}
+     * @readonly
+     */
+    this.isElevationLayer = true;
+    this.noDataValue = noDataValue;
     if (config.zmin || config.zmax) {
       console.warn('Config using zmin and zmax are deprecated, use {clampValues: {min, max}} structure.');
     }
-    this.zmin = config.clampValues?.min ?? config.zmin;
-    this.zmax = config.clampValues?.max ?? config.zmax;
-    this.isElevationLayer = true;
-    this.defineLayerProperty('scale', this.scale || 1.0);
+
+    /**
+     * @type {number | undefined}
+     */
+    this.zmin = clampValues?.min ?? config.zmin;
+
+    /**
+     * @type {number | undefined}
+     */
+    this.zmax = clampValues?.max ?? config.zmax;
+    this.defineLayerProperty('scale', scale);
+    this.useRgbaTextureElevation = useRgbaTextureElevation;
+    this.useColorTextureElevation = useColorTextureElevation;
+    this.colorTextureElevationMinZ = colorTextureElevationMinZ;
+    this.colorTextureElevationMaxZ = colorTextureElevationMaxZ;
+    this.bias = bias;
+    this.mode = mode;
   }
 
   /**

package/lib/Layer/EntwinePointTileLayer.js

@@ -10,13 +10,13 @@ bboxMesh.geometry.boundingBox = box3;
  * @property {boolean} isEntwinePointTileLayer - Used to checkout whether this
  * layer is a EntwinePointTileLayer. Default is `true`. You should not change
  * this, as it is used internally for optimisation.
+ *
+ * @extends PointCloudLayer
  */
 class EntwinePointTileLayer extends PointCloudLayer {
   /**
    * Constructs a new instance of Entwine Point Tile layer.
    *
-   * @extends PointCloudLayer
-   *
    * @example
    * // Create a new point cloud layer
    * const points = new EntwinePointTileLayer('EPT',
@@ -36,15 +36,22 @@ class EntwinePointTileLayer extends PointCloudLayer {
    * contains three elements `name, protocol, extent`, these elements will be
    * available using `layer.name` or something else depending on the property
    * name. See the list of properties to know which one can be specified.
-   * @param {string} [config.crs=ESPG:4326] - The CRS of the {@link View} this
+   * @param {string} [config.crs='ESPG:4326'] - The CRS of the {@link View} this
    * layer will be attached to. This is used to determine the extent of this
    * layer. Default to `EPSG:4326`.
-   * @param {number} [config.skip=1] - Read one point from every `skip` points
-   * - see {@link LASParser}.
    */
   constructor(id, config) {
     super(id, config);
+
+    /**
+     * @type {boolean}
+     * @readonly
+     */
     this.isEntwinePointTileLayer = true;
+
+    /**
+     * @type {THREE.Vector3}
+     */
     this.scale = new THREE.Vector3(1, 1, 1);
     const resolve = this.addInitializationStep();
     this.whenReady = this.source.whenReady.then(() => {

package/lib/Layer/FeatureGeometryLayer.js

@@ -12,10 +12,11 @@ import Feature2Mesh from "../Converter/Feature2Mesh.js";
  * @property {boolean} isFeatureGeometryLayer - Used to checkout whether this layer is
  * a FeatureGeometryLayer. Default is true. You should not change this, as it is used
  * internally for optimisation.
+ *
+ * @extends GeometryLayer
  */
 class FeatureGeometryLayer extends GeometryLayer {
   /**
-   * @extends GeometryLayer
    *
    * @param {string} id - The id of the layer, that should be unique. It is
    * not mandatory, but an error will be emitted if this layer is added a
@@ -28,6 +29,9 @@ class FeatureGeometryLayer extends GeometryLayer {
    * @param {THREE.Object3D} [options.object3d=new THREE.Group()] root object3d layer.
    * @param {function} [options.onMeshCreated] this callback is called when the mesh is created. The callback parameters are the
    * `mesh` and the `context`.
+   * @param {function} [options.filter] callback which filters the features of
+   * this layer. It takes an object with a `properties` property as argument
+   * and shall return a boolean.
    * @param {boolean} [options.accurate=TRUE] If `accurate` is `true`, data are re-projected with maximum geographical accuracy.
    * With `true`, `proj4` is used to transform data source.
    *
@@ -45,14 +49,24 @@ class FeatureGeometryLayer extends GeometryLayer {
    */
   constructor(id) {
     let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    options.update = FeatureProcessing.update;
-    options.convert = Feature2Mesh.convert({
-      batchId: options.batchId
+    const {
+      object3d,
+      batchId,
+      onMeshCreated,
+      accurate = true,
+      filter,
+      ...geometryOptions
+    } = options;
+    super(id, object3d || new Group(), geometryOptions);
+    this.update = FeatureProcessing.update;
+    this.convert = Feature2Mesh.convert({
+      batchId
     });
-    super(id, options.object3d || new Group(), options);
+    this.onMeshCreated = onMeshCreated;
     this.isFeatureGeometryLayer = true;
-    this.accurate = options.accurate ?? true;
+    this.accurate = accurate;
     this.buildExtent = !this.accurate;
+    this.filter = filter;
   }
   preUpdate(context, sources) {
     if (sources.has(this.parent)) {

package/lib/Layer/GeometryLayer.js

@@ -23,8 +23,6 @@ class GeometryLayer extends Layer {
    * A layer usually managing a geometry to display on a view. For example, it
    * can be a layer of buildings extruded from a a WFS stream.
    *
-   * @extends Layer
-   *
    * @param {string} id - The id of the layer, that should be unique. It is
    * not mandatory, but an error will be emitted if this layer is added a
    * {@link View} that already has a layer going by that id.
@@ -36,7 +34,10 @@ class GeometryLayer extends Layer {
    * contains three elements `name, protocol, extent`, these elements will be
    * available using `layer.name` or something else depending on the property
    * name.
-   * @param {Source} [config.source] - Description and options of the source.
+   * @param {Source} config.source - Description and options of the source.
+   * @param {number} [config.cacheLifeTime=Infinity] - set life time value in cache.
+   * This value is used for [Cache]{@link Cache} expiration mechanism.
+   * @param {boolean} [config.visible]
    *
    * @throws {Error} `object3d` must be a valid `THREE.Object3d`.
    *
@@ -55,12 +56,21 @@ class GeometryLayer extends Layer {
    */
   constructor(id, object3d) {
     let config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    config.cacheLifeTime = config.cacheLifeTime ?? CACHE_POLICIES.GEOMETRY;
+    const {
+      cacheLifeTime = CACHE_POLICIES.GEOMETRY,
+      visible = true,
+      opacity = 1.0,
+      ...layerConfig
+    } = config;
+    super(id, {
+      ...layerConfig,
+      cacheLifeTime
+    });
 
-    // Remove this part when Object.assign(this, config) will be removed from Layer Constructor
-    const visible = config.visible;
-    delete config.visible;
-    super(id, config);
+    /**
+     * @type {boolean}
+     * @readonly
+     */
     this.isGeometryLayer = true;
     if (!object3d || !object3d.isObject3D) {
       throw new Error(`Missing/Invalid object3d parameter (must be a
@@ -69,15 +79,36 @@ class GeometryLayer extends Layer {
     if (object3d.type === 'Group' && object3d.name === '') {
       object3d.name = id;
     }
+
+    /**
+     * @type {THREE.Object3D}
+     * @readonly
+     */
+    this.object3d = object3d;
     Object.defineProperty(this, 'object3d', {
-      value: object3d,
       writable: false,
       configurable: true
     });
-    this.opacity = 1.0;
+
+    /**
+     * @type {number}
+     */
+    this.opacity = opacity;
+
+    /**
+     * @type {boolean}
+     */
     this.wireframe = false;
+
+    /**
+     * @type {Layer[]}
+     */
     this.attachedLayers = [];
-    this.visible = visible ?? true;
+
+    /**
+     * @type {boolean}
+     */
+    this.visible = visible;
     Object.defineProperty(this.zoom, 'max', {
       value: Infinity,
       writable: false