Merge pull request #239 from ahocevar/3625
Removing imageOffset and using getImageSize. r=@elemoine
This commit is contained in:
@@ -159,13 +159,6 @@ OpenLayers.Layer = OpenLayers.Class({
|
||||
*/
|
||||
imageSize: null,
|
||||
|
||||
/**
|
||||
* Property: imageOffset
|
||||
* {<OpenLayers.Pixel>} For layers with a gutter, the image offset
|
||||
* represents displacement due to the gutter.
|
||||
*/
|
||||
imageOffset: null,
|
||||
|
||||
// OPTIONS
|
||||
|
||||
/**
|
||||
@@ -693,7 +686,7 @@ OpenLayers.Layer = OpenLayers.Class({
|
||||
/**
|
||||
* APIMethod: setTileSize
|
||||
* Set the tile size based on the map size. This also sets layer.imageSize
|
||||
* and layer.imageOffset for use by Tile.Image.
|
||||
* or use by Tile.Image.
|
||||
*
|
||||
* Parameters:
|
||||
* size - {<OpenLayers.Size>}
|
||||
@@ -710,8 +703,6 @@ OpenLayers.Layer = OpenLayers.Class({
|
||||
// this.name + ": layers with " +
|
||||
// "gutters need non-null tile sizes");
|
||||
//}
|
||||
this.imageOffset = new OpenLayers.Pixel(-this.gutter,
|
||||
-this.gutter);
|
||||
this.imageSize = new OpenLayers.Size(tileSize.w + (2*this.gutter),
|
||||
tileSize.h + (2*this.gutter));
|
||||
}
|
||||
|
||||
@@ -208,11 +208,12 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, {
|
||||
* code.
|
||||
*/
|
||||
positionTile: function() {
|
||||
var style = this.getTile().style;
|
||||
var style = this.getTile().style,
|
||||
size = this.layer.getImageSize(this.bounds);
|
||||
style.left = this.position.x + "%";
|
||||
style.top = this.position.y + "%";
|
||||
style.width = this.size.w + "%";
|
||||
style.height = this.size.h + "%";
|
||||
style.width = size.w + "%";
|
||||
style.height = size.h + "%";
|
||||
},
|
||||
|
||||
/**
|
||||
@@ -256,11 +257,6 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, {
|
||||
var top = this.layer.gutter / this.layer.tileSize.h * 100;
|
||||
style.left = -left + "%";
|
||||
style.top = -top + "%";
|
||||
style.width = (2 * left + 100) + "%";
|
||||
style.height = (2 * top + 100) + "%";
|
||||
} else {
|
||||
style.width = "100%";
|
||||
style.height = "100%";
|
||||
}
|
||||
style.visibility = "hidden";
|
||||
style.opacity = 0;
|
||||
|
||||
Reference in New Issue
Block a user