From 1df5cfa1583fa28bfcd9dfb95a590dc3c25be562 Mon Sep 17 00:00:00 2001
From: fredj <frederic.junod@camptocamp.com>
Date: Fri, 9 Dec 2011 10:13:11 +0100
Subject: [PATCH] replace LonLat argument with simple object
 (Map.getLayerPxFromLonLat)

---
 lib/OpenLayers/Layer/Boxes.js | 13 ++++++++-----
 lib/OpenLayers/Layer/Grid.js  |  6 ++++--
 lib/OpenLayers/Layer/Image.js |  6 ++++--
 tests/Layer/Grid.html         |  2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/lib/OpenLayers/Layer/Boxes.js b/lib/OpenLayers/Layer/Boxes.js
index f6febd9516..a3e2f99c73 100644
--- a/lib/OpenLayers/Layer/Boxes.js
+++ b/lib/OpenLayers/Layer/Boxes.js
@@ -38,11 +38,14 @@ OpenLayers.Layer.Boxes = OpenLayers.Class(OpenLayers.Layer.Markers, {
      * marker - {<OpenLayers.Marker.Box>} 
      */
     drawMarker: function(marker) {
-        var bounds   = marker.bounds;
-        var topleft  = this.map.getLayerPxFromLonLat(
-                            new OpenLayers.LonLat(bounds.left,  bounds.top));
-        var botright = this.map.getLayerPxFromLonLat(
-                             new OpenLayers.LonLat(bounds.right, bounds.bottom));
+        var topleft = this.map.getLayerPxFromLonLat({
+            lon: marker.bounds.left,
+            lat: marker.bounds.top
+        });
+        var botright = this.map.getLayerPxFromLonLat({
+            lon: marker.bounds.right,
+            lat: marker.bounds.bottom
+        });
         if (botright == null || topleft == null) {
             marker.display(false);
         } else {
diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js
index fca45f3eba..42b850bc63 100644
--- a/lib/OpenLayers/Layer/Grid.js
+++ b/lib/OpenLayers/Layer/Grid.js
@@ -627,8 +627,10 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
                                   center.lon + (tileWidth/2),
                                   center.lat + (tileHeight/2));
   
-        var ul = new OpenLayers.LonLat(tileBounds.left, tileBounds.top);
-        var px = this.map.getLayerPxFromLonLat(ul);
+        var px = this.map.getLayerPxFromLonLat({
+            lon: tileBounds.left,
+            lat: tileBounds.top
+        });
 
         if (!this.grid.length) {
             this.grid[0] = [];
diff --git a/lib/OpenLayers/Layer/Image.js b/lib/OpenLayers/Layer/Image.js
index 23d4e1c7c1..698b223a97 100644
--- a/lib/OpenLayers/Layer/Image.js
+++ b/lib/OpenLayers/Layer/Image.js
@@ -164,8 +164,10 @@ OpenLayers.Layer.Image = OpenLayers.Class(OpenLayers.Layer, {
             this.setTileSize();
 
             //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(ul);
+            var ulPx = this.map.getLayerPxFromLonLat({
+                lon: this.extent.left,
+                lat: this.extent.top
+            });
 
             if(firstRendering) {
                 //create the new tile
diff --git a/tests/Layer/Grid.html b/tests/Layer/Grid.html
index 85724378c3..254b52e63b 100644
--- a/tests/Layer/Grid.html
+++ b/tests/Layer/Grid.html
@@ -417,7 +417,7 @@
         translatedPX = {};
         layer.map = {
             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;        
             },
             getResolution: function() {