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

ArcGISCache layer should not generate x and y values of less than 0, p=dmiddlecamp, r=me (closes #3169)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@11696 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
bartvde
2011-03-11 18:34:53 +00:00
parent 5b7d530461
commit 807000c4b7
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/OpenLayers/Layer/ArcGISCache.js
View File

@@ -214,8 +214,8 @@ OpenLayers.Layer.ArcGISCache = OpenLayers.Class(OpenLayers.Layer.XYZ, {
*/
getContainingTileCoords: function(point, res) {
return new OpenLayers.Pixel(
Math.floor((point.x - this.tileOrigin.lon) / (this.tileSize.w * res)),
Math.floor((this.tileOrigin.lat - point.y) / (this.tileSize.h * res))
Math.max(Math.floor((point.x - this.tileOrigin.lon) / (this.tileSize.w * res)),0),
Math.max(Math.floor((this.tileOrigin.lat - point.y) / (this.tileSize.h * res)),0)
);
},

19
tests/Layer/ArcGISCache.html
View File

@@ -199,6 +199,25 @@
t.ok('00000100' == layer.zeroPad(256, 8, 16), 'zeroPad should generate tile indexes properly ');
t.ok('00001000' == layer.zeroPad(4096, 8, 16), 'zeroPad should generate tile indexes properly ');
}
/**
* Check to ensure our LOD calculation will correctly avoid returning tile indexes less than zero
* (see http://trac.osgeo.org/openlayers/ticket/3169)
*/
function test_Layer_ARCGISCACHE_tileBounds(t) {
t.plan(1);
var layer = new OpenLayers.Layer.ArcGISCache('test', null, { });
var res = 264.583862501058;
layer.tileOrigin = new OpenLayers.LonLat(0.0, 650000.0);
layer.tileSize = new OpenLayers.Size(512, 512);
// pick a point off the left of our tile origin (would be a negative tile index)
var point = new OpenLayers.Geometry.Point(-123308.94829, 393128.85817);
var tile = layer.getContainingTileCoords(point, res);
t.ok((tile.x >= 0 && tile.y >= 0), 'layer should not generate negative tile ranges for level of detail');
}
</script>
</head>