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

added support for text labels. This also adds getCentroid methods to all

Browse Source 
geometries. Thanks crschmidt for the great help with this patch, and 
thanks to camptocamp for the initial work on this and rcoup for creating 
the first patches. r=crschmidt (closes #1895)


git-svn-id: http://svn.openlayers.org/trunk/openlayers@9262 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2009-04-10 16:05:26 +00:00
parent dd556be0be
commit cc2e19d789
15 changed files with 560 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Layer/Vector.html
+1 -1
View File
@@ -426,7 +426,7 @@
graphicYOffset: -16
});
var root = renderer.root;
var root = renderer.vectorRoot;
if (layer.renderer.CLASS_NAME == 'OpenLayers.Renderer.SVG') {
feature.style = customStyle1;
layer.drawFeature(feature);
tests/Layer/Vector/RootContainer.html
+12 -4
View File
@@ -5,7 +5,6 @@
var layer, map;
function test_RootContainer_collectResetRoots(t) {
t.plan(4);
map = new OpenLayers.Map("map");
var layer1 = new OpenLayers.Layer.Vector("layer1");
@@ -13,15 +12,24 @@
layer = new OpenLayers.Layer.Vector.RootContainer("layer_1_2", {
layers: [layer1, layer2]
});
// we cannot test this with a renderer that does not hava a rendererRoot
var plan = layer.renderer.rendererRoot ? 4 : 0;
t.plan(plan);
if(plan == 0) {
return;
}
var numRoots = layer.renderer.rendererRoot.childNodes.length;
// 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(layer.renderer.rendererRoot.childNodes.length, numRoots * 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");
t.eq(layer.renderer.rendererRoot.childNodes.length, numRoots, "roots removed from container");
t.eq(layer1.renderer.rendererRoot.childNodes.length, numRoots, "root re-added to original layer");
}
function test_RootContainer_getFeatureFromEvent(t) {
tests/Renderer/Elements.html
+16 -16
View File
@@ -17,9 +17,8 @@
OpenLayers.Renderer.Elements.prototype._createRoot =
OpenLayers.Renderer.Elements.prototype.createRoot;
var root = document.createElement("div");
OpenLayers.Renderer.Elements.prototype.createRoot = function() {
return root;
return document.createElement("div");
};
OpenLayers.Renderer.Elements.prototype._createNode =
@@ -108,7 +107,7 @@
}
function test_Elements_clear(t) {
t.plan(1);
t.plan(2);
setUp();
@@ -121,7 +120,8 @@
r.clear();
t.ok(r.root.childNodes.length == 0, "root is correctly cleared");
t.ok(r.vectorRoot.childNodes.length == 0, "vector root is correctly cleared");
t.ok(r.textRoot.childNodes.length == 0, "text root is correctly cleared");
tearDown();
}
@@ -134,7 +134,7 @@
var r = create_renderer();
var element = document.createElement("div");
r.root = element;
r.vectorRoot = element;
r.nodeFactory = function(id, type) {
var element = document.createElement("div");
@@ -149,7 +149,7 @@
r.redrawBackgroundNode = function(id, geometry, style, featureId) {
b_Node = r.nodeFactory();
b_Node.id = "foo_background";
r.root.appendChild(b_Node);
element.appendChild(b_Node);
};
r.getNodeType = function(geometry, style) {
@@ -162,8 +162,8 @@
var style = {'backgroundGraphic': 'foo'};
var featureId = 'dude';
r.drawGeometry(geometry, style, featureId);
t.ok(g_Node.parentNode == r.root, "node is correctly appended to root");
t.ok(b_Node.parentNode == r.root, "redrawBackgroundNode appended background node");
t.ok(g_Node.parentNode == element, "node is correctly appended to root");
t.ok(b_Node.parentNode == element, "redrawBackgroundNode appended background node");
t.eq(g_Node._featureId, 'dude', "_featureId is correct");
t.eq(g_Node._style.backgroundGraphic, "foo", "_style is correct");
t.eq(g_Node._geometryClass, 'bar', "_geometryClass is correct");
@@ -178,8 +178,8 @@
style = {'display':'none'};
r.drawGeometry(geometry, style, featureId);
t.ok(g_Node.parentNode != r.root, "node is correctly removed");
t.ok(b_Node.parentNode != r.root, "background node correctly removed")
t.ok(g_Node.parentNode != element, "node is correctly removed");
t.ok(b_Node.parentNode != element, "background node correctly removed")
document.getElementById = _getElement;
@@ -474,7 +474,7 @@
var r = create_renderer(null, {zIndexing: true});
var element = document.createElement("div");
r.root = element;
r.vectorRoot = element;
document.body.appendChild(element);
r.createNode = function(type, id) {
@@ -505,14 +505,14 @@
return result;
}
t.eq(r.root.childNodes.length, 1, "root is correctly filled");
t.eq(element.childNodes.length, 1, "root is correctly filled");
t.eq(r.indexer.maxZIndex, 10, "indexer.maxZIndex is correctly filled");
t.eq(r.indexer.order.length, 1, "indexer.order is correctly filled");
t.eq(count(r.indexer.indices), 1, "indexer.indices is correctly filled");
r.eraseGeometry(geometry);
t.eq(r.root.childNodes.length, 0, "root is correctly cleared");
t.eq(element.childNodes.length, 0, "root is correctly cleared");
t.eq(r.indexer.maxZIndex, 0, "indexer.maxZIndex is correctly reset");
t.eq(r.indexer.order.length, 0, "indexer.order is correctly reset");
t.eq(count(r.indexer.indices), 0, "indexer.indices is correctly reset");
@@ -520,14 +520,14 @@
delete(style.graphicZIndex);
r.drawGeometry(geometry, style, featureId);
t.eq(r.root.childNodes.length, 1, "root is correctly filled");
t.eq(element.childNodes.length, 1, "root is correctly filled");
t.eq(r.indexer.maxZIndex, 0, "indexer.maxZIndex is correctly filled");
t.eq(r.indexer.order.length, 1, "indexer.order is correctly filled");
t.eq(count(r.indexer.indices), 1, "indexer.indices is correctly filled");
r.clear();
t.eq(r.root.childNodes.length, 0, "root is correctly cleared");
t.eq(element.childNodes.length, 0, "root is correctly cleared");
t.eq(r.indexer.maxZIndex, 0, "indexer.maxZIndex is correctly reset");
t.eq(r.indexer.order.length, 0, "indexer.order is correctly reset");
t.eq(count(r.indexer.indices), 0, "indexer.indices is correctly reset");
@@ -535,7 +535,7 @@
style.graphicZIndex = 12;
r.drawGeometry(geometry, style, featureId);
t.eq(r.root.childNodes.length, 1, "root is correctly filled");
t.eq(element.childNodes.length, 1, "root is correctly filled");
t.eq(r.indexer.maxZIndex, 12, "indexer.maxZIndex is correctly filled");
t.eq(r.indexer.order.length, 1, "indexer.order is correctly filled");
t.eq(count(r.indexer.indices), 1, "indexer.indices is correctly filled");