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

Using util method for array indexOf in TMS layer. r=crschmidt (pullup #2100)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@9403 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Tim Schaub
2009-05-21 14:52:38 +00:00
parent 16715f41f6
commit d178a7675b
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Layer/TMS.js
+3 -1
View File
@@ -105,7 +105,9 @@ OpenLayers.Layer.TMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
var res = this.map.getResolution(); var res = this.map.getResolution();
var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w)); var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w));
var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h)); var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
var z = this.serverResolutions != null ? this.serverResolutions.indexOf(res) : this.map.getZoom(); var z = this.serverResolutions != null ?
OpenLayers.Util.indexOf(this.serverResolutions, res) :
this.map.getZoom();
var path = this.serviceVersion + "/" + this.layername + "/" + z + "/" + x + "/" + y + "." + this.type; var path = this.serviceVersion + "/" + this.layername + "/" + z + "/" + x + "/" + y + "." + this.type;
var url = this.url; var url = this.url;
if (url instanceof Array) { if (url instanceof Array) {
tests/Layer/TMS.html
+6 -4
View File
@@ -51,7 +51,7 @@
var testBounds = new OpenLayers.Bounds(1,2,3,4); var testBounds = new OpenLayers.Bounds(1,2,3,4);
t.ok( bounds.equals(testBounds), "getTMSBounds() returns correct bounds") t.ok( bounds.equals(testBounds), "getTMSBounds() returns correct bounds");
layer.grid = null; layer.grid = null;
} }
@@ -136,7 +136,7 @@
layer = new OpenLayers.Layer.TMS( "TMS", layer = new OpenLayers.Layer.TMS( "TMS",
"http://labs.metacarta.com/wms-c/Basic.py/", {layername: 'basic', type:'png', resolutions:[0.000634956337608418]} ); "http://labs.metacarta.com/wms-c/Basic.py/", {layername: 'basic', type:'png', resolutions:[0.000634956337608418]} );
m.addLayer(layer); m.addLayer(layer);
m.zoomToMaxExtent() m.zoomToMaxExtent();
t.eq(layer.getURL(layer.grid[3][3].bounds), "http://labs.metacarta.com/wms-c/Basic.py/1.0.0/basic/0/1/1.png", "TMS tiles around rounded properly."); t.eq(layer.getURL(layer.grid[3][3].bounds), "http://labs.metacarta.com/wms-c/Basic.py/1.0.0/basic/0/1/1.png", "TMS tiles around rounded properly.");
m.destroy(); m.destroy();
} }
@@ -159,7 +159,9 @@
layer.serverResolutions = [14,13,12,11,10]; layer.serverResolutions = [14,13,12,11,10];
tileurl = layer.getURL(new OpenLayers.Bounds(0,0,0,0)); tileurl = layer.getURL(new OpenLayers.Bounds(0,0,0,0));
level = parseInt(tileurl.split('/')[2]); level = parseInt(tileurl.split('/')[2]);
t.eq(layer.serverResolutions.indexOf(map.getResolution()), level, "Tile zoom level is correct with serverResolutions"); var res = map.getResolution();
var gotLevel = OpenLayers.Util.indexOf(layer.serverResolutions, res);
t.eq(gotLevel, level, "Tile zoom level is correct with serverResolutions");
map.destroy(); map.destroy();
} }
@@ -208,6 +210,6 @@
</script> </script>
</head> </head>
<body> <body>
<div id="map" style="width:500px;height:550px"></div> <div id="map" style="width:500px;height:550px;"></div>
</body> </body>
</html> </html>