Fix a Control.OverviewMap test that failed in Firefox 10.0.1 (Linux).

This commit is contained in:
Marc Jansen
2012-02-15 14:11:54 +01:00
parent 79540f346d
commit 67ea250cca
+17 -15
View File
@@ -115,33 +115,35 @@
function test_control_events (t) { function test_control_events (t) {
t.plan( 10 ); t.plan( 10 );
var evt = {which: 1}; // control expects left-click
map = new OpenLayers.Map('map'); map = new OpenLayers.Map('map', {
var layer = new OpenLayers.Layer.WMS("Test Layer", // when we recenter, don't waste time animating the panning
"http://octo.metacarta.com/cgi-bin/mapserv?", // without this, the test fails in Firefox 10.0.1 on Linux
{map: "/mapdata/vmap_wms.map", layers: "basic"}); panMethod: null,
map.addLayer(layer); layers: [ new OpenLayers.Layer('Test Layer', {isBaseLayer: true}) ]
});
control = new OpenLayers.Control.OverviewMap(); control = new OpenLayers.Control.OverviewMap();
map.addControl(control, new OpenLayers.Pixel(20,20)); map.addControl(control, new OpenLayers.Pixel(20,20));
var centerLL = new OpenLayers.LonLat(-71,42); var centerLL = new OpenLayers.LonLat(-71,42);
map.setCenter(centerLL, 11); map.setCenter(centerLL, 11);
t.delay_call( t.delay_call(
1, 0.1,
function() { function() {
var overviewCenter = control.ovmap.getCenter(); var overviewCenter = control.ovmap.getCenter();
var overviewZoom = control.ovmap.getZoom(); var overviewZoom = control.ovmap.getZoom();
t.eq(overviewCenter.lon, -71, t.eq(overviewCenter.lon, -71,
"Overviewmap center lon correct"); "OverviewMap center lon correct");
t.eq(overviewCenter.lat, 42, t.eq(overviewCenter.lat, 42,
"Overviewmap center lat correct"); "OverviewMap center lat correct");
t.eq(overviewZoom, 8, t.eq(overviewZoom, 8,
"Overviewmap zoomcorrect"); "OverviewMap zoom correct");
control.mapDivClick({'xy':new OpenLayers.Pixel(5,5)}); control.mapDivClick({'xy':new OpenLayers.Pixel(5,5)});
}, },
2, 0.1,
function() { function() {
var cent = map.getCenter(); var cent = map.getCenter();
t.eq(cent.lon, -71.3515625, t.eq(cent.lon, -71.3515625,
@@ -156,7 +158,7 @@
control.rectDrag(new OpenLayers.Pixel(15, 15)); control.rectDrag(new OpenLayers.Pixel(15, 15));
control.updateMapToRect(); control.updateMapToRect();
}, },
2, 0.1,
function() { function() {
var cent = map.getCenter(); var cent = map.getCenter();
t.eq(cent.lon, -71.2734375, t.eq(cent.lon, -71.2734375,
@@ -168,11 +170,11 @@
var overviewCenter = control.ovmap.getCenter(); var overviewCenter = control.ovmap.getCenter();
var overviewZoom = control.ovmap.getZoom(); var overviewZoom = control.ovmap.getZoom();
t.eq(overviewCenter.lon, 0, t.eq(overviewCenter.lon, 0,
"Overviewmap center lon correct -- second zoom"); "OverviewMap center lon correct -- second zoom");
t.eq(overviewCenter.lat, 0, t.eq(overviewCenter.lat, 0,
"Overviewmap center lat correct -- second zoom"); "OverviewMap center lat correct -- second zoom");
t.eq(overviewZoom, 0, t.eq(overviewZoom, 0,
"Overviewmap zoomcorrect -- second zoom"); "OverviewMap zoomcorrect -- second zoom");
map.destroy(); map.destroy();
} }
); );