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

Merge pull request #269 from ahocevar/wms-extent

Browse Source 
Fixing extent check for undefined extents. r=@elemoine
This commit is contained in:
ahocevar
2013-03-05 00:54:12 -08:00
parent 3526244e0c 19aeb04141
commit 3803275a1e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/epsg-4326.js
View File

@@ -27,6 +27,7 @@ var layers = new ol.Collection([
source: new ol.source.TiledWMS({ source: new ol.source.TiledWMS({
url: 'http://vmap0.tiles.osgeo.org/wms/vmap0', url: 'http://vmap0.tiles.osgeo.org/wms/vmap0',
crossOrigin: null, crossOrigin: null,
version: '1.1.1',
params: { params: {
'LAYERS': 'basic', 'LAYERS': 'basic',
'FORMAT': 'image/jpeg' 'FORMAT': 'image/jpeg'

4
src/ol/source/tiledwmssource.js
View File

@@ -49,9 +49,11 @@ ol.source.TiledWMS = function(tiledWMSOptions) {
var x = tileCoord.x; var x = tileCoord.x;
var tileExtent = tileGrid.getTileCoordExtent(tileCoord); var tileExtent = tileGrid.getTileCoordExtent(tileCoord);
var projectionExtent = projection.getExtent(); var projectionExtent = projection.getExtent();
var extent = goog.isDef(tiledWMSOptions.extent) ?
tiledWMSOptions.extent : projectionExtent;
// FIXME do we want a wrapDateLine param? The code below will break maps // FIXME do we want a wrapDateLine param? The code below will break maps
// with projections that do not span the whole world width. // with projections that do not span the whole world width.
if (extent && extent.minX === projectionExtent.minX && if (extent.minX === projectionExtent.minX &&
extent.maxX === projectionExtent.maxX) { extent.maxX === projectionExtent.maxX) {
var numCols = Math.ceil( var numCols = Math.ceil(
(extent.maxX - extent.minX) / (tileExtent.maxX - tileExtent.minX)); (extent.maxX - extent.minX) / (tileExtent.maxX - tileExtent.minX));