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

#628 - a feature has a geometry - a geometry doesn't have a feature - features are rendered, selected, moved, modified, etc - down in the renderer, expando properties on nodes are limited to _featureId, _style, and _options - this removes expandos that created circular references back through the map and to other dom elements - when the renderer is involved in selecting features, it returns a featureId (instead of a geometry or feature) and the layer is responsible for fetching the appropriate feature

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@3043 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Tim Schaub
2007-04-10 16:07:56 +00:00
parent 8af1822d94
commit 645bff1286
21 changed files with 335 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Renderer/Elements.js
+44 -38
View File
@@ -61,7 +61,7 @@ OpenLayers.Renderer.Elements.prototype =
/**
* Remove all the elements from the root
*
* @private
*/
clear: function() {
if (this.root) {
@@ -71,24 +71,6 @@ OpenLayers.Renderer.Elements.prototype =
}
},
/**
* Cycle through the rendered nodes and reproject them (this should be
* called when the extent or size has changed);
*
* @param {OpenLayers.Bounds} extent
*/
reproject: function(extent) {
for (var i = 0; i < this.root.childNodes.length; i++) {
var node = this.root.childNodes[i];
//reproject node
// for the moment, this only really happens so as to reset
// the heaviness of the line relative to the resolution and
// the size of the circle for the Point object
this.reprojectNode(node);
}
},
/** This function is in charge of asking the specific renderer which type
* of node to create for the given geometry. All geometries in an
* Elements-based renderer consist of one node and some attributes. We
@@ -100,23 +82,42 @@ OpenLayers.Renderer.Elements.prototype =
*
* @returns The corresponding node type for the specified geometry
* @type String
* @private
*/
getNodeType: function(geometry) { },
/**
* Draw the geometry on the specified layer, creating new nodes,
* setting paths, setting style.
* Draw the feature. The optional style argument can be used
* to override the feature's own style. This method should only
* be called from layer.drawFeature().
*
* @param {OpenLayers.Feature.Vector} feature
* @param {Object} style
*/
drawFeature: function(feature, style) {
if(style == null) {
style = feature.style;
}
this.drawGeometry(feature.geometry, style, feature.id);
},
/**
* Draw the geometry, creating new nodes, setting paths, setting style,
* setting featureId on the node. This method should only be called
* by the renderer itself.
*
* @param {OpenLayers.Geometry} geometry
* @param {Object} style
* @param {Object} style
* @param {String} featureId
* @private
*/
drawGeometry: function(geometry, style) {
drawGeometry: function(geometry, style, featureId) {
if ((geometry.CLASS_NAME == "OpenLayers.Geometry.MultiPoint") ||
(geometry.CLASS_NAME == "OpenLayers.Geometry.MultiLineString") ||
(geometry.CLASS_NAME == "OpenLayers.Geometry.MultiPolygon")) {
for (var i = 0; i < geometry.components.length; i++) {
this.drawGeometry(geometry.components[i], style);
this.drawGeometry(geometry.components[i], style, featureId);
}
return;
};
@@ -124,24 +125,27 @@ OpenLayers.Renderer.Elements.prototype =
//first we create the basic node and add it to the root
var nodeType = this.getNodeType(geometry);
var node = this.nodeFactory(geometry.id, nodeType, geometry);
node.geometry = geometry;
node.olStyle = style;
node._featureId = featureId;
node._geometryClass = geometry.CLASS_NAME;
node._style = style;
this.root.appendChild(node);
//now actually draw the node, and style it
this.drawGeometryNode(node);
this.drawGeometryNode(node, geometry);
},
/**
* Given a node, draw a geometry on the specified layer.
* node and geometry are required arguments, style is optional.
* This method is only called by the render itself.
*
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @param {Object} style
* @param {Object} style
* @private
*/
drawGeometryNode: function(node, geometry, style) {
geometry = geometry || node.geometry;
style = style || node.olStyle;
style = style || node._style;
var options = {
'isFilled': true,
@@ -171,19 +175,22 @@ OpenLayers.Renderer.Elements.prototype =
break;
}
node.olStyle = style;
node.olOptions = options;
node._style = style;
node._options = options;
//set style
this.setStyle(node);
//TBD simplify this
this.setStyle(node, style, options, geometry);
},
/**
* virtual functions for drawing different Geometries.
* These should all be implemented by subclasses.
* These methods are only called by the render itself.
*
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawPoint: function(node, geometry) {},
drawLineString: function(node, geometry) {},
@@ -200,10 +207,9 @@ OpenLayers.Renderer.Elements.prototype =
* @returns A geometry from an event that happened on a layer
* @type OpenLayers.Geometry
*/
getGeometryFromEvent: function(evt) {
getFeatureIdFromEvent: function(evt) {
var node = evt.target || evt.srcElement;
var geometry = node.geometry ? node.geometry : null
return geometry;
return node._featureId;
},
/** Erase a geometry from the renderer. In the case of a multi-geometry,
lib/OpenLayers/Renderer/SVG.js
+20 -12
View File
@@ -46,6 +46,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {OpenLayers.Bounds} extent
* @private
*/
setExtent: function(extent) {
OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,
@@ -64,6 +65,7 @@ OpenLayers.Renderer.SVG.prototype =
* sets the size of the drawing surface
*
* @param size {OpenLayers.Size} the size of the drawing surface
* @private
*/
setSize: function(size) {
OpenLayers.Renderer.prototype.setSize.apply(this, arguments);
@@ -80,6 +82,7 @@ OpenLayers.Renderer.SVG.prototype =
*
* @returns The corresponding node type for the specified geometry
* @type String
* @private
*/
getNodeType: function(geometry) {
var nodeType = null;
@@ -106,14 +109,7 @@ OpenLayers.Renderer.SVG.prototype =
}
return nodeType;
},
/**
* @param {DOMElement} node
*/
reprojectNode: function(node) {
this.drawGeometryNode(node);
},
/**
* Use to set all the style attributes to a SVG node.
*
@@ -125,13 +121,13 @@ OpenLayers.Renderer.SVG.prototype =
* @param {Object} options
* @option isFilled {boolean}
* @option isStroked {boolean}
* @private
*/
setStyle: function(node, style, options) {
style = style || node.olStyle;
options = options || node.olOptions;
style = style || node._style;
options = options || node._options;
if (node.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
if (node._geometryClass == "OpenLayers.Geometry.Point") {
node.setAttributeNS(null, "r", style.pointRadius);
}
@@ -192,6 +188,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @returns The specific render engine's root element
* @type DOMElement
* @private
*/
createRenderRoot: function() {
var id = this.container.id + "_svgRoot";
@@ -202,6 +199,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @returns The main root element to which we'll add vectors
* @type DOMElement
* @private
*/
createRoot: function() {
var id = this.container.id + "_root";
@@ -224,6 +222,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawPoint: function(node, geometry) {
this.drawCircle(node, geometry, 1);
@@ -233,6 +232,7 @@ OpenLayers.Renderer.SVG.prototype =
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @param {float} radius
* @private
*/
drawCircle: function(node, geometry, radius) {
var resolution = this.getResolution();
@@ -244,6 +244,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawLineString: function(node, geometry) {
node.setAttributeNS(null, "points", this.getComponentsString(geometry.components));
@@ -252,6 +253,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawLinearRing: function(node, geometry) {
node.setAttributeNS(null, "points", this.getComponentsString(geometry.components));
@@ -260,6 +262,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawPolygon: function(node, geometry) {
var d = "";
@@ -279,6 +282,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawRectangle: function(node, geometry) {
node.setAttributeNS(null, "x", geometry.x / resolution);
@@ -291,6 +295,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawCurve: function(node, geometry) {
var d = null;
@@ -309,6 +314,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawSurface: function(node, geometry) {
@@ -329,6 +335,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {Array} components array of points
* @private
*/
getComponentsString: function(components) {
var strings = [];
@@ -341,6 +348,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {OpenLayers.Geometry.Point} point
* @private
*/
getShortString: function(point) {
var resolution = this.getResolution();
lib/OpenLayers/Renderer/VML.js
+23 -18
View File
@@ -89,6 +89,7 @@ OpenLayers.Renderer.VML.prototype =
*
* @returns The corresponding node type for the specified geometry
* @type String
* @private
*/
getNodeType: function(geometry) {
var nodeType = null;
@@ -112,16 +113,6 @@ OpenLayers.Renderer.VML.prototype =
return nodeType;
},
/**
* @param {DOMElement} node
*/
reprojectNode: function(node) {
//we have to reprojectNode the entire node since the coordinates
// system has changed
this.drawGeometryNode(node);
},
/**
* Use to set all the style attributes to a VML node.
*
@@ -129,14 +120,16 @@ OpenLayers.Renderer.VML.prototype =
* @param {Object} style
* @param {Object} options
* @option isFilled {boolean}
* @option isStroked {boolean}
* @option isStroked {boolean}
* @param {OpenLayers.Geometry} geometry
* @private
*/
setStyle: function(node, style, options) {
style = style || node.olStyle;
options = options || node.olOptions;
setStyle: function(node, style, options, geometry) {
style = style || node._style;
options = options || node._options;
if (node.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
this.drawCircle(node, node.geometry, style.pointRadius);
if (node._geometryClass == "OpenLayers.Geometry.Point") {
this.drawCircle(node, geometry, style.pointRadius);
}
//fill
@@ -186,6 +179,7 @@ OpenLayers.Renderer.VML.prototype =
*
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
setNodeDimension: function(node, geometry) {
@@ -257,6 +251,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @returns The specific render engine's root element
* @type DOMElement
* @private
*/
createRenderRoot: function() {
var id = this.container.id + "_vmlRoot";
@@ -267,6 +262,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @returns The main root element to which we'll add vectors
* @type DOMElement
* @private
*/
createRoot: function() {
var id = this.container.id + "_root";
@@ -282,10 +278,11 @@ OpenLayers.Renderer.VML.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawPoint: function(node, geometry) {
this.drawCircle(node, node.geometry, 1);
this.drawCircle(node, geometry, 1);
},
/** Size and Center a circle given geometry (x,y center) and radius
@@ -293,6 +290,7 @@ OpenLayers.Renderer.VML.prototype =
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @param {float} radius
* @private
*/
drawCircle: function(node, geometry, radius) {
@@ -311,6 +309,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawLineString: function(node, geometry) {
this.drawLine(node, geometry, false);
@@ -319,6 +318,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawLinearRing: function(node, geometry) {
this.drawLine(node, geometry, true);
@@ -328,6 +328,7 @@ OpenLayers.Renderer.VML.prototype =
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @param {Boolean} closeLine Close the line? (make it a ring?)
* @private
*/
drawLine: function(node, geometry, closeLine) {
@@ -352,6 +353,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @parm {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawPolygon: function(node, geometry) {
this.setNodeDimension(node, geometry);
@@ -380,6 +382,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @parm {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawRectangle: function(node, geometry) {
var resolution = this.getResolution();
@@ -395,6 +398,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @parm {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawCurve: function(node, geometry) {
this.setNodeDimension(node, geometry);
@@ -421,6 +425,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @parm {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawSurface: function(node, geometry) {