Changeset 4088

Timestamp:

08/28/07 19:16:23 (11 months ago)

Author:

tschaub

Message:

Add a getTileBounds method to gridded layers. Thanks to crschmidt for the tests on this one. Committed with a few minor ndoc changes (closes 482).

Files:

• trunk/openlayers/lib/OpenLayers/Layer/Grid.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/KaMap.js (modified) (1 diff)
• trunk/openlayers/tests/Layer/test_Grid.html (modified) (2 diffs)
• trunk/openlayers/tests/Layer/test_KaMap.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Layer/Grid.js

@@ -230 +230 @@
-
-    /**
-
-
-
-
+
+
+
+
+
+
+
-     * {<OpenLayers.Bounds>} A Bounds object representing the bounds of all the
-
-onscreen)
+    
+    onscreen).
-     */
-    getTilesBounds: function() {    
@@ -674 +677 @@
-    },
-    
+    /**
+     * APIMethod: getTileBounds
+     * Returns The tile bounds for a layer given a pixel location
+     *
+     * Parameters: 
+     * viewPortPx - {OpenLayers.Pixel} The location in the viewport
+     */
+    getTileBounds: function(viewPortPx) {
+        var maxExtent = this.map.getMaxExtent();
+        var resolution = this.getResolution();
+        var tileMapWidth = resolution * this.tileSize.w;
+        var tileMapHeight = resolution * this.tileSize.h;
+        var mapPoint = this.getLonLatFromViewPortPx(viewPortPx);
+        var tileLeft = maxExtent.left + (tileMapWidth *
+                                         Math.floor((mapPoint.lon -
+                                                     maxExtent.left) /
+                                                    tileMapWidth));
+        var tileBottom = maxExtent.bottom + (tileMapHeight *
+                                             Math.floor((mapPoint.lat -
+                                                         maxExtent.bottom) /
+                                                        tileMapHeight));
+        return new OpenLayers.Bounds(tileLeft, tileBottom,
+                                     tileLeft + tileMapWidth,
+                                     tileBottom + tileMapHeight);
+    },
+    
-    CLASS_NAME: "OpenLayers.Layer.Grid"
-});

trunk/openlayers/lib/OpenLayers/Layer/KaMap.js

@@ -226 +226 @@
-        return obj;
-    },    
+    
+    /**
+     * APIMethod: getTileBounds
+     * Returns The tile bounds for a layer given a pixel location.
+     *
+     * Parameters:
+     * viewPortPx - {<OpenLayers.Pixel>} The location in the viewport.
+     *
+     * Returns:
+     * {<OpenLayers.Bounds>} Bounds of the tile at the given pixel location.
+     */
+    getTileBounds: function(viewPortPx) {
+        var resolution = this.getResolution();
+        var tileMapWidth = resolution * this.tileSize.w;
+        var tileMapHeight = resolution * this.tileSize.h;
+        var mapPoint = this.getLonLatFromViewPortPx(viewPortPx);
+        var tileLeft = tileMapWidth * Math.floor(mapPoint.lon / tileMapWidth);
+        var tileBottom = tileMapHeight * Math.floor(mapPoint.lat / tileMapHeight);
+        return new OpenLayers.Bounds(tileLeft, tileBottom,
+                                     tileLeft + tileMapWidth,
+                                     tileBottom + tileMapHeight);
+    },
-
-    CLASS_NAME: "OpenLayers.Layer.KaMap"

trunk/openlayers/tests/Layer/test_Grid.html

@@ -529 +529 @@
-        t.ok(width == parseInt(width) && height == parseInt(height), "calculated tileSize width/height are integer values");
-    }
+    function test_12_Layer_Grid_getTileBounds(t) {
+        t.plan(2);
+        var map = new OpenLayers.Map("map2");
+        var url = "http://octo.metacarta.com/cgi-bin/mapserv";
+        layer = new OpenLayers.Layer.WMS(name, url, params);
+        
+        var newParams = { layers: 'sooper', 
+                          chickpeas: 'image/png'};
+
+        map.addLayer(layer);
+        map.zoomToMaxExtent();
+        map.zoomIn();
+        var bounds = layer.getTileBounds(new OpenLayers.Pixel(200,200));
+        t.eq(bounds.toBBOX(), "-180,-90,0,90", "get tile bounds returns correct bounds"); 
+        map.pan(200,0);
+        var bounds = layer.getTileBounds(new OpenLayers.Pixel(200,200));
+        t.eq(bounds.toBBOX(), "0,-90,180,90", "get tile bounds returns correct bounds after pan"); 
+    }
-
-    function test_99_Layer_Grid_destroy (t) {
@@ -564 +582 @@
-<body>
-<div id="map" style="width:499px;height:549px;display:none"></div>
+<div id="map2" style="width:500px;height:550px;display:none"></div>
-</body>
-</html>

trunk/openlayers/tests/Layer/test_KaMap.html

@@ -190 +190 @@
-        t.ok( (layer.tileSize.h == 50) && (layer.tileSize.w == 500), "tileSize has been set correctly");
-    }
+    function test_12_Layer_KaMap_getTileBounds(t) {
+        t.plan(2);
+        var map = new OpenLayers.Map("map");
+        var url = "http://octo.metacarta.com/cgi-bin/mapserv";
+        layer = new OpenLayers.Layer.KaMap(name, url, params);
+        
+        var newParams = { layers: 'sooper', 
+                          chickpeas: 'image/png'};
+
+        map.addLayer(layer);
+        map.zoomToMaxExtent();
+        map.zoomIn();
+        var bounds = layer.getTileBounds(new OpenLayers.Pixel(200,200));
+        t.eq(bounds.toBBOX(), "-180,0,0,180", "get tile bounds returns correct bounds"); 
+        map.pan(200,0);
+        var bounds = layer.getTileBounds(new OpenLayers.Pixel(200,200));
+        t.eq(bounds.toBBOX(), "0,0,180,180", "get tile bounds returns correct bounds after pan"); 
+    }
-
-    function test_99_Layer_KaMap_destroy (t) {