incorrect argument type in calculateGridLayout, p=madair (closes #3160)
git-svn-id: http://svn.openlayers.org/trunk/openlayers@11681 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -102,14 +102,14 @@ OpenLayers.Layer.KaMap = OpenLayers.Class(OpenLayers.Layer.Grid, {
|
|||||||
*
|
*
|
||||||
* Parameters:
|
* Parameters:
|
||||||
* bounds - {<OpenLayers.Bound>}
|
* bounds - {<OpenLayers.Bound>}
|
||||||
* extent - {<OpenLayers.Bounds>}
|
* origin - {<OpenLayers.LonLat>}
|
||||||
* resolution - {Number}
|
* resolution - {Number}
|
||||||
*
|
*
|
||||||
* Returns:
|
* Returns:
|
||||||
* Object containing properties tilelon, tilelat, tileoffsetlat,
|
* Object containing properties tilelon, tilelat, tileoffsetlat,
|
||||||
* tileoffsetlat, tileoffsetx, tileoffsety
|
* tileoffsetlat, tileoffsetx, tileoffsety
|
||||||
*/
|
*/
|
||||||
calculateGridLayout: function(bounds, extent, resolution) {
|
calculateGridLayout: function(bounds, origin, resolution) {
|
||||||
var tilelon = resolution*this.tileSize.w;
|
var tilelon = resolution*this.tileSize.w;
|
||||||
var tilelat = resolution*this.tileSize.h;
|
var tilelat = resolution*this.tileSize.h;
|
||||||
|
|
||||||
|
|||||||
@@ -439,28 +439,28 @@ OpenLayers.Layer.MapGuide = OpenLayers.Class(OpenLayers.Layer.Grid, {
|
|||||||
*
|
*
|
||||||
* Parameters:
|
* Parameters:
|
||||||
* bounds - {<OpenLayers.Bound>}
|
* bounds - {<OpenLayers.Bound>}
|
||||||
* extent - {<OpenLayers.Bounds>}
|
* origin - {<OpenLayers.LonLat>}
|
||||||
* resolution - {Number}
|
* resolution - {Number}
|
||||||
*
|
*
|
||||||
* Returns:
|
* Returns:
|
||||||
* Object containing properties tilelon, tilelat, tileoffsetlat,
|
* Object containing properties tilelon, tilelat, tileoffsetlat,
|
||||||
* tileoffsetlat, tileoffsetx, tileoffsety
|
* tileoffsetlat, tileoffsetx, tileoffsety
|
||||||
*/
|
*/
|
||||||
calculateGridLayout: function(bounds, extent, resolution) {
|
calculateGridLayout: function(bounds, origin, resolution) {
|
||||||
var tilelon = resolution * this.tileSize.w;
|
var tilelon = resolution * this.tileSize.w;
|
||||||
var tilelat = resolution * this.tileSize.h;
|
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 tilecol = Math.floor(offsetlon/tilelon) - this.buffer;
|
||||||
var tilecolremain = offsetlon/tilelon - tilecol;
|
var tilecolremain = offsetlon/tilelon - tilecol;
|
||||||
var tileoffsetx = -tilecolremain * this.tileSize.w;
|
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 tilerow = Math.floor(offsetlat/tilelat) - this.buffer;
|
||||||
var tilerowremain = tilerow - offsetlat/tilelat;
|
var tilerowremain = tilerow - offsetlat/tilelat;
|
||||||
var tileoffsety = tilerowremain * this.tileSize.h;
|
var tileoffsety = tilerowremain * this.tileSize.h;
|
||||||
var tileoffsetlat = extent.top - tilelat*tilerow;
|
var tileoffsetlat = origin.lat - tilelat*tilerow;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
tilelon: tilelon, tilelat: tilelat,
|
tilelon: tilelon, tilelat: tilelat,
|
||||||
|
|||||||
@@ -258,28 +258,28 @@ OpenLayers.Layer.Zoomify = OpenLayers.Class(OpenLayers.Layer.Grid, {
|
|||||||
*
|
*
|
||||||
* Parameters:
|
* Parameters:
|
||||||
* bounds - {<OpenLayers.Bound>}
|
* bounds - {<OpenLayers.Bound>}
|
||||||
* extent - {<OpenLayers.Bounds>}
|
* origin - {<OpenLayers.LonLat>}
|
||||||
* resolution - {Number}
|
* resolution - {Number}
|
||||||
*
|
*
|
||||||
* Returns:
|
* Returns:
|
||||||
* Object containing properties tilelon, tilelat, tileoffsetlat,
|
* Object containing properties tilelon, tilelat, tileoffsetlat,
|
||||||
* tileoffsetlat, tileoffsetx, tileoffsety
|
* tileoffsetlat, tileoffsetx, tileoffsety
|
||||||
*/
|
*/
|
||||||
calculateGridLayout: function(bounds, extent, resolution) {
|
calculateGridLayout: function(bounds, origin, resolution) {
|
||||||
var tilelon = resolution * this.tileSize.w;
|
var tilelon = resolution * this.tileSize.w;
|
||||||
var tilelat = resolution * this.tileSize.h;
|
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 tilecol = Math.floor(offsetlon/tilelon) - this.buffer;
|
||||||
var tilecolremain = offsetlon/tilelon - tilecol;
|
var tilecolremain = offsetlon/tilelon - tilecol;
|
||||||
var tileoffsetx = -tilecolremain * this.tileSize.w;
|
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 tilerow = Math.floor(offsetlat/tilelat) - this.buffer;
|
||||||
var tilerowremain = tilerow - offsetlat/tilelat;
|
var tilerowremain = tilerow - offsetlat/tilelat;
|
||||||
var tileoffsety = tilerowremain * this.tileSize.h;
|
var tileoffsety = tilerowremain * this.tileSize.h;
|
||||||
var tileoffsetlat = extent.top - tilelat*tilerow;
|
var tileoffsetlat = origin.lat - tilelat*tilerow;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
tilelon: tilelon, tilelat: tilelat,
|
tilelon: tilelon, tilelat: tilelat,
|
||||||
|
|||||||
Reference in New Issue
Block a user