Changeset 7955

Timestamp:

09/04/08 17:44:52 (3 months ago)

Author:

tschaub

Message:

Adding support to the gml parser for serializing OpenLayers.Bounds as gml:Box. This gives the filter format (and the sld format) the ability to write spatial filters (that have bounds as a value). r=me (closes #1543)

Files:

• trunk/openlayers/lib/OpenLayers/Format/GML.js (modified) (3 diffs)
• trunk/openlayers/tests/Format/GML.html (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Format/GML.js

@@ -140 +140 @@
-        var order = ["MultiPolygon", "Polygon",
-                     "MultiLineString", "LineString",
-
+, "Box"
-        var type, nodeList, geometry, parser;
-        for(var i=0; i<order.length; ++i) {
@@ -805 +805 @@
-            }
-            return gml;
+
+        },
+ 
+        /**
+         * Method: buildGeometry.bounds
+         * Given an OpenLayers bounds, create a GML box.
+         *
+         * Parameters:
+         * bounds - {<OpenLayers.Geometry.Bounds>} A bounds object.
+         *
+         * Returns:
+         * {DOMElement} A GML box node.
+         */
+        bounds: function(bounds) {
+            var gml = this.createElementNS(this.gmlns, "gml:Box");
+            gml.appendChild(this.buildCoordinatesNode(bounds));
+            return gml;
-        }
-    },
@@ -826 +843 @@
-        coordinatesNode.setAttribute("cs", ",");
-        coordinatesNode.setAttribute("ts", " ");
-
-
+
-        var parts = [];
-
-
+
+
+
+
+
+
+
+
+
-        }
-

trunk/openlayers/tests/Format/GML.html

@@ -69 +69 @@
-        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog
-        t.eq(output, multilinestring, "MultiLine geometry round trips correctly.");
+
-    }    
-    function test_Format_GML_read_point_geom(t) {
@@ -326 +327 @@
-    }
-    
+    function test_buildGeometryNode_bounds(t) {
+        t.plan(1);
+        var parser = new OpenLayers.Format.GML();
+        var bounds = new OpenLayers.Bounds(-180, -90, 180, 90);
+        var output, expect;
+        
+        // test that bounds are written as gml:Box
+        var output = parser.buildGeometryNode(bounds);
+        var expect = '<gml:Box xmlns:gml="http://www.opengis.net/gml"><gml:coordinates decimal="." cs="," ts=" ">-180,-90 180,90</gml:coordinates></gml:Box>';
+        t.xml_eq(output, expect, "[xy true] Bounds correctly written as gml:Box");
+    }
-
-    var test_content = ['<?xml version="1.0" encoding="utf-8" ?>\n<ogr:FeatureCollection\n     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n     xsi:schemaLocation="http://ogr.maptools.org/ testoutput.xsd"\n     xmlns:ogr="http://ogr.maptools.org/"\n     xmlns:gml="http://www.opengis.net/gml">\n  <gml:boundedBy>\n    <gml:Box>\n      <gml:coord><gml:X>-1254041.389711702</gml:X><gml:Y>250906.9515983529</gml:Y></gml:coord>\n      <gml:coord><gml:X>-634517.1199908922</gml:X><gml:Y>762236.2940800377</gml:Y></gml:coord>\n    </gml:Box>\n  </gml:boundedBy>                    \n  <gml:featureMember>\n    <ogr:states fid="F0">\n      <ogr:geometryProperty><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-634517.11999089224,691849.77929356066,0 -653761.64509297756,471181.53429472551,0 -673343.60852865304,250906.9515983529,0 -1088825.734430399,299284.85108220269,0 -1254041.3897117018,324729.27754874947,0 -1235750.4212498858,434167.33911316615,0 -1190777.7803201093,704392.96327195223,0 -1181607.835811228,762236.29408003774,0 -634517.11999089224,691849.77929356066,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>\n      <ogr:NAME>WY</ogr:NAME>\n    <ogr:LONGNAME><![CDATA[Wyoming]]></ogr:LONGNAME>\n    </ogr:states>\n  </gml:featureMember>\n</ogr:FeatureCollection>\n',