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

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";
@@ -53,7 +53,7 @@ export { default as PointCloudLayer } from "./Layer/PointCloudLayer.js";
 export { default as PotreeLayer } from "./Layer/PotreeLayer.js";
 export { default as Potree2Layer } from "./Layer/Potree2Layer.js";
 export { default as C3DTilesLayer, C3DTILES_LAYER_EVENTS } from "./Layer/C3DTilesLayer.js";
-export { default as OGC3DTilesLayer, OGC3DTILES_LAYER_EVENTS, enableDracoLoader, enableKtx2Loader } from "./Layer/OGC3DTilesLayer.js";
+export { default as OGC3DTilesLayer, OGC3DTILES_LAYER_EVENTS, enableDracoLoader, enableKtx2Loader, enableMeshoptDecoder } from "./Layer/OGC3DTilesLayer.js";
 export { default as TiledGeometryLayer } from "./Layer/TiledGeometryLayer.js";
 export { default as OrientedImageLayer } from "./Layer/OrientedImageLayer.js";
 export { STRATEGY_MIN_NETWORK_TRAFFIC, STRATEGY_GROUP, STRATEGY_PROGRESSIVE, STRATEGY_DICHOTOMY } from "./Layer/LayerUpdateStrategy.js";

package/lib/Parser/GeoJsonParser.js

@@ -195,7 +195,7 @@ export default {
     _in.crs = _in.crs || readCRS(json);
     if (out.filteringExtent) {
       if (typeof out.filteringExtent == 'boolean') {
-        out.filterExtent = options.extent.as(_in.crs);
+        out.filterExtent = options.extent.isExtent ? options.extent.as(_in.crs) : options.extent.toExtent(_in.crs);
       } else if (out.filteringExtent.isExtent) {
         out.filterExtent = out.filteringExtent;
       }

package/lib/Parser/VectorTileParser.js

@@ -1,7 +1,7 @@
 import { Vector2, Vector3 } from 'three';
 import Protobuf from 'pbf';
 import { VectorTile } from '@mapbox/vector-tile';
-import { globalExtentTMS } from "../Core/Geographic/Extent.js";
+import { globalExtentTMS } from "../Core/Tile/TileGrid.js";
 import { FeatureCollection, FEATURE_TYPES } from "../Core/Feature.js";
 import { deprecatedParsingOptionsToNewOne } from "../Core/Deprecated/Undeprecator.js";
 import Coordinates from "../Core/Geographic/Coordinates.js";

package/lib/Parser/XbilParser.js

@@ -67,10 +67,22 @@ export function computeMinMaxElevation(texture, pitch, options) {
         }
       }
     }
-    if (options.zmin > min) {
+  }
+
+  // Clamp values to zmin and zmax values configured in ElevationLayer
+  if (options.zmin != null) {
+    if (min < options.zmin) {
       min = options.zmin;
     }
-    if (options.zmax < max) {
+    if (max < options.zmin) {
+      max = options.zmin;
+    }
+  }
+  if (options.zmax != null) {
+    if (min > options.zmax) {
+      min = options.zmax;
+    }
+    if (max > options.zmax) {
       max = options.zmax;
     }
   }

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/Provider/URLBuilder.js

@@ -1,6 +1,9 @@
-import Extent from "../Core/Geographic/Extent.js";
-const extent = new Extent('EPSG:4326', [0, 0, 0, 0]);
 let subDomainsCount = 0;
+
+/**
+ * @param {string} url
+ * @returns {string}
+ */
 function subDomains(url) {
   const subDomainsPtrn = /\$\{u:([\w-_.|]+)\}/.exec(url);
   if (!subDomainsPtrn) {
@@ -51,8 +54,13 @@ export default {
    * // The resulting url is:
    * // http://server.geo/tms/15/2142/3412.jpg;
    *
-   * @param {Extent} coords - the coordinates
-   * @param {Source} source
+   * @param {Object} coords - tile coordinates
+   * @param {number} coords.row - tile row
+   * @param {number} coords.col - tile column
+   * @param {number} coords.zoom - tile zoom
+   * @param {Object} source
+   * @param {string} source.url
+   * @param {Function} source.tileMatrixCallback
    *
    * @return {string} the formed url
    */
@@ -79,8 +87,12 @@ export default {
    * // The resulting url is:
    * // http://server.geo/wms/BBOX=12,35,14,46&FORMAT=jpg&SERVICE=WMS
    *
-   * @param {Extent} bbox - the bounding box
-   * @param {Object} source
+   * @param {Object} bbox - the bounding box
+   * @param {number} bbox.west
+   * @param {number} bbox.south
+   * @param {number} bbox.east
+   * @param {number} bbox.north
+   * @param {Object} source - the source of data
    * @param {string} source.crs
    * @param {number} source.bboxDigits
    * @param {string} source.url
@@ -93,11 +105,10 @@ export default {
     if (source.bboxDigits !== undefined) {
       precision = source.bboxDigits;
     }
-    bbox.as(source.crs, extent);
-    const w = extent.west.toFixed(precision);
-    const s = extent.south.toFixed(precision);
-    const e = extent.east.toFixed(precision);
-    const n = extent.north.toFixed(precision);
+    const w = bbox.west.toFixed(precision);
+    const s = bbox.south.toFixed(precision);
+    const e = bbox.east.toFixed(precision);
+    const n = bbox.north.toFixed(precision);
     let bboxInUnit = source.axisOrder || 'wsen';
     bboxInUnit = bboxInUnit.replace('w', `${w},`).replace('s', `${s},`).replace('e', `${e},`).replace('n', `${n},`).slice(0, -1);
     return subDomains(source.url.replace('%bbox', bboxInUnit));

package/lib/Renderer/Camera.js

@@ -173,7 +173,7 @@ class Camera {
    * @return  {Coordinates}   Coordinates object holding camera's position.
    */
   position(crs) {
-    return new Coordinates(this.crs, this.camera3D.position).as(crs || this.crs);
+    return new Coordinates(this.crs).setFromVector3(this.camera3D.position).as(crs || this.crs);
   }
 
   /**

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

@@ -258,7 +258,7 @@ class PointsMaterial extends THREE.ShaderMaterial {
   /**
    * @class      PointsMaterial
    * @param      {object}  [options={}]  The options
-   * @param      {number}  [options.size=0]  size point
+   * @param      {number}  [options.size=1] point size
    * @param      {number}  [options.mode=PNTS_MODE.COLOR]  display mode.
    * @param      {number}  [options.shape=PNTS_SHAPE.CIRCLE]  rendered points shape.
    * @param      {THREE.Vector4}  [options.overlayColor=new THREE.Vector4(0, 0, 0, 0)]  overlay color.

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

@@ -1,9 +1,3 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 import * as THREE from 'three';
 function SphereHelper(radius) {
   THREE.Mesh.call(this);

package/lib/Source/CopcSource.js

@@ -1,3 +1,4 @@
+import proj4 from 'proj4';
 import { Binary, Info, Las } from 'copc';
 import Extent from "../Core/Geographic/Extent.js";
 import Fetcher from "../Provider/Fetcher.js";
@@ -102,8 +103,18 @@ class CopcSource extends Source {
       this.header = metadata.header;
       this.info = metadata.info;
       this.eb = metadata.eb;
-      // TODO: use wkt definition in `metadata.wkt` to infer/define crs
-      this.crs = config.crs || 'EPSG:4326';
+      proj4.defs('unknown', metadata.wkt);
+      let projCS;
+      if (proj4.defs('unknown').type === 'COMPD_CS') {
+        console.warn('CopcSource: compound coordinate system is not yet supported.');
+        projCS = proj4.defs('unknown').PROJCS;
+      } else {
+        projCS = proj4.defs('unknown');
+      }
+      this.crs = projCS.title || projCS.name || 'EPSG:4326';
+      if (!(this.crs in proj4.defs)) {
+        proj4.defs(this.crs, projCS);
+      }
       const bbox = new THREE.Box3();
       bbox.min.fromArray(this.info.cube, 0);
       bbox.max.fromArray(this.info.cube, 3);

package/lib/Source/EntwinePointTileSource.js

@@ -38,10 +38,19 @@ class EntwinePointTileSource extends Source {
       // Set parser and its configuration from schema
       this.parse = metadata.dataType === 'laszip' ? LASParser.parse : PotreeBinParser.parse;
       this.extension = metadata.dataType === 'laszip' ? 'laz' : 'bin';
-      if (metadata.srs && metadata.srs.authority && metadata.srs.horizontal) {
-        this.crs = `${metadata.srs.authority}:${metadata.srs.horizontal}`;
-        if (!proj4.defs(this.crs)) {
-          proj4.defs(this.crs, metadata.srs.wkt);
+      if (metadata.srs) {
+        if (metadata.srs.authority && metadata.srs.horizontal) {
+          this.crs = `${metadata.srs.authority}:${metadata.srs.horizontal}`;
+          if (!proj4.defs(this.crs)) {
+            proj4.defs(this.crs, metadata.srs.wkt);
+          }
+        } else if (metadata.srs.wkt) {
+          proj4.defs('unknown', metadata.srs.wkt);
+          const projCS = proj4.defs('unknown');
+          this.crs = projCS.title || projCS.name;
+          if (!(this.crs in proj4.defs)) {
+            proj4.defs(this.crs, projCS);
+          }
         }
         if (metadata.srs.vertical && metadata.srs.vertical !== metadata.srs.horizontal) {
           console.warn('EntwinePointTileSource: Vertical coordinates system code is not yet supported.');
@@ -53,6 +62,7 @@ class EntwinePointTileSource extends Source {
       // span in ept.json. This needs improvements.
       this.spacing = (Math.abs(metadata.boundsConforming[3] - metadata.boundsConforming[0]) + Math.abs(metadata.boundsConforming[4] - metadata.boundsConforming[1])) / (2 * metadata.span);
       this.boundsConforming = metadata.boundsConforming;
+      this.bounds = metadata.bounds;
       this.span = metadata.span;
       return this;
     });

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
@@ -104,12 +103,10 @@ class FileSource extends Source {
    * presents in `features` under the property `crs`, it is fine.
    */
   constructor(source) {
-    /* istanbul ignore next */
     if (source.parsedData) {
       console.warn('FileSource parsedData parameter is deprecated, use features instead of.');
       source.features = source.features || source.parsedData;
     }
-    /* istanbul ignore next */
     if (source.projection) {
       console.warn('FileSource projection parameter is deprecated, use crs instead.');
       source.crs = source.crs || source.projection;
@@ -155,7 +152,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]]);
@@ -30,7 +30,6 @@ const noCache = {
  */
 class InformationsData {
   constructor(options) {
-    /* istanbul ignore next */
     if (options.projection) {
       console.warn('Source projection parameter is deprecated, use crs instead.');
       options.crs = options.crs || options.projection;
@@ -166,8 +165,6 @@ class Source extends InformationsData {
         in: this,
         extent
       })).catch(err => this.handlingError(err)), key);
-
-      /* istanbul ignore next */
       if (this.onParsedFile) {
         features.then(feat => {
           this.onParsedFile(feat);

package/lib/Source/TMSSource.js

@@ -1,8 +1,9 @@
 import Source from "./Source.js";
 import URLBuilder from "../Provider/URLBuilder.js";
-import Extent, { globalExtentTMS } from "../Core/Geographic/Extent.js";
-import CRS from "../Core/Geographic/Crs.js";
-const extent = new Extent(CRS.tms_4326, 0, 0, 0);
+import Extent from "../Core/Geographic/Extent.js";
+import Tile from "../Core/Tile/Tile.js";
+import { globalExtentTMS } from "../Core/Tile/TileGrid.js";
+const _tile = new Tile('EPSG:4326', 0, 0, 0);
 
 /**
  * An object defining the source of resources to get from a
@@ -86,7 +87,7 @@ class TMSSource extends Source {
     }
     this.zoom = source.zoom;
     this.isInverted = source.isInverted || false;
-    this.crs = CRS.formatToTms(source.crs);
+    this.crs = source.crs;
     this.tileMatrixSetLimits = source.tileMatrixSetLimits;
     this.extentSetlimits = {};
     this.tileMatrixCallback = source.tileMatrixCallback || (zoomLevel => zoomLevel);
@@ -107,8 +108,8 @@ class TMSSource extends Source {
       }
     }
   }
-  urlFromExtent(extent) {
-    return URLBuilder.xyz(extent, this);
+  urlFromExtent(tile) {
+    return URLBuilder.xyz(tile, this);
   }
   onLayerAdded(options) {
     super.onLayerAdded(options);
@@ -118,17 +119,17 @@ class TMSSource extends Source {
     const crs = parent ? parent.extent.crs : options.out.crs;
     if (this.tileMatrixSetLimits && !this.extentSetlimits[crs]) {
       this.extentSetlimits[crs] = {};
-      extent.crs = this.crs;
+      _tile.crs = this.crs;
       for (let i = this.zoom.max; i >= this.zoom.min; i--) {
         const tmsl = this.tileMatrixSetLimits[i];
         const {
           west,
           north
-        } = extent.set(i, tmsl.minTileRow, tmsl.minTileCol).as(crs);
+        } = _tile.set(i, tmsl.minTileRow, tmsl.minTileCol).toExtent(crs);
         const {
           east,
           south
-        } = extent.set(i, tmsl.maxTileRow, tmsl.maxTileCol).as(crs);
+        } = _tile.set(i, tmsl.maxTileRow, tmsl.maxTileCol).toExtent(crs);
         this.extentSetlimits[crs][i] = new Extent(crs, west, east, south, north);
       }
     }

package/lib/Source/VectorTilesSource.js

@@ -1,4 +1,4 @@
-import { featureFilter } from '@mapbox/mapbox-gl-style-spec';
+import { featureFilter } from '@maplibre/maplibre-gl-style-spec';
 import Style from "../Core/Style.js";
 import TMSSource from "./TMSSource.js";
 import URLBuilder from "../Provider/URLBuilder.js";
@@ -135,8 +135,8 @@ class VectorTilesSource extends TMSSource {
       this.urls = Array.from(new Set(TMSUrlList));
     });
   }
-  urlFromExtent(extent, url) {
-    return URLBuilder.xyz(extent, {
+  urlFromExtent(tile, url) {
+    return URLBuilder.xyz(tile, {
       tileMatrixCallback: this.tileMatrixCallback,
       url
     });
@@ -162,8 +162,6 @@ class VectorTilesSource extends TMSSource {
         in: this,
         extent
       })))).then(collections => mergeCollections(collections)).catch(err => this.handlingError(err)), key);
-
-      /* istanbul ignore next */
       if (this.onParsedFile) {
         features.then(feat => {
           this.onParsedFile(feat);

package/lib/Source/WFSSource.js

@@ -1,6 +1,7 @@
 import Source from "./Source.js";
 import URLBuilder from "../Provider/URLBuilder.js";
-import CRS from "../Core/Geographic/Crs.js";
+import Extent from "../Core/Geographic/Extent.js";
+const _extent = new Extent('EPSG:4326', [0, 0, 0, 0]);
 
 /**
  * An object defining the source of resources to get from a
@@ -118,22 +119,25 @@ class WFSSource extends Source {
     this.typeName = source.typeName;
     this.version = source.version || '2.0.2';
     this.bboxDigits = source.bboxDigits;
-
-    // Add ? at the end of the url if it is not already in the given URL
-    if (!this.url.endsWith('?')) {
-      this.url = `${this.url}?`;
-    }
-    this.url = `${source.url}SERVICE=WFS&REQUEST=GetFeature&typeName=${this.typeName}&VERSION=${this.version}&SRSNAME=${this.crs}&outputFormat=${this.format}&BBOX=%bbox,${this.crs}`;
     this.zoom = {
       min: 0,
       max: Infinity
     };
+    const urlObj = new URL(source.url);
+    urlObj.searchParams.set('SERVICE', 'WFS');
+    urlObj.searchParams.set('REQUEST', 'GetFeature');
+    urlObj.searchParams.set('typeName', this.typeName);
+    urlObj.searchParams.set('VERSION', this.version);
+    urlObj.searchParams.set('SRSNAME', this.crs);
+    urlObj.searchParams.set('outputFormat', this.format);
+    urlObj.searchParams.set('BBOX', `%bbox,${this.crs}`);
     this.vendorSpecific = source.vendorSpecific;
     for (const name in this.vendorSpecific) {
       if (Object.prototype.hasOwnProperty.call(this.vendorSpecific, name)) {
-        this.url = `${this.url}&${name}=${this.vendorSpecific[name]}`;
+        urlObj.searchParams.set(name, this.vendorSpecific[name]);
       }
     }
+    this.url = decodeURIComponent(urlObj.toString());
   }
   handlingError(err) {
     if (err.response && err.response.status == 400) {
@@ -149,13 +153,14 @@ class WFSSource extends Source {
     return super.handlingError(err);
   }
   requestToKey(extent) {
-    if (CRS.isTms(extent.crs)) {
+    if (extent.isTile) {
       return super.requestToKey(extent);
     } else {
       return [extent.zoom, extent.south, extent.west];
     }
   }
-  urlFromExtent(extent) {
+  urlFromExtent(extentOrTile) {
+    const extent = extentOrTile.isExtent ? extentOrTile.as(this.crs, _extent) : extentOrTile.toExtent(this.crs, _extent);
     return URLBuilder.bbox(extent, this);
   }
   extentInsideLimit(extent) {