ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a grid layer may be moved while its grid hasn't been initialized yet, r=ahocevar (references #3458)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@12236 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Éric Lemoine
2011-08-11 13:21:04 +00:00
parent 8647445636
commit fe5b8a7a78
2 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/OpenLayers/Map.js
View File

@@ -1722,7 +1722,8 @@ OpenLayers.Map = OpenLayers.Class({
var layer, i, len; var layer, i, len;
for (i=0, len=this.layers.length; i<len; ++i) { for (i=0, len=this.layers.length; i<len; ++i) {
layer = this.layers[i]; layer = this.layers[i];
if (layer.visibility) { if (layer.visibility &&
(layer === this.baseLayer || layer.inRange)) {
layer.moveByPx(dx, dy); layer.moveByPx(dx, dy);
layer.events.triggerEvent("move"); layer.events.triggerEvent("move");
} }

60
tests/Map.html
View File

@@ -1790,36 +1790,76 @@
} }
function test_moveByPx(t) { function test_moveByPx(t) {
t.plan(8); t.plan(16);
var moved;
var Layer = OpenLayers.Class(OpenLayers.Layer, {
moveByPx: function(dx, dy) {
moved[this.name] = true;
}
});
var map = new OpenLayers.Map({ var map = new OpenLayers.Map({
div: 'map', div: 'map',
maxExtent: new OpenLayers.Bounds(-50, -50, 50, 50), maxExtent: new OpenLayers.Bounds(-50, -50, 50, 50),
restrictedExtent: new OpenLayers.Bounds(-10, -10, 10, 10), restrictedExtent: new OpenLayers.Bounds(-10, -10, 10, 10),
layers: [ layers: [
new OpenLayers.Layer('name', {isBaseLayer: true}) new Layer('base',
{isBaseLayer: true}),
new Layer('outofrange',
{isBaseLayer: false, minResolution:2})
] ]
}); });
moved = {};
map.zoomToExtent(new OpenLayers.Bounds(-1, -1, 1, 1)); map.zoomToExtent(new OpenLayers.Bounds(-1, -1, 1, 1));
// check initial state // check initial state
t.eq(map.layerContainerDiv.style.left, '0px', 'layer container left correct'); t.eq(map.layerContainerDiv.style.left, '0px',
t.eq(map.layerContainerDiv.style.top, '0px', 'layer container top correct'); '[initial state] layer container left correct');
t.eq(map.layerContainerDiv.style.top, '0px',
'[initial state] layer container top correct');
t.eq(moved['base'], undefined,
'[initial state] base layer not moved');
t.eq(moved['outofrange'], undefined,
'[initial state] out-of-range layer not moved');
// move to a valid position // move to a valid position
moved = {};
map.moveByPx(-455, 455); map.moveByPx(-455, 455);
t.eq(map.layerContainerDiv.style.left, '455px', 'layer container left correct'); t.eq(map.layerContainerDiv.style.left, '455px',
t.eq(map.layerContainerDiv.style.top, '-455px', 'layer container top correct'); '[valid position] layer container left correct');
t.eq(map.layerContainerDiv.style.top, '-455px',
'[valid position] layer container top correct');
t.eq(moved['base'], true,
'[valid position] base layer moved');
t.eq(moved['outofrange'], undefined,
'[valid position] out-of-range layer not moved');
// move outside the max extent // move outside the max extent
moved = {};
map.moveByPx(-4500, 4500); map.moveByPx(-4500, 4500);
t.eq(map.layerContainerDiv.style.left, '455px', 'layer container left correct'); t.eq(map.layerContainerDiv.style.left, '455px',
t.eq(map.layerContainerDiv.style.top, '-455px', 'layer container top correct'); '[outside max extent] layer container left correct');
t.eq(map.layerContainerDiv.style.top, '-455px',
'[outside max extent] layer container top correct');
t.eq(moved['base'], undefined,
'[outside max extent] base layer not moved');
t.eq(moved['outofrange'], undefined,
'[outside max extent] out-of-range layer not moved');
// move outside the restricted extent // move outside the restricted extent
moved = {};
map.moveByPx(-500, 500); map.moveByPx(-500, 500);
t.eq(map.layerContainerDiv.style.left, '455px', 'layer container left correct'); t.eq(map.layerContainerDiv.style.left, '455px',
t.eq(map.layerContainerDiv.style.top, '-455px', 'layer container top correct'); '[outside restricted extent] layer container left correct');
t.eq(map.layerContainerDiv.style.top, '-455px',
'[outside restricted extent] layer container top correct');
t.eq(moved['base'], undefined,
'[outside restricted extent] base layer not moved');
t.eq(moved['outofrange'], undefined,
'[outside restricted extent] out-of-range layer not moved');
map.destroy(); map.destroy();
} }