Ticket #821: patch-821-r5408-B0.diff

tests/Renderer/test_SVG.html

@@ -144 +144 @@
-        r.drawCircle(node, geometry, 3);
-        
-        t.eq(node.getAttributeNS(null, 'cx'), '2', "cx is correct");
-
+-
-        t.eq(node.getAttributeNS(null, 'r'), '3', "r is correct");
-    }
-    
@@ -271 +271 @@
-        r.drawRectangle(node, geometry);
-        
-        t.eq(node.getAttributeNS(null, "x"), "2", "x attribute is correctly set");
-
+-
-        t.eq(node.getAttributeNS(null, "width"), "6", "width attribute is correctly set");
-        t.eq(node.getAttributeNS(null, "height"), "8", "height attribute is correctly set");
-    }
@@ -355 +355 @@
-        };
-        
-        var string = r.getShortString(point);
-
+-
-    }
-    
-    

lib/OpenLayers/Renderer/SVG.js

@@ -215 +215 @@
-                var opacity = style.graphicOpacity || style.fillOpacity;
-                
-                node.setAttributeNS(null, "x", (x + xOffset).toFixed());
--
+
-                node.setAttributeNS(null, "width", width);
-                node.setAttributeNS(null, "height", height);
-                node.setAttributeNS("http://www.w3.org/1999/xlink", "href", style.externalGraphic);
-                node.setAttributeNS(null, "transform", "scale(1,-1)");
-                node.setAttributeNS(null, "style", "opacity: "+opacity);
-            } else {
-                node.setAttributeNS(null, "r", style.pointRadius);
@@ -304 +303 @@
-     */
-    createRoot: function() {
-        var id = this.container.id + "_root";
-
-        var root = this.nodeFactory(id, "g");
-
-        // flip the SVG display Y axis upside down so it 
-        // matches the display Y axis of the map
-        root.setAttributeNS(null, "transform", "scale(1, -1)");
-
-        return root;
-    },
-
@@ -344 +337 @@
-    drawCircle: function(node, geometry, radius) {
-        var resolution = this.getResolution();
-        var x = (geometry.x / resolution + this.left);
-geometry.y / resolution - this.top
+this.top - geometry.y / resolution
-
-        if (this.inValidRange(x, y)) { 
-            node.setAttributeNS(null, "cx", x);
@@ -423 +416 @@
-    drawRectangle: function(node, geometry) {
-        var resolution = this.getResolution();
-        var x = (geometry.x / resolution + this.left);
-geometry.y / resolution - this.top
+this.top - geometry.y / resolution
-
-        if (this.inValidRange(x, y)) { 
-            node.setAttributeNS(null, "x", x);
@@ -504 +497 @@
-    getShortString: function(point) {
-        var resolution = this.getResolution();
-        var x = (point.x / resolution + this.left);
-point.y / resolution - this.top
+this.top - point.y / resolution
-
-        if (this.inValidRange(x, y)) { 
-            return x + "," + y;