From 91a566ca61d5e2b0bb35af33360ad824b40eb5d9 Mon Sep 17 00:00:00 2001
From: euzuro <euzuro@metacarta.com>
Date: Tue, 20 Jun 2006 23:23:31 +0000
Subject: [PATCH] the last of the screen -> viewPort changes

git-svn-id: http://svn.openlayers.org/trunk/openlayers@634 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 lib/OpenLayers/Map.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index 2a8a9081fb..355d62c715 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -319,7 +319,7 @@ OpenLayers.Map.prototype = {
      * @returns px translated into view port pixel coordinates
      * @type OpenLayers.Pixel
      */
-    getViewPortPxFromLayerPxPx:function(layerPx) {
+    getViewPortPxFromLayerPx:function(layerPx) {
         var viewPortPx = layerPx.copyOf();
 
         viewPortPx.x += parseInt(this.layerContainerDiv.style.left);
@@ -329,13 +329,13 @@ OpenLayers.Map.prototype = {
     },
     
     /**
-     * @param {OpenLayers.Pixel} screenPx
+     * @param {OpenLayers.Pixel} viewPortPx
      * 
-     * @returns px translated into screen pixel coordinates
+     * @returns px translated into view port pixel coordinates
      * @type OpenLayers.Pixel
      */
-    getLayerPxFromScreenPx:function(screenPx) {
-        var layerPx = screenPx.copyOf();
+    getLayerPxFromViewPortPx:function(viewPortPx) {
+        var layerPx = viewPortPx.copyOf();
 
         layerPx.x -= parseInt(this.layerContainerDiv.style.left);
         layerPx.y -= parseInt(this.layerContainerDiv.style.top);
@@ -351,25 +351,25 @@ OpenLayers.Map.prototype = {
     */
     getLonLatFromLayerPx: function (px) {
        //adjust for displacement of layerContainerDiv
-       px = thigetViewPortPxFromLayerPxPx(px);
+       px = this.getViewPortPxFromLayerPx(px);
        return this.getLonLatFromViewPortPx(px);         
     },
     
     /**
-    * @param {OpenLayers.Pixel} screenPx
+    * @param {OpenLayers.Pixel} viewPortPx
     *
     * @returns An OpenLayers.LonLat which is the passed-in view port
     *          OpenLayers.Pixel, translated into lon/lat given the 
     *          current extent and resolution
     * @type OpenLayers.LonLat
     */
-    getLonLatFromViewPortPx: function (screenPx) {
+    getLonLatFromViewPortPx: function (viewPortPx) {
         var center = this.getCenter();        //map center lon/lat
         var res  = this.getResolution();
         var size = this.getSize();
     
-        var delta_x = screenPx.x - (size.w / 2);
-        var delta_y = screenPx.y - (size.h / 2);
+        var delta_x = viewPortPx.x - (size.w / 2);
+        var delta_y = viewPortPx.y - (size.h / 2);
         
         return new OpenLayers.LonLat(center.lon + delta_x * res ,
                                      center.lat - delta_y * res); 
@@ -386,7 +386,7 @@ OpenLayers.Map.prototype = {
     getLayerPxFromLonLat: function (lonlat) {
        //adjust for displacement of layerContainerDiv
        var px = this.getViewPortPxFromLonLat(lonlat);
-       return this.getLayerPxFromScreenPx(px);         
+       return this.getLayerPxFromViewPortPx(px);         
     },
 
     /**