Check ol.source.UrlTile#urls property for null value

Fixes #4446
This commit is contained in:
Frederic Junod
2015-11-18 11:30:10 +01:00
parent 77ca38aa10
commit aef097e348
3 changed files with 17 additions and 5 deletions

View File

@@ -91,7 +91,7 @@ ol.source.TileArcGISRest.prototype.getRequestUrl_ =
pixelRatio, projection, params) { pixelRatio, projection, params) {
var urls = this.urls; var urls = this.urls;
if (urls.length === 0) { if (!urls) {
return undefined; return undefined;
} }

View File

@@ -212,7 +212,7 @@ ol.source.TileWMS.prototype.getRequestUrl_ =
pixelRatio, projection, params) { pixelRatio, projection, params) {
var urls = this.urls; var urls = this.urls;
if (urls.length === 0) { if (!urls) {
return undefined; return undefined;
} }
@@ -298,9 +298,11 @@ ol.source.TileWMS.prototype.resetCoordKeyPrefix_ = function() {
var i = 0; var i = 0;
var res = []; var res = [];
var j, jj; if (this.urls) {
for (j = 0, jj = this.urls.length; j < jj; ++j) { var j, jj;
res[i++] = this.urls[j]; for (j = 0, jj = this.urls.length; j < jj; ++j) {
res[i++] = this.urls[j];
}
} }
var key; var key;

View File

@@ -13,6 +13,16 @@ describe('ol.source.TileWMS', function() {
}; };
}); });
describe('constructor', function() {
it('can be constructed without url or urls params', function() {
var source = new ol.source.TileWMS({
projection: 'EPSG:3857',
tileGrid: ol.tilegrid.createXYZ({maxZoom: 6})
});
expect(source).to.be.an(ol.source.TileWMS);
});
});
describe('#getTile', function() { describe('#getTile', function() {
it('returns a tile with the expected URL', function() { it('returns a tile with the expected URL', function() {