Changeset 2960

Timestamp:

04/01/07 20:15:59 (2 years ago)

Author:

crschmidt

Message:

Fix SVG renderer. Stephen Woodbridge reported problems with this, and it was
also reported on the users mailing list. The problem appears to be that Firefox
has poor support for circles of very small radius -- below about .0002. Since
units were in geographic units, this just didn't work so well. So:

• Change coordinate space to be pixel based.
  
• Make all x/y operations divided by resolution
  
• add getComponentsString, getShortString helpers
  
• Redraw nodes totally on every 'reprojectNode' call
  

Files:

• trunk/openlayers/lib/OpenLayers/Renderer/SVG.js (modified) (12 diffs)

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

@@ -51 +51 @@
-        OpenLayers.Renderer.Elements.prototype.setExtent.apply(this, 
-                                                               arguments);
-
-
+
+
+
+
+
-        this.rendererRoot.setAttributeNS(null, "viewBox", extentString);
-    },
@@ -109 +112 @@
-     */
-    reprojectNode: function(node) {
-
-
-
+
-    },
-    
@@ -131 +132 @@
-
-        if (node.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
-
-
+
-        }
-        
@@ -145 +145 @@
-            node.setAttributeNS(null, "stroke", style.strokeColor);
-            node.setAttributeNS(null, "stroke-opacity", style.strokeOpacity);
-
-
+
-        } else {
-            node.setAttributeNS(null, "stroke", "none");
@@ -232 +231 @@
-     */
-    drawCircle: function(node, geometry, radius) {
-
-
+
+
+
-        node.setAttributeNS(null, "r", radius);
-    },
@@ -242 +242 @@
-     */
-    drawLineString: function(node, geometry) {
-geometry.getComponentsString(
+this.getComponentsString(geometry.components
-    },
-    
@@ -250 +250 @@
-     */
-    drawLinearRing: function(node, geometry) {
-geometry.getComponentsString(
+this.getComponentsString(geometry.components
-    },
-    
@@ -263 +263 @@
-            d += " M";
-            for (var i = 0; i < linearRing.components.length; i++) {
-linearRing.components[i].toShortString(
+this.getShortString(linearRing.components[i]
-            }
-        }
@@ -277 +277 @@
-     */
-    drawRectangle: function(node, geometry) {
-
-
+ / resolution
+ / resolution
-        node.setAttributeNS(null, "width", geometry.width);
-        node.setAttributeNS(null, "height", geometry.height);
@@ -292 +292 @@
-        for (var i = 0; i < geometry.components.length; i++) {
-            if ((i%3) == 0 && (i/3) == 0) {
-geometry.components[i].toShortString(
+this.getShortString(geometry.components[i]
-            } else if ((i%3) == 1) {
-geometry.components[i].toShortString(
+this.getShortString(geometry.components[i]
-            } else {
-geometry.components[i].toShortString(
+this.getShortString(geometry.components[i]
-            }
-        }
@@ -312 +312 @@
-        for (var i = 0; i < geometry.components.length; i++) {
-            if ((i%3) == 0 && (i/3) == 0) {
-geometry.components[i].toShortString(
+this.getShortString(geometry.components[i]
-            } else if ((i%3) == 1) {
-geometry.components[i].toShortString(
+this.getShortString(geometry.components[i]
-            } else {
-geometry.components[i].toShortString(
+this.getShortString(geometry.components[i]
-            }
-        }
@@ -323 +323 @@
-    },
-
+    /** 
+     * @param {Array} components array of points
+     */
+    getComponentsString: function(components) {
+        var strings = [];
+        for(var i = 0; i < components.length; i++) {
+            strings.push(this.getShortString(components[i]));
+        }
+        return strings.join(",");
+    },
+
+    
+    /** 
+     * @param {OpenLayers.Geometry.Point} point
+     */
+    getShortString: function(point) {
+        var resolution = this.getResolution();
+        return point.x / resolution + "," + point.y / resolution;  
+        
+    },
+    
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Renderer.SVG"