Ticket #1546: gml.patch

tests/Format/GML.html

@@ -325 +325 @@
-        t.eq(output, multilinestring_xy, "MultiLine geometry round trips correctly.");
-    }
-    
+    function test_geometryTypes(t) {
+        t.plan(8);
+        var parser = new OpenLayers.Format.GML();
+        
+        t.ok(parser.geometryTypes === null, "geometryTypes is null by default");
+        
+        // test reading with null geometryTypes
+        var data = parser.read(test_content[1]);
+        t.eq(data.length, 2, "2 features read with null geometryTypes.");
+        
+        // test reading with ["Point"] geometryTypes
+        parser.geometryTypes = ["Point"];
+        data = parser.read(test_content[1]);
+        t.eq(data.length, 1, "1 feature read with ['Point'] geometryTypes.");
+        t.ok(data[0].geometry instanceof OpenLayers.Geometry.Point,
+             "only point geom read with ['Point'] geometryTypes.");
+        
+        // test reading with ["Polygon"] geometryTypes
+        parser.geometryTypes = ["Polygon"];
+        data = parser.read(test_content[1]);
+        t.eq(data.length, 1, "1 feature read with ['Polygon'] geometryTypes.");
+        t.ok(data[0].geometry instanceof OpenLayers.Geometry.Polygon,
+             "only point geom read with ['Polygon'] geometryTypes.");
-
+        // test reading with ["Point", "Polygon"] geometryTypes
+        parser.geometryTypes = ["Point", "Polygon"];
+        data = parser.read(test_content[1]);
+        t.eq(data.length, 2, "2 feature read with ['Point', 'Polygon'] geometryTypes.");
+        
+        // test reading with ["foo"] geometryTypes
+        parser.geometryTypes = ["foo"];
+        data = parser.read(test_content[1]);
+        alert('f');
+        t.eq(data.length, 0, "0 features read with ['foo'] geometryTypes.");
+
+    }
+
-    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',
- '<wfs:FeatureCollection' + 
- '   xmlns:fs="http://example.com/featureserver"' + 

lib/OpenLayers/Format/GML.js

@@ -54 +54 @@
-     * {String} Name of geometry element.  Defaults to "geometry".
-     */
-    geometryName: "geometry",
+
+    /**
+     * Property: geometryTypes
+     * {Array(String)} Allowed types of geometry element.  Defaults to null.
+     *     If non-null, the geometryTypes value must be an array that includes
+     *     one or more of the following strings: "MultiPolygon", "Polygon",
+     *     "MultiLineString", "LineString", "MultiPoint", "Point", "Envelope".
+     *     If non-null, all geometries in the GML document will be assumed to
+     *     one of the types in this list.
+     */
+    geometryTypes: null,
-    
-    /** 
-     * APIProperty: collectionName
@@ -136 +147 @@
-     * node - {DOMElement} A GML feature node. 
-     */
-    parseFeature: function(node) {
-
-
+
+
+
+
+
+
-                     "MultiLineString", "LineString",
-                     "MultiPoint", "Point", "Envelope"];
+        }
-        var type, nodeList, geometry, parser;
-        for(var i=0; i<order.length; ++i) {
-            type = order[i];