Skip to content

Commit

Permalink
fix(source): support urls already containing query parameters for wms…
Browse files Browse the repository at this point in the history 
…, wmts, and wfs
  • Loading branch information
@tebben @jailln
tebben authored and jailln committed Oct 15, 2024
1 parent b65d8ae commit 4f53025
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 49 deletions.
25 changes: 12 additions & 13 deletions src/Source/WFSSource.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,26 +125,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) {
Expand Down
29 changes: 15 additions & 14 deletions src/Source/WMSSource.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,26 +116,27 @@ 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) {
Expand Down
28 changes: 14 additions & 14 deletions src/Source/WMTSSource.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,26 +72,26 @@ class WMTSSource extends TMSSource {

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());
}
}

Expand Down
10 changes: 5 additions & 5 deletions test/unit/dataSourceProvider.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ describe('Provide in Sources', function () {
});

featureLayer.source = new WFSSource({
url: 'http://',
url: 'http://domain.com',
typeName: 'name',
format: 'application/json',
extent: globalExtent,
Expand Down Expand Up @@ -128,7 +128,7 @@ describe('Provide in Sources', function () {

it('should get wmts texture with DataSourceProvider', (done) => {
colorlayer.source = new WMTSSource({
url: 'http://',
url: 'http://domain.com',
name: 'name',
format: 'image/png',
tileMatrixSet: 'PM',
Expand Down Expand Up @@ -159,7 +159,7 @@ describe('Provide in Sources', function () {

it('should get wmts texture elevation with DataSourceProvider', (done) => {
elevationlayer.source = new WMTSSource({
url: 'http://',
url: 'http://domain.com',
name: 'name',
format: 'image/png',
tileMatrixSet: 'PM',
Expand Down Expand Up @@ -188,7 +188,7 @@ describe('Provide in Sources', function () {

it('should get wms texture with DataSourceProvider', (done) => {
colorlayer.source = new WMSSource({
url: 'http://',
url: 'http://domain.com',
name: 'name',
format: 'image/png',
extent: globalExtent,
Expand Down Expand Up @@ -320,7 +320,7 @@ describe('Provide in Sources', function () {

it('should get updated RasterLayer', (done) => {
colorlayer.source = new WMTSSource({
url: 'http://',
url: 'http://domain.com',
name: 'name',
format: 'image/png',
tileMatrixSet: 'PM',
Expand Down
6 changes: 3 additions & 3 deletions test/unit/source.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ describe('Sources', function () {

describe('WFSSource', function () {
const paramsWFS = {
url: 'http://',
url: 'http://domain.com',
typeName: 'test',
crs: 'EPSG:4326',
};
Expand Down Expand Up @@ -93,7 +93,7 @@ describe('Sources', function () {

describe('WMTSSource', function () {
const paramsWMTS = {
url: 'http://',
url: 'http://domain.com',
name: 'name',
crs: 'EPSG:4326',
tileMatrixSet: 'PM',
Expand Down Expand Up @@ -141,7 +141,7 @@ describe('Sources', function () {

describe('WMSSource', function () {
const paramsWMS = {
url: 'http://',
url: 'http://domain.com',
name: 'name',
extent: [-90, 90, -45, 45],
crs: 'EPSG:4326',
Expand Down

0 comments on commit 4f53025

Please sign in to comment.