Tagging 2.0-rc2.

git-svn-id: http://svn.openlayers.org/tags/openlayers/release-2.0-rc2@1335 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf

examples/kamap.html

@@ -18,7 +18,7 @@
                  {layers: 'basic'} );
 
             var jpl_wms = new OpenLayers.Layer.KaMap( "Satellite",
-                    "http://www.openlayers.org/world/index.php", {g: "satellite", map: "world"});
+                    "/world/index.php", {g: "satellite", map: "world"});
             var dm_wms = new OpenLayers.Layer.WMS( "Canada",
                 "http://www2.dmsolutions.ca/cgi-bin/mswms_gmap",
                 {layers: "bathymetry,land_fn,park,drain_fn,drainage," +

lib/OpenLayers/Control/MouseDefaults.js

@@ -60,7 +60,6 @@ OpenLayers.Control.MouseDefaults.prototype =
         var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 
         this.map.setCenter(newCenter, this.map.zoom + 1);
         Event.stop(evt);
-        return false;
     },
 
     /**
@@ -125,24 +124,20 @@ OpenLayers.Control.MouseDefaults.prototype =
     defaultMouseUp: function (evt) {
         if (!Event.isLeftClick(evt)) return;
         if (this.zoomBox) {
-            if (Math.abs(this.mouseDragStart.x - evt.xy.x) > 5 ||    
-                Math.abs(this.mouseDragStart.y - evt.xy.y) > 5) {   
-                var start = this.map.getLonLatFromViewPortPx( this.mouseDragStart ); 
-                var end = this.map.getLonLatFromViewPortPx( evt.xy );
-                var top = Math.max(start.lat, end.lat);
-                var bottom = Math.min(start.lat, end.lat);
-                var left = Math.min(start.lon, end.lon);
-                var right = Math.max(start.lon, end.lon);
-                var bounds = new OpenLayers.Bounds(left, bottom, right, top);
-                var zoom = this.map.getZoomForExtent(bounds);
-                this.map.setCenter(new OpenLayers.LonLat(
-                  (start.lon + end.lon) / 2,
-                  (start.lat + end.lat) / 2
-                 ), zoom);
-            }
+            var start = this.map.getLonLatFromViewPortPx( this.mouseDragStart ); 
+            var end = this.map.getLonLatFromViewPortPx( evt.xy );
+            var top = Math.max(start.lat, end.lat);
+            var bottom = Math.min(start.lat, end.lat);
+            var left = Math.min(start.lon, end.lon);
+            var right = Math.max(start.lon, end.lon);
+            var bounds = new OpenLayers.Bounds(left, bottom, right, top);
+            var zoom = this.map.getZoomForExtent(bounds);
+            this.map.setCenter(new OpenLayers.LonLat(
+              (start.lon + end.lon) / 2,
+              (start.lat + end.lat) / 2
+             ), zoom);
             this.map.viewPortDiv.removeChild(document.getElementById("zoomBox"));
             this.zoomBox = null;
-            
         } else {
             if (this.performedDrag) {
                 this.map.setCenter(this.map.center);

lib/OpenLayers/Control/MouseToolbar.js

@@ -47,6 +47,7 @@ OpenLayers.Control.MouseToolbar.prototype =
         centered = centered.add((this.direction == "vertical" ? 0 : sz.w), (this.direction == "vertical" ? sz.h : 0));
         this._addButton("pan", "panning-hand-off.png", "panning-hand-on.png", centered, sz, "Drag the map to pan.");
         centered = centered.add((this.direction == "vertical" ? 0 : sz.w), (this.direction == "vertical" ? sz.h : 0));
+        this._addButton("measure", "measuring-stick-off.png", "measuring-stick-on.png", centered, sz, "Hold alt when clicking to show distance between selected points");
         this.switchModeTo("pan");
         this.map.events.register("zoomend", this, function() { this.switchModeTo("pan"); });
         return this.div;
@@ -94,8 +95,6 @@ OpenLayers.Control.MouseToolbar.prototype =
         this.performedDrag = false;
         var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 
         this.map.setCenter(newCenter, this.map.zoom + 2);
-        Event.stop(evt);
-        return false;
     },
 
     /**
@@ -239,25 +238,18 @@ OpenLayers.Control.MouseToolbar.prototype =
         if (!Event.isLeftClick(evt)) return;
         switch (this.mode) {
             case "zoombox":
-                console.log(this.mouseDragStart, evt.xy);
-                console.log(Math.abs(this.mouseDragStart.x - evt.xy.x) > 5 ||                        Math.abs((this.mouseDragStart.y - evt.xy.y)) > 5);
-                console.log(Math.abs(this.mouseDragStart.x-evt.xy.x) > 5); 
-                console.log(Math.abs(this.mouseDragStart.y-evt.xy.y)>5); 
-                if (Math.abs(this.mouseDragStart.x - evt.xy.x) > 5 ||    
-                    Math.abs(this.mouseDragStart.y - evt.xy.y) > 5) {  
-                    var start = this.map.getLonLatFromViewPortPx( this.mouseDragStart ); 
-                    var end = this.map.getLonLatFromViewPortPx( evt.xy );
-                    var top = Math.max(start.lat, end.lat);
-                    var bottom = Math.min(start.lat, end.lat);
-                    var left = Math.min(start.lon, end.lon);
-                    var right = Math.max(start.lon, end.lon);
-                    var bounds = new OpenLayers.Bounds(left, bottom, right, top);
-                    var zoom = this.map.getZoomForExtent(bounds);
-                    this.map.setCenter(new OpenLayers.LonLat(
-                      (start.lon + end.lon) / 2,
-                      (start.lat + end.lat) / 2
-                     ), zoom);
-                }    
+                var start = this.map.getLonLatFromViewPortPx( this.mouseDragStart ); 
+                var end = this.map.getLonLatFromViewPortPx( evt.xy );
+                var top = Math.max(start.lat, end.lat);
+                var bottom = Math.min(start.lat, end.lat);
+                var left = Math.min(start.lon, end.lon);
+                var right = Math.max(start.lon, end.lon);
+                var bounds = new OpenLayers.Bounds(left, bottom, right, top);
+                var zoom = this.map.getZoomForExtent(bounds);
+                this.map.setCenter(new OpenLayers.LonLat(
+                  (start.lon + end.lon) / 2,
+                  (start.lat + end.lat) / 2
+                 ), zoom);
                 this.map.viewPortDiv.removeChild(document.getElementById("zoomBox"));
                 this.zoomBox = null;
                 this.leaveMode();

lib/OpenLayers/Layer/EventPane.js

@@ -63,6 +63,7 @@ OpenLayers.Layer.EventPane.prototype =
         } else {
             this.map.layerContainerDiv.appendChild(this.pane);
         }
+        this.map.events.attachToElement(this.pane);
     },
   
     /** 

lib/OpenLayers/Layer/KaMap.js

@@ -49,7 +49,7 @@ OpenLayers.Layer.KaMap.prototype =
      */
     getURL: function (bounds) {
         var mapRes = this.map.getResolution();
-        var scale = Math.round((this.map.getScale() * 10000)) / 10000;        
+        var scale = this.map.getScale();        
         var cellSize = new OpenLayers.Size(mapRes*this.tileSize.w, mapRes*this.tileSize.h);
         var pX = Math.round(((bounds.left) / cellSize.w) * this.tileSize.w);
         var pY = -Math.round(((bounds.top) / cellSize.h) * this.tileSize.h);