Ticket #1613: ticket1613.patch

GML.js

@@ -105 +105 @@
-     * 
-     * Parameters:
-     * data - {String} or {DOMElement} data to read/parse.
+     * options - {Object} The options object may contain a returnBbox property.  If
+     *     the returnBbox is true, the bounding box of the feature collection
+     *     will be returned along with the features.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Feature.Vector>)} An array of features.
-     */
-
+, options
-        if(typeof data == "string") { 
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
+
+        var bbox;
+        if (options && options.returnBbox) {
+            var boundedByNodes = this.getElementsByTagNameNS(
+                data.documentElement, this.gmlns, 'boundedBy');
+            for (var i=0; i < boundedByNodes.length; i++) {
+                // we are only interested in the top level boundedBy
+                // and there is currently no way to limit getElementsByTagNameNS
+                // to a certain level
+                if (boundedByNodes[i].parentNode == data.documentElement) {
+                    var type = 'Box';
+                    var parser = this.parseGeometry[type.toLowerCase()];
+                    if (parser) {
+                        bbox = parser.apply(this, [boundedByNodes[i]]);
+                    }
+                }
+            }
+        }
+
-        var featureNodes = this.getElementsByTagNameNS(data.documentElement,
-                                                       this.gmlns,
-                                                       this.featureName);
@@ -123 +145 @@
-                features.push(feature);
-            }
-        }
-
+
+
+
+
+
+
-    },
-    
-    /**
@@ -263 +290 @@
-                                                 coords[2]);
-            }
-        },
+
+        /**
+         * Method: parseGeometry.box
+         * Given a GML node representing a box geometry, create an
+         *     OpenLayers rectangle geometry.
+         *
+         * Parameters:
+         * node - {DOMElement} A GML node.
+         *
+         * Returns:
+         * {<OpenLayers.Bounds>} A bounds representing the box.
+         */
+        box: function(node) {
+            var nodeList = this.getElementsByTagNameNS(node, this.gmlns,
+                                                   "coordinates");
+            var coordString;
+            var coords, beginPoint, endPoint;
+            if (nodeList.length > 0) {
+                coordString = nodeList[0].firstChild.nodeValue;
+                coords = coordString.split(" ");
+                for (var i=0; i < coords.length; i++) {
+                    if (i == 0) {
+                        beginPoint = coords[i].split(",");
+                    }
+                    if (i == 1) {
+                        endPoint = coords[i].split(",");
+                    }
+                }
+            }
+            return new OpenLayers.Bounds(parseInt(beginPoint[0]),
+                parseInt(beginPoint[1]),
+                parseInt(endPoint[0]),
+                parseInt(endPoint[1]) );
+        },
-        
-        /**
-         * Method: parseGeometry.multipoint