Changeset 329

Timestamp:

05/24/06 14:45:50 (3 years ago)

Author:

euzuro

Message:

fix for #60

conversions to/from lonlat/px need to take into account
the offset of the layersContainerDiv.

I have introduced the following functions for converting
between layer and screen pixel values:

getLayerPxFromScreenPx() and getScreenPxFromLayerPx()

they are pretty self-explanitory.

I then renamed:

getPixelFromLonLat() and getLonLatFromPixel()

to:

getScreenPxFromLonLat() and getLonLatFroScreenmPx()

and added:

getLayerPxFromLonLat() and getLonLatFromLayerPx()

updates were made throughout the code, demos, and tests
so everything should still run smoothly.

-e-

Files:

• trunk/openlayers/examples/markerss.html (modified) (4 diffs)
• trunk/openlayers/lib/OpenLayers/Control/MouseDefaults.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/Markers.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (4 diffs)
• trunk/openlayers/tests/test_Map.html (modified) (1 diff)

trunk/openlayers/examples/markerss.html

@@ -9 +9 @@
-        }
-    </style>
-
+../
-    <script type="text/javascript">
-        <!--
@@ -22 +22 @@
-                {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'} );
-                
+
+            map.addLayer(
+            new OpenLayers.Layer.WMS("NASA Mosaic", 
+                         "http://wms.jpl.nasa.gov/wms.cgi",
+                         {"EXCEPTIONS" : "application/vnd.ogc.se_inimage",
+                          "format" : "image/jpeg",
+                          layers:"modis,global_mosaic"}
+                         ));
+
-            map.addLayer(layer);
-
@@ -32 +41 @@
-        
-        function changer() {
-
-
+
+
+
+
+
+
-        }
-
-        function add() {
-            var icon = new OpenLayers.Icon('http://boston.openguides.org/markers/AQUA.png',new OpenLayers.Size(10,17));
-180,9
+0,0
-            markers.addMarker(marker);
-            
@@ -59 +72 @@
-    <div id="map"></div>
-    <div style="background-color:purple" onclick="add()"> click to add popup to map</div>
-modify popup's attributes
+get lon/lat for pixel point(0,0)
-    <div style="background-color:red" onclick="destroy()"> click to destroy the popup</div>
-    <div style="background-color:green" onclick="remove()"> click to remove the popup from map</div>

trunk/openlayers/lib/OpenLayers/Control/MouseDefaults.js

@@ -20 +20 @@
-    */
-    defaultDblClick: function (evt) {
-Pixel
+ScreenPx
-        this.map.setCenter(newCenter, this.map.zoom + 1);
-    },
@@ -69 +69 @@
-                var newXY = new OpenLayers.Pixel(size.w / 2 + deltaX,
-                                                 size.h / 2 + deltaY);
-Pixel
+ScreenPx
-                this.map.setCenter(newCenter);
-                this.mouseDragStart = evt.xy.copyOf();
@@ -81 +81 @@
-    defaultMouseUp: function (evt) {
-        if (this.zoomBox) {
-Pixel
-Pixel
+ScreenPx
+ScreenPx
-            var top = Math.max(start.lat, end.lat);
-            var bottom = Math.min(start.lat, end.lat);

trunk/openlayers/lib/OpenLayers/Layer/Markers.js

@@ -59 +59 @@
-    */
-    drawMarker: function(marker) {
-Pixel
+LayerPx
-        var markerImg = marker.draw(px);
-        if (!marker.drawn) {

trunk/openlayers/lib/OpenLayers/Map.js

@@ -172 +172 @@
-    addPopup: function(popup) {
-        this.popups.push(popup);
-Pixel
+LayerPx
-        var popupDiv = popup.draw(px);
-        if (popupDiv) {
@@ -275 +275 @@
-    
-    /**
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    *
-    * @return {OpenLayers.LonLat} 
-    */
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        var center = this.getCenter();        //map center lon/lat
-        var res  = this.getResolution();
-        var size = this.getSize();
-    
-point
-point
+screenPx
+screenPx
-        
-        return new OpenLayers.LonLat(center.lon + delta_x * res ,
-                                     center.lat - delta_y * res); 
+    },
+
+    /**
+    * @param {OpenLayers.LonLat} lonlat
+    *
+    * @returns An OpenLayers.Pixel which is the passed-in OpenLayers.LonLat, 
+    *          translated into layer pixels given the current extent 
+    *          and resolution
+    * @type OpenLayers.Pixel
+    */
+    getLayerPxFromLonLat: function (lonlat) {
+       //adjust for displacement of layerContainerDiv
+       var px = this.getScreenPxFromLonLat(lonlat);
+       return this.getLayerPxFromScreenPx(px);         
-    },
-
@@ -299 +358 @@
-    * @type OpenLayers.Pixel
-    */
-Pixel
+ScreenPx
-        var resolution = this.getResolution();
-        var extent = this.getExtent();
@@ -337 +396 @@
-            for (var i = 0; i < this.popups.length; i++) {
-                var popup = this.popups[i];
-Pixel
+LayerPx
-                popup.moveTo(px);
-            }

trunk/openlayers/tests/test_Map.html

@@ -126 +126 @@
- 
-        var pixel = new OpenLayers.Pixel(50,150);
-Pixel
-Pixel
+ScreenPx
+ScreenPx
-
-Pixel
-Pixel
+ScreenPx
+ScreenPx
-
-        // WARNING!!!  I'm faily sure that the following test's validity