Changeset 6495

Timestamp:

03/12/08 08:53:34 (10 months ago)

Author:

crschmidt

Message:

Improve the handling of tile events with regard to tiles being unloaded before
their load events fire by adding an 'unload' event to the tile, and calling
it from the places where we're about to stop listening to events. In the longer
term, it might make sense to have this be automatic, but this resolves issues
with map resizes screwing with tile events, and reverts a previous,
incomplete solution to solve a problem with untiled tiles not resizing when
the map size changes. r=ahocevar, checked out by bartvde (Closes #1417)

Files:

• trunk/openlayers/lib/OpenLayers/Layer/Grid.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/WFS.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Tile.js (modified) (2 diffs)

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

@@ -548 +548 @@
-        };
-        tile.events.register("loadend", this, tile.onLoadEnd);
+        tile.events.register("unload", this, tile.onLoadEnd);
-    },
-
@@ -559 +560 @@
-     */
-    removeTileMonitoringHooks: function(tile) {
+        tile.unload()
-        tile.events.un({
-            "loadstart": tile.onLoadStart,
-            "loadend": tile.onLoadEnd,
+            "unload": tile.onLoadEnd,
-            scope: this
-        });
@@ -701 +704 @@
-    onMapResize: function() {
-        if (this.singleTile) {
+            this.clearGrid();
-            this.setTileSize();
-        }

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

@@ -342 +342 @@
-        };
-        tile.events.register("loadend", tile, tile.onLoadEnd);
+        tile.events.register("unload", tile, tile.onLoadEnd);
-    },
-    
@@ -353 +354 @@
-     */
-    removeTileMonitoringHooks: function(tile) {
+        tile.unload();
-        tile.events.un({
-            "loadstart": tile.onLoadStart,
-            "loadend": tile.onLoadEnd,
+            "unload": tile.onLoadEnd,
-            scope: tile
-        });

trunk/openlayers/lib/OpenLayers/Tile.js

@@ -26 +26 @@
-     * {Array(String)} Supported application event types
-     */
-
+, "unload"
-    
-    /**
@@ -137 +137 @@
-        
-        this.events = new OpenLayers.Events(this, null, this.EVENT_TYPES);
+    },
+
+    /**
+     * Method: unload
+     * Call immediately before destroying if you are listening to tile
+     * events, so that counters are properly handled if tile is still
+     * loading at destroy-time. Will only fire an event if the tile is
+     * still loading.
+     */
+    unload: function() {
+       if (this.isLoading) { 
+           this.isLoading = false; 
+           this.events.triggerEvent("unload"); 
+       }
-    },
-