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

add setLayer function to SelectFeature control so that we can change the layer attached to the control on the fly, r=ahocevar (closes #2340)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@9789 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
bartvde
2009-11-08 16:58:33 +00:00
parent 5fd5085eba
commit e77a804559
2 changed files with 100 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/OpenLayers/Control/SelectFeature.js
View File

@@ -182,16 +182,7 @@ OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
if(this.scope === null) { if(this.scope === null) {
this.scope = this; this.scope = this;
} }
if(layers instanceof Array) { this.initLayer(layers);
this.layers = layers;
this.layer = new OpenLayers.Layer.Vector.RootContainer(
this.id + "_container", {
layers: layers
}
);
} else {
this.layer = layers;
}
var callbacks = { var callbacks = {
click: this.clickFeature, click: this.clickFeature,
clickout: this.clickoutFeature clickout: this.clickoutFeature
@@ -216,6 +207,27 @@ OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
); );
} }
}, },
/**
* Method: initLayer
* Assign the layer property. If layers is an array, we need to use
* a RootContainer.
*
* Parameters:
* layers - {<OpenLayers.Layer.Vector>}, or an array of vector layers.
*/
initLayer: function(layers) {
if(layers instanceof Array) {
this.layers = layers;
this.layer = new OpenLayers.Layer.Vector.RootContainer(
this.id + "_container", {
layers: layers
}
);
} else {
this.layer = layers;
}
},
/** /**
* Method: destroy * Method: destroy
@@ -558,5 +570,28 @@ OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
OpenLayers.Control.prototype.setMap.apply(this, arguments); OpenLayers.Control.prototype.setMap.apply(this, arguments);
}, },
/**
* Method: setLayer
* Attach a new layer to the control, overriding any existing layers.
*
* Parameters:
* layers - Array of {<OpenLayers.Layer.Vector>} or a single
* {<OpenLayers.Layer.Vector>}
*/
setLayer: function(layers) {
var isActive = this.active;
this.unselectAll();
this.deactivate();
if(this.layers) {
this.layer.destroy();
this.layers = null;
}
this.initLayer(layers);
this.handlers.feature.layer = this.layer;
if (isActive) {
this.activate();
}
},
CLASS_NAME: "OpenLayers.Control.SelectFeature" CLASS_NAME: "OpenLayers.Control.SelectFeature"
}); });

86
tests/Control/SelectFeature.html
View File

@@ -12,16 +12,16 @@
t.ok(control instanceof OpenLayers.Control.SelectFeature, t.ok(control instanceof OpenLayers.Control.SelectFeature,
"new OpenLayers.Control.SelectFeature returns an instance"); "new OpenLayers.Control.SelectFeature returns an instance");
t.eq(control.layers[0], "bar", t.eq(control.layers[0], "bar",
"constructor with array of layers sets layer correctly"); "constructor with array of layers sets layer correctly");
// t.eq(control.handlers.feature.geometryTypes, "foo", // t.eq(control.handlers.feature.geometryTypes, "foo",
// "constructor sets options correctly on feature handler"); // "constructor sets options correctly on feature handler");
t.ok(control.layer instanceof OpenLayers.Layer.Vector.RootContainer, "control has a root container layer if constructor was called with an array of layers"); t.ok(control.layer instanceof OpenLayers.Layer.Vector.RootContainer, "control has a root container layer if constructor was called with an array of layers");
control = new OpenLayers.Control.SelectFeature(layer, options); control = new OpenLayers.Control.SelectFeature(layer, options);
t.eq(control.layers, null, "this.layers is null if constructor called with a single layer"); t.eq(control.layers, null, "this.layers is null if constructor called with a single layer");
t.eq(control.layer, layer, "this.layer holds the layer that was passed with the constructor if called with a single layer") t.eq(control.layer, layer, "this.layer holds the layer that was passed with the constructor if called with a single layer")
} }
function test_Control_SelectFeature_destroy(t) { function test_Control_SelectFeature_destroy(t) {
t.plan(2); t.plan(2);
var map = new OpenLayers.Map("map"); var map = new OpenLayers.Map("map");
@@ -38,9 +38,9 @@
} }
// should nullify the layer property here // should nullify the layer property here
control.destroy(); control.destroy();
} }
function test_Control_SelectFeature_select(t) { function test_Control_SelectFeature_select(t) {
t.plan(4); t.plan(4);
var map = new OpenLayers.Map("map"); var map = new OpenLayers.Map("map");
@@ -66,7 +66,7 @@
control.unselect(feature2); control.unselect(feature2);
t.eq(feature2.renderIntent, "default", "render intent is set back to default"); t.eq(feature2.renderIntent, "default", "render intent is set back to default");
} }
function test_Control_SelectFeature_clickFeature(t) { function test_Control_SelectFeature_clickFeature(t) {
t.plan(6); t.plan(6);
// mock up layer // mock up layer
@@ -92,7 +92,7 @@
layer: layer layer: layer
}; };
} }
// test that onSelect gets called properly // test that onSelect gets called properly
control.onSelect = function(feature) { control.onSelect = function(feature) {
feature.tested += 1; feature.tested += 1;
@@ -108,11 +108,11 @@
feature.tested += 1; feature.tested += 1;
t.eq(feature.id, features[feature.index].id, t.eq(feature.id, features[feature.index].id,
"onUnselect called with proper feature (" + feature.index + ")"); "onUnselect called with proper feature (" + feature.index + ")");
t.eq(feature.tested, feature.test, t.eq(feature.tested, feature.test,
"onUnselect called only once for feature (" + feature.index + ")"); "onUnselect called only once for feature (" + feature.index + ")");
t.ok(this == control, "onUnselect called in the scope of the control if control.scope is not provided"); t.ok(this == control, "onUnselect called in the scope of the control if control.scope is not provided");
} }
// mock up first click on first feature (runs 3 tests from onSelect) // mock up first click on first feature (runs 3 tests from onSelect)
var feature = features[0]; var feature = features[0];
feature.index = 0; feature.index = 0;
@@ -128,9 +128,9 @@
feature.test = 2; feature.test = 2;
control.clickFeature(feature); control.clickFeature(feature);
} }
function test_box(t) { function test_box(t) {
t.plan(5); t.plan(5);
var map = new OpenLayers.Map("map"); var map = new OpenLayers.Map("map");
@@ -149,30 +149,30 @@
control.setMap(map); control.setMap(map);
map.getLonLatFromPixel = function(arg) { map.getLonLatFromPixel = function(arg) {
return new OpenLayers.LonLat(arg.x, arg.y); return new OpenLayers.LonLat(arg.x, arg.y);
} }
control.selectBox(new OpenLayers.Bounds(-1, -1, 2, 2)); control.selectBox(new OpenLayers.Bounds(-1, -1, 2, 2));
t.eq(layer.selectedFeatures.length, 3, "box around all features selects 3 features"); t.eq(layer.selectedFeatures.length, 3, "box around all features selects 3 features");
control.selectBox(new OpenLayers.Bounds(-3, -3, -1, -1)); control.selectBox(new OpenLayers.Bounds(-3, -3, -1, -1));
t.eq(layer.selectedFeatures.length, 4, "box around other features doesn't turn off already selected features."); t.eq(layer.selectedFeatures.length, 4, "box around other features doesn't turn off already selected features.");
control.multipleSelect = function() { control.multipleSelect = function() {
return false; return false;
}; };
control.selectBox(new OpenLayers.Bounds(-3, -3, -1, -1)); control.selectBox(new OpenLayers.Bounds(-3, -3, -1, -1));
t.eq(layer.selectedFeatures.length, 1, "box around other features correctly turns off already selected features."); t.eq(layer.selectedFeatures.length, 1, "box around other features correctly turns off already selected features.");
control.geometryTypes = null; control.geometryTypes = null;
control.selectBox(new OpenLayers.Bounds(-100, -100, 100, 100)); control.selectBox(new OpenLayers.Bounds(-100, -100, 100, 100));
t.eq(layer.selectedFeatures.length, layer.features.length, "all features selected with no geometryTypes filter"); t.eq(layer.selectedFeatures.length, layer.features.length, "all features selected with no geometryTypes filter");
control.geometryTypes = ["OpenLayers.Geometry.Point"]; control.geometryTypes = ["OpenLayers.Geometry.Point"];
control.selectBox(new OpenLayers.Bounds(-100, -100, 100, 100)); control.selectBox(new OpenLayers.Bounds(-100, -100, 100, 100));
t.eq(layer.selectedFeatures.length, 3, "3 features selected with geometryTypes filter"); t.eq(layer.selectedFeatures.length, 3, "3 features selected with geometryTypes filter");
} }
function test_Control_SelectFeature_activate(t) { function test_Control_SelectFeature_activate(t) {
t.plan(4); t.plan(4);
var map = new OpenLayers.Map("map"); var map = new OpenLayers.Map("map");
@@ -267,9 +267,9 @@
t.eq(feature.renderIntent, "temporary", t.eq(feature.renderIntent, "temporary",
"feature drawn with expected render intent after \"mouseover\""); "feature drawn with expected render intent after \"mouseover\"");
t.eq(feature._lastHighlighter, ctrl2.id, t.eq(feature._lastHighlighter, ctrl2.id,
"feature._lastHighlighter properly set after \"mouseover\""); "feature._lastHighlighter properly set after \"mouseover\"");
t.eq(feature._prevHighlighter, undefined, t.eq(feature._prevHighlighter, undefined,
"feature._prevHighlighter properly set after \"mouseover\""); "feature._prevHighlighter properly set after \"mouseover\"");
// click in feature, feature is drawn with "select" // click in feature, feature is drawn with "select"
_feature = feature; _feature = feature;
@@ -278,9 +278,9 @@
t.eq(feature.renderIntent, "select", t.eq(feature.renderIntent, "select",
"feature drawn with expected render intent after \"clickin\""); "feature drawn with expected render intent after \"clickin\"");
t.eq(feature._lastHighlighter, ctrl1.id, t.eq(feature._lastHighlighter, ctrl1.id,
"feature._lastHighlighter properly set after \"clickin\""); "feature._lastHighlighter properly set after \"clickin\"");
t.eq(feature._prevHighlighter, ctrl2.id, t.eq(feature._prevHighlighter, ctrl2.id,
"feature._prevHighlighter properly set after \"clickin\""); "feature._prevHighlighter properly set after \"clickin\"");
// mouse out of feature, feature is still drawn with "select" // mouse out of feature, feature is still drawn with "select"
_feature = null; _feature = null;
@@ -289,9 +289,9 @@
t.eq(feature.renderIntent, "select", t.eq(feature.renderIntent, "select",
"feature drawn with expected render intent after \"mouseout\""); "feature drawn with expected render intent after \"mouseout\"");
t.eq(feature._lastHighlighter, ctrl1.id, t.eq(feature._lastHighlighter, ctrl1.id,
"feature._lastHighlighter properly set after \"nouseout\""); "feature._lastHighlighter properly set after \"nouseout\"");
t.ok(feature._prevHighlighter, ctrl2.id, t.ok(feature._prevHighlighter, ctrl2.id,
"feature._prevHighlighter properly set after \"mouseout\""); "feature._prevHighlighter properly set after \"mouseout\"");
// mouse over feature again, feature is drawn with "temporary" // mouse over feature again, feature is drawn with "temporary"
_feature = feature; _feature = feature;
@@ -300,9 +300,9 @@
t.eq(feature.renderIntent, "temporary", t.eq(feature.renderIntent, "temporary",
"feature drawn with expected render intent after \"mouseover\""); "feature drawn with expected render intent after \"mouseover\"");
t.eq(feature._lastHighlighter, ctrl2.id, t.eq(feature._lastHighlighter, ctrl2.id,
"feature._lastHighlighter properly set after \"mouseover\""); "feature._lastHighlighter properly set after \"mouseover\"");
t.eq(feature._prevHighlighter, ctrl1.id, t.eq(feature._prevHighlighter, ctrl1.id,
"feature._prevHighlighter properly set after \"mouseover\""); "feature._prevHighlighter properly set after \"mouseover\"");
// mouve out of feature again, feature is still drawn with "select" // mouve out of feature again, feature is still drawn with "select"
_feature = null; _feature = null;
@@ -311,9 +311,9 @@
t.eq(feature.renderIntent, "select", t.eq(feature.renderIntent, "select",
"feature drawn with expected render intent after \"mouseout\""); "feature drawn with expected render intent after \"mouseout\"");
t.eq(feature._lastHighlighter, ctrl1.id, t.eq(feature._lastHighlighter, ctrl1.id,
"feature._lastHighlighter properly set after \"mouseout\""); "feature._lastHighlighter properly set after \"mouseout\"");
t.eq(feature._prevHighlighter, undefined, t.eq(feature._prevHighlighter, undefined,
"feature._prevHighlighter properly set after \"mouseout\""); "feature._prevHighlighter properly set after \"mouseout\"");
// click out of feature, feature is drawn with "default" // click out of feature, feature is drawn with "default"
_feature = null; _feature = null;
@@ -322,9 +322,9 @@
t.eq(feature.renderIntent, "default", t.eq(feature.renderIntent, "default",
"feature drawn with expected render intent after \"clickout\""); "feature drawn with expected render intent after \"clickout\"");
t.eq(feature._lastHighlighter, undefined, t.eq(feature._lastHighlighter, undefined,
"feature._lastHighlighter properly set after \"clickout\""); "feature._lastHighlighter properly set after \"clickout\"");
t.eq(feature._prevHighlighter, undefined, t.eq(feature._prevHighlighter, undefined,
"feature._prevHighlighter properly set after \"clickout\""); "feature._prevHighlighter properly set after \"clickout\"");
// with selectStyle // with selectStyle
@@ -373,6 +373,30 @@
map.events.triggerEvent("click", evt); map.events.triggerEvent("click", evt);
} }
function test_setLayer(t) {
t.plan(5);
var map = new OpenLayers.Map("map");
var layer1 = new OpenLayers.Layer.Vector();
var layer2 = new OpenLayers.Layer.Vector();
var layer3 = new OpenLayers.Layer.Vector();
map.addLayer(layer1, layer2, layer3);
// initialize it with a single layer
var control = new OpenLayers.Control.SelectFeature(layer1);
map.addControl(control);
control.activate();
control.setLayer([layer2, layer3]);
t.eq(control.layer instanceof OpenLayers.Layer.Vector.RootContainer, true, "Root container created correctly on setLayer with multiple layers");
t.eq(control.active, true, "Control should be active still after using setLayer");
t.eq((control.handlers.feature.layer === control.layer), true, "Feature handler layer set correctly");
control.destroy();
// initialize with an array of layers
control = new OpenLayers.Control.SelectFeature([layer1, layer2]);
t.eq((control.layers !== null), true, "Control has a layers property");
control.setLayer(layer3);
t.eq((control.layers === null), true, "When using setLayer with a single layer, the layers property is removed if present before");
map.destroy();
}
</script> </script>
</head> </head>
<body> <body>