fix (wfs, wms, wmts): support urls ending with or without ? character

iTowns · Nov 8, 2022 · f44dfb2 · f44dfb2
1 parent f3bd6c7
commit f44dfb2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/Source/WFSSource.js b/src/Source/WFSSource.js
@@ -124,6 +124,10 @@ class WFSSource extends Source {
         this.typeName = source.typeName;
         this.version = source.version || '2.0.2';
 
+        // 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

diff --git a/src/Source/WMSSource.js b/src/Source/WMSSource.js
@@ -114,7 +114,11 @@ class WMSSource extends Source {
 
         const crsPropName = (this.version === '1.3.0') ? 'CRS' : 'SRS';
 
-        this.url = `${source.url}?SERVICE=WMS&REQUEST=GetMap&LAYERS=${
+        // 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=${

diff --git a/src/Source/WMTSSource.js b/src/Source/WMTSSource.js
@@ -70,8 +70,13 @@ 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}` +
+            `LAYER=${source.name}` +
             `&FORMAT=${this.format}` +
             '&SERVICE=WMTS' +
             `&VERSION=${source.version || '1.0.0'}` +