Ticket #800: mergeNewParams.3.patch

tests/test_Layer.html

@@ -165 +165 @@
-
-    }
-    
+    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();
+        
+    }
-    
-/******
- * 

tests/Layer/test_HTTPRequest.html

@@ -65 +65 @@
-    }
-
-    function test_05_Layer_HTTPRequest_mergeNewParams (t) {
-3
+4
-
-        layer = new OpenLayers.Layer.HTTPRequest(name, url, params, options);
-        
@@ -80 +80 @@
-        newParams.chickpeas = 151;
-
-        t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hash");
+        
+        layer.redraw = function() {
+            t.ok(true, "layer.mergeNewParams calls layer.redraw");
+        }
+        layer.mergeNewParams();
-
-
-    }

lib/OpenLayers/Layer.js

@@ -335 +335 @@
-    },
-
-    /**
+     * 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;
+    },
+
+    /**
-     * Method: moveTo
-     * 
-     * Parameters:
@@ -451 +476 @@
-        if (visibility != this.visibility) {
-            this.visibility = visibility;
-            this.display(visibility);
-
-
-
-
-
-
+
-            if ((this.map != null) && 
-                ((noEvent == null) || (noEvent == false))) {
-                this.map.events.triggerEvent("changelayer");

lib/OpenLayers/Map.js

@@ -518 +518 @@
-                layer.setVisibility(false);
-            }
-        } else {
-
-
-
+
-        }
-
-        this.events.triggerEvent("addlayer");

lib/OpenLayers/Layer/Markers.js

@@ -72 +72 @@
-        OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
-
-        if (zoomChanged || !this.drawn) {
-
+
+
+
-            this.drawn = true;
-        }
-    },
@@ -116 +118 @@
-        }
-    },
-
-    /**
-     * 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
-     * Calculate the pixel location for the marker, create it, and 

lib/OpenLayers/Layer/Grid.js

@@ -395 +395 @@
-    addTile:function(bounds, position) {
-        // Should be implemented by subclasses
-    },
-
-    /**
-     * APIMethod: mergeNewParams
-     * Once params have been changed, we will need to re-init our tiles
-     *
-     * Parameters:
-     * newParams - {Object} Hashtable of new params to use
-     */
-    mergeNewParams:function(newArguments) {
-        OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this,
-                                                                [newArguments]);
-
-        if (this.map != null) {
-            this._initTiles();
-        }
-    },
-
-    
-    /**
-     * Method: shiftRow

lib/OpenLayers/Layer/HTTPRequest.js

@@ -115 +115 @@
-     */
-    mergeNewParams:function(newParams) {
-        this.params = OpenLayers.Util.extend(this.params, newParams);
+        this.redraw();
-    },
-    
-    /**

lib/OpenLayers/Layer/MapServer/Untiled.js

@@ -241 +241 @@
-     */
-    setUrl: function(newUrl) {
-        OpenLayers.Layer.HTTPRequest.prototype.setUrl.apply(this, arguments);
-moveTo
+redraw
-    },
-
-    /** 
@@ -254 +254 @@
-    mergeNewParams:function(newParams) {
-        OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this, 
-                                                                 [newParams]);
-        //redraw
-        this.moveTo(null, true);
-    },
-    
-    /** 

lib/OpenLayers/Layer/WMS/Untiled.js

@@ -257 +257 @@
-     */
-    setUrl: function(newUrl) {
-        OpenLayers.Layer.HTTPRequest.prototype.setUrl.apply(this, arguments);
-moveTo
+redraw
-    },
-
-    /**
@@ -272 +272 @@
-        var newArguments = [upperParams];
-        OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this, 
-                                                                 newArguments);
-        //redraw
-        this.moveTo(null, true);
-    },
-    
-    /** 

lib/OpenLayers/Layer/WFS.js

@@ -248 +248 @@
-        var newArguments = [upperParams];
-        OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this, 
-                                                                 newArguments);
-        //redraw
-        this.moveTo(null, true);
-    },
-
-    /**