itowns 2.44.3-next.11 → 2.44.3-next.13

package/lib/Controls/StateControl.js

@@ -257,7 +257,7 @@ class StateControl extends THREE.EventDispatcher {
   touchToState(finger) {
     for (const key of Object.keys(DEFAULT_STATES)) {
       const state = this[key];
-      if (state.enable && finger == state.finger) {
+      if (state.enable && finger === state.finger) {
         return state;
       }
     }
@@ -377,7 +377,7 @@ class StateControl extends THREE.EventDispatcher {
     event.preventDefault();
     if (this.enabled && this.ZOOM.enable) {
       viewCoords.copy(this._view.eventToViewCoords(event));
-      this.currentState = this.NONE;
+      this.currentState = this.ZOOM;
       this.dispatchEvent({
         type: this.ZOOM._event,
         delta: event.deltaY,

package/lib/Source/WFSSource.js

@@ -120,22 +120,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) {

package/lib/Source/WMSSource.js

@@ -109,18 +109,25 @@ class WMSSource extends Source {
       }
     }
     const crsPropName = this.version === '1.3.0' ? 'CRS' : 'SRS';
-
-    // 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 = `${this.url}SERVICE=WMS&REQUEST=GetMap&LAYERS=${this.name}&VERSION=${this.version}&STYLES=${this.style}&FORMAT=${this.format}&TRANSPARENT=${this.transparent}&BBOX=%bbox&${crsPropName}=${this.crs}&WIDTH=${this.width}&HEIGHT=${this.height}`;
+    const urlObj = new URL(this.url);
+    urlObj.searchParams.set('SERVICE', 'WMS');
+    urlObj.searchParams.set('REQUEST', 'GetMap');
+    urlObj.searchParams.set('LAYERS', this.name);
+    urlObj.searchParams.set('VERSION', this.version);
+    urlObj.searchParams.set('STYLES', this.style);
+    urlObj.searchParams.set('FORMAT', this.format);
+    urlObj.searchParams.set('TRANSPARENT', this.transparent);
+    urlObj.searchParams.set('BBOX', '%bbox');
+    urlObj.searchParams.set(crsPropName, this.crs);
+    urlObj.searchParams.set('WIDTH', this.width);
+    urlObj.searchParams.set('HEIGHT', this.height);
     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());
   }
   urlFromExtent(extentOrTile) {
     const extent = extentOrTile.isExtent ? extentOrTile.as(this.crs, _extent) : extentOrTile.toExtent(this.crs, _extent);

package/lib/Source/WMTSSource.js

@@ -69,18 +69,24 @@ class WMTSSource extends TMSSource {
     }
     super(source);
     this.isWMTSSource = true;
-
-    // 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 = `${this.url}` + `LAYER=${source.name}` + `&FORMAT=${this.format}` + '&SERVICE=WMTS' + `&VERSION=${source.version || '1.0.0'}` + '&REQUEST=GetTile' + `&STYLE=${source.style || 'normal'}` + `&TILEMATRIXSET=${source.tileMatrixSet}` + '&TILEMATRIX=%TILEMATRIX&TILEROW=%ROW&TILECOL=%COL';
+    const urlObj = new URL(this.url);
+    urlObj.searchParams.set('LAYER', source.name);
+    urlObj.searchParams.set('FORMAT', this.format);
+    urlObj.searchParams.set('SERVICE', 'WMTS');
+    urlObj.searchParams.set('VERSION', source.version || '1.0.0');
+    urlObj.searchParams.set('REQUEST', 'GetTile');
+    urlObj.searchParams.set('STYLE', source.style || 'normal');
+    urlObj.searchParams.set('TILEMATRIXSET', source.tileMatrixSet);
+    urlObj.searchParams.set('TILEMATRIX', '%TILEMATRIX');
+    urlObj.searchParams.set('TILEROW', '%ROW');
+    urlObj.searchParams.set('TILECOL', '%COL');
     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());
   }
 }
 export default WMTSSource;

package/package.json

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