Remove unused ol.source.wms.getUrl function
This commit is contained in:
@@ -1,10 +1,6 @@
|
|||||||
goog.provide('ol.source.wms');
|
goog.provide('ol.source.wms');
|
||||||
goog.provide('ol.source.wms.ServerType');
|
goog.provide('ol.source.wms.ServerType');
|
||||||
|
|
||||||
goog.require('goog.asserts');
|
|
||||||
goog.require('goog.object');
|
|
||||||
goog.require('goog.uri.utils');
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @define {string} WMS default version.
|
* @define {string} WMS default version.
|
||||||
@@ -20,40 +16,3 @@ ol.source.wms.ServerType = {
|
|||||||
MAPSERVER: 'mapserver',
|
MAPSERVER: 'mapserver',
|
||||||
QGIS: 'qgis'
|
QGIS: 'qgis'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {string} baseUrl WMS base URL.
|
|
||||||
* @param {Object.<string, string|number>} params Request parameters.
|
|
||||||
* @param {ol.Extent} extent Extent.
|
|
||||||
* @param {ol.Size} size Size.
|
|
||||||
* @param {ol.proj.Projection} projection Projection.
|
|
||||||
* @return {string} WMS GetMap request URL.
|
|
||||||
*/
|
|
||||||
ol.source.wms.getUrl = function(baseUrl, params, extent, size, projection) {
|
|
||||||
var baseParams = {
|
|
||||||
'SERVICE': 'WMS',
|
|
||||||
'VERSION': ol.source.wms.DEFAULT_VERSION,
|
|
||||||
'REQUEST': 'GetMap',
|
|
||||||
'FORMAT': 'image/png',
|
|
||||||
'TRANSPARENT': true,
|
|
||||||
'WIDTH': Math.round(size[0]),
|
|
||||||
'HEIGHT': Math.round(size[1])
|
|
||||||
};
|
|
||||||
goog.object.extend(baseParams, params);
|
|
||||||
|
|
||||||
//TODO: Provide our own appendParams function to avoid this empty string hack
|
|
||||||
var stylesParam = 'STYLES';
|
|
||||||
baseParams[stylesParam] = params[stylesParam] || new String('');
|
|
||||||
|
|
||||||
var wms13 = baseParams['VERSION'] > '1.3';
|
|
||||||
baseParams[wms13 ? 'CRS' : 'SRS'] = projection.getCode();
|
|
||||||
|
|
||||||
var axisOrientation = projection.getAxisOrientation();
|
|
||||||
var bboxValues = (wms13 && axisOrientation.substr(0, 2) == 'ne') ?
|
|
||||||
[extent[1], extent[0], extent[3], extent[2]] :
|
|
||||||
[extent[0], extent[1], extent[2], extent[3]];
|
|
||||||
baseParams['BBOX'] = bboxValues.join(',');
|
|
||||||
|
|
||||||
return goog.uri.utils.appendParamsFromMap(baseUrl, baseParams);
|
|
||||||
};
|
|
||||||
|
|||||||
@@ -1,33 +0,0 @@
|
|||||||
goog.provide('ol.test.source.wms');
|
|
||||||
|
|
||||||
describe('ol.source.wms', function() {
|
|
||||||
|
|
||||||
describe('ol.source.wms.getUrl', function() {
|
|
||||||
it('creates expected URL', function() {
|
|
||||||
var epsg3857 = ol.proj.get('EPSG:3857');
|
|
||||||
var extent = [-20037508.342789244, -20037508.342789244, 0, 0];
|
|
||||||
var expected = 'http://wms?SERVICE=WMS&VERSION=1.3.0&REQUEST=' +
|
|
||||||
'GetMap&FORMAT=image%2Fpng&TRANSPARENT=true&WIDTH=256&HEIGHT=256&' +
|
|
||||||
'foo=bar&STYLES=&CRS=EPSG%3A3857&BBOX=' +
|
|
||||||
'-20037508.342789244%2C-20037508.342789244%2C0%2C0';
|
|
||||||
var url = ol.source.wms.getUrl('http://wms', {'foo': 'bar'},
|
|
||||||
extent, [256, 256], epsg3857);
|
|
||||||
expect(url).to.eql(expected);
|
|
||||||
});
|
|
||||||
it('creates expected URL respecting axis orientation', function() {
|
|
||||||
var epsg4326 = ol.proj.get('EPSG:4326');
|
|
||||||
var extent = [-180, -90, 0, 90];
|
|
||||||
var expected = 'http://wms?SERVICE=WMS&VERSION=1.3.0&REQUEST=' +
|
|
||||||
'GetMap&FORMAT=image%2Fpng&TRANSPARENT=true&WIDTH=256&HEIGHT=256&' +
|
|
||||||
'foo=bar&STYLES=&CRS=EPSG%3A4326&BBOX=-90%2C-180%2C90%2C0';
|
|
||||||
var url = ol.source.wms.getUrl('http://wms', {'foo': 'bar'},
|
|
||||||
extent, [256, 256], epsg4326);
|
|
||||||
expect(url).to.eql(expected);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
goog.require('ol.proj');
|
|
||||||
goog.require('ol.source.wms');
|
|
||||||
Reference in New Issue
Block a user