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

s/TileUrl/TileUrlFunction/

Browse Source
This commit is contained in:
Tom Payne
2012-07-08 12:21:35 +02:00
committed by Tom Payne
parent 58e9ba322e
commit d30c30f01d
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ol/tileurl.js → src/ol/tileurlfunction.js
View File

@@ -1,4 +1,5 @@
goog.provide('ol.TileUrl');
goog.provide('ol.TileUrlFunction');
goog.provide('ol.TileUrlFunctionType');
goog.require('goog.math');
goog.require('ol.TileCoord');
@@ -7,14 +8,14 @@ goog.require('ol.TileCoord');
/**
* @typedef {function(ol.TileCoord): string}
*/
ol.TileUrlFunction;
ol.TileUrlFunctionType;
/**
* @param {string} template Template.
* @return {ol.TileUrlFunction} Tile URL function.
* @return {ol.TileUrlFunctionType} Tile URL function.
*/
ol.TileUrl.createFromTemplate = function(template) {
ol.TileUrlFunction.createFromTemplate = function(template) {
return function(tileCoord) {
return template.replace(/\{z\}/, tileCoord.z)
.replace(/\{x\}/, tileCoord.x)
@@ -24,10 +25,10 @@ ol.TileUrl.createFromTemplate = function(template) {
/**
* @param {Array.<ol.TileUrlFunction>} tileUrlFunctions Tile URL Functions.
* @return {ol.TileUrlFunction} Tile URL function.
* @param {Array.<ol.TileUrlFunctionType>} tileUrlFunctions Tile URL Functions.
* @return {ol.TileUrlFunctionType} Tile URL function.
*/
ol.TileUrl.createFromTileUrlFunctions = function(tileUrlFunctions) {
ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
return function(tileCoord) {
var index = goog.math.modulo(tileCoord.hash(), tileUrlFunctions.length);
return tileUrlFunctions[index](tileCoord);

10
src/ol/tileurl_test.js → src/ol/tileurlfunction_test.js
View File

@@ -1,18 +1,18 @@
goog.require('goog.testing.jsunit');
goog.require('ol.TileCoord');
goog.require('ol.TileUrl');
goog.require('ol.TileUrlFunction');
function testCreateFromTemplate() {
var tileUrl = ol.TileUrl.createFromTemplate('{z}/{x}/{y}');
var tileUrl = ol.TileUrlFunction.createFromTemplate('{z}/{x}/{y}');
assertEquals('3/2/1', tileUrl(new ol.TileCoord(3, 2, 1)));
}
function testCreateFromTileUrlFunctions() {
var tileUrl = ol.TileUrl.createFromTileUrlFunctions([
ol.TileUrl.createFromTemplate('a'),
ol.TileUrl.createFromTemplate('b')
var tileUrl = ol.TileUrlFunction.createFromTileUrlFunctions([
ol.TileUrlFunction.createFromTemplate('a'),
ol.TileUrlFunction.createFromTemplate('b')
]);
var tileUrl1 = tileUrl(new ol.TileCoord(1, 0, 0));
var tileUrl2 = tileUrl(new ol.TileCoord(1, 0, 1));