[OpenLayers-Commits] r11681 - trunk/openlayers/lib/OpenLayers/Layer

[commits-20090109 at openlayers.org]

Author: bartvde
Date: 2011-03-08 14:28:13 -0800 (Tue, 08 Mar 2011)
New Revision: 11681

Modified:
   trunk/openlayers/lib/OpenLayers/Layer/KaMap.js
   trunk/openlayers/lib/OpenLayers/Layer/MapGuide.js
   trunk/openlayers/lib/OpenLayers/Layer/Zoomify.js
Log:
incorrect argument type in calculateGridLayout, p=madair (closes #3160)

Modified: trunk/openlayers/lib/OpenLayers/Layer/KaMap.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Layer/KaMap.js	2011-03-08 21:39:23 UTC (rev 11680)
+++ trunk/openlayers/lib/OpenLayers/Layer/KaMap.js	2011-03-08 22:28:13 UTC (rev 11681)
@@ -102,14 +102,14 @@
      *
      * Parameters:
      * bounds - {<OpenLayers.Bound>}
-     * extent - {<OpenLayers.Bounds>}
+     * origin - {<OpenLayers.LonLat>}
      * resolution - {Number}
      *
      * Returns:
      * Object containing properties tilelon, tilelat, tileoffsetlat,
      * tileoffsetlat, tileoffsetx, tileoffsety
      */
-    calculateGridLayout: function(bounds, extent, resolution) {
+    calculateGridLayout: function(bounds, origin, resolution) {
         var tilelon = resolution*this.tileSize.w;
         var tilelat = resolution*this.tileSize.h;
         

Modified: trunk/openlayers/lib/OpenLayers/Layer/MapGuide.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Layer/MapGuide.js	2011-03-08 21:39:23 UTC (rev 11680)
+++ trunk/openlayers/lib/OpenLayers/Layer/MapGuide.js	2011-03-08 22:28:13 UTC (rev 11681)
@@ -439,28 +439,28 @@
      *
      * Parameters:
      * bounds - {<OpenLayers.Bound>}
-     * extent - {<OpenLayers.Bounds>}
+     * origin - {<OpenLayers.LonLat>}
      * resolution - {Number}
      *
      * Returns:
      * Object containing properties tilelon, tilelat, tileoffsetlat,
      * tileoffsetlat, tileoffsetx, tileoffsety
      */
-    calculateGridLayout: function(bounds, extent, resolution) {
+    calculateGridLayout: function(bounds, origin, resolution) {
         var tilelon = resolution * this.tileSize.w;
         var tilelat = resolution * this.tileSize.h;
         
-        var offsetlon = bounds.left - extent.left;
+        var offsetlon = bounds.left - origin.lon;
         var tilecol = Math.floor(offsetlon/tilelon) - this.buffer;
         var tilecolremain = offsetlon/tilelon - tilecol;
         var tileoffsetx = -tilecolremain * this.tileSize.w;
-        var tileoffsetlon = extent.left + tilecol * tilelon;
+        var tileoffsetlon = origin.lon + tilecol * tilelon;
         
-        var offsetlat = extent.top - bounds.top + tilelat; 
+        var offsetlat = origin.lat - bounds.top + tilelat; 
         var tilerow = Math.floor(offsetlat/tilelat) - this.buffer;
         var tilerowremain = tilerow - offsetlat/tilelat;
         var tileoffsety = tilerowremain * this.tileSize.h;
-        var tileoffsetlat = extent.top - tilelat*tilerow;
+        var tileoffsetlat = origin.lat - tilelat*tilerow;
         
         return { 
           tilelon: tilelon, tilelat: tilelat,

Modified: trunk/openlayers/lib/OpenLayers/Layer/Zoomify.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Layer/Zoomify.js	2011-03-08 21:39:23 UTC (rev 11680)
+++ trunk/openlayers/lib/OpenLayers/Layer/Zoomify.js	2011-03-08 22:28:13 UTC (rev 11681)
@@ -258,28 +258,28 @@
      *
      * Parameters:
      * bounds - {<OpenLayers.Bound>}
-     * extent - {<OpenLayers.Bounds>}
+     * origin - {<OpenLayers.LonLat>}
      * resolution - {Number}
      *
      * Returns:
      * Object containing properties tilelon, tilelat, tileoffsetlat,
      * tileoffsetlat, tileoffsetx, tileoffsety
      */
-    calculateGridLayout: function(bounds, extent, resolution) {
+    calculateGridLayout: function(bounds, origin, resolution) {
         var tilelon = resolution * this.tileSize.w;
         var tilelat = resolution * this.tileSize.h;
 
-        var offsetlon = bounds.left - extent.left;
+        var offsetlon = bounds.left - origin.lon;
         var tilecol = Math.floor(offsetlon/tilelon) - this.buffer;
         var tilecolremain = offsetlon/tilelon - tilecol;
         var tileoffsetx = -tilecolremain * this.tileSize.w;
-        var tileoffsetlon = extent.left + tilecol * tilelon;
+        var tileoffsetlon = origin.lon + tilecol * tilelon;
 
-        var offsetlat = extent.top - bounds.top + tilelat;
+        var offsetlat = origin.lat - bounds.top + tilelat;
         var tilerow = Math.floor(offsetlat/tilelat) - this.buffer;
         var tilerowremain = tilerow - offsetlat/tilelat;
         var tileoffsety = tilerowremain * this.tileSize.h;
-        var tileoffsetlat = extent.top - tilelat*tilerow;
+        var tileoffsetlat = origin.lat - tilelat*tilerow;
 
         return {
           tilelon: tilelon, tilelat: tilelat,