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

Tag 2.4-RC2.

Browse Source 
git-svn-id: http://svn.openlayers.org/tags/openlayers/release-2.4-rc2@3089 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2007-04-20 01:29:54 +00:00
parent b6fb16153c
commit 9011c8ca0a
118 changed files with 1591 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
lib/OpenLayers/Renderer/Elements.js
View File

@@ -1,5 +1,5 @@
/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
* See http://svn.openlayers.org/trunk/openlayers/repository-license.txt
/* Copyright (c) 2006 MetaCarta, Inc., published under a BSD license.
* See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
@@ -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,27 @@ 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 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 +110,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 +160,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) {},
@@ -199,11 +191,11 @@ OpenLayers.Renderer.Elements.prototype =
*
* @returns A geometry from an event that happened on a layer
* @type OpenLayers.Geometry
* @private
*/
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,
@@ -212,6 +204,7 @@ OpenLayers.Renderer.Elements.prototype =
* the DOM.
*
* @param {OpenLayers.Geometry} geometry
* @private
*/
eraseGeometry: function(geometry) {
if ((geometry.CLASS_NAME == "OpenLayers.Geometry.MultiPoint") ||
@@ -246,6 +239,7 @@ OpenLayers.Renderer.Elements.prototype =
*
* @returns A new node of the given type and id
* @type DOMElement
* @private
*/
nodeFactory: function(id, type, geometry) {
var node = $(id);

183
lib/OpenLayers/Renderer/SVG.js
View File

@@ -1,5 +1,5 @@
/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
* See http://svn.openlayers.org/trunk/openlayers/repository-license.txt
/* Copyright (c) 2006 MetaCarta, Inc., published under a BSD license.
* See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
@@ -13,7 +13,17 @@ OpenLayers.Renderer.SVG.prototype =
/** @type String */
xmlns: "http://www.w3.org/2000/svg",
// Firefox has a limitation where values larger or smaller than about
// 15000 in an SVG document lock the browser up. This works around it.
/** @type Integer */
maxPixel: 15000,
/** @type Float
@private */
localResolution: null,
/**
* @constructor
*
@@ -46,6 +56,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {OpenLayers.Bounds} extent
* @private
*/
setExtent: function(extent) {
OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,
@@ -53,8 +64,33 @@ OpenLayers.Renderer.SVG.prototype =
var resolution = this.getResolution();
var extentString = extent.left / resolution + " " + -extent.top / resolution + " " +
// If the resolution has changed, start over changing the corner, because
// the features will redraw.
if (!this.localResolution || resolution != this.localResolution) {
this.left = -extent.left / resolution;
this.top = extent.top / resolution;
}
var left = 0;
var top = 0;
// If the resolution has not changed, we already have features, and we need
// to adjust the viewbox to fit them.
if (this.localResolution && resolution == this.localResolution) {
left = (this.left) - (-extent.left / resolution);
top = (this.top) - (extent.top / resolution);
}
// Store resolution for use later.
this.localResolution = resolution;
// Set the viewbox -- the left/top will be pixels-dragged-since-res change,
// the width/height will be pixels.
var extentString = left + " " + top + " " +
extent.getWidth() / resolution + " " + extent.getHeight() / resolution;
//var extentString = extent.left / resolution + " " + -extent.top / resolution + " " +
this.rendererRoot.setAttributeNS(null, "viewBox", extentString);
},
@@ -64,6 +100,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 +117,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 +144,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,12 +156,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);
}
@@ -152,6 +184,10 @@ OpenLayers.Renderer.SVG.prototype =
if (style.pointerEvents) {
node.setAttributeNS(null, "pointer-events", style.pointerEvents);
}
if (style.cursor) {
node.setAttributeNS(null, "cursor", style.cursor);
}
},
/**
@@ -187,6 +223,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @returns The specific render engine's root element
* @type DOMElement
* @private
*/
createRenderRoot: function() {
var id = this.container.id + "_svgRoot";
@@ -197,6 +234,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";
@@ -219,6 +257,7 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawPoint: function(node, geometry) {
this.drawCircle(node, geometry, 1);
@@ -228,17 +267,32 @@ OpenLayers.Renderer.SVG.prototype =
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @param {float} radius
* @private
*/
drawCircle: function(node, geometry, radius) {
var resolution = this.getResolution();
node.setAttributeNS(null, "cx", geometry.x / resolution);
node.setAttributeNS(null, "cy", geometry.y / resolution);
node.setAttributeNS(null, "r", radius);
var x = (geometry.x / resolution + this.left);
var y = (geometry.y / resolution - this.top);
var draw = true;
if (x < -this.maxPixel || x > this.maxPixel) { draw = false; }
if (y < -this.maxPixel || y > this.maxPixel) { draw = false; }
if (draw) {
node.setAttributeNS(null, "cx", x);
node.setAttributeNS(null, "cy", y);
node.setAttributeNS(null, "r", radius);
} else {
node.setAttributeNS(null, "cx", "");
node.setAttributeNS(null, "cy", "");
node.setAttributeNS(null, "r", 0);
}
},
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawLineString: function(node, geometry) {
node.setAttributeNS(null, "points", this.getComponentsString(geometry.components));
@@ -247,6 +301,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));
@@ -255,80 +310,132 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawPolygon: function(node, geometry) {
var d = "";
var draw = true;
for (var j = 0; j < geometry.components.length; j++) {
var linearRing = geometry.components[j];
d += " M";
for (var i = 0; i < linearRing.components.length; i++) {
d += " " + this.getShortString(linearRing.components[i]);
var component = this.getShortString(linearRing.components[i])
if (component) {
d += " " + component;
} else {
draw = false;
}
}
}
d += " z";
node.setAttributeNS(null, "d", d);
node.setAttributeNS(null, "fill-rule", "evenodd");
if (draw) {
node.setAttributeNS(null, "d", d);
node.setAttributeNS(null, "fill-rule", "evenodd");
} else {
node.setAttributeNS(null, "d", "");
}
},
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawRectangle: function(node, geometry) {
node.setAttributeNS(null, "x", geometry.x / resolution);
node.setAttributeNS(null, "y", geometry.y / resolution);
node.setAttributeNS(null, "width", geometry.width);
node.setAttributeNS(null, "height", geometry.height);
// This needs to be reworked
var x = (geometry.x / resolution + this.left);
var y = (geometry.y / resolution - this.top);
var draw = true;
if (x < -this.maxPixel || x > this.maxPixel) { draw = false; }
if (y < -this.maxPixel || y > this.maxPixel) { draw = false; }
if (draw) {
node.setAttributeNS(null, "x", x);
node.setAttributeNS(null, "y", y);
node.setAttributeNS(null, "width", geometry.width);
node.setAttributeNS(null, "height", geometry.height);
} else {
node.setAttributeNS(null, "x", "");
node.setAttributeNS(null, "y", "");
node.setAttributeNS(null, "width", 0);
node.setAttributeNS(null, "height", 0);
}
},
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawCurve: function(node, geometry) {
var d = null;
var draw = true;
for (var i = 0; i < geometry.components.length; i++) {
if ((i%3) == 0 && (i/3) == 0) {
d = "M " + this.getShortString(geometry.components[i]);
var component = this.getShortString(geometry.components[i]);
if (!component) { draw = false; }
d = "M " + component;
} else if ((i%3) == 1) {
d += " C " + this.getShortString(geometry.components[i]);
var component = this.getShortString(geometry.components[i]);
if (!component) { draw = false; }
d += " C " + component;
} else {
d += " " + this.getShortString(geometry.components[i]);
var component = this.getShortString(geometry.components[i]);
if (!component) { draw = false; }
d += " " + component;
}
}
node.setAttributeNS(null, "d", d);
if (draw) {
node.setAttributeNS(null, "d", d);
} else {
node.setAttributeNS(null, "d", "");
}
},
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawSurface: function(node, geometry) {
// create the svg path string representation
var d = null;
var draw = true;
for (var i = 0; i < geometry.components.length; i++) {
if ((i%3) == 0 && (i/3) == 0) {
d = "M " + this.getShortString(geometry.components[i]);
var component = this.getShortString(geometry.components[i]);
if (!component) { draw = false; }
d = "M " + component;
} else if ((i%3) == 1) {
d += " C " + this.getShortString(geometry.components[i]);
var component = this.getShortString(geometry.components[i]);
if (!component) { draw = false; }
d += " C " + component;
} else {
d += " " + this.getShortString(geometry.components[i]);
var component = this.getShortString(geometry.components[i]);
if (!component) { draw = false; }
d += " " + component;
}
}
d += " Z";
node.setAttributeNS(null, "d", d);
if (draw) {
node.setAttributeNS(null, "d", d);
} else {
node.setAttributeNS(null, "d", "");
}
},
/**
* @param {Array} components array of points
* @private
*/
getComponentsString: function(components) {
var strings = [];
for(var i = 0; i < components.length; i++) {
strings.push(this.getShortString(components[i]));
var component = this.getShortString(components[i]);
if (!component) { return false; }
strings.push(component);
}
return strings.join(",");
},
@@ -336,10 +443,16 @@ OpenLayers.Renderer.SVG.prototype =
/**
* @param {OpenLayers.Geometry.Point} point
* @private
*/
getShortString: function(point) {
var resolution = this.getResolution();
return point.x / resolution + "," + point.y / resolution;
var x = (point.x / resolution + this.left);
var y = (point.y / resolution - this.top);
if (x < -this.maxPixel || x > this.maxPixel) { return false; }
if (y < -this.maxPixel || y > this.maxPixel) { return false; }
var string = x + "," + y;
return string;
},

49
lib/OpenLayers/Renderer/VML.js
View File

@@ -1,5 +1,5 @@
/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
* See http://svn.openlayers.org/trunk/openlayers/repository-license.txt
/* Copyright (c) 2006 MetaCarta, Inc., published under a BSD license.
* See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
@@ -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
@@ -174,6 +167,10 @@ OpenLayers.Renderer.VML.prototype =
}
stroke.setAttribute("opacity", style.strokeOpacity);
}
if (style.cursor) {
node.style.cursor = style.cursor;
}
},
@@ -182,6 +179,7 @@ OpenLayers.Renderer.VML.prototype =
*
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
setNodeDimension: function(node, geometry) {
@@ -253,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";
@@ -263,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";
@@ -278,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
@@ -289,6 +290,7 @@ OpenLayers.Renderer.VML.prototype =
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @param {float} radius
* @private
*/
drawCircle: function(node, geometry, radius) {
@@ -307,6 +309,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawLineString: function(node, geometry) {
this.drawLine(node, geometry, false);
@@ -315,6 +318,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @param {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawLinearRing: function(node, geometry) {
this.drawLine(node, geometry, true);
@@ -324,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) {
@@ -348,6 +353,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @parm {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawPolygon: function(node, geometry) {
this.setNodeDimension(node, geometry);
@@ -376,6 +382,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @parm {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawRectangle: function(node, geometry) {
var resolution = this.getResolution();
@@ -391,6 +398,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @parm {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawCurve: function(node, geometry) {
this.setNodeDimension(node, geometry);
@@ -417,6 +425,7 @@ OpenLayers.Renderer.VML.prototype =
/**
* @parm {DOMElement} node
* @param {OpenLayers.Geometry} geometry
* @private
*/
drawSurface: function(node, geometry) {