Merge pull request #218 from marcjansen/testsuite-fixes

Testsuite fixes

tests/Format/WKT.html

@@ -254,21 +254,40 @@
         t.plan(1);
 
         var projections = {
-            src:  new OpenLayers.Projection("EPSG:4326"),
-            dest: new OpenLayers.Projection("EPSG:900913")
-        };
-
-        var points = {
-            src:  new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(-87.9, 41.9)),
-            dest: new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(-9784983.2393667, 5146011.6785665))
-        };
-
-        var format = new OpenLayers.Format.WKT({
-            externalProjection: projections["src"],
-            internalProjection: projections["dest"]
-        });
-        var feature = format.read("GEOMETRYCOLLECTION(POINT(" + points["src"].geometry.x + " " + points["src"].geometry.y + "))")[0];
-        t.eq(feature.geometry.toString(), points["dest"].geometry.toString(), 
+                src:  new OpenLayers.Projection("EPSG:4326"),
+                dest: new OpenLayers.Projection("EPSG:900913")
+            },
+            points = {
+                src:  new OpenLayers.Feature.Vector(
+                    new OpenLayers.Geometry.Point(-87.9, 41.9)
+                ),
+                dest: new OpenLayers.Feature.Vector(
+                    new OpenLayers.Geometry.Point(-9784983.2393667, 5146011.6785665)
+                )
+            },
+            format = new OpenLayers.Format.WKT({
+                externalProjection: projections["src"],
+                internalProjection: projections["dest"]
+            }),
+            gc_wkt_parts = [
+                "GEOMETRYCOLLECTION(",
+                "POINT(",
+                points["src"].geometry.x,
+                " ",
+                points["src"].geometry.y, 
+                ")",
+                ")"
+            ],
+            feature = format.read( gc_wkt_parts.join("") )[0],
+            gotGeom = feature.geometry,
+            expectGeom = points["dest"].geometry,
+            // we don't use geometry::toString because we might run into 
+            // precision issues
+            precision = 7,
+            got = gotGeom.x.toFixed(precision) + ' ' + gotGeom.y.toFixed(precision),
+            expected = expectGeom.x.toFixed(precision) + ' ' + expectGeom.y.toFixed(precision);
+        
+        t.eq(got, expected, 
             "Geometry collections aren't transformed twice when reprojection.");
     }
     </script> 

tests/Format/XML.html

@@ -147,7 +147,7 @@
         var uri = "http://foo.com";
         var prefix = "foo";
         var localName = "bar";
-        var qualifiedName = prefix + ":" + name;
+        var qualifiedName = prefix + ":" + localName;
         var node = format.createElementNS(uri, qualifiedName);
         t.eq(node.nodeType, 1,
              "node has correct type");