ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix WMTS layers URLs with dimensions

Browse Source
This commit is contained in:
Guillaume Beraudo
2018-08-13 15:02:52 +02:00
committed by Frederic Junod
parent a94dff2c06
commit 315cfa1033
2 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ol/source/WMTS.js
View File

@@ -493,6 +493,7 @@ function createFromWMTSTemplate(template) {
}); });
const tileGrid = this.tileGrid; const tileGrid = this.tileGrid;
const dimensions = this.dimensions_;
return ( return (
/** /**
@@ -510,7 +511,7 @@ function createFromWMTSTemplate(template) {
'TileCol': tileCoord[1], 'TileCol': tileCoord[1],
'TileRow': -tileCoord[2] - 1 'TileRow': -tileCoord[2] - 1
}; };
assign(localContext, this.dimensions_); assign(localContext, dimensions);
let url = template; let url = template;
if (requestEncoding == WMTSRequestEncoding.KVP) { if (requestEncoding == WMTSRequestEncoding.KVP) {
url = appendParams(url, localContext); url = appendParams(url, localContext);

53
test/spec/ol/source/wmts.test.js
View File

@@ -177,31 +177,29 @@ describe('ol.source.WMTS', function() {
}); });
describe('when creating tileUrlFunction', function() { describe('when creating tileUrlFunction', function() {
const defaultTileGrid = new WMTSTileGrid({
origin: [-20037508.342789244, 20037508.342789244],
resolutions: [559082264.029 * 0.28E-3,
279541132.015 * 0.28E-3,
139770566.007 * 0.28E-3],
matrixIds: [0, 1, 2]
});
it('can replace lowercase REST parameters', it('can replace lowercase REST parameters',
function() { function() {
const source = new WMTS({ const source = new WMTS({
layer: 'layer', layer: 'layer',
style: 'default', style: 'default',
urls: ['http://www.example.com/wmts/coastlines/{layer}/{style}/' + urls: ['http://host/{layer}/{style}/{tilematrixset}/{TileMatrix}/{TileCol}/{TileRow}.jpg'],
'{tilematrixset}/{TileMatrix}/{TileCol}/{TileRow}.jpg'],
matrixSet: 'EPSG:3857', matrixSet: 'EPSG:3857',
requestEncoding: 'REST', requestEncoding: 'REST',
tileGrid: new WMTSTileGrid({ tileGrid: defaultTileGrid
origin: [-20037508.342789244, 20037508.342789244],
resolutions: [559082264.029 * 0.28E-3,
279541132.015 * 0.28E-3,
139770566.007 * 0.28E-3],
matrixIds: [0, 1, 2]
})
}); });
const projection = getProjection('EPSG:3857'); const projection = getProjection('EPSG:3857');
const url = source.tileUrlFunction( const url = source.tileUrlFunction(
source.getTileCoordForTileUrlFunction([1, 1, -2]), 1, projection); source.getTileCoordForTileUrlFunction([1, 1, -2]), 1, projection);
expect(url).to.be.eql('http://www.example.com/wmts/coastlines/' + expect(url).to.be.eql('http://host/layer/default/EPSG:3857/1/1/1.jpg');
'layer/default/EPSG:3857/1/1/1.jpg');
}); });
it('can replace camelcase REST parameters', it('can replace camelcase REST parameters',
@@ -209,25 +207,34 @@ describe('ol.source.WMTS', function() {
const source = new WMTS({ const source = new WMTS({
layer: 'layer', layer: 'layer',
style: 'default', style: 'default',
urls: ['http://www.example.com/wmts/coastlines/{Layer}/{Style}/' + urls: ['http://host/{Layer}/{Style}/{tilematrixset}/{TileMatrix}/{TileCol}/{TileRow}.jpg'],
'{tilematrixset}/{TileMatrix}/{TileCol}/{TileRow}.jpg'],
matrixSet: 'EPSG:3857', matrixSet: 'EPSG:3857',
requestEncoding: 'REST', requestEncoding: 'REST',
tileGrid: new WMTSTileGrid({ tileGrid: defaultTileGrid
origin: [-20037508.342789244, 20037508.342789244],
resolutions: [559082264.029 * 0.28E-3,
279541132.015 * 0.28E-3,
139770566.007 * 0.28E-3],
matrixIds: [0, 1, 2]
})
}); });
const projection = getProjection('EPSG:3857'); const projection = getProjection('EPSG:3857');
const url = source.tileUrlFunction( const url = source.tileUrlFunction(
source.getTileCoordForTileUrlFunction([1, 1, -2]), 1, projection); source.getTileCoordForTileUrlFunction([1, 1, -2]), 1, projection);
expect(url).to.be.eql('http://www.example.com/wmts/coastlines/' + expect(url).to.be.eql('http://host/layer/default/EPSG:3857/1/1/1.jpg');
'layer/default/EPSG:3857/1/1/1.jpg'); });
it('can replace dimensions',
function() {
const source = new WMTS({
layer: 'layer',
style: 'default',
dimensions: {'Time': 42},
urls: ['http://host/{Layer}/{Style}/{Time}/{tilematrixset}/{TileMatrix}/{TileCol}/{TileRow}.jpg'],
matrixSet: 'EPSG:3857',
requestEncoding: 'REST',
tileGrid: defaultTileGrid
});
const projection = getProjection('EPSG:3857');
const url = source.tileUrlFunction(
source.getTileCoordForTileUrlFunction([1, 1, -2]), 1, projection);
expect(url).to.be.eql('http://host/layer/default/42/EPSG:3857/1/1/1.jpg');
}); });
}); });