itowns 2.44.3-next.21 → 2.44.3-next.22

package/lib/Converter/Feature2Mesh.js

@@ -4,7 +4,6 @@ import { FEATURE_TYPES } from "../Core/Feature.js";
 import ReferLayerProperties from "../Layer/ReferencingLayerProperties.js";
 import { deprecatedFeature2MeshOptions } from "../Core/Deprecated/Undeprecator.js";
 import Extent from "../Core/Geographic/Extent.js";
-import Crs from "../Core/Geographic/Crs.js";
 import OrientationUtils from "../Utils/OrientationUtils.js";
 import Coordinates from "../Core/Geographic/Coordinates.js";
 import Style, { StyleContext } from "../Core/Style.js";
@@ -54,7 +53,7 @@ class FeatureMesh extends THREE.Group {
       } else {
         // calculate the scale transformation to transform the feature.extent
         // to feature.extent.as(crs)
-        coord.crs = Crs.formatToEPSG(this.#originalCrs);
+        coord.crs = this.#originalCrs;
         // TODO: An extent here could be either a geographic extent (for
         // features from WFS) or a tiled extent (for features from MVT).
         // Unify both behavior.

package/lib/Converter/textureConverter.js

@@ -1,7 +1,6 @@
 import * as THREE from 'three';
 import Feature2Texture from "./Feature2Texture.js";
 import Extent from "../Core/Geographic/Extent.js";
-import CRS from "../Core/Geographic/Crs.js";
 const extentTexture = new Extent('EPSG:4326', [0, 0, 0, 0]);
 const textureLayer = (texture, layer) => {
   texture.generateMipmaps = false;
@@ -20,7 +19,7 @@ export default {
     if (data.isFeatureCollection) {
       const backgroundLayer = layer.source.backgroundLayer;
       const backgroundColor = backgroundLayer && backgroundLayer.paint ? new THREE.Color(backgroundLayer.paint['background-color']) : undefined;
-      destinationTile.toExtent(CRS.formatToEPSG(layer.crs), extentTexture);
+      destinationTile.toExtent(layer.crs, extentTexture);
       texture = Feature2Texture.createTextureFromFeature(data, extentTexture, layer.subdivisionThreshold, layer.style, backgroundColor);
       texture.features = data;
       texture.extent = destinationTile;

package/lib/Core/Feature.js

@@ -1,7 +1,6 @@
 import * as THREE from 'three';
 import Extent from "./Geographic/Extent.js";
 import Coordinates from "./Geographic/Coordinates.js";
-import CRS from "./Geographic/Crs.js";
 import Style from "./Style.js";
 function defaultExtent(crs) {
   return new Extent(crs, Infinity, -Infinity, Infinity, -Infinity);
@@ -340,7 +339,7 @@ export class FeatureCollection extends THREE.Object3D {
   constructor(options) {
     super();
     this.isFeatureCollection = true;
-    this.crs = CRS.formatToEPSG(options.accurate || !options.source?.crs ? options.crs : options.source.crs);
+    this.crs = 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/Coordinates.js

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import proj4 from 'proj4';
-import CRS from "./Crs.js";
+import * as CRS from "./Crs.js";
 import Ellipsoid from "../Math/Ellipsoid.js";
 proj4.defs('EPSG:4978', '+proj=geocent +datum=WGS84 +units=m +no_defs');
 const ellipsoid = new Ellipsoid();

package/lib/Core/Geographic/Crs.js

@@ -1,5 +1,12 @@
 import proj4 from 'proj4';
 proj4.defs('EPSG:4978', '+proj=geocent +datum=WGS84 +units=m +no_defs');
+
+/**
+ * A projection as a CRS identifier string. This identifier references a
+ * projection definition previously defined with
+ * [`proj4.defs`](https://github.com/proj4js/proj4js#named-projections).
+ */
+
 function isString(s) {
   return typeof s === 'string' || s instanceof String;
 }
@@ -8,168 +15,131 @@ function mustBeString(crs) {
     throw new Error(`Crs parameter value must be a string: '${crs}'`);
   }
 }
-function isTms(crs) {
-  return isString(crs) && crs.startsWith('TMS');
-}
-function isEpsg(crs) {
-  return isString(crs) && crs.startsWith('EPSG');
-}
-function formatToTms(crs) {
-  mustBeString(crs);
-  return isTms(crs) ? crs : `TMS:${crs.match(/\d+/)[0]}`;
-}
-function formatToEPSG(crs) {
-  mustBeString(crs);
-  return isEpsg(crs) ? crs : `EPSG:${crs.match(/\d+/)[0]}`;
-}
-const UNIT = {
+
+/**
+ * System units supported for a coordinate system. See
+ * [proj](https://proj4.org/en/9.5/operations/conversions/unitconvert.html#angular-units).
+ * Note that only degree and meters units are supported for now.
+ */
+export const UNIT = {
+  /**
+   * Angular unit in degree.
+   */
   DEGREE: 1,
+  /**
+   * Distance unit in meter.
+   */
   METER: 2
 };
-function is4326(crs) {
+
+/**
+ * Checks that the CRS is EPSG:4326.
+ * @internal
+ *
+ * @param crs - The CRS to test.
+ */
+export function is4326(crs) {
   return crs === 'EPSG:4326';
 }
-function isGeocentric(crs) {
-  mustBeString(crs);
-  const projection = proj4.defs(crs);
-  return !projection ? false : projection.projName == 'geocent';
-}
-function _unitFromProj4Unit(projunit) {
-  if (projunit === 'degrees') {
+function unitFromProj4Unit(proj) {
+  if (proj.units === 'degrees') {
     return UNIT.DEGREE;
-  } else if (projunit === 'm') {
+  } else if (proj.units === 'm') {
+    return UNIT.METER;
+  } else if (proj.units === undefined && proj.to_meter === undefined) {
+    // See https://proj.org/en/9.4/usage/projections.html [17/10/2024]
+    // > The default unit for projected coordinates is the meter.
     return UNIT.METER;
   } else {
     return undefined;
   }
 }
-function toUnit(crs) {
+
+/**
+ * Returns the horizontal coordinates system units associated with this CRS.
+ *
+ * @param crs - The CRS to extract the unit from.
+ * @returns Either `UNIT.METER`, `UNIT.DEGREE` or `undefined`.
+ */
+export function getUnit(crs) {
   mustBeString(crs);
-  switch (crs) {
-    case 'EPSG:4326':
-      return UNIT.DEGREE;
-    case 'EPSG:4978':
-      return UNIT.METER;
-    default:
-      {
-        const p = proj4.defs(formatToEPSG(crs));
-        if (!p) {
-          return undefined;
-        }
-        return _unitFromProj4Unit(p.units);
-      }
+  const p = proj4.defs(crs);
+  if (!p) {
+    return undefined;
   }
+  return unitFromProj4Unit(p);
+}
+
+/**
+ * Asserts that the CRS is using metric units.
+ *
+ * @param crs - The CRS to check.
+ * @throws {@link Error} if the CRS is not valid.
+ */
+export function isMetricUnit(crs) {
+  return getUnit(crs) === UNIT.METER;
+}
+
+/**
+ * Asserts that the CRS is geographic.
+ *
+ * @param crs - The CRS to check.
+ * @throws {@link Error} if the CRS is not valid.
+ */
+export function isGeographic(crs) {
+  return getUnit(crs) === UNIT.DEGREE;
 }
-function toUnitWithError(crs) {
+
+/**
+ * Asserts that the CRS is geocentric.
+ *
+ * @param crs - The CRS to test.
+ * @returns false if the crs isn't defined.
+ */
+export function isGeocentric(crs) {
   mustBeString(crs);
-  const u = toUnit(crs);
-  if (u === undefined) {
-    throw new Error(`No unit found for crs: '${crs}'`);
+  const projection = proj4.defs(crs);
+  return !projection ? false : projection.projName == 'geocent';
+}
+
+/**
+ * Asserts that the CRS is valid, meaning it has been previously defined and
+ * includes an unit.
+ *
+ * @param crs - The CRS to test.
+ * @throws {@link Error} if the crs is not valid.
+ */
+export function isValid(crs) {
+  const proj = proj4.defs(crs);
+  if (!proj) {
+    throw new Error(`Undefined crs '${crs}'. Add it with proj4.defs('${crs}', string)`);
+  }
+  if (!unitFromProj4Unit(proj)) {
+    throw new Error(`No valid unit found for crs '${crs}', found ${proj.units}`);
   }
-  return u;
 }
 
 /**
- * This module provides basic methods to manipulate a CRS (as a string).
+ * Gives a reasonable epsilon for this CRS.
  *
- * @module CRS
+ * @param crs - The CRS to use.
+ * @returns 0.01 if the CRS is EPSG:4326, 0.001 otherwise.
  */
-export default {
-  /**
-   * Units that can be used for a CRS.
-   *
-   * @enum {number}
-   */
-  UNIT,
-  /**
-   * Assert that the CRS is valid one.
-   *
-   * @param {string} crs - The CRS to validate.
-   *
-   * @throws {Error} if the CRS is not valid.
-   */
-  isValid(crs) {
-    toUnitWithError(crs);
-  },
-  /**
-   * Assert that the CRS is geographic.
-   *
-   * @param {string} crs - The CRS to validate.
-   * @return {boolean}
-   * @throws {Error} if the CRS is not valid.
-   */
-  isGeographic(crs) {
-    return toUnitWithError(crs) == UNIT.DEGREE;
-  },
-  /**
-   * Assert that the CRS is using metric units.
-   *
-   * @param {string} crs - The CRS to validate.
-   * @return {boolean}
-   * @throws {Error} if the CRS is not valid.
-   */
-  isMetricUnit(crs) {
-    return toUnit(crs) == UNIT.METER;
-  },
-  /**
-   * Get the unit to use with the CRS.
-   *
-   * @param {string} crs - The CRS to get the unit from.
-   * @return {number} Either `UNIT.METER`, `UNIT.DEGREE` or `undefined`.
-   */
-  toUnit,
-  /**
-   * Is the CRS EPSG:4326 ?
-   *
-   * @param {string} crs - The CRS to test.
-   * @return {boolean}
-   */
-  is4326,
-  /**
-   * Is the CRS geocentric ?
-   * if crs isn't defined the method returns false.
-   *
-   * @param {string} crs - The CRS to test.
-   * @return {boolean}
-   */
-  isGeocentric,
-  /**
-   * Give a reasonnable epsilon to use with this CRS.
-   *
-   * @param {string} crs - The CRS to use.
-   * @return {number} 0.01 if the CRS is EPSG:4326, 0.001 otherwise.
-   */
-  reasonnableEpsilon(crs) {
-    if (is4326(crs)) {
-      return 0.01;
-    } else {
-      return 0.001;
-    }
-  },
-  /**
-   * format crs to European Petroleum Survey Group notation : EPSG:XXXX.
-   *
-   * @param      {string}  crs     The crs to format
-   * @return     {string}  formated crs
-   */
-  formatToEPSG,
-  /**
-   * format crs to tile matrix set notation : TMS:XXXX.
-   *
-   * @param      {string}  crs     The crs to format
-   * @return     {string}  formated crs
-   */
-  formatToTms,
-  isTms,
-  isEpsg,
-  tms_3857: 'TMS:3857',
-  tms_4326: 'TMS:4326',
-  /**
-   * Define a proj4 projection as a string and reference.
-   *
-   * @param {string}  code    code is the projection's SRS code (only used internally by the Proj4js library)
-   * @param {string}  proj4def is the Proj4 definition string for the projection to use
-   * @return {undefined}
-   */
-  defs: (code, proj4def) => proj4.defs(code, proj4def)
-};
+export function reasonableEpsilon(crs) {
+  if (is4326(crs)) {
+    return 0.01;
+  } else {
+    return 0.001;
+  }
+}
+
+/**
+ * Defines a proj4 projection as a named alias.
+ * This function is a specialized wrapper over the
+ * [`proj4.defs`](https://github.com/proj4js/proj4js#named-projections)
+ * function.
+ *
+ * @param code - Named alias of the currently defined projection.
+ * @param proj4def - Proj4 or WKT string of the defined projection.
+ */
+export const defs = (code, proj4def) => proj4.defs(code, proj4def);

package/lib/Core/Geographic/Extent.js

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
+import * as CRS from "./Crs.js";
 import Coordinates from "./Coordinates.js";
-import CRS from "./Crs.js";
 
 /**
  * Extent is a SIG-area (so 2D)
@@ -43,9 +43,6 @@ class Extent {
     if (CRS.isGeocentric(crs)) {
       throw new Error(`${crs} is a geocentric projection, it doesn't make sense with a geographical extent`);
     }
-    if (CRS.isTms(crs)) {
-      throw new Error(`${crs} is a tiled projection, use Tile instead`);
-    }
     this.isExtent = true;
     this.crs = crs;
     this.west = 0;
@@ -220,7 +217,7 @@ class Extent {
    */
   isInside(extent, epsilon) {
     extent.as(this.crs, _extent);
-    epsilon = epsilon == undefined ? CRS.reasonnableEpsilon(this.crs) : epsilon;
+    epsilon = epsilon ?? CRS.reasonableEpsilon(this.crs);
     return this.east - _extent.east <= epsilon && _extent.west - this.west <= epsilon && this.north - _extent.north <= epsilon && _extent.south - this.south <= epsilon;
   }
 

package/lib/Core/Geographic/GeoidGrid.js

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
+import * as CRS from "./Crs.js";
 import Coordinates from "./Coordinates.js";
-import CRS from "./Crs.js";
 const coord = new Coordinates('EPSG:4326');
 const indexes = new THREE.Vector2();
 function biLinearInterpolation(indexes, getData) {

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 "../../Tile/TileGrid.js";
 import BuilderEllipsoidTile from "./BuilderEllipsoidTile.js";
-import CRS from "../../Geographic/Crs.js";
 
 // matrix to convert sphere to ellipsoid
 const worldToScaledEllipsoid = new THREE.Matrix4();
@@ -49,11 +48,11 @@ class GlobeLayer extends TiledGeometryLayer {
   constructor(id, object3d) {
     let config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     // Configure tiles
-    const scheme = schemeTiles.get(CRS.tms_4326);
+    const scheme = schemeTiles.get('EPSG:4326');
     const schemeTile = globalExtentTMS.get('EPSG:4326').subdivisionByScheme(scheme);
 
     // Supported tile matrix set for color/elevation layer
-    config.tileMatrixSets = [CRS.tms_4326, CRS.tms_3857];
+    config.tileMatrixSets = ['EPSG:4326', 'EPSG:3857'];
     const uvCount = config.tileMatrixSets.length;
     const builder = new BuilderEllipsoidTile({
       crs: 'EPSG:4978',
@@ -97,7 +96,7 @@ class GlobeLayer extends TiledGeometryLayer {
   }
   subdivision(context, layer, node) {
     if (node.level == 5) {
-      const row = node.getExtentsByProjection(CRS.tms_4326)[0].row;
+      const row = node.getExtentsByProjection('EPSG:4326')[0].row;
       if (row == 31 || row == 0) {
         // doesn't subdivise the pole
         return false;

package/lib/Core/Prefab/GlobeView.js

@@ -5,7 +5,6 @@ import Coordinates from "../Geographic/Coordinates.js";
 import GlobeLayer from "./Globe/GlobeLayer.js";
 import Atmosphere from "./Globe/Atmosphere.js";
 import CameraUtils from "../../Utils/CameraUtils.js";
-import CRS from "../Geographic/Crs.js";
 import { ellipsoidSizes } from "../Math/Ellipsoid.js";
 
 /**
@@ -129,11 +128,11 @@ class GlobeView extends View {
       return Promise.reject(new Error('Add Layer type object'));
     }
     if (layer.isColorLayer) {
-      if (!this.tileLayer.tileMatrixSets.includes(CRS.formatToTms(layer.source.crs))) {
+      if (!this.tileLayer.tileMatrixSets.includes(layer.source.crs)) {
         return layer._reject(`Only ${this.tileLayer.tileMatrixSets} tileMatrixSet are currently supported for color layers`);
       }
     } else if (layer.isElevationLayer) {
-      if (CRS.formatToTms(layer.source.crs) !== this.tileLayer.tileMatrixSets[0]) {
+      if (layer.source.crs !== this.tileLayer.tileMatrixSets[0]) {
         return layer._reject(`Only ${this.tileLayer.tileMatrixSets[0]} tileMatrixSet is currently supported for elevation layers`);
       }
     }

package/lib/Core/Prefab/Planar/PlanarLayer.js

@@ -1,7 +1,6 @@
 import * as THREE from 'three';
 import TiledGeometryLayer from "../../../Layer/TiledGeometryLayer.js";
 import { globalExtentTMS } from "../../Tile/TileGrid.js";
-import CRS from "../../Geographic/Crs.js";
 import PlanarTileBuilder from "./PlanarTileBuilder.js";
 
 /**
@@ -35,12 +34,12 @@ class PlanarLayer extends TiledGeometryLayer {
    */
   constructor(id, extent, object3d) {
     let config = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-    const tms = CRS.formatToTms(extent.crs);
+    const tileMatrixSets = [extent.crs];
     if (!globalExtentTMS.get(extent.crs)) {
       // Add new global extent for this new crs projection.
       globalExtentTMS.set(extent.crs, extent);
     }
-    config.tileMatrixSets = [tms];
+    config.tileMatrixSets = tileMatrixSets;
     super(id, object3d || new THREE.Group(), [extent], new PlanarTileBuilder({
       crs: extent.crs
     }), config);

package/lib/Core/Tile/Tile.js

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
+import * as CRS from "../Geographic/Crs.js";
 import Coordinates from "../Geographic/Coordinates.js";
-import CRS from "../Geographic/Crs.js";
 import Extent from "../Geographic/Extent.js";
 import { getInfoTms, getCountTiles } from "./TileGrid.js";
 const _tmsCoord = new THREE.Vector2();
@@ -169,14 +169,14 @@ class Tile {
  * @returns {Tile[]}
  */
 export function tiledCovering(e, tms) {
-  if (e.crs == 'EPSG:4326' && tms == CRS.tms_3857) {
+  if (e.crs == 'EPSG:4326' && tms == 'EPSG:3857') {
     const WMTS_PM = [];
-    const extent = _extent.copy(e).as(CRS.formatToEPSG(tms), _extent2);
+    const extent = _extent.copy(e).as(tms, _extent2);
     const {
       globalExtent,
       globalDimension,
       sTs
-    } = getInfoTms(CRS.formatToEPSG(tms));
+    } = getInfoTms(tms);
     extent.clampByExtent(globalExtent);
     extent.planarDimensions(_dimensionTile);
     const zoom = e.zoom + 1 || Math.floor(Math.log2(Math.round(globalDimension.x / (_dimensionTile.x * sTs.x))));

package/lib/Core/Tile/TileGrid.js

@@ -1,5 +1,4 @@
 import * as THREE from 'three';
-import CRS from "../Geographic/Crs.js";
 import Extent from "../Geographic/Extent.js";
 const _countTiles = new THREE.Vector2();
 const _dim = new THREE.Vector2();
@@ -15,23 +14,21 @@ const extent3857 = extent4326.as('EPSG:3857');
 extent3857.clampSouthNorth(extent3857.west, extent3857.east);
 globalExtentTMS.set('EPSG:3857', extent3857);
 schemeTiles.set('default', new THREE.Vector2(1, 1));
-schemeTiles.set(CRS.tms_3857, schemeTiles.get('default'));
-schemeTiles.set(CRS.tms_4326, new THREE.Vector2(2, 1));
+schemeTiles.set('EPSG:3857', schemeTiles.get('default'));
+schemeTiles.set('EPSG:4326', new THREE.Vector2(2, 1));
 export function getInfoTms(/** @type {string} */crs) {
-  const epsg = CRS.formatToEPSG(crs);
-  const globalExtent = globalExtentTMS.get(epsg);
+  const globalExtent = globalExtentTMS.get(crs);
   const globalDimension = globalExtent.planarDimensions(_dim);
-  const tms = CRS.formatToTms(crs);
-  const sTs = schemeTiles.get(tms) || schemeTiles.get('default');
+  const sTs = schemeTiles.get(crs) || schemeTiles.get('default');
   // The isInverted parameter is to be set to the correct value, true or false
   // (default being false) if the computation of the coordinates needs to be
   // inverted to match the same scheme as OSM, Google Maps or other system.
   // See link below for more information
   // https://alastaira.wordpress.com/2011/07/06/converting-tms-tile-coordinates-to-googlebingosm-tile-coordinates/
   // in crs includes ':NI' => tms isn't inverted (NOT INVERTED)
-  const isInverted = !tms.includes(':NI');
+  const isInverted = !crs.includes(':NI');
   return {
-    epsg,
+    epsg: crs,
     globalExtent,
     globalDimension,
     sTs,
@@ -39,7 +36,7 @@ export function getInfoTms(/** @type {string} */crs) {
   };
 }
 export function getCountTiles(/** @type {string} */crs, /** @type {number} */zoom) {
-  const sTs = schemeTiles.get(CRS.formatToTms(crs)) || schemeTiles.get('default');
+  const sTs = schemeTiles.get(crs) || schemeTiles.get('default');
   const count = 2 ** zoom;
   _countTiles.set(count, count).multiply(sTs);
   return _countTiles;

package/lib/Core/TileMesh.js

@@ -1,5 +1,4 @@
 import * as THREE from 'three';
-import CRS from "./Geographic/Crs.js";
 import { geoidLayerIsVisible } from "../Layer/GeoidLayer.js";
 import { tiledCovering } from "./Tile/Tile.js";
 
@@ -71,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";
@@ -53,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;

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/Renderer/OBB.js

@@ -1,8 +1,8 @@
 import * as THREE from 'three';
+import * as CRS from "../Core/Geographic/Crs.js";
 import TileGeometry from "../Core/TileGeometry.js";
 import BuilderEllipsoidTile from "../Core/Prefab/Globe/BuilderEllipsoidTile.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({
@@ -137,7 +137,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]);

package/lib/Source/Source.js

@@ -1,3 +1,4 @@
+import * as CRS from "../Core/Geographic/Crs.js";
 import Extent from "../Core/Geographic/Extent.js";
 import GeoJsonParser from "../Parser/GeoJsonParser.js";
 import KMLParser from "../Parser/KMLParser.js";
@@ -8,7 +9,6 @@ import ISGParser from "../Parser/ISGParser.js";
 import VectorTileParser from "../Parser/VectorTileParser.js";
 import Fetcher from "../Provider/Fetcher.js";
 import Cache from "../Core/Scheduler/Cache.js";
-import CRS from "../Core/Geographic/Crs.js";
 
 /** @private */
 export const supportedParsers = new Map([['application/geo+json', GeoJsonParser.parse], ['application/json', GeoJsonParser.parse], ['application/kml', KMLParser.parse], ['application/gpx', GpxParser.parse], ['application/x-protobuf;type=mapbox-vector', VectorTileParser.parse], ['application/gtx', GTXParser.parse], ['application/isg', ISGParser.parse], ['application/gdf', GDFParser.parse]]);