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

fixes WMTS optionsFromCapabilities extent not considering the Wgs84BoundingBox

Browse Source
This commit is contained in:
amir-ba
2020-08-07 00:50:23 +02:00
parent 1a356332f3
commit 3de64763e7
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,9 +6,10 @@ import TileImage from './TileImage.js';
import WMTSRequestEncoding from './WMTSRequestEncoding.js'; import WMTSRequestEncoding from './WMTSRequestEncoding.js';
import {appendParams} from '../uri.js'; import {appendParams} from '../uri.js';
import {assign} from '../obj.js'; import {assign} from '../obj.js';
import {containsExtent} from '../extent.js';
import {createFromCapabilitiesMatrixSet} from '../tilegrid/WMTS.js'; import {createFromCapabilitiesMatrixSet} from '../tilegrid/WMTS.js';
import {createFromTileUrlFunctions, expandUrl} from '../tileurlfunction.js'; import {createFromTileUrlFunctions, expandUrl} from '../tileurlfunction.js';
import {equivalent, get as getProjection} from '../proj.js'; import {equivalent, get as getProjection, transformExtent} from '../proj.js';
import {find, findIndex, includes} from '../array.js'; import {find, findIndex, includes} from '../array.js';
/** /**
@@ -448,7 +449,7 @@ export function optionsFromCapabilities(wmtsCap, config) {
} }
} }
const wrapX = false; let wrapX = false;
const switchOriginXY = projection.getAxisOrientation().substr(0, 2) == 'ne'; const switchOriginXY = projection.getAxisOrientation().substr(0, 2) == 'ne';
let matrix = matrixSetObj.TileMatrix[0]; let matrix = matrixSetObj.TileMatrix[0];
@@ -478,14 +479,28 @@ export function optionsFromCapabilities(wmtsCap, config) {
: matrix.TopLeftCorner; : matrix.TopLeftCorner;
const tileSpanX = matrix.TileWidth * resolution; const tileSpanX = matrix.TileWidth * resolution;
const tileSpanY = matrix.TileHeight * resolution; const tileSpanY = matrix.TileHeight * resolution;
let extent;
const extent = [ const wgs84BoundingBox = l['WGS84BoundingBox'];
const tileMatrixExtend = [
origin[0] + tileSpanX * selectedMatrixLimit.MinTileCol, origin[0] + tileSpanX * selectedMatrixLimit.MinTileCol,
// add one to get proper bottom/right coordinate // add one to get proper bottom/right coordinate
origin[1] - tileSpanY * (1 + selectedMatrixLimit.MaxTileRow), origin[1] - tileSpanY * (1 + selectedMatrixLimit.MaxTileRow),
origin[0] + tileSpanX * (1 + selectedMatrixLimit.MaxTileCol), origin[0] + tileSpanX * (1 + selectedMatrixLimit.MaxTileCol),
origin[1] - tileSpanY * selectedMatrixLimit.MinTileRow, origin[1] - tileSpanY * selectedMatrixLimit.MinTileRow,
]; ];
if (wgs84BoundingBox !== undefined) {
const wgs84ProjectionExtent = getProjection('EPSG:4326').getExtent();
wrapX =
wgs84BoundingBox[0] === wgs84ProjectionExtent[0] &&
wgs84BoundingBox[2] === wgs84ProjectionExtent[2];
extent = transformExtent(wgs84BoundingBox, 'EPSG:4326', projection);
if (!containsExtent(tileMatrixExtend, extent)) {
extent = tileMatrixExtend;
}
} else {
extent = tileMatrixExtend;
}
if (projection.getExtent() === null) { if (projection.getExtent() === null) {
projection.setExtent(extent); projection.setExtent(extent);