Ticket #1172: Renderer.diff

lib/OpenLayers/Renderer/Elements.js

@@ -84 +84 @@
-    /** 
-     * Method: getNodeType
-     * This function is in charge of asking the specific renderer which type
-. All geometries in an 
-Elements-based renderer consist of one node and some attributes. W
-have the nodeFactory() function which creates a node for us, but it
-takes a 'type' as input, and that is precisely what this function 
-
+ and style. All geometries
+in an Elements-based renderer consist of one node and som
+attributes. We have the nodeFactory() function which creates a node
+for us, but it takes a 'type' as input, and that is precisely what
+his function t
-     *  
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
+     * style - {Object}
-     * 
-     * Returns:
-     * {String} The corresponding node type for the specified geometry
@@ -96 +97 @@
-     * Returns:
-     * {String} The corresponding node type for the specified geometry
-     */
-
+, style
-
-    /** 
-     * Method: drawGeometry 
@@ -122 +123 @@
-        };
-
-        //first we create the basic node and add it to the root
-
+, style
-        var node = this.nodeFactory(geometry.id, nodeType);
-        node._featureId = featureId;
-        node._geometryClass = geometry.CLASS_NAME;
@@ -131 +132 @@
-        //now actually draw the node, and style it
-        node = this.drawGeometryNode(node, geometry);
-        this.root.appendChild(node);
+        this.postDraw(node);
-    },
-
-    /**
@@ -184 +186 @@
-    },
-    
-    /**
+     * Method: postDraw
+     * Things that have do be done after the geometry node is appended
+     * to its parent node. To be overridden by subclasses.
+     * 
+     * Parameters:
+     * node - {DOMElement}
+     */
+    postDraw: function(node) {},
+    
+    /**
-     * Method: drawPoint
-     * Virtual function for drawing Point Geometry. 
-     * Should be implemented by subclasses.

lib/OpenLayers/Renderer/SVG.js

@@ -147 +147 @@
-     * 
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
+     * style - {Object}
-     * 
-     * Returns:
-     * {String} The corresponding node type for the specified geometry
@@ -151 +152 @@
-     * Returns:
-     * {String} The corresponding node type for the specified geometry
-     */
-
+, style
-        var nodeType = null;
-        switch (geometry.CLASS_NAME) {
-            case "OpenLayers.Geometry.Point":
-
+style.externalGraphic ? "image" : 
-                break;
-            case "OpenLayers.Geometry.Rectangle":
-                nodeType = "rect";
@@ -196 +197 @@
-        options = options || node._options;
-        if (node._geometryClass == "OpenLayers.Geometry.Point") {
-            if (style.externalGraphic) {
-                // remove old node
-                var id = node.getAttributeNS(null, "id");
-                var x = parseFloat(node.getAttributeNS(null, "cx"));
-                var y = parseFloat(node.getAttributeNS(null, "cy"));
-                var _featureId = node._featureId;
-                var _geometryClass = node._geometryClass;
-                var _style = node._style;
-                
-                // create new image node
-                node = this.createNode("image", id);
-                node._featureId = _featureId;
-                node._geometryClass = _geometryClass;
-                node._style = _style;
-
-                // now style the new node
-                if (style.graphicWidth && style.graphicHeight) {
-                  node.setAttributeNS(null, "preserveAspectRatio", "none");
-                }
@@ -222 +211 @@
-                    style.graphicXOffset : -(0.5 * width);
-                var yOffset = (style.graphicYOffset != undefined) ?
-                    style.graphicYOffset : -(0.5 * height);
+
-                var opacity = style.graphicOpacity || style.fillOpacity;
-                
-                node.setAttributeNS(null, "x", (x + xOffset).toFixed());

lib/OpenLayers/Renderer/VML.js

@@ -105 +105 @@
-
-    /**
-     * Method: getNodeType
-
+ and style
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
+     * style - {Object}
-     *
-     * Returns:
-     * {String} The corresponding node type for the specified geometry
@@ -113 +114 @@
-     * Returns:
-     * {String} The corresponding node type for the specified geometry
-     */
-
+, style
-        var nodeType = null;
-        switch (geometry.CLASS_NAME) {
-            case "OpenLayers.Geometry.Point":
-
+style.externalGraphic ? "v:rect" : 
-                break;
-            case "OpenLayers.Geometry.Rectangle":
-                nodeType = "v:rect";
@@ -153 +154 @@
-        
-        if (node._geometryClass == "OpenLayers.Geometry.Point") {
-            if (style.externalGraphic) {
-                // remove old node
-                var id = node.id;
-                var _featureId = node._featureId;
-                var _geometryClass = node._geometryClass;
-                var _style = node._style;
-                
-                // create new image node
-                node = this.createNode("v:rect", id);
-                var fill = this.createNode("v:fill", id+"_image");
-                node.appendChild(fill);
-                node._featureId = _featureId;
-                node._geometryClass = _geometryClass;
-                node._style = _style;
-                
-                fill.src = style.externalGraphic;
-                fill.type = "frame";
-                node.style.flip = "y";
-                
-                if (!(style.graphicWidth && style.graphicHeight)) {
-                  fill.aspect = "atmost";
-                }
-                
-                // now style the new node
-                var width = style.graphicWidth || style.graphicHeight;
-                var height = style.graphicHeight || style.graphicWidth;
-                width = width ? width : style.pointRadius*2;
@@ -192 +170 @@
-                node.style.width = width;
-                node.style.height = height;    
-                
-fill style for rect
+style/options for fill and stroke
-                style.fillColor = "none";
-style.strokeColor = "none"
+options.isStroked = false
-                         
-            } else {
-                this.drawCircle(node, geometry, style.pointRadius);
@@ -216 +194 @@
-        } else {
-            if (!fill) {
-                fill = this.createNode('v:fill', node.id + "_fill");
+
+                if (style.fillOpacity) {
+                    fill.setAttribute("opacity", style.fillOpacity);
+                }
+
+                if (node._geometryClass == "OpenLayers.Geometry.Point" &&
+                        style.externalGraphic) {
+
+                    // override fillOpacity
+                    if (style.graphicOpacity) {
+                        fill.setAttribute("opacity", style.graphicOpacity);
+                    }
+                    
+                    fill.setAttribute("src", style.externalGraphic);
+                    fill.setAttribute("type", "frame");
+                    node.style.flip = "y";
+                    
+                    if (!(style.graphicWidth && style.graphicHeight)) {
+                      fill.aspect = "atmost";
+                    }
+                }
-                node.appendChild(fill);
-            }
-            // if graphicOpacity is set use it in priority for external graphic
-            if (node._geometryClass == "OpenLayers.Geometry.Point" &&
-                style.externalGraphic &&
-                style.graphicOpacity) {
-                fill.setAttribute("opacity", style.graphicOpacity);
-            } else if (style.fillOpacity) {
-                fill.setAttribute("opacity", style.fillOpacity);
-            }
-        }
-
-
@@ -257 +248 @@
-        return node;
-    },
-
+    /**
+     * Method: postDraw
+     * Some versions of Internet Explorer seem to be unable to set fillcolor
+     * and strokecolor to "none" correctly before the fill node is appended to
+     * a visible vml node. This method takes care of that and sets fillcolor
+     * and strokecolor again if needed.
+     * 
+     * Parameters:
+     * node - {DOMElement}
+     */
+    postDraw: function(node) {
+        var fillColor = node._style.fillColor;
+        var strokeColor = node._style.strokeColor;
+        if (fillColor == "none" &&
+                node.getAttribute("fillcolor") != fillColor) {
+            node.setAttribute("fillcolor", fillColor);
+        }
+        if (strokeColor == "none" &&
+                node.getAttribute("strokecolor") != strokeColor) {
+            node.setAttribute("strokecolor", strokeColor)
+        }
+    },
+
-
-    /**
-     * Method: setNodeDimension