itowns 2.44.3-next.21 → 2.44.3-next.23

package/lib/Layer/Layer.js

@@ -90,62 +90,96 @@ class Layer extends THREE.EventDispatcher {
    */
   constructor(id) {
     let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    /* istanbul ignore next */
-    if (config.projection) {
-      console.warn('Layer projection parameter is deprecated, use crs instead.');
-      config.crs = config.crs || config.projection;
-    }
-    if (config.source === undefined || config.source === true) {
-      throw new Error(`Layer ${id} needs Source`);
-    }
+    const {
+      source,
+      name,
+      style = {},
+      subdivisionThreshold = 256,
+      addLabelLayer = false,
+      cacheLifeTime,
+      options = {},
+      updateStrategy,
+      zoom,
+      mergeFeatures = true,
+      crs
+    } = config;
     super();
+
+    /**
+     * @type {boolean}
+     * @readonly
+     */
     this.isLayer = true;
-    if (config.style && !(config.style instanceof Style)) {
-      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
-        };
-      }
-      config.style = new Style(config.style);
-    }
-    this.style = config.style || new Style();
-    this.subdivisionThreshold = config.subdivisionThreshold || 256;
-    this.sizeDiagonalTexture = (2 * (this.subdivisionThreshold * this.subdivisionThreshold)) ** 0.5;
-    Object.assign(this, config);
+
+    /**
+     * @type {string}
+     * @readonly
+     */
+    this.id = id;
     Object.defineProperty(this, 'id', {
-      value: id,
       writable: false
     });
-    // Default properties
-    this.options = config.options || {};
-    if (!this.updateStrategy) {
-      this.updateStrategy = {
-        type: STRATEGY_MIN_NETWORK_TRAFFIC,
-        options: {}
-      };
+
+    /**
+     * @type {string}
+     */
+    this.name = name;
+    if (source === undefined || source === true) {
+      throw new Error(`Layer ${id} needs Source`);
     }
-    this.defineLayerProperty('frozen', false);
-    if (config.zoom) {
-      this.zoom = {
-        max: config.zoom.max,
-        min: config.zoom.min || 0
-      };
-      if (this.zoom.max == undefined) {
-        this.zoom.max = Infinity;
+    /**
+     * @type {Source}
+     */
+    this.source = source || new Source({
+      url: 'none'
+    });
+    this.crs = crs;
+    if (style && !(style instanceof Style)) {
+      if (typeof style.fill?.pattern === 'string') {
+        console.warn('Using style.fill.pattern = { source: Img|url } is adviced');
+        style.fill.pattern = {
+          source: style.fill.pattern
+        };
       }
+      this.style = new Style(style);
     } else {
-      this.zoom = {
-        max: Infinity,
-        min: 0
-      };
+      this.style = style || new Style();
     }
+
+    /**
+     * @type {number}
+     */
+    this.subdivisionThreshold = subdivisionThreshold;
+    this.sizeDiagonalTexture = (2 * (this.subdivisionThreshold * this.subdivisionThreshold)) ** 0.5;
+    this.addLabelLayer = addLabelLayer;
+
+    // Default properties
+    this.options = options;
+    this.updateStrategy = updateStrategy ?? {
+      type: STRATEGY_MIN_NETWORK_TRAFFIC,
+      options: {}
+    };
+    this.defineLayerProperty('frozen', false);
+    this.zoom = {
+      min: zoom?.min ?? 0,
+      max: zoom?.max ?? Infinity
+    };
     this.info = new InfoLayer(this);
-    this.source = this.source || new Source({
-      url: 'none'
-    });
+
+    /**
+     * @type {boolean}
+     */
     this.ready = false;
+
+    /**
+     * @type {Array<Promise<any>>}
+     * @protected
+     */
     this._promises = [];
+
+    /**
+     * @type {Promise<this>}
+     */
     this.whenReady = new Promise((re, rj) => {
       this._resolve = re;
       this._reject = rj;
@@ -157,11 +191,12 @@ class Layer extends THREE.EventDispatcher {
       return this;
     });
     this._promises.push(this.source.whenReady);
-    this.cache = new Cache(config.cacheLifeTime);
-    this.mergeFeatures = this.mergeFeatures === undefined ? true : config.mergeFeatures;
 
-    // TODO: verify but this.source.filter seems be always undefined.
-    this.filter = this.filter || this.source.filter;
+    /**
+     * @type {Cache}
+     */
+    this.cache = new Cache(cacheLifeTime);
+    this.mergeFeatures = mergeFeatures;
   }
   addInitializationStep() {
     // Possibility to add rejection handler, if it's necessary.
@@ -243,15 +278,6 @@ class Layer extends THREE.EventDispatcher {
     return data;
   }
 
-  /**
-   * Determines whether the specified feature is valid data.
-   *
-   * @param      {Feature}  feature  The feature
-   * @returns {Feature} the feature is returned if it's valided
-   */
-  // eslint-disable-next-line
-  isValidData() {}
-
   /**
    * Remove and dispose all objects from layer.
    * @param {boolean} [clearCache=false] Whether to clear the layer cache or not

package/lib/Layer/OGC3DTilesLayer.js

@@ -335,7 +335,8 @@ class OGC3DTilesLayer extends GeometryLayer {
     const {
       face,
       index,
-      object
+      object,
+      instanceId
     } = intersects[0];
 
     /** @type{number|null} */
@@ -343,7 +344,7 @@ class OGC3DTilesLayer extends GeometryLayer {
     if (object.isPoints && index) {
       batchId = object.geometry.getAttribute('_BATCHID')?.getX(index) ?? index;
     } else if (object.isMesh && face) {
-      batchId = object.geometry.getAttribute('_BATCHID')?.getX(face.a);
+      batchId = object.geometry.getAttribute('_BATCHID')?.getX(face.a) ?? instanceId;
     }
     if (batchId === undefined) {
       return null;

package/lib/Layer/OrientedImageLayer.js

@@ -96,14 +96,22 @@ class OrientedImageLayer extends GeometryLayer {
    */
   constructor(id) {
     let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    const {
+      backgroundDistance,
+      background = createBackground(backgroundDistance),
+      onPanoChanged = () => {},
+      getCamerasNameFromFeature = () => {},
+      ...geometryOptions
+    } = config;
+
     /* istanbul ignore next */
     if (config.projection) {
       console.warn('OrientedImageLayer projection parameter is deprecated, use crs instead.');
       config.crs = config.crs || config.projection;
     }
-    super(id, new THREE.Group(), config);
+    super(id, new THREE.Group(), geometryOptions);
     this.isOrientedImageLayer = true;
-    this.background = config.background || createBackground(config.backgroundDistance);
+    this.background = background;
     if (this.background) {
       // Add layer id to easily identify the objects later on (e.g. to delete the geometries when deleting the layer)
       this.background.layer = this.background.layer ?? {};
@@ -115,10 +123,10 @@ class OrientedImageLayer extends GeometryLayer {
     this.currentPano = undefined;
 
     // store a callback to fire event when current panoramic change
-    this.onPanoChanged = config.onPanoChanged || (() => {});
+    this.onPanoChanged = onPanoChanged;
 
     // function to get cameras name from panoramic feature
-    this.getCamerasNameFromFeature = config.getCamerasNameFromFeature || (() => {});
+    this.getCamerasNameFromFeature = getCamerasNameFromFeature;
     const resolve = this.addInitializationStep();
     this.mergeFeatures = false;
     this.filteringExtent = false;

package/lib/Layer/PointCloudLayer.js

@@ -113,6 +113,8 @@ function changeAngleRange(layer) {
  * @property {number} [maxIntensityRange=1] - The maximal intensity of the
  * layer. Changing this value will affect the material, if it has the
  * corresponding uniform. The value is normalized between 0 and 1.
+ *
+ * @extends GeometryLayer
  */
 class PointCloudLayer extends GeometryLayer {
   /**
@@ -120,8 +122,6 @@ class PointCloudLayer extends GeometryLayer {
    * Constructs a new instance of a Point Cloud Layer. This should not be used
    * directly, but rather implemented using `extends`.
    *
-   * @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
    * {@link View} that already has a layer going by that id.
@@ -130,40 +130,86 @@ class PointCloudLayer extends GeometryLayer {
    * 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 {Source} config.source - Description and options of the source.
    */
   constructor(id) {
     let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    super(id, config.object3d || new THREE.Group(), config);
+    const {
+      object3d = new THREE.Group(),
+      group = new THREE.Group(),
+      bboxes = new THREE.Group(),
+      octreeDepthLimit = -1,
+      pointBudget = 2000000,
+      pointSize = 2,
+      sseThreshold = 2,
+      minIntensityRange = 1,
+      maxIntensityRange = 65536,
+      minElevationRange = 0,
+      maxElevationRange = 1000,
+      minAngleRange = -90,
+      maxAngleRange = 90,
+      material = {},
+      mode = PNTS_MODE.COLOR,
+      ...geometryLayerConfig
+    } = config;
+    super(id, object3d, geometryLayerConfig);
+
+    /**
+     * @type {boolean}
+     * @readonly
+     */
     this.isPointCloudLayer = true;
     this.protocol = 'pointcloud';
-    this.group = config.group || new THREE.Group();
+    this.group = group;
     this.object3d.add(this.group);
-    this.bboxes = config.bboxes || new THREE.Group();
+    this.bboxes = bboxes || new THREE.Group();
     this.bboxes.visible = false;
     this.object3d.add(this.bboxes);
     this.group.updateMatrixWorld();
 
     // default config
-    this.octreeDepthLimit = config.octreeDepthLimit || -1;
-    this.pointBudget = config.pointBudget || 2000000;
-    this.pointSize = config.pointSize === 0 || !isNaN(config.pointSize) ? config.pointSize : 4;
-    this.sseThreshold = config.sseThreshold || 2;
-    this.defineLayerProperty('minIntensityRange', config.minIntensityRange || 1, changeIntensityRange);
-    this.defineLayerProperty('maxIntensityRange', config.maxIntensityRange || 65536, changeIntensityRange);
-    this.defineLayerProperty('minElevationRange', config.minElevationRange || 0, changeElevationRange);
-    this.defineLayerProperty('maxElevationRange', config.maxElevationRange || 1000, changeElevationRange);
-    this.defineLayerProperty('minAngleRange', config.minAngleRange || -90, changeAngleRange);
-    this.defineLayerProperty('maxAngleRange', config.maxAngleRange || 90, changeAngleRange);
-    this.material = config.material || {};
+    /**
+     * @type {number}
+     */
+    this.octreeDepthLimit = octreeDepthLimit;
+
+    /**
+     * @type {number}
+     */
+    this.pointBudget = pointBudget;
+
+    /**
+     * @type {number}
+     */
+    this.pointSize = pointSize;
+
+    /**
+     * @type {number}
+     */
+    this.sseThreshold = sseThreshold;
+    this.defineLayerProperty('minIntensityRange', minIntensityRange, changeIntensityRange);
+    this.defineLayerProperty('maxIntensityRange', maxIntensityRange, changeIntensityRange);
+    this.defineLayerProperty('minElevationRange', minElevationRange, changeElevationRange);
+    this.defineLayerProperty('maxElevationRange', maxElevationRange, changeElevationRange);
+    this.defineLayerProperty('minAngleRange', minAngleRange, changeAngleRange);
+    this.defineLayerProperty('maxAngleRange', maxAngleRange, changeAngleRange);
+
+    /**
+     * @type {THREE.Material}
+     */
+    this.material = material;
     if (!this.material.isMaterial) {
-      config.material = config.material || {};
-      config.material.intensityRange = new THREE.Vector2(this.minIntensityRange, this.maxIntensityRange);
-      config.material.elevationRange = new THREE.Vector2(this.minElevationRange, this.maxElevationRange);
-      config.material.angleRange = new THREE.Vector2(this.minAngleRange, this.maxAngleRange);
-      this.material = new PointsMaterial(config.material);
+      this.material.intensityRange = new THREE.Vector2(this.minIntensityRange, this.maxIntensityRange);
+      this.material.elevationRange = new THREE.Vector2(this.minElevationRange, this.maxElevationRange);
+      this.material.angleRange = new THREE.Vector2(this.minAngleRange, this.maxAngleRange);
+      this.material = new PointsMaterial(this.material);
     }
-    this.material.defines = this.material.defines || {};
-    this.mode = config.mode || PNTS_MODE.COLOR;
+    this.mode = mode || PNTS_MODE.COLOR;
+
+    /**
+     * @type {PointCloudNode | undefined}
+     */
+    this.root = undefined;
   }
   preUpdate(context, changeSources) {
     // See https://cesiumjs.org/hosted-apps/massiveworlds/downloads/Ring/WorldScaleTerrainRendering.pptx

package/lib/Layer/Potree2Layer.js

@@ -99,13 +99,13 @@ function parseAttributes(jsonAttributes) {
  * @property {boolean} isPotreeLayer - Used to checkout whether this layer
  * is a Potree2Layer. Default is `true`. You should not change this, as it is
  * used internally for optimisation.
+ *
+ * @extends PointCloudLayer
  */
 class Potree2Layer extends PointCloudLayer {
   /**
    * Constructs a new instance of Potree2 layer.
    *
-   * @extends PointCloudLayer
-   *
    * @example
    * // Create a new point cloud layer
    * const points = new Potree2Layer('points',
@@ -132,6 +132,11 @@ class Potree2Layer extends PointCloudLayer {
    */
   constructor(id, config) {
     super(id, config);
+
+    /**
+     * @type {boolean}
+     * @readonly
+     */
     this.isPotreeLayer = true;
     const resolve = this.addInitializationStep();
     this.source.whenReady.then(metadata => {

package/lib/Layer/PotreeLayer.js

@@ -10,13 +10,13 @@ bboxMesh.geometry.boundingBox = box3;
  * @property {boolean} isPotreeLayer - Used to checkout whether this layer
  * is a PotreeLayer. Default is `true`. You should not change this, as it is
  * used internally for optimisation.
+ *
+ * @extends PointCloudLayer
  */
 class PotreeLayer extends PointCloudLayer {
   /**
    * Constructs a new instance of Potree layer.
    *
-   * @extends PointCloudLayer
-   *
    * @example
    * // Create a new point cloud layer
    * const points = new PotreeLayer('points',
@@ -37,12 +37,17 @@ class PotreeLayer 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`.
    */
   constructor(id, config) {
     super(id, config);
+
+    /**
+     * @type {boolean}
+     * @readonly
+     */
     this.isPotreeLayer = true;
     const resolve = this.addInitializationStep();
     this.source.whenReady.then(cloud => {

package/lib/Layer/RasterLayer.js

@@ -4,8 +4,18 @@ import textureConverter from "../Converter/textureConverter.js";
 import { CACHE_POLICIES } from "../Core/Scheduler/Cache.js";
 class RasterLayer extends Layer {
   constructor(id, config) {
-    config.cacheLifeTime = config.cacheLifeTime ?? CACHE_POLICIES.TEXTURE;
-    super(id, config);
+    const {
+      cacheLifeTime = CACHE_POLICIES.TEXTURE,
+      minFilter,
+      magFilter,
+      ...layerConfig
+    } = config;
+    super(id, {
+      ...layerConfig,
+      cacheLifeTime
+    });
+    this.minFilter = minFilter;
+    this.magFilter = magFilter;
   }
   convert(data, extentDestination) {
     return textureConverter.convert(data, extentDestination, this);

package/lib/Layer/TiledGeometryLayer.js

@@ -16,6 +16,8 @@ const boundingSphereCenter = new THREE.Vector3();
  * as it is used internally for optimisation.
  * @property {boolean} hideSkirt (default false) - Used to hide the skirt (tile borders).
  * Useful when the layer opacity < 1
+ *
+ * @extends GeometryLayer
  */
 class TiledGeometryLayer extends GeometryLayer {
   /**
@@ -38,12 +40,10 @@ class TiledGeometryLayer extends GeometryLayer {
    * It corresponds at meters by pixel. If the projection tile exceeds a certain pixel size (on screen)
    * then it is subdivided into 4 tiles with a zoom greater than 1.
    *
-   * @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
    * {@link View} that already has a layer going by that id.
-   * @param {THREE.Object3d} object3d - The object3d used to contain the
+   * @param {THREE.Object3D} object3d - The object3d used to contain the
    * geometry of the TiledGeometryLayer. It is usually a `THREE.Group`, but it
    * can be anything inheriting from a `THREE.Object3d`.
    * @param {Array} schemeTile - extents Array of root tiles
@@ -58,16 +58,63 @@ class TiledGeometryLayer extends GeometryLayer {
    * @throws {Error} `object3d` must be a valid `THREE.Object3d`.
    */
   constructor(id, object3d, schemeTile, builder, config) {
-    // cacheLifeTime = CACHE_POLICIES.INFINITE because the cache is handled by the builder
-    config.cacheLifeTime = CACHE_POLICIES.INFINITE;
-    config.source = false;
-    super(id, object3d, config);
+    const {
+      sseSubdivisionThreshold = 1.0,
+      minSubdivisionLevel,
+      maxSubdivisionLevel,
+      maxDeltaElevationLevel,
+      tileMatrixSets,
+      diffuse,
+      showOutline = false,
+      segments,
+      disableSkirt = false,
+      materialOptions,
+      ...configGeometryLayer
+    } = config;
+    super(id, object3d, {
+      ...configGeometryLayer,
+      // cacheLifeTime = CACHE_POLICIES.INFINITE because the cache is handled by the builder
+      cacheLifeTime: CACHE_POLICIES.INFINITE,
+      source: false
+    });
+
+    /**
+     * @type {boolean}
+     * @readonly
+     */
     this.isTiledGeometryLayer = true;
+    this.protocol = 'tile';
+
     // TODO : this should be add in a preprocess method specific to GeoidLayer.
     this.object3d.geoidHeight = 0;
-    this.protocol = 'tile';
+
+    /**
+     * @type {boolean}
+     */
+    this.disableSkirt = disableSkirt;
     this._hideSkirt = !!config.hideSkirt;
-    this.sseSubdivisionThreshold = this.sseSubdivisionThreshold || 1.0;
+
+    /**
+     * @type {number}
+     */
+    this.sseSubdivisionThreshold = sseSubdivisionThreshold;
+
+    /**
+     * @type {number}
+     */
+    this.minSubdivisionLevel = minSubdivisionLevel;
+
+    /**
+     * @type {number}
+     */
+    this.maxSubdivisionLevel = maxSubdivisionLevel;
+
+    /**
+     * @type {number}
+     * @deprecated
+     */
+    this.maxDeltaElevationLevel = maxDeltaElevationLevel;
+    this.segments = segments;
     this.schemeTile = schemeTile;
     this.builder = builder;
     this.info = new InfoTiledGeometryLayer(this);
@@ -77,9 +124,19 @@ class TiledGeometryLayer extends GeometryLayer {
     if (!this.builder) {
       throw new Error(`Cannot init tiled layer without builder for layer ${this.id}`);
     }
-    if (config.maxDeltaElevationLevel) {
-      console.warn('Config using maxDeltaElevationLevel is deprecated. The parameter maxDeltaElevationLevel is not longer used');
-    }
+    this.maxScreenSizeNode = this.sseSubdivisionThreshold * (this.sizeDiagonalTexture * 2);
+    this.tileMatrixSets = tileMatrixSets;
+    this.materialOptions = materialOptions;
+
+    /*
+     * @type {boolean}
+     */
+    this.showOutline = showOutline;
+
+    /**
+     * @type {THREE.Vector3 | undefined}
+     */
+    this.diffuse = diffuse;
     this.level0Nodes = [];
     const promises = [];
     for (const root of this.schemeTile) {
@@ -90,7 +147,6 @@ class TiledGeometryLayer extends GeometryLayer {
       this.object3d.add(...level0s);
       this.object3d.updateMatrixWorld();
     }));
-    this.maxScreenSizeNode = this.sseSubdivisionThreshold * (this.sizeDiagonalTexture * 2);
   }
   get hideSkirt() {
     return this._hideSkirt;

package/lib/Main.js

@@ -7,7 +7,7 @@ export const REVISION = conf.version;
 export { default as Extent } from "./Core/Geographic/Extent.js";
 export { default as Coordinates } from "./Core/Geographic/Coordinates.js";
 export { default as GeoidGrid } from "./Core/Geographic/GeoidGrid.js";
-export { default as CRS } from "./Core/Geographic/Crs.js";
+export * as CRS from "./Core/Geographic/Crs.js";
 export { default as Ellipsoid, ellipsoidSizes } from "./Core/Math/Ellipsoid.js";
 export { default as GlobeView, GLOBE_VIEW_EVENTS } from "./Core/Prefab/GlobeView.js";
 export { default as PlanarView } from "./Core/Prefab/PlanarView.js";

package/lib/Provider/Fetcher.js

@@ -102,7 +102,11 @@ export default {
       res = resolve;
       rej = reject;
     });
-    textureLoader.load(url, res, () => {}, rej);
+    textureLoader.load(url, res, () => {}, event => {
+      const error = new Error(`Failed to load texture from URL: \`${url}\``);
+      error.originalEvent = event;
+      rej(error);
+    });
     return promise;
   },
   /**

package/lib/Renderer/OBB.js

@@ -1,12 +1,11 @@
 import * as THREE from 'three';
-import TileGeometry from "../Core/TileGeometry.js";
-import BuilderEllipsoidTile from "../Core/Prefab/Globe/BuilderEllipsoidTile.js";
+import * as CRS from "../Core/Geographic/Crs.js";
+import { TileGeometry } from "../Core/TileGeometry.js";
+import { GlobeTileBuilder } from "../Core/Prefab/Globe/GlobeTileBuilder.js";
 import Coordinates from "../Core/Geographic/Coordinates.js";
-import CRS from "../Core/Geographic/Crs.js";
 
 // get oriented bounding box of tile
-const builder = new BuilderEllipsoidTile({
-  crs: 'EPSG:4978',
+const builder = new GlobeTileBuilder({
   uvCount: 1
 });
 const size = new THREE.Vector3();
@@ -114,18 +113,17 @@ class OBB extends THREE.Object3D {
     let maxHeight = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : extent.max || 0;
     if (extent.crs == 'EPSG:4326') {
       const {
-        sharableExtent,
+        shareableExtent,
         quaternion,
         position
-      } = builder.computeSharableExtent(extent);
+      } = builder.computeShareableExtent(extent);
       // Compute the minimum count of segment to build tile
-      const segments = Math.max(Math.floor(sharableExtent.planarDimensions(dimension).x / 90 + 1), 2);
-      const geometry = new TileGeometry({
-        extent: sharableExtent,
+      const segments = Math.max(Math.floor(shareableExtent.planarDimensions(dimension).x / 90 + 1), 2);
+      const geometry = new TileGeometry(builder, {
+        extent: shareableExtent,
         level: 0,
         segments,
-        disableSkirt: true,
-        builder
+        disableSkirt: true
       });
       obb.box3D.copy(geometry.boundingBox);
       obb.natBox.copy(geometry.boundingBox);
@@ -137,7 +135,7 @@ class OBB extends THREE.Object3D {
       this.position.copy(position);
       this.quaternion.copy(quaternion);
       this.updateMatrixWorld(true);
-    } else if (!CRS.isTms(extent.crs) && CRS.isMetricUnit(extent.crs)) {
+    } else if (CRS.isMetricUnit(extent.crs)) {
       extent.center(coord).toVector3(this.position);
       extent.planarDimensions(dimension);
       size.set(dimension.x, dimension.y, Math.abs(maxHeight - minHeight));

package/lib/Renderer/RasterTile.js

@@ -1,7 +1,6 @@
 import * as THREE from 'three';
 import { ELEVATION_MODES } from "./LayeredMaterial.js";
 import { checkNodeElevationTextureValidity, insertSignificantValuesFromParent, computeMinMaxElevation } from "../Parser/XbilParser.js";
-import CRS from "../Core/Geographic/Crs.js";
 export const EMPTY_TEXTURE_ZOOM = -1;
 const pitch = new THREE.Vector4();
 function getIndiceWithPitch(i, pitch, w) {
@@ -29,7 +28,7 @@ class RasterTile extends THREE.EventDispatcher {
   constructor(material, layer) {
     super();
     this.layer = layer;
-    this.crs = layer.parent.tileMatrixSets.indexOf(CRS.formatToTms(layer.crs));
+    this.crs = layer.parent.tileMatrixSets.indexOf(layer.crs);
     if (this.crs == -1) {
       console.error('Unknown crs:', layer.crs);
     }

package/lib/Source/FileSource.js

@@ -1,6 +1,5 @@
 import Source from "./Source.js";
 import Cache from "../Core/Scheduler/Cache.js";
-import CRS from "../Core/Geographic/Crs.js";
 
 /**
  * An object defining the source of a single resource to get from a direct
@@ -155,7 +154,7 @@ class FileSource extends Source {
     if (!features) {
       options.out.buildExtent = this.crs != 'EPSG:4978';
       if (options.out.buildExtent) {
-        options.out.forcedExtentCrs = options.out.crs != 'EPSG:4978' ? options.out.crs : CRS.formatToEPSG(this.crs);
+        options.out.forcedExtentCrs = options.out.crs != 'EPSG:4978' ? options.out.crs : this.crs;
       }
       features = this.parser(this.fetchedData, options);
       this._featuresCaches[options.out.crs].setByArray(features, [0]);