Changeset 5430

Timestamp:

12/15/07 11:24:31 (1 year ago)

Author:

crschmidt

Message:

Don't flip SVG Y values anymore, since we're working in pixel space these days,
and the Y transforms just make working with the SVG directly -- for example,
with people modifying it to support text -- more difficult than it should be.

Files:

• trunk/openlayers/lib/OpenLayers/Renderer/SVG.js (modified) (5 diffs)
• trunk/openlayers/tests/Renderer/test_SVG.html (modified) (3 diffs)

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

@@ -216 +216 @@
-                
-                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 {
@@ -305 +304 @@
-    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;
-    },
@@ -345 +338 @@
-        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)) { 
@@ -424 +417 @@
-        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)) { 
@@ -505 +498 @@
-        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)) { 

trunk/openlayers/tests/Renderer/test_SVG.html

@@ -145 +145 @@
-        
-        t.eq(node.getAttributeNS(null, 'cx'), '2', "cx is correct");
-
+-
-        t.eq(node.getAttributeNS(null, 'r'), '3', "r is correct");
-    }
@@ -272 +272 @@
-        
-        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");
@@ -356 +356 @@
-        
-        var string = r.getShortString(point);
-
+-
-    }
-