Changeset 5323

Timestamp:

12/01/07 17:57:58 (1 year ago)

Author:

crschmidt

Message:

Fixes and performance improvements to VML renderer problems with
externalGraphic, diligently filed, investigated, and fixed by The great and
powerful Oz, er, Andreas, who is becoming my new vector rendering hero.
(Closes #1172)

Files:

• trunk/openlayers/lib/OpenLayers/Renderer/Elements.js (modified) (4 diffs)
• trunk/openlayers/lib/OpenLayers/Renderer/SVG.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Renderer/VML.js (modified) (5 diffs)

trunk/openlayers/lib/OpenLayers/Renderer/Elements.js

@@ -85 +85 @@
-     * 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
-     */
-
+, style
-
-    /** 
@@ -123 +124 @@
-
-        //first we create the basic node and add it to the root
-
+, style
-        var node = this.nodeFactory(geometry.id, nodeType);
-        node._featureId = featureId;
@@ -132 +133 @@
-        node = this.drawGeometryNode(node, geometry);
-        this.root.appendChild(node);
+        this.postDraw(node);
-    },
-
@@ -183 +185 @@
-        return this.setStyle(node, style, options, geometry);
-    },
+    
+    /**
+     * 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) {},
-    
-    /**

trunk/openlayers/lib/OpenLayers/Renderer/SVG.js

@@ -148 +148 @@
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
+     * style - {Object}
-     * 
-     * 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":
@@ -197 +198 @@
-        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");
@@ -223 +212 @@
-                var yOffset = (style.graphicYOffset != undefined) ?
-                    style.graphicYOffset : -(0.5 * height);
+
-                var opacity = style.graphicOpacity || style.fillOpacity;
-                

trunk/openlayers/lib/OpenLayers/Renderer/VML.js

@@ -106 +106 @@
-    /**
-     * Method: getNodeType
-
-
-
-
+
+
+
+
+
-     *
-     * 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":
@@ -154 +155 @@
-        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;
@@ -193 +171 @@
-                node.style.height = height;    
-                
-fill style for rect
+style/options for fill and stroke
-                style.fillColor = "none";
-style.strokeColor = "none"
+options.isStroked = false
-                         
-            } else {
@@ -217 +195 @@
-            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);
-            }
-        }
@@ -256 +247 @@
-        }
-        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)
+        }
-    },
-