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;
     },
 
     /**
@@ -81,7 +80,6 @@ OpenLayers.Control.MouseDefaults.prototype =
             this.zoomBox.style.backgroundColor = "white";
             this.zoomBox.style.filter = "alpha(opacity=50)"; // IE
             this.zoomBox.style.opacity = "0.50";
-            this.zoomBox.style.fontSize = "1px";
             this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
             this.map.viewPortDiv.appendChild(this.zoomBox);
         }
@@ -97,8 +95,8 @@ OpenLayers.Control.MouseDefaults.prototype =
             if (this.zoomBox) {
                 var deltaX = Math.abs(this.mouseDragStart.x - evt.xy.x);
                 var deltaY = Math.abs(this.mouseDragStart.y - evt.xy.y);
-                this.zoomBox.style.width = Math.max(1, deltaX) + "px";
-                this.zoomBox.style.height = Math.max(1, deltaY) + "px";
+                this.zoomBox.style.width = deltaX+"px";
+                this.zoomBox.style.height = deltaY+"px";
                 if (evt.xy.x < this.mouseDragStart.x) {
                     this.zoomBox.style.left = evt.xy.x+"px";
                 }
@@ -126,7 +124,20 @@ OpenLayers.Control.MouseDefaults.prototype =
     defaultMouseUp: function (evt) {
         if (!Event.isLeftClick(evt)) return;
         if (this.zoomBox) {
-            this.zoomBoxEnd(evt);    
+            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);
@@ -162,37 +173,6 @@ OpenLayers.Control.MouseDefaults.prototype =
         this.map.zoomOut();
     },
 
-    /** Zoombox function. 
-     *
-     */
-    zoomBoxEnd: function(evt) {
-        if (this.mouseDragStart != null) {
-            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);
-            } else {
-                var end = this.map.getLonLatFromViewPortPx( evt.xy );
-                this.map.setCenter(new OpenLayers.LonLat(
-                  (end.lon),
-                  (end.lat)
-                 ), this.map.getZoom() + 1);
-            }    
-            this.map.viewPortDiv.removeChild(document.getElementById("zoomBox"));
-            this.zoomBox = null;
-       }     
-    },
-
 
 /**
  *  Mouse ScrollWheel code thanks to http://adomas.org/javascript-mouse-wheel/

lib/OpenLayers/Control/MouseToolbar.js

@@ -6,14 +6,12 @@
  * @class
  * 
  * @requires OpenLayers/Control.js
- * @requires OpenLayers/Control/MouseDefaults.js
  */
 OpenLayers.Control.MouseToolbar = Class.create();
 OpenLayers.Control.MouseToolbar.X = 6;
 OpenLayers.Control.MouseToolbar.Y = 300;
 OpenLayers.Control.MouseToolbar.prototype = 
-  Object.extend( new OpenLayers.Control(), 
-    Object.extend( new OpenLayers.Control.MouseDefaults(), {
+  Object.extend( new OpenLayers.Control(), {
     
     mode: null,
 
@@ -49,7 +47,9 @@ 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;
         
     },
@@ -95,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;
     },
 
     /**
@@ -106,10 +104,8 @@ OpenLayers.Control.MouseToolbar.prototype =
         if (!Event.isLeftClick(evt)) return;
         this.mouseDragStart = evt.xy.clone();
         this.performedDrag = false;
-        this.startViaKeyboard = false;
         if (evt.shiftKey && this.mode !="zoombox") {
             this.switchModeTo("zoombox");
-            this.startViaKeyboard = true;
         } else if (evt.altKey && this.mode !="measure") {
             this.switchModeTo("measure");
         } else if (!this.mode) {
@@ -128,10 +124,8 @@ OpenLayers.Control.MouseToolbar.prototype =
                 this.zoomBox.style.backgroundColor = "white";
                 this.zoomBox.style.filter = "alpha(opacity=50)"; // IE
                 this.zoomBox.style.opacity = "0.50";
-                this.zoomBox.style.fontSize = "1px";
                 this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
                 this.map.viewPortDiv.appendChild(this.zoomBox);
-                this.performedDrag = true;
                 break;
             case "measure":
                 var distance = "";
@@ -184,7 +178,7 @@ OpenLayers.Control.MouseToolbar.prototype =
 
     switchModeTo: function(mode) {
         if (mode != this.mode) {
-            if (this.mode && this.buttons[this.mode]) {
+            if (this.mode) {
                 OpenLayers.Util.modifyAlphaImageDiv(this.buttons[this.mode], null, null, null, this.buttons[this.mode].imgLocation);
             }
             if (this.mode == "measure" && mode != "measure") {
@@ -197,9 +191,7 @@ OpenLayers.Control.MouseToolbar.prototype =
                 this.measureStart = null;
             }
             this.mode = mode;
-            if (this.buttons[mode]) {
-                OpenLayers.Util.modifyAlphaImageDiv(this.buttons[mode], null, null, null, this.buttons[mode].activeImgLocation);
-            }
+            OpenLayers.Util.modifyAlphaImageDiv(this.buttons[mode], null, null, null, this.buttons[mode].activeImgLocation);
         } 
     }, 
 
@@ -216,8 +208,8 @@ OpenLayers.Control.MouseToolbar.prototype =
                 case "zoombox": 
                     var deltaX = Math.abs(this.mouseDragStart.x - evt.xy.x);
                     var deltaY = Math.abs(this.mouseDragStart.y - evt.xy.y);
-                    this.zoomBox.style.width = Math.max(1, deltaX) + "px";
-                    this.zoomBox.style.height = Math.max(1, deltaY) + "px";
+                    this.zoomBox.style.width = deltaX+"px";
+                    this.zoomBox.style.height = deltaY+"px";
                     if (evt.xy.x < this.mouseDragStart.x) {
                         this.zoomBox.style.left = evt.xy.x+"px";
                     }
@@ -246,8 +238,21 @@ OpenLayers.Control.MouseToolbar.prototype =
         if (!Event.isLeftClick(evt)) return;
         switch (this.mode) {
             case "zoombox":
-                this.zoomBoxEnd(evt);
-                if (this.startViaKeyboard) this.leaveMode();
+                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();
                 break;
             case "pan":
                 if (this.performedDrag) {
@@ -271,5 +276,5 @@ OpenLayers.Control.MouseToolbar.prototype =
             return false;
         }
     }
-}));
+});
 

lib/OpenLayers/Control/PanZoomBar.js

@@ -184,8 +184,8 @@ OpenLayers.Control.PanZoomBar.prototype =
                 this.slider.style.top = newTop+"px";
             }
             this.mouseDragStart = evt.xy.clone();
-            Event.stop(evt);
         }
+        Event.stop(evt);
     },
     
     /* 

lib/OpenLayers/Layer.js

@@ -182,9 +182,6 @@ OpenLayers.Layer.prototype = {
           'minExtent', 'maxExtent',
           'numZoomLevels'
         );
-        if (this.map.maxZoomLevel && !this.numZoomLevels) {
-            this.numZoomLevels = this.map.maxZoomLevel + 1;
-        }
         for(var i=0; i < properties.length; i++) {
             if (this[properties[i]] == null) {
                 this[properties[i]] = this.map[properties[i]];

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);

lib/OpenLayers/Map.js

@@ -371,12 +371,9 @@ OpenLayers.Map.prototype = {
                 if (center != null) {
                     var zoom = this.getZoom();
                     this.zoom = null;
-                    if (zoom > this.baseLayer.numZoomLevels - 1) {
-                        zoom = this.baseLayer.numZoomLevels - 1;
-                    }    
                     this.setCenter(center, zoom);            
-                
                 }
+
                 if ((noEvent == null) || (noEvent == false)) {
                     this.events.triggerEvent("changebaselayer");
                 }
@@ -565,6 +562,7 @@ OpenLayers.Map.prototype = {
     *                        trigger movestart/end events
     */
     setCenter: function (lonlat, zoom, minor) {
+
         var zoomChanged = (this.isValidZoomLevel(zoom)) && 
                           (zoom != this.getZoom());
 
@@ -601,7 +599,7 @@ OpenLayers.Map.prototype = {
                     this.popups[i].updatePosition();
                 }
             }    
-            
+
             //send the move call to the baselayer and all the overlays    
             var bounds = this.getExtent();
             for (var i = 0; i < this.layers.length; i++) {

tests/list-tests.html

@@ -22,7 +22,6 @@
     <li>test_Tile.html</li>
     <li>test_Tile_Image.html</li>
     <li>test_Control.html</li>
-    <li>test_Control_MouseToolbar.html</li>
     <li>test_Control_LayerSwitcher.html</li>
     <li>test_Control_PanZoom.html</li>
     <li>test_Control_PanZoomBar.html</li>

tests/test_Control_MouseToolbar.html

@@ -1,55 +0,0 @@
-<html>
-<head>
-  <script src="../lib/OpenLayers.js"></script>
-  <script type="text/javascript"><!--
-    var map; 
-    function test_01_Control_MouseToolbar_constructor (t) {
-        t.plan( 1 );
-    
-        control = new OpenLayers.Control.MouseToolbar();
-        t.ok( control instanceof OpenLayers.Control.MouseToolbar, "new OpenLayers.Control.MouseToolbar returns object" );
-    }
-    function test_02_Control_MouseToolbar_addControl (t) {
-        t.plan( 7 );
-        map = new OpenLayers.Map('map');
-        control = new OpenLayers.Control.MouseToolbar();
-        t.ok( control instanceof OpenLayers.Control.MouseToolbar, "new OpenLayers.Control.MouseToolbar returns object" );
-        t.ok( map instanceof OpenLayers.Map, "new OpenLayers.Map creates map" );
-        map.addControl(control);
-        t.ok( control.map === map, "Control.map is set to the map object" );
-        t.ok( map.controls[2] === control, "map.controls contains control" );
-        t.eq( parseInt(control.div.style.zIndex), map.Z_INDEX_BASE['Control'] + 3, "Control div zIndexed properly" );
-        t.eq( parseInt(map.viewPortDiv.lastChild.style.zIndex), map.Z_INDEX_BASE['Control'] + 3, "Viewport div contains control div" );
-        t.eq( control.div.style.top, "6px", "Control div top located correctly by default");
-
-    }
-    function test_03_Control_MouseToolbar_control_events (t) {
-        t.plan( 1 );
-        var evt = {which: 1}; // control expects left-click
-        map = new OpenLayers.Map('map');
-        var layer = new OpenLayers.Layer.WMS("Test Layer", 
-            "http://octo.metacarta.com/cgi-bin/mapserv?",
-            {map: "/mapdata/vmap_wms.map", layers: "basic"});
-        map.addLayer(layer);
-
-        control = new OpenLayers.Control.MouseToolbar();
-        map.addControl(control);
-
-        var centerLL = new OpenLayers.LonLat(0,0); 
-        map.setCenter(centerLL, 5);
-
-        evt.shiftKey = true;
-        evt.xy = new OpenLayers.Size(5,5);
-        control.defaultMouseDown(evt);
-        evt.xy = new OpenLayers.Size(15,15);
-        control.defaultMouseUp(evt);
-        t.eq(map.getZoom(), 5, "Map zoom set correctly after zoombox");
-
-    }
-  // -->
-  </script>
-</head>
-<body>
-    <div id="map" style="width: 1024px; height: 512px;"/>
-</body>
-</html>