#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
git-svn-id: http://svn.openlayers.org/trunk/openlayers@3043 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user