Changeset 3582

Timestamp:

07/05/07 10:04:51 (1 year ago)

Author:

euzuro

Message:

fix for #795 - all layers now have a redraw() method that simply redraws them no matter whether the extent or parameters or zoom has changed. Big big thanks to tim schaub for not only taking the time to listen to my relentless (and often cracked) brainstorming about this ticket and for taking the time out to review the final patch.... but above and beyond the call of duty, adding *tests* for this patch. real ace. top knotch.

Files:

• trunk/openlayers/lib/OpenLayers/Layer.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/MapServer/Untiled.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/Markers.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/WMS/Untiled.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (1 diff)
• trunk/openlayers/tests/test_Layer.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Layer.js

@@ -333 +333 @@
-    onMapResize: function() {
-        //this function can be implemented by subclasses  
+    },
+
+    /**
+     * APIMethod: redraw
+     * Redraws the layer.  Returns true if the layer was redrawn, false if not.
+     *
+     * Return:
+     * {Boolean} The layer was redrawn.
+     */
+    redraw: function() {
+        var redrawn = false;
+        if (this.map) {
+
+            // min/max Range may have changed
+            this.inRange = this.calculateInRange();
+
+            // map's center might not yet be set
+            var extent = this.getExtent();
+
+            if (extent && this.inRange && this.visibility) {
+                this.moveTo(extent, true, false);
+                redrawn = true;
+            }
+        }
+        return redrawn;
-    },
-
@@ -452 +477 @@
-            this.visibility = visibility;
-            this.display(visibility);
-
-
-
-
-
-
+
-            if ((this.map != null) && 
-                ((noEvent == null) || (noEvent == false))) {

trunk/openlayers/lib/OpenLayers/Layer/MapServer/Untiled.js

@@ -242 +242 @@
-    setUrl: function(newUrl) {
-        OpenLayers.Layer.HTTPRequest.prototype.setUrl.apply(this, arguments);
-moveTo
+redraw
-    },
-
@@ -255 +255 @@
-        OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this, 
-                                                                 [newParams]);
-
-
+
-    },
-    

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

@@ -73 +73 @@
-
-        if (zoomChanged || !this.drawn) {
-
+
+
+
-            this.drawn = true;
-        }
@@ -117 +119 @@
-    },
-
-    /**
-     * APIMethod: redraw
-     * Clear all the marker div's from the layer and then redraw all of them.
-     *    Use the map to recalculate new placement of markers.
-     */
-    redraw: function() {
-        for(i=0; i < this.markers.length; i++) {
-            this.drawMarker(this.markers[i]);
-        }
-    },
-
-    /** 
-     * Method: drawMarker

trunk/openlayers/lib/OpenLayers/Layer/WMS/Untiled.js

@@ -258 +258 @@
-    setUrl: function(newUrl) {
-        OpenLayers.Layer.HTTPRequest.prototype.setUrl.apply(this, arguments);
-moveTo
+redraw
-    },
-
@@ -273 +273 @@
-        OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this, 
-                                                                 newArguments);
-
-
+
-    },
-    

trunk/openlayers/lib/OpenLayers/Map.js

@@ -519 +519 @@
-            }
-        } else {
-
-
-
+
-        }
-

trunk/openlayers/tests/test_Layer.html

@@ -166 +166 @@
-    }
-    
+    function test_Layer_redraw(t) {
+        t.plan(8)
+
+        var name = 'Test Layer';
+        var url = "http://octo.metacarta.com/cgi-bin/mapserv";
+        var params = { map: '/mapdata/vmap_wms.map', 
+                       layers: 'basic', 
+                       format: 'image/jpeg'};
+
+        var layer = new OpenLayers.Layer.WMS(name, url, params);
+        
+        t.ok(!layer.redraw(),
+             "redraw on an orphan layer returns false");
+        
+        var map = new OpenLayers.Map('map');
+        map.addLayer(layer);
+
+        t.ok(!layer.redraw(),
+             "redraw returns false if map does not yet have a center");
+        map.zoomToMaxExtent();
+        
+        t.ok(layer.redraw(),
+             "redraw returns true after map has a center");
+        
+        layer.setVisibility(false);
+        t.ok(!layer.redraw(),
+             "redraw returns false if a layer is not visible");
+        
+        layer.setVisibility(true);
+        t.ok(layer.redraw(),
+                "redraw returns true even if extent has not changed");
+        
+        layer.moveTo = function(bounds, zoomChanged, dragging) {
+            var extent = layer.map.getExtent();
+            t.ok(bounds.equals(extent),
+                 "redraw calls moveTo with the map extent");
+            t.ok(zoomChanged,
+                 "redraw calls moveTo with zoomChanged true");
+            t.ok(!dragging,
+                 "redraw calls moveTo with dragging false");
+        }
+        layer.redraw();
+        
+    }
-    
-/******