itowns 2.44.3-next.33 → 2.44.3-next.35

package/lib/Core/Tile/TileGrid.js

@@ -13,13 +13,19 @@ globalExtentTMS.set('EPSG:4326', extent4326);
 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('EPSG:3857', schemeTiles.get('default'));
+const defaultScheme = new THREE.Vector2(1, 1);
+schemeTiles.set('EPSG:3857', defaultScheme);
 schemeTiles.set('EPSG:4326', new THREE.Vector2(2, 1));
-export function getInfoTms(/** @type {string} */crs) {
+
+// TODO: For now we can only have a single TMS grid per proj4 identifier.
+// This causes TMS identifier to be proj4 identifier.
+export function getInfoTms(crs) {
   const globalExtent = globalExtentTMS.get(crs);
+  if (!globalExtent) {
+    throw new Error(`The tile matrix set ${crs} is not defined.`);
+  }
   const globalDimension = globalExtent.planarDimensions(_dim);
-  const sTs = schemeTiles.get(crs) || schemeTiles.get('default');
+  const sTs = schemeTiles.get(crs) ?? defaultScheme;
   // 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.
@@ -35,8 +41,8 @@ export function getInfoTms(/** @type {string} */crs) {
     isInverted
   };
 }
-export function getCountTiles(/** @type {string} */crs, /** @type {number} */zoom) {
-  const sTs = schemeTiles.get(crs) || schemeTiles.get('default');
+export function getCountTiles(crs, zoom) {
+  const sTs = schemeTiles.get(crs) || defaultScheme;
   const count = 2 ** zoom;
   _countTiles.set(count, count).multiply(sTs);
   return _countTiles;

package/lib/Source/Source.js

@@ -121,7 +121,7 @@ class Source extends InformationsData {
     this.whenReady = Promise.resolve();
     this._featuresCaches = {};
     if (source.extent && !source.extent.isExtent) {
-      this.extent = new Extent(this.crs, source.extent);
+      this.extent = new Extent(this.crs).setFromExtent(source.extent);
     } else {
       this.extent = source.extent;
     }

package/lib/Source/VectorTilesSource.js

@@ -1,5 +1,5 @@
 import { featureFilter } from '@maplibre/maplibre-gl-style-spec';
-import Style from "../Core/Style.js";
+import StyleOptions from "../Core/StyleOptions.js";
 import TMSSource from "./TMSSource.js";
 import URLBuilder from "../Provider/URLBuilder.js";
 import Fetcher from "../Provider/Fetcher.js";
@@ -112,7 +112,7 @@ class VectorTilesSource extends TMSSource {
           if (layer['source-layer'] === undefined) {
             getPropertiesFromRefLayer(mvtStyle.layers, layer);
           }
-          const style = Style.setFromVectorTileLayer(layer, this.sprites, this.symbolToCircle);
+          const style = StyleOptions.setFromVectorTileLayer(layer, this.sprites, this.symbolToCircle);
           this.styles[layer.id] = style;
           if (!this.layers[layer['source-layer']]) {
             this.layers[layer['source-layer']] = [];

package/lib/Source/WFSSource.js

@@ -1,7 +1,7 @@
 import Source from "./Source.js";
 import URLBuilder from "../Provider/URLBuilder.js";
 import Extent from "../Core/Geographic/Extent.js";
-const _extent = new Extent('EPSG:4326', [0, 0, 0, 0]);
+const _extent = new Extent('EPSG:4326');
 
 /**
  * An object defining the source of resources to get from a

package/lib/Source/WMSSource.js

@@ -2,7 +2,7 @@ import Source from "./Source.js";
 import URLBuilder from "../Provider/URLBuilder.js";
 import Extent from "../Core/Geographic/Extent.js";
 import * as CRS from "../Core/Geographic/Crs.js";
-const _extent = new Extent('EPSG:4326', [0, 0, 0, 0]);
+const _extent = new Extent('EPSG:4326');
 
 /**
  * Proj provides an optional param to define axis order and orientation for a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.44.3-next.33",
+  "version": "2.44.3-next.35",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",