ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

the last of the screen -> viewPort changes

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@634 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2006-06-20 23:23:31 +00:00
parent 9a74fc1f7e
commit 91a566ca61
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/OpenLayers/Map.js
View File

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