improve map's getLayer() function, includes improved test. cheers to pensyakito for bringing this up and to cr5 for the review (Closes #861)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@5221 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2007-11-20 06:21:07 +00:00
parent 8296db3072
commit 3ae69b0789
2 changed files with 15 additions and 12 deletions
+1
View File
@@ -475,6 +475,7 @@ OpenLayers.Map = OpenLayers.Class({
var layer = this.layers[i]; var layer = this.layers[i];
if (layer.id == id) { if (layer.id == id) {
foundLayer = layer; foundLayer = layer;
break;
} }
} }
return foundLayer; return foundLayer;
+13 -11
View File
@@ -242,21 +242,23 @@
} }
function test_10_Map_getLayer(t) { function test_10_Map_getLayer(t) {
t.plan( 2 ); var numLayers = 3;
t.plan( numLayers + 1 );
map = new OpenLayers.Map('map'); var m = {
layer = new OpenLayers.Layer.WMS('Test Layer', layers: []
"http://octo.metacarta.com/cgi-bin/mapserv", };
{map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'},
{maxExtent: new OpenLayers.Bounds(33861, 717605, 330846, 1019656), maxResolution: 296985/1024, projection:"EPSG:2805" } );
map.addLayer(layer); for(var i = 0; i < numLayers; i++) {
var gotLayer = map.getLayer(layer.id); m.layers.push( { 'id': i } );
}
t.ok( layer == gotLayer, "getLayer correctly returns layer" ); for(var i = 0; i < numLayers; i++) {
var layer = OpenLayers.Map.prototype.getLayer.apply(m, [i]);
gotLayer = map.getLayer("chicken"); t.ok( layer == m.layers[i], "getLayer correctly returns layer " + i);
}
var gotLayer = OpenLayers.Map.prototype.getLayer.apply(m, ["chicken"]);
t.ok( gotLayer == null, "getLayer correctly returns null when layer not found"); t.ok( gotLayer == null, "getLayer correctly returns null when layer not found");
} }