Pullup r2999:3087 for RC2.

svn merge trunk/openlayers/@2999 trunk/openlayers/@HEAD branches/openlayers/2.4/



git-svn-id: http://svn.openlayers.org/branches/openlayers/2.4@3088 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2007-04-20 01:10:43 +00:00
parent b6fb16153c
commit b5103eb8ce
58 changed files with 1399 additions and 503 deletions

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
@@ -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) {