Changeset 2836

Timestamp:

03/21/07 15:03:09 (2 years ago)

Author:

euzuro

Message:

fix for #549 - clearing out of map div on map.destroy(). this fixes many opera tests

Files:

• trunk/openlayers/lib/OpenLayers/Map.js (modified) (1 diff)
• trunk/openlayers/tests/Control/test_OverviewMap.html (modified) (2 diffs)
• trunk/openlayers/tests/Layer/test_WMS.html (modified) (8 diffs)
• trunk/openlayers/tests/test_Map.html (modified) (1 diff)
• trunk/openlayers/tests/test_Marker.html (modified) (3 diffs)

trunk/openlayers/lib/OpenLayers/Map.js

@@ -226 +226 @@
-            this.controls = null;
-        }
+        this.div.innerHTML = "";
-    },
-

trunk/openlayers/tests/Control/test_OverviewMap.html

@@ -22 +22 @@
-        t.eq( parseInt(map.viewPortDiv.lastChild.style.zIndex), map.Z_INDEX_BASE['Control'] + 4, "Viewport div contains control div" );
-
+        map.destroy();
-    }
-    function test_03_Control_PanZoom_control_events (t) {
@@ -65 +66 @@
-        t.eq(overviewZoom, 0, "Overviewmap zoomcorrect -- second zoom");
-        
+        map.destroy();
-
-    }

trunk/openlayers/tests/Layer/test_WMS.html

@@ -63 +63 @@
-             "div first child is correct image object" );
-        t.eq( tile.position.toString(), "x=5,y=6", "Position of tile is set correctly." );
+        map.destroy();
-    }
-    
@@ -73 +74 @@
-        t.eq( layer.grid.length, 7, "Grid rows is correct." );
-        t.eq( layer.grid[0].length, 6, "Grid cols is correct." );
-
+map.destroy();
-    }
-
@@ -102 +103 @@
-
-        layer.grid = null;
+        map.destroy();
-    }
-
@@ -143 +145 @@
-
-        t.eq( layer.params.CHICKPEAS, "image/png", "mergeNewParams() makes clean copy of hashtable");
+        map.destroy();
-    }
-
@@ -172 +175 @@
-             tUrl + "?" + OpenLayers.Util.getParameterString(tParams),
-             "getFullRequestString() by default does *not* add SRS value if projection is 'none'");
+        map.destroy();
- 
-    }
@@ -197 +201 @@
-        t.eq(parseFloat(tile.imgDiv.style.opacity), 0.6, "Tile opacity is set correctly");
-
+        map.destroy();
-    }    
-    
-    function test_20_Layer_WMS_Reproject (t) { 
-        t.plan(5);
+
-        var map = new OpenLayers.Map('map');
-        var layer = new OpenLayers.Layer.Google("Google");
-        map.addLayer(layer);
-
-
-
+wms
+wms
+wms
-        map.setCenter(new OpenLayers.LonLat(0,0), 5);
-        var tile = layer.grid[0][0];
@@ -213 +219 @@
-        t.eq( tile.bounds.bottom.toFixed(6), '11.178402', "bottom side matches" ); 
-        t.eq( tile.bounds.top.toFixed(6), '21.943046', "top side matches" ); 
+        map.destroy();
-        
-        var map = new OpenLayers.Map('map');
@@ -220 +227 @@
-        var tile = layer.grid[0][0];
-        t.ok( tile.bounds.equals(new OpenLayers.Bounds(-33.75, 33.75, -22.5, 45)), "okay");
+
+        map.destroy();
-    }
-    

trunk/openlayers/tests/test_Map.html

@@ -319 +319 @@
-    
-    function test_99_Map_destroy (t) {
-2
+3
-        map = new OpenLayers.Map('map');
-        map.destroy();
-        t.eq( map.layers, null, "map.layers is null after destroy" );
-        t.eq( map.controls, null, "map.controls is null after destroy" );
+        t.eq( map.div.innerHTML, "", "map's div cleared out");
-    }
-  // -->

trunk/openlayers/tests/test_Marker.html

@@ -43 +43 @@
-
-        t.ok( !marker2.onScreen(), "marker knows it's offscreen" );
-
+map.destroy();
-    }
-
@@ -71 +71 @@
-
-        t.eq(parseFloat(marker.icon.imageDiv.style.opacity), 0.5, "marker.setOpacity() works");
+        map.destroy();
-    }
-    function test_04_Marker_moveTo(t) {
@@ -102 +103 @@
-        t.eq(marker.lonlat.lon, map.getExtent().left, "on left edge of map"); 
-        t.eq(marker.lonlat.lat, map.getExtent().top, "on top edge of map"); 
+        map.destroy();
-    
-    }