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

Cope with axis orientation for tiled WMS sources

Browse Source
This commit is contained in:
Tom Payne
2013-02-21 20:22:28 +01:00
parent 6b26cbfb38
commit 66e5b1d736
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/source/tiledwmssource.js
+5 -2
View File
@@ -52,19 +52,22 @@ ol.source.TiledWMS = function(tiledWMSOptions) {
baseParams[version >= '1.3' ? 'CRS' : 'SRS'] = projection.getCode(); baseParams[version >= '1.3' ? 'CRS' : 'SRS'] = projection.getCode();
goog.object.extend(baseParams, tiledWMSOptions.params); goog.object.extend(baseParams, tiledWMSOptions.params);
var axisOrientation = projection.getAxisOrientation();
var tileUrlFunction; var tileUrlFunction;
if (tiledWMSOptions.urls) { if (tiledWMSOptions.urls) {
var tileUrlFunctions = goog.array.map( var tileUrlFunctions = goog.array.map(
tiledWMSOptions.urls, function(url) { tiledWMSOptions.urls, function(url) {
url = goog.uri.utils.appendParamsFromMap(url, baseParams); url = goog.uri.utils.appendParamsFromMap(url, baseParams);
return ol.TileUrlFunction.createBboxParam(url, tileGrid); return ol.TileUrlFunction.createBboxParam(
url, tileGrid, axisOrientation);
}); });
tileUrlFunction = ol.TileUrlFunction.createFromTileUrlFunctions( tileUrlFunction = ol.TileUrlFunction.createFromTileUrlFunctions(
tileUrlFunctions); tileUrlFunctions);
} else if (tiledWMSOptions.url) { } else if (tiledWMSOptions.url) {
var url = goog.uri.utils.appendParamsFromMap( var url = goog.uri.utils.appendParamsFromMap(
tiledWMSOptions.url, baseParams); tiledWMSOptions.url, baseParams);
tileUrlFunction = ol.TileUrlFunction.createBboxParam(url, tileGrid); tileUrlFunction =
ol.TileUrlFunction.createBboxParam(url, tileGrid, axisOrientation);
} else { } else {
tileUrlFunction = ol.TileUrlFunction.nullTileUrlFunction; tileUrlFunction = ol.TileUrlFunction.nullTileUrlFunction;
} }
src/ol/tileurlfunction.js
+7 -6
View File
@@ -73,19 +73,20 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
/** /**
* @param {string} baseUrl Base URL (may have query data). * @param {string} baseUrl Base URL (may have query data).
* @param {ol.tilegrid.TileGrid} tileGrid Tile grid. * @param {ol.tilegrid.TileGrid} tileGrid Tile grid.
* @param {string} axisOrientation Axis orientation.
* @return {ol.TileUrlFunctionType} Tile URL function. * @return {ol.TileUrlFunctionType} Tile URL function.
*/ */
ol.TileUrlFunction.createBboxParam = function(baseUrl, tileGrid) { ol.TileUrlFunction.createBboxParam =
function(baseUrl, tileGrid, axisOrientation) {
return function(tileCoord) { return function(tileCoord) {
if (goog.isNull(tileCoord)) { if (goog.isNull(tileCoord)) {
return undefined; return undefined;
} else { } else {
var tileExtent = tileGrid.getTileCoordExtent(tileCoord); var tileExtent = tileGrid.getTileCoordExtent(tileCoord);
// FIXME Projection dependant axis order. var bboxValues = axisOrientation.substr(0, 2) == 'ne' ?
var bboxValue = [ [tileExtent.minY, tileExtent.minX, tileExtent.maxY, tileExtent.maxX] :
tileExtent.minX, tileExtent.minY, tileExtent.maxX, tileExtent.maxY [tileExtent.minX, tileExtent.minY, tileExtent.maxX, tileExtent.maxY];
].join(','); return goog.uri.utils.appendParam(baseUrl, 'BBOX', bboxValues.join(','));
return goog.uri.utils.appendParam(baseUrl, 'BBOX', bboxValue);
} }
}; };
}; };
test/spec/ol/tileurlfunction.test.js
+12 -1
View File
@@ -69,14 +69,25 @@ describe('ol.TileUrlFunction', function() {
}); });
}); });
it('creates expected URL', function() { it('creates expected URL', function() {
var epsg3857 = ol.Projection.getFromCode('EPSG:3857');
var tileUrlFunction = ol.TileUrlFunction.createBboxParam( var tileUrlFunction = ol.TileUrlFunction.createBboxParam(
'http://wms?foo=bar', tileGrid); 'http://wms?foo=bar', tileGrid, epsg3857.getAxisOrientation());
var tileCoord = new ol.TileCoord(1, 0, 0); var tileCoord = new ol.TileCoord(1, 0, 0);
var tileUrl = tileUrlFunction(tileCoord); var tileUrl = tileUrlFunction(tileCoord);
var expected = 'http://wms?foo=bar&BBOX=-20037508.342789244' + var expected = 'http://wms?foo=bar&BBOX=-20037508.342789244' +
'%2C20037508.342789244%2C0%2C40075016.68557849'; '%2C20037508.342789244%2C0%2C40075016.68557849';
expect(tileUrl).toEqual(expected); expect(tileUrl).toEqual(expected);
}); });
it('creates expected URL respecting axis orientation', function() {
var epsg4326 = ol.Projection.getFromCode('EPSG:4326');
var tileUrlFunction = ol.TileUrlFunction.createBboxParam(
'http://wms?foo=bar', tileGrid, epsg4326.getAxisOrientation());
var tileCoord = new ol.TileCoord(1, 0, 0);
var tileUrl = tileUrlFunction(tileCoord);
var expected = 'http://wms?foo=bar&BBOX=20037508.342789244' +
'%2C-20037508.342789244%2C40075016.68557849%2C0';
expect(tileUrl).toEqual(expected);
});
}); });
}); });