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
src/all.js
+2 -1
View File
@@ -11,5 +11,6 @@ goog.require('ol.Projection');
goog.require('ol.TileBounds'); goog.require('ol.TileBounds');
goog.require('ol.TileCoord'); goog.require('ol.TileCoord');
goog.require('ol.TileGrid'); goog.require('ol.TileGrid');
goog.require('ol.TileUrl'); goog.require('ol.TileUrlFunction');
goog.require('ol.TileUrlFunctionType');
goog.require('ol.TransformFunction'); goog.require('ol.TransformFunction');
src/ol/tileurl.js → src/ol/tileurlfunction.js
+8 -7
View File
@@ -1,4 +1,5 @@
goog.provide('ol.TileUrl'); goog.provide('ol.TileUrlFunction');
goog.provide('ol.TileUrlFunctionType');
goog.require('goog.math'); goog.require('goog.math');
goog.require('ol.TileCoord'); goog.require('ol.TileCoord');
@@ -7,14 +8,14 @@ goog.require('ol.TileCoord');
/** /**
* @typedef {function(ol.TileCoord): string} * @typedef {function(ol.TileCoord): string}
*/ */
ol.TileUrlFunction; ol.TileUrlFunctionType;
/** /**
* @param {string} template Template. * @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 function(tileCoord) {
return template.replace(/\{z\}/, tileCoord.z) return template.replace(/\{z\}/, tileCoord.z)
.replace(/\{x\}/, tileCoord.x) .replace(/\{x\}/, tileCoord.x)
@@ -24,10 +25,10 @@ ol.TileUrl.createFromTemplate = function(template) {
/** /**
* @param {Array.<ol.TileUrlFunction>} tileUrlFunctions Tile URL Functions. * @param {Array.<ol.TileUrlFunctionType>} tileUrlFunctions Tile URL Functions.
* @return {ol.TileUrlFunction} Tile URL function. * @return {ol.TileUrlFunctionType} Tile URL function.
*/ */
ol.TileUrl.createFromTileUrlFunctions = function(tileUrlFunctions) { ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
return function(tileCoord) { return function(tileCoord) {
var index = goog.math.modulo(tileCoord.hash(), tileUrlFunctions.length); var index = goog.math.modulo(tileCoord.hash(), tileUrlFunctions.length);
return tileUrlFunctions[index](tileCoord); return tileUrlFunctions[index](tileCoord);
src/ol/tileurl_test.js → src/ol/tileurlfunction_test.js
+5 -5
View File
@@ -1,18 +1,18 @@
goog.require('goog.testing.jsunit'); goog.require('goog.testing.jsunit');
goog.require('ol.TileCoord'); goog.require('ol.TileCoord');
goog.require('ol.TileUrl'); goog.require('ol.TileUrlFunction');
function testCreateFromTemplate() { 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))); assertEquals('3/2/1', tileUrl(new ol.TileCoord(3, 2, 1)));
} }
function testCreateFromTileUrlFunctions() { function testCreateFromTileUrlFunctions() {
var tileUrl = ol.TileUrl.createFromTileUrlFunctions([ var tileUrl = ol.TileUrlFunction.createFromTileUrlFunctions([
ol.TileUrl.createFromTemplate('a'), ol.TileUrlFunction.createFromTemplate('a'),
ol.TileUrl.createFromTemplate('b') ol.TileUrlFunction.createFromTemplate('b')
]); ]);
var tileUrl1 = tileUrl(new ol.TileCoord(1, 0, 0)); var tileUrl1 = tileUrl(new ol.TileCoord(1, 0, 0));
var tileUrl2 = tileUrl(new ol.TileCoord(1, 0, 1)); var tileUrl2 = tileUrl(new ol.TileCoord(1, 0, 1));