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

SelectFeature control can now select across multiple vector

Browse Source 
layers when passed an array of layers instead of a single layer with 
the constructor. This changeset also introduces a new layer type, 
Layer.Vector.RootContainer, which will be set as the topmost layer by 
the SelectFeature control and collect the svg/vml/canvas roots of 
multiple vector layers. r=crschmidt (closes #1666)


git-svn-id: http://svn.openlayers.org/trunk/openlayers@9116 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2009-03-22 14:25:18 +00:00
parent 5c26d578ca
commit 2b1e8641f9
14 changed files with 552 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Control/SelectFeature.html
+28 -17
View File
@@ -3,7 +3,7 @@
<script src="../../lib/OpenLayers.js"></script>
<script type="text/javascript">
function test_Control_SelectFeature_constructor(t) {
t.plan(2);
t.plan(3);
var options = {
// geometryTypes: "foo"
};
@@ -11,10 +11,11 @@
var control = new OpenLayers.Control.SelectFeature(layer, options);
t.ok(control instanceof OpenLayers.Control.SelectFeature,
"new OpenLayers.Control.SelectFeature returns an instance");
t.eq(control.layer, "bar",
t.eq(control.layers[0], "bar",
"constructor sets layer correctly");
// t.eq(control.handlers.feature.geometryTypes, "foo",
// "constructor sets options correctly on feature handler");
t.ok(control.layer instanceof OpenLayers.Layer.Vector.RootContainer, "control has a root container layer");
}
function test_Control_SelectFeature_destroy(t) {
@@ -37,20 +38,29 @@
}
function test_Control_SelectFeature_select(t) {
t.plan(2);
t.plan(4);
var map = new OpenLayers.Map("map");
var layer = new OpenLayers.Layer.Vector();
map.addLayer(layer);
var control = new OpenLayers.Control.SelectFeature(layer);
var feature = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(0,0));
layer.addFeatures(feature);
layer.drawFeature = function(feature, style) {
layer.styleMap.createSymbolizer(feature, style);
var layer1 = new OpenLayers.Layer.Vector();
var layer2 = new OpenLayers.Layer.Vector();
map.addLayers([layer1, layer2]);
var control = new OpenLayers.Control.SelectFeature([layer1, layer2]);
var feature1 = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(0,1));
var feature2 = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(1,0));
layer1.addFeatures(feature1);
layer2.addFeatures(feature2);
var drawFeature = function(feature, style) {
feature.layer.styleMap.createSymbolizer(feature, style);
}
control.select(feature);
t.eq(feature.renderIntent, "select", "render intent is set to select");
control.unselect(feature);
t.eq(feature.renderIntent, "default", "render intent is set back to default");
layer1.drawFeature = drawFeature;
layer2.drawFeature = drawFeature;
control.select(feature1);
t.eq(feature1.renderIntent, "select", "render intent is set to select");
control.select(feature2);
t.eq(feature2.renderIntent, "select", "render intent is set to select");
control.unselect(feature1);
t.eq(feature1.renderIntent, "default", "render intent is set back to default");
control.unselect(feature2);
t.eq(feature2.renderIntent, "default", "render intent is set back to default");
}
function test_Control_SelectFeature_clickFeature(t) {
@@ -74,14 +84,15 @@
features[i] = {
id: Math.random(),
tested: 0,
style: ""
style: "",
layer: layer
};
}
// test that onSelect gets called properly
control.onSelect = function(feature) {
feature.tested += 1;
t.eq(feature, features[feature.index],
t.eq(feature.id, features[feature.index].id,
"onSelect called with proper feature (" + feature.index + ")");
t.eq(feature.tested, feature.test,
"onSelect called only once for feature (" + feature.index + ")");
@@ -90,7 +101,7 @@
// test that onUnselect gets called properly
control.onUnselect = function(feature) {
feature.tested += 1;
t.eq(feature, features[feature.index],
t.eq(feature.id, features[feature.index].id,
"onUnselect called with proper feature (" + feature.index + ")");
t.eq(feature.tested, feature.test,
"onUnselect called only once for feature (" + feature.index + ")");
tests/Layer/Vector/RootContainer.html
+55
View File
@@ -0,0 +1,55 @@
<html>
<head>
<script src="../../../lib/OpenLayers.js"></script>
<script type="text/javascript">
var layer, map;
function test_RootContainer_collectResetRoots(t) {
t.plan(4);
map = new OpenLayers.Map("map");
var layer1 = new OpenLayers.Layer.Vector("layer1");
var layer2 = new OpenLayers.Layer.Vector("layer2");
layer = new OpenLayers.Layer.Vector.RootContainer("layer_1_2", {
layers: [layer1, layer2]
});
// addLayers will call setMap() for layer, which will call collectRoots()
map.addLayers([layer1, layer2, layer]);
t.eq(layer.renderer.rendererRoot.childNodes.length, 3, "layer has correct number of renderer roots");
t.eq(layer1.renderer.rendererRoot.childNodes.length, 0, "layer1 has no own renderer root");
layer.resetRoots();
t.eq(layer.renderer.rendererRoot.childNodes.length, 1, "roots removed from container");
t.eq(layer1.renderer.rendererRoot.childNodes.length, 1, "root re-added to original layer");
}
function test_RootContainer_getFeatureFromEvent(t) {
t.plan(2);
var map = new OpenLayers.Map("map");
var layer1 = new OpenLayers.Layer.Vector("layer1");
var layer2 = new OpenLayers.Layer.Vector("layer2");
layer = new OpenLayers.Layer.Vector.RootContainer("layer_1_2", {
layers: [layer1, layer2]
});
map.addLayers([layer1, layer2, layer]);
var feature1 = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(0,1));
var feature2 = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(1,0));
layer1.addFeatures(feature1);
layer2.addFeatures(feature2);
t.eq(layer.getFeatureFromEvent({
srcElement: {
_featureId: feature1.id
}
}).id, feature1.id, "feature from layer1 found");
t.eq(layer.getFeatureFromEvent({srcElement: {
_featureId: feature2.id
}}).id, feature2.id, "feature from layer2 found");
}
</script>
</head>
<body>
<div id="map" style="width:500px;height:550px"></div>
</body>
</html>
tests/Renderer/Elements.html
+14 -1
View File
@@ -466,7 +466,7 @@
OpenLayers.Util.getElement = OpenLayers.Util._getElement;
}
function test_Elements_drawAndErase(t) {
t.plan(20);
@@ -543,6 +543,19 @@
tearDown();
}
function test_Elements_moveRoot(t) {
t.plan(2);
setUp();
var r1 = create_renderer();
var r2 = create_renderer();
r1.moveRoot(r2);
t.xml_eq(r1.root.parentNode, r2.root.parentNode, "root moved successfully");
r1.moveRoot(r1);
t.xml_eq(r1.root.parentNode, r1.rendererRoot, "root moved back successfully");
tearDown();
}
</script>
</head>
tests/list-tests.html
+1
View File
@@ -115,6 +115,7 @@
<li>Layer/TileCache.html</li>
<li>Layer/TMS.html</li>
<li>Layer/Vector.html</li>
<li>Layer/Vector/RootContainer.html</li>
<li>Layer/WFS.html</li>
<li>Layer/WMS.html</li>
<li>Layer/WrapDateLine.html</li>