For PanZoomBar, this fixes the slider behavior. Now the buttonclick listener argument also includes a buttonXY property, and PanZoomPanel does not need an Events instance for the zoombarDiv any more.
For Panel, this fixes events for panels outside the map. Just setting the element on the Events instance was no longer enough after e70569b2bb. Events::attachToElement is now used, and it needed to be modified to also work if the Events instance had no element previously.
Finally, I renamed the button property of the buttonclick listener argument to buttonElement, to not confuse it with the browser event button property, and added some more tests and documentation.
219 lines
9.7 KiB
HTML
219 lines
9.7 KiB
HTML
<html>
|
|
<head>
|
|
<script src="../OLLoader.js"></script>
|
|
<script type="text/javascript">
|
|
var map;
|
|
function test_Control_PanZoomBar_constructor (t) {
|
|
t.plan( 4 );
|
|
|
|
control = new OpenLayers.Control.PanZoomBar({position: new OpenLayers.Pixel(100,100)});
|
|
t.ok( control instanceof OpenLayers.Control.PanZoomBar, "new OpenLayers.Control.PanZoomBar returns object" );
|
|
t.eq( control.displayClass, "olControlPanZoomBar", "displayClass is correct" );
|
|
t.eq( control.position.x, 100, "PanZoom X Set correctly.");
|
|
t.eq( control.position.y, 100, "PanZoom y Set correctly.");
|
|
}
|
|
function test_Control_PanZoomBar_addControl (t) {
|
|
t.plan( 8 );
|
|
map = new OpenLayers.Map('map', {controls:[]});
|
|
var layer = new OpenLayers.Layer.WMS("Test Layer",
|
|
"http://octo.metacarta.com/cgi-bin/mapserv?",
|
|
{map: "/mapdata/vmap_wms.map", layers: "basic"});
|
|
map.addLayer(layer);
|
|
control = new OpenLayers.Control.PanZoomBar();
|
|
t.ok( control instanceof OpenLayers.Control.PanZoomBar, "new OpenLayers.Control.PanZoomBar returns object" );
|
|
t.ok( map instanceof OpenLayers.Map, "new OpenLayers.Map creates map" );
|
|
map.addControl(control);
|
|
t.ok( control.map === map, "Control.map is set to the map object" );
|
|
t.ok( map.controls[0] === control, "map.controls contains control" );
|
|
t.eq( parseInt(control.div.style.zIndex), 1001, "Control div zIndexed properly" );
|
|
t.eq( parseInt(map.viewPortDiv.lastChild.style.zIndex), 1001, "Viewport div contains control div" );
|
|
t.eq( control.div.style.top, "4px", "Control div top located correctly by default");
|
|
|
|
var control2 = new OpenLayers.Control.PanZoomBar();
|
|
map.addControl(control2, new OpenLayers.Pixel(100,100));
|
|
t.eq( control2.div.style.top, "100px", "2nd control div is located correctly");
|
|
}
|
|
|
|
function test_Control_PanZoomBar_clearDiv(t) {
|
|
t.plan(2);
|
|
map = new OpenLayers.Map('map', {controls:[]});
|
|
var layer = new OpenLayers.Layer.WMS("Test Layer",
|
|
"http://octo.metacarta.com/cgi-bin/mapserv?",
|
|
{map: "/mapdata/vmap_wms.map", layers: "basic"});
|
|
map.addLayer(layer);
|
|
control = new OpenLayers.Control.PanZoomBar();
|
|
map.addControl(control);
|
|
control.removeButtons();
|
|
var div = control.div;
|
|
map.destroy();
|
|
t.eq(div.childNodes.length, 0, "control's div cleared.");
|
|
t.eq(control.zoombarDiv, null, "zoombar div nullified.")
|
|
}
|
|
|
|
function test_Control_PanZoomBar_onButtonClick (t) {
|
|
t.plan(2);
|
|
map = new OpenLayers.Map('map', {controls:[]});
|
|
var layer = new OpenLayers.Layer.WMS("Test Layer",
|
|
"http://octo.metacarta.com/cgi-bin/mapserv?",
|
|
{map: "/mapdata/vmap_wms.map", layers: "basic"});
|
|
map.addLayer(layer);
|
|
control = new OpenLayers.Control.PanZoomBar();
|
|
map.addControl(control);
|
|
control.onButtonClick({'buttonXY': {'x': 0, 'y': 50}, buttonElement: control.zoombarDiv});
|
|
t.eq(map.zoom, 11, "zoom is correct on standard map");
|
|
|
|
map.fractionalZoom = true;
|
|
control.onButtonClick({'buttonXY': {'x': 0, 'y': 49}, buttonElement: control.zoombarDiv});
|
|
t.eq(map.zoom.toFixed(3), '10.545', "zoom is correct on fractional zoom map");
|
|
|
|
}
|
|
|
|
function test_Control_PanZoomBar_forceFixedZoomLevel_onButtonClick(t){
|
|
t.plan(1);
|
|
map = new OpenLayers.Map('map', {
|
|
controls: [],
|
|
fractionalZoom: true
|
|
});
|
|
var layer = new OpenLayers.Layer.WMS("Test Layer", "http://octo.metacarta.com/cgi-bin/mapserv?", {
|
|
map: "/mapdata/vmap_wms.map",
|
|
layers: "basic"
|
|
});
|
|
map.addLayer(layer);
|
|
control = new OpenLayers.Control.PanZoomBar({
|
|
forceFixedZoomLevel: true
|
|
});
|
|
map.addControl(control);
|
|
|
|
control.onButtonClick({
|
|
'buttonXY': {
|
|
'x': 0,
|
|
'y': 49
|
|
},
|
|
buttonElement: control.zoombarDiv
|
|
});
|
|
t.eq(map.zoom, 11, "forceFixedZoomLevel makes sure that after a div click only fixed zoom levels are used even if the map has fractionalZoom");
|
|
}
|
|
|
|
function test_Control_PanZoomBar_forceFixedZoomLevel_zoomBarUp (t) {
|
|
var numRandomDrags = 25;
|
|
// plan one static recorded test and two for every random drag
|
|
t.plan(1 + (numRandomDrags * 2));
|
|
|
|
|
|
var map = new OpenLayers.Map('map', {
|
|
controls: [],
|
|
fractionalZoom: true
|
|
});
|
|
var layer = new OpenLayers.Layer.WMS("Test Layer", "http://octo.metacarta.com/cgi-bin/mapserv?", {
|
|
map: "/mapdata/vmap_wms.map",
|
|
layers: "basic"
|
|
});
|
|
map.addLayer(layer);
|
|
|
|
// zoom to a fractional ZoomLevel initially:
|
|
map.setCenter(new OpenLayers.LonLat(0, 0), 9.545);
|
|
|
|
control = new OpenLayers.Control.PanZoomBar({
|
|
forceFixedZoomLevel: true
|
|
});
|
|
map.addControl(control);
|
|
|
|
// The y values come from manually recording real values in an example
|
|
var evt = {
|
|
'xy': {
|
|
'x': 0,
|
|
'y': -10.633
|
|
},
|
|
which: 1
|
|
};
|
|
control.zoomStart = {
|
|
'x': 0,
|
|
'y': 5.366
|
|
};
|
|
control.mouseDragStart = {
|
|
'x': 0,
|
|
'y': -10.633
|
|
};
|
|
control.deltaY = control.zoomStart.y - evt.xy.y
|
|
control.zoomBarUp(evt);
|
|
t.eq(map.zoom, 11, "forceFixedZoomLevel makes sure that after dragging of the handle only fixed zoom levels are used even if the map has fractionalZoom");
|
|
|
|
// randomly drag the handle around
|
|
// we should never get a zoom < 0 or a non-integer zoom, regardless of
|
|
// captured random values for start and end of the drag.
|
|
for (var i = 0; i < numRandomDrags; i++) {
|
|
var randStartY = Math.random() * 10 * ((i % 2 === 0) ? -1 : 1);
|
|
var randStopY = Math.random() * 160 * ((i % 2 === 1) ? -1 : 1);
|
|
var evt = {
|
|
'xy': {
|
|
'x': 0,
|
|
'y': randStopY
|
|
},
|
|
which: 1
|
|
};
|
|
control.zoomStart = {
|
|
'x': 0,
|
|
'y': randStartY
|
|
};
|
|
control.mouseDragStart = {
|
|
'x': 0,
|
|
'y': randStopY
|
|
};
|
|
control.deltaY = control.zoomStart.y - evt.xy.y
|
|
control.zoomBarUp(evt);
|
|
|
|
t.eq(Math.floor(map.zoom), Math.ceil(map.zoom), 'Only integer zooms after random handle drag with forceFixedZoomLevel=true and fractionalZoom=true (current zoom was ' + map.zoom + ')');
|
|
t.ok(map.zoom >= 0, 'map.zoom is never < 0 after random handle drag with forceFixedZoomLevel=true and fractionalZoom=true');
|
|
}
|
|
}
|
|
|
|
function test_Control_PanZoomBar_shows (t) {
|
|
t.plan(22);
|
|
|
|
var control, map;
|
|
|
|
control = new OpenLayers.Control.PanZoomBar({panIcons: true, zoomWorldIcon: false});
|
|
map = new OpenLayers.Map('map', {controls: [control]});
|
|
t.eq(control.buttons.length, 6, "(a) pan, no world - expected number of buttons");
|
|
t.ok(control.buttons[0].id.match("_panup$"), "(a) pan, no world - pan up");
|
|
t.ok(control.buttons[1].id.match("_panleft$"), "(a) pan, no world - pan left");
|
|
t.ok(control.buttons[2].id.match("_panright$"), "(a) pan, no world - pan right");
|
|
t.ok(control.buttons[3].id.match("_pandown$"), "(a) pan, no world - pan down");
|
|
t.ok(control.buttons[4].id.match("_zoomin$"), "(a) pan, no world - zoom in");
|
|
t.ok(control.buttons[5].id.match("_zoomout$"), "(a) pan, no world - zoom out");
|
|
map.destroy();
|
|
|
|
control = new OpenLayers.Control.PanZoomBar({panIcons: true, zoomWorldIcon: true});
|
|
map = new OpenLayers.Map('map', {controls:[control]});
|
|
t.eq(control.buttons.length, 7, "(b) pan, world - expected number of buttons");
|
|
t.ok(control.buttons[0].id.match("_panup$"), "(b) pan, world - pan up");
|
|
t.ok(control.buttons[1].id.match("_panleft$"), "(b) pan, world - pan left");
|
|
t.ok(control.buttons[2].id.match("_zoomworld$"), "(b) pan, world - zoom world");
|
|
t.ok(control.buttons[3].id.match("_panright$"), "(b) pan, world - pan right");
|
|
t.ok(control.buttons[4].id.match("_pandown$"), "(b) pan, world - pan down");
|
|
t.ok(control.buttons[5].id.match("_zoomin$"), "(b) pan, world - zoom in");
|
|
t.ok(control.buttons[6].id.match("_zoomout$"), "(b) pan, world - zoom out");
|
|
map.destroy();
|
|
|
|
control = new OpenLayers.Control.PanZoomBar({panIcons: false, zoomWorldIcon: false});
|
|
map = new OpenLayers.Map('map', {controls:[control]});
|
|
t.eq(control.buttons.length, 2, "(c) no pan, no world - expected number of buttons");
|
|
t.ok(control.buttons[0].id.match("_zoomin$"), "(c) no pan, no world - zoom in");
|
|
t.ok(control.buttons[1].id.match("_zoomout$"), "(c) no pan, no world - zoom out");
|
|
map.destroy();
|
|
|
|
control = new OpenLayers.Control.PanZoomBar({panIcons: false, zoomWorldIcon: true});
|
|
map = new OpenLayers.Map('map', {controls:[control]});
|
|
t.eq(control.buttons.length, 3, "(d) no pan, world - expected number of buttons");
|
|
t.ok(control.buttons[0].id.match("_zoomin$"), "(d) no pan, world - zoom in");
|
|
t.ok(control.buttons[1].id.match("_zoomout$"), "(d) no pan, world - zoom out");
|
|
t.ok(control.buttons[2].id.match("_zoomworld$"), "(d) no pan, world - zoom world");
|
|
map.destroy();
|
|
}
|
|
</script>
|
|
</head>
|
|
<body>
|
|
<div id="map" style="width: 1024px; height: 512px;"/>
|
|
</body>
|
|
</html>
|