Ticket #442: final_animatedZooming_OverviewMap.patch

tests/Control/test_OverviewMap.html

@@ -3 +3 @@
-  <script src="../../lib/OpenLayers.js"></script>
-  <script type="text/javascript"><!--
-    var map; 
-PanZoom
+OverviewMap
-        t.plan( 1 );
-    
-        control = new OpenLayers.Control.OverviewMap();
-        t.ok( control instanceof OpenLayers.Control.OverviewMap, "new OpenLayers.Control.OverviewMap returns object" );
-    }
-PanZoom
+OverviewMap
-        t.plan( 6 );
-        map = new OpenLayers.Map('map');
-        control = new OpenLayers.Control.OverviewMap();
@@ -23 +23 @@
-
-        map.destroy();
-    }
-PanZoom
+OverviewMap
-        t.plan( 10 );
-        var evt = {which: 1}; // control expects left-click
-        map = new OpenLayers.Map('map');
@@ -44 +44 @@
-        t.eq(overviewCenter.lat, 42, "Overviewmap center lat correct");
-        t.eq(overviewZoom, 8, "Overviewmap zoomcorrect");
-        
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+    function test_04_Control_OverviewMap_updateRectToMap (t) {
+        t.plan( 4 );
+
+        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.OverviewMap();
+        map.addControl(control, new OpenLayers.Pixel(20,20));
+        map.setCenter(new OpenLayers.LonLat(0,0), 5);
+        control.updateRectToMap();
+        t.eq(control.extentRectangle.style.left, "45px", "rectangle left position has been set correctly");
+        t.eq(control.extentRectangle.style.top, "23px", "rectangle top position has been set correctly");
+        t.eq(control.extentRectangle.style.width, "90px", "rectangle width position has been set correctly");
+        t.eq(control.extentRectangle.style.height, "45px", "rectangle height position has been set correctly");
-    }
+
+    function test_05_Control_OverviewMap_updateMapToRect (t) {
+        t.plan( 4 );
+
+        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.OverviewMap();
+        map.addControl(control, new OpenLayers.Pixel(20,20));
+        map.setCenter(new OpenLayers.LonLat(0,0), 5);
+        control.updateRectToMap();
+        t.eq(control.extentRectangle.style.left, "45px", "rectangle left position has been set correctly");
+        t.eq(control.extentRectangle.style.top, "23px", "rectangle top position has been set correctly");
+        t.eq(control.extentRectangle.style.width, "90px", "rectangle width position has been set correctly");
+        t.eq(control.extentRectangle.style.height, "45px", "rectangle height position has been set correctly");
+    }
+
-  // -->
-  </script>
-</head>

lib/OpenLayers/Control/OverviewMap.js

@@ -119 +119 @@
-
-        this.div.appendChild(this.element);
-
-
+
+
-        
-
+double
-        // The extent rectangle can be dragged to recenter the map.
-        // If the mousedown happened elsewhere, then mousemove and mouseup
-        // should slip through.
@@ -143 +144 @@
-        this.rectEvents.register('click', this, function(e) {
-            OpenLayers.Event.stop(e);
-        });
-        this.rectEvents.register('dblclick', this, this.rectDblClick );
-        this.mapDivEvents = new OpenLayers.Events(this, this.mapDiv);
-click', this, this.mapDiv
+dblclick', this, this.mapDivDbl
-
-        // Optionally add min/max buttons if the control will go in the
-        // map viewport.
@@ -283 +283 @@
-        this.rectDragStart = null;
-    },
-    
-    /**
-    * @param {OpenLayers.Event} evt
-    */
-    rectDblClick: function(evt) {
-        this.performedRectDrag = false;
-        OpenLayers.Event.stop(evt);
-        this.updateOverview();
-    },
-
-    /**
-    * @param {OpenLayers.Event} evt
-    */
-
+Dbl
-        var pxBounds = this.getRectPxBounds();
-        var pxCenter = pxBounds.getCenterPixel();
-        var deltaX = evt.xy.x - pxCenter.x;
@@ -308 +300 @@
-        newTop = Math.min(newTop, this.ovmap.size.h - height);
-        var newLeft = Math.max(0, (left + deltaX));
-        newLeft = Math.min(newLeft, this.ovmap.size.w - width);
-this.setRectPxBounds(
+pxBounds = 
-                                                   newTop + height,
-                                                   newLeft + width,
-)
-
+
+pxBounds
-        OpenLayers.Event.stop(evt);
-    },
-
@@ -360 +352 @@
-        if(this.ovmap == null) {
-            this.createMap();
-        }
-
+
-        if(!this.isSuitableOverview()) {
-            this.updateOverview();
-        }
-
+
-        // update extent rectangle
-        this.updateRectToMap();
+
+        this.updateOverview();
-    },
-
+
-    /**
-     * Determines if the overview map is suitable given the extent and
-     * resolution of the main map.
@@ -380 +374 @@
-                                Math.max(mapExtent.left, maxExtent.left),
-                                Math.max(mapExtent.bottom, maxExtent.bottom),
-                                Math.min(mapExtent.right, maxExtent.right),
-        
+
-        var resRatio = this.ovmap.getResolution() / this.map.getResolution();
-        return ((resRatio > this.minRatio) &&
-                (resRatio <= this.maxRatio) &&
-                (this.ovmap.getExtent().containsBounds(testExtent)));
-    },
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        var targetRes = this.ovmap.getResolution();
-        var resRatio = targetRes / mapRes;
-        if(resRatio > this.maxRatio) {
@@ -400 +405 @@
-        }
-        this.ovmap.setCenter(this.map.center,
-                            this.ovmap.getZoomForResolution(targetRes));
-
+bounds
-    },
-    
-    createMap: function() {
@@ -424 +429 @@
-    },
-        
-    /**
-
+
+
+
+
+
-     */
-
+bounds
-        // The base layer for overview map needs to be in the same projection
-        // as the base layer for the main map.  This should be made more robust.
-        if(this.map.units != 'degrees') {
@@ -434 +443 @@
-                alert('The overview map only works when it is in the same projection as the main map');
-            }
-        }
-
+
+
+
+
-        if (pxBounds) {
-          this.setRectPxBounds(pxBounds);
-        }
@@ -443 +455 @@
-    /**
-     * Updates the map extent to match the extent rectangle position and size
-     */
-
-
+
+
+
-        var lonLatBounds = this.getMapBoundsFromRectBounds(pxBounds);
-
+
+
+
+
+
+
+
+
+
+
+
+
-    },
-    
-    /**

lib/OpenLayers/Map.js

@@ -906 +906 @@
-        return valid;
-    },
-
+    /** Sets the map resolution during zooming/scaling.
+     * 
+     * @param {float} newResolution
+     */ 
+    setScaleResolution: function (newResolution) {
+        //calculate the current bounds of the new viewport
+        var newScaleBounds = this.calculateBounds(this.getCenter(), newResolution);
+        
+        //update the overviewMap
+        for (i=0; i<this.controls.length; i++) {
+            if (this.controls[i].CLASS_NAME == "OpenLayers.Control.OverviewMap") 
+                this.controls[i].updateOverview(newResolution, newScaleBounds);
+        }          
+    },
+
+
-  /********************************************************/
-  /*                                                      */
-  /*                 Layer Options                        */