Changeset 630

Timestamp:

06/20/06 18:51:55 (2 years ago)

Author:

euzuro

Message:

change function name from ScreenPx to ViewPortPx

Files:

• trunk/openlayers/examples/click.html (modified) (1 diff)
• trunk/openlayers/examples/markerss.html (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Control/MouseDefaults.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Control/MouseToolbar.js (modified) (5 diffs)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (2 diffs)
• trunk/openlayers/tests/test_Map.html (modified) (1 diff)

trunk/openlayers/examples/click.html

@@ -27 +27 @@
-            map.setCenter(new OpenLayers.LonLat(0, 0), 0);
-            map.events.register("click", map, function(e) { 
-Screen
+ViewPort
-                alert("You clicked near " + lonlat.lat + " N, " +
-                                          + lonlat.lon + " E");

trunk/openlayers/examples/markerss.html

@@ -42 +42 @@
-            var lon = map.getLonLatFromLayerPx(new OpenLayers.Pixel(0,0)).lon;
-            var lat = map.getLonLatFromLayerPx(new OpenLayers.Pixel(0,0)).lat;
-Screen
-Screen
+ViewPort
+ViewPort
-            alert("lon=" + lon + " lat=" + lat 
-                  + "slon=" + slon + " slat=" + slat);

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

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

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

@@ -86 +86 @@
-    defaultDblClick: function (evt) {
-        this.switchModeTo("pan");
-Screen
+ViewPort
-        this.map.setCenter(newCenter, this.map.zoom + 2);
-    },
@@ -121 +121 @@
-                var distance = "";
-                if (this.measureStart) {
-Screen
+ViewPort
-                    distance = OpenLayers.Util.distVincenty(this.measureStart, measureEnd);
-                    distance = Math.round(distance * 100) / 100;
@@ -127 +127 @@
-                    this.measureStartBox = this.measureBox;
-                }    
-Screen
+ViewPort
-                this.measureBox = OpenLayers.Util.createDiv(null,
-                                                         this.mouseDragStart.add(
@@ -212 +212 @@
-                    var newXY = new OpenLayers.Pixel(size.w / 2 + deltaX,
-                                                     size.h / 2 + deltaY);
-Screen
+ViewPort
-                    this.map.setCenter(newCenter, null, true);
-                    this.mouseDragStart = evt.xy.copyOf();
@@ -225 +225 @@
-        switch (this.mode) {
-            case "zoombox":
-Screen
-Screen
+ViewPort
+ViewPort
-                var top = Math.max(start.lat, end.lat);
-                var bottom = Math.min(start.lat, end.lat);

trunk/openlayers/lib/OpenLayers/Map.js

@@ -353 +353 @@
-       //adjust for displacement of layerContainerDiv
-       px = this.getScreenPxFromLayerPx(px);
-Screen
+ViewPort
-    },
-    
@@ -364 +364 @@
-    * @type OpenLayers.LonLat
-    */
-Screen
+ViewPort
-        var center = this.getCenter();        //map center lon/lat
-        var res  = this.getResolution();

trunk/openlayers/tests/test_Map.html

@@ -126 +126 @@
- 
-        var pixel = new OpenLayers.Pixel(50,150);
-Screen
-Screen
+ViewPort
+ViewPort
-
-        var newPixel = map.getScreenPxFromLonLat(lonlat);