replace LonLat argument with simple object (Map.getLayerPxFromLonLat)
This commit is contained in:
@@ -38,11 +38,14 @@ OpenLayers.Layer.Boxes = OpenLayers.Class(OpenLayers.Layer.Markers, {
|
|||||||
* marker - {<OpenLayers.Marker.Box>}
|
* marker - {<OpenLayers.Marker.Box>}
|
||||||
*/
|
*/
|
||||||
drawMarker: function(marker) {
|
drawMarker: function(marker) {
|
||||||
var bounds = marker.bounds;
|
var topleft = this.map.getLayerPxFromLonLat({
|
||||||
var topleft = this.map.getLayerPxFromLonLat(
|
lon: marker.bounds.left,
|
||||||
new OpenLayers.LonLat(bounds.left, bounds.top));
|
lat: marker.bounds.top
|
||||||
var botright = this.map.getLayerPxFromLonLat(
|
});
|
||||||
new OpenLayers.LonLat(bounds.right, bounds.bottom));
|
var botright = this.map.getLayerPxFromLonLat({
|
||||||
|
lon: marker.bounds.right,
|
||||||
|
lat: marker.bounds.bottom
|
||||||
|
});
|
||||||
if (botright == null || topleft == null) {
|
if (botright == null || topleft == null) {
|
||||||
marker.display(false);
|
marker.display(false);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -627,8 +627,10 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
|
|||||||
center.lon + (tileWidth/2),
|
center.lon + (tileWidth/2),
|
||||||
center.lat + (tileHeight/2));
|
center.lat + (tileHeight/2));
|
||||||
|
|
||||||
var ul = new OpenLayers.LonLat(tileBounds.left, tileBounds.top);
|
var px = this.map.getLayerPxFromLonLat({
|
||||||
var px = this.map.getLayerPxFromLonLat(ul);
|
lon: tileBounds.left,
|
||||||
|
lat: tileBounds.top
|
||||||
|
});
|
||||||
|
|
||||||
if (!this.grid.length) {
|
if (!this.grid.length) {
|
||||||
this.grid[0] = [];
|
this.grid[0] = [];
|
||||||
|
|||||||
@@ -164,8 +164,10 @@ OpenLayers.Layer.Image = OpenLayers.Class(OpenLayers.Layer, {
|
|||||||
this.setTileSize();
|
this.setTileSize();
|
||||||
|
|
||||||
//determine new position (upper left corner of new bounds)
|
//determine new position (upper left corner of new bounds)
|
||||||
var ul = new OpenLayers.LonLat(this.extent.left, this.extent.top);
|
var ulPx = this.map.getLayerPxFromLonLat({
|
||||||
var ulPx = this.map.getLayerPxFromLonLat(ul);
|
lon: this.extent.left,
|
||||||
|
lat: this.extent.top
|
||||||
|
});
|
||||||
|
|
||||||
if(firstRendering) {
|
if(firstRendering) {
|
||||||
//create the new tile
|
//create the new tile
|
||||||
|
|||||||
@@ -417,7 +417,7 @@
|
|||||||
translatedPX = {};
|
translatedPX = {};
|
||||||
layer.map = {
|
layer.map = {
|
||||||
getLayerPxFromLonLat: function(ul) {
|
getLayerPxFromLonLat: function(ul) {
|
||||||
t.ok(ul.equals(desiredUL), "correct ul passed to translation");
|
t.ok(ul.lon === desiredUL.lon && ul.lat === desiredUL.lat, "correct ul passed to translation");
|
||||||
return translatedPX;
|
return translatedPX;
|
||||||
},
|
},
|
||||||
getResolution: function() {
|
getResolution: function() {
|
||||||
|
|||||||
Reference in New Issue
Block a user