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

Allow out-of-range signalling with undefined

Browse Source
This commit is contained in:
Tom Payne
2012-07-15 22:21:25 +02:00
parent e23e19c074
commit bf31b614e8
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ol/tileurlfunction.js
View File

@@ -6,7 +6,7 @@ goog.require('ol.TileCoord');
/**
* @typedef {function(ol.TileCoord): string}
* @typedef {function(ol.TileCoord): string|undefined}
*/
ol.TileUrlFunctionType;
@@ -17,9 +17,13 @@ ol.TileUrlFunctionType;
*/
ol.TileUrlFunction.createFromTemplate = function(template) {
return function(tileCoord) {
return template.replace(/\{z\}/, tileCoord.z)
.replace(/\{x\}/, tileCoord.x)
.replace(/\{y\}/, tileCoord.y);
if (goog.isNull(tileCoord)) {
return undefined;
} else {
return template.replace(/\{z\}/, tileCoord.z)
.replace(/\{x\}/, tileCoord.x)
.replace(/\{y\}/, tileCoord.y);
}
};
};
@@ -30,8 +34,12 @@ ol.TileUrlFunction.createFromTemplate = function(template) {
*/
ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
return function(tileCoord) {
var index = goog.math.modulo(tileCoord.hash(), tileUrlFunctions.length);
return tileUrlFunctions[index](tileCoord);
if (goog.isNull(tileCoord)) {
return undefined;
} else {
var index = goog.math.modulo(tileCoord.hash(), tileUrlFunctions.length);
return tileUrlFunctions[index](tileCoord);
}
};
};
@@ -54,6 +62,10 @@ ol.TileUrlFunction.createFromTemplates = function(templates) {
ol.TileUrlFunction.withTileCoordTransform =
function(transform, tileUrlFunction) {
return function(tileCoord) {
return tileUrlFunction(transform(tileCoord));
if (goog.isNull(tileCoord)) {
return undefined;
} else {
return tileUrlFunction(transform(tileCoord));
}
};
};