Variety of changes based on feedback from bartvde

Author: iguess

lib/OpenLayers/Format/GML/v3.js

@@ -225,7 +225,7 @@ OpenLayers.Format.GML.v3 = OpenLayers.Class(OpenLayers.Format.GML.Base, {
                 this.readChildNodes(node, obj);
             },
             "Envelope": function(node, container) {
-                var obj = {points: []};
+                var obj = {points: new Array(2)};
                 this.readChildNodes(node, obj);
                 if(!container.components) {
                     container.components = [];

lib/OpenLayers/Format/WCSCapabilities/v1_0_0.js

@@ -69,7 +69,7 @@ OpenLayers.Format.WCSCapabilities.v1_0_0 = OpenLayers.Class(
                 // Rearrange things a little to get a tree that is
                 // compatible with 1.1.0
                 var providerName = children.serviceContact.providerName;
-                children.serviceContact.providerName = undefined;
+                delete children.serviceContact.providerName;
 
                 obj.serviceProvider = { 
                     providerName:   providerName,
@@ -147,7 +147,8 @@ OpenLayers.Format.WCSCapabilities.v1_0_0 = OpenLayers.Class(
                 contentMetadata.push(coverageOfferingBrief);
             },
             "name": function(node, serviceOrCoverageOfferingBrief) {
-                if(node.parentNode.nodeName === "Service") {
+                // split/pop used to strip off any namespace prefixes
+                if(node.parentNode.nodeName.split(':').pop() === "Service") {
                     // We're parsing a service description
                     serviceOrCoverageOfferingBrief.title = this.getChildValue(node);
                 }
@@ -157,7 +158,8 @@ OpenLayers.Format.WCSCapabilities.v1_0_0 = OpenLayers.Class(
                 }
             },
             "label": function(node, serviceOrCoverageOfferingBrief) {
-                if(node.parentNode.nodeName === "Service") {
+                // split/pop used to strip off any namespace prefixes
+                if(node.parentNode.nodeName.split(':').pop() === "Service") {
                     // We're parsing a service description
                     serviceOrCoverageOfferingBrief.abstract = this.getChildValue(node);
                 }

lib/OpenLayers/Format/WCSDescribeCoverage.js

@@ -41,17 +41,7 @@ OpenLayers.Format.WCSDescribeCoverage = OpenLayers.Class(OpenLayers.Format.XML.V
      * Returns:
      * {Array} List of coverage descriptions.
      */
-
-    /**
-     * Method: read
-     *
-     * Parameters:
-     * data - {DOMElement|String} A WFS DescribeFeatureType document.
-     *
-     * Returns:
-     * {Object} An object representing the WFS DescribeFeatureType response.
-     */
-     
+   
     CLASS_NAME: "OpenLayers.Format.WCSDescribeCoverage" 
 
 });

lib/OpenLayers/Format/WCSDescribeCoverage/v1.js

@@ -5,6 +5,7 @@
 
 /**
  * @requires OpenLayers/Format/WCSCapabilities.js
+ * @requires OpenLayers/Format/XML.js
  */
 
 /**
@@ -27,17 +28,6 @@ OpenLayers.Format.WCSDescribeCoverage.v1 = OpenLayers.Class(
      */
     defaultPrefix: "wcs",
 
-    /**
-     * APIMethod: read
-     * Read capabilities data from a string, and return a list of coverages. 
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array} List of named coverages.
-     */
-
     /**
      * APIMethod: read
      *

lib/OpenLayers/Format/WCSDescribeCoverage/v1_0_0.js

@@ -7,11 +7,12 @@
  * @requires OpenLayers/Format/WCSDescribeCoverage/v1.js
  * @requires OpenLayers/Format/OWSCommon/v1_0_0.js
  * @requires OpenLayers/Format/GML/v3.js
+ * @requires OpenLayers.Format.WCSCapabilities.v1_0_0.js
  */
 
 /**
  * Class: OpenLayers.Format.WCSDescribeCoverage/v1_0_0
- * Read WCS Capabilities version 1.0.0.
+ * Read WCS DescribeCoverage version 1.0.0.
  * 
  * Inherits from:
  *  - <OpenLayers.Format.WCSDescribeCoverage.v1>
@@ -33,7 +34,7 @@ OpenLayers.Format.WCSDescribeCoverage.v1_0_0 = OpenLayers.Class(
 
     /**
      * Constructor: OpenLayers.Format.WCSDescribeCoverage.v1_0_0
-     * Create a new parser for WCS capabilities version 1.0.0.
+     * Create a new parser for WCS DescribeCoverage version 1.0.0.
      *
      * Parameters:
      * options - {Object} An optional object whose properties will be set on
@@ -49,7 +50,7 @@ OpenLayers.Format.WCSDescribeCoverage.v1_0_0 = OpenLayers.Class(
      *     from the parent.
      */
     readers: {
-        "wcs": OpenLayers.Util.applyDefaults({
+        "wcs": {
             // Root object, contains one or more CoverageDecription entries
             // In 1.0.0, this is CoverageDescription, in 1.1.0, 
             // it will be CoverageDescriptions (plural)
@@ -60,12 +61,8 @@ OpenLayers.Format.WCSDescribeCoverage.v1_0_0 = OpenLayers.Class(
                 // Make a list of keys for easy access
                 obj.coverageDescriptionKeys = [];
                 for(var key in obj.coverageDescriptions) {
-                    if(obj.coverageDescriptions.hasOwnProperty(key)) {
-                        obj.coverageDescriptionKeys.push(key);
-                    }
+                    obj.coverageDescriptionKeys.push(key);
                 }
-                // This would be more concise, but only in newer browsers:
-                // obj.coverageDescriptionKeys = Object.keys(obj.coverageDescriptions);
             },
             // In 1.1.0, this element is called CoverageDescription.  We'll use
             // that name because it's... better.
@@ -91,52 +88,54 @@ OpenLayers.Format.WCSDescribeCoverage.v1_0_0 = OpenLayers.Class(
             // so we can reuse that reader
             "lonLatEnvelope": function(node, description) {
                 OpenLayers.Format.WCSCapabilities.v1_0_0.prototype.readers.wcs.lonLatEnvelope.call(this, node, description);
-                var nodeList = this.getElementsByTagNameNS(node, "http://www.opengis.net/gml", "pos");
             },
             // Essentially the same as domain in 1.1.0
             "domainSet": function(node, description) {
                 description.domain = {};
-                 this.readChildNodes(node, description.domain);
+                this.readChildNodes(node, description.domain);
             },
             "spatialDomain": function(node, domain) {
-                domain.spatialDomain = {};
-                domain.spatialDomain.boundingBoxes = {};
+                domain.spatialDomain = { boundingBoxes: {} };
                 this.readChildNodes(node, domain.spatialDomain);
             },
              "nativeCRSs": function(node, description) {
-                if(!!!description.nativeCRSs)
+                if(!description.nativeCRSs) {
                     description.nativeCRSs = [];
-                var crs;
-                crs = this.getChildValue(node);
+                }
+                var crs = this.getChildValue(node);
                 description.nativeCRSs.push(crs);
             },
             "supportedCRSs": function(node, description) {
-                if(!!!description.supportedCRSs)
+                if(!description.supportedCRSs) {
                     description.supportedCRSs = [];
+                }
                 this.readChildNodes(node, description.supportedCRSs)
             },
             // There will be several of these within the supportedCRSs tag
             "requestResponseCRSs" : function(node, supportedCRSs) {
                 supportedCRSs.push(this.getChildValue(node));
             },
              "supportedFormats": function(node, description) {
-                if(!!!description.supportedFormats)
+                if(!description.supportedFormats) {
                     description.supportedFormats = [];
+                }
                 this.readChildNodes(node, description.supportedFormats)
             },
             // There will be several of these within the supportedFormats tag
             "formats" : function(node, supportedFormats) {
                 supportedFormats.push(this.getChildValue(node));
             },
-        }, OpenLayers.Format.WCSDescribeCoverage.v1.prototype.readers["wcs"]),
+        }, 
 
         "ows": OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers["ows"],
         "gml": OpenLayers.Util.applyDefaults({
             // Use custom Envelope reader that understands the srsName attribute
             "Envelope": function(node, spatialDomain) {
                 var srsName = node.getAttribute("srsName");
-                if(!!!srsName)  // No SRS?  What does this envelope mean?!?
+                if(!srsName) { // No SRS?  What does this envelope mean?!?
                     return;
+                }
+
                 var obj = {points: []};
                 this.readChildNodes(node, obj);
 
@@ -145,7 +144,7 @@ OpenLayers.Format.WCSDescribeCoverage.v1_0_0 = OpenLayers.Class(
                 var bounds = new OpenLayers.Bounds(min.x, min.y, max.x, max.y);
                 spatialDomain.boundingBoxes[srsName] = bounds;
             }
-        }, OpenLayers.Format.GML.v3.prototype.readers["gml"]) 
+        }, OpenLayers.Format.GML.v3.prototype.readers["gml"])
     },
 
     CLASS_NAME: "OpenLayers.Format.WCSDescribeCoverage.v1_0_0" 

lib/OpenLayers/Format/WCSDescribeCoverage/v1_1_0.js

@@ -6,11 +6,12 @@
 /**
  * @requires OpenLayers/Format/WCSDescribeCoverage/v1.js
  * @requires OpenLayers/Format/OWSCommon/v1_1_0.js
+ * @requires OpenLayers/BaseTypes/Bounds.js
  */
 
 /**
  * Class: OpenLayers.Format.WCSDescribeCoverage/v1_1_0
- * Read WCS Capabilities version 1.1.0.
+ * Read WCS DescribeCoverage version 1.1.0.
  * 
  * Inherits from:
  *  - <OpenLayers.Format.WCSDescribeCoverage.v1>
@@ -31,7 +32,7 @@ OpenLayers.Format.WCSDescribeCoverage.v1_1_0 = OpenLayers.Class(
 
     /**
      * Constructor: OpenLayers.Format.WCSDescribeCoverage.v1_1_0
-     * Create a new parser for WCS capabilities version 1.1.0.
+     * Create a new parser for WCS DescribeCoverage version 1.1.0.
      *
      * Parameters:
      * options - {Object} An optional object whose properties will be set on
@@ -47,8 +48,8 @@ OpenLayers.Format.WCSDescribeCoverage.v1_1_0 = OpenLayers.Class(
      *     from the parent.
      */
     readers: {
-        "wcs": OpenLayers.Util.applyDefaults({
-            // Root object, contains one or more CoverageDecription entries
+        "wcs": {
+            // Root object, contains one or more CoverageDescription entries
             // In 1.0.0, this was CoverageDescription, in 1.1.0, it's 
             // CoverageDescriptions (plural)
             "CoverageDescriptions": function(node, obj) {
@@ -57,9 +58,7 @@ OpenLayers.Format.WCSDescribeCoverage.v1_1_0 = OpenLayers.Class(
 
                 obj.coverageDescriptionKeys = [];
                 for(var key in obj.coverageDescriptions) {
-                    if(obj.coverageDescriptions.hasOwnProperty(key)) {
-                        obj.coverageDescriptionKeys.push(key);
-                    }
+                    obj.coverageDescriptionKeys.push(key);
                 }
                 // This would be more efficient, but only in newer browsers:
                 // obj.coverageDescriptionKeys = Object.keys(obj.coverageDescriptions);
@@ -132,18 +131,22 @@ OpenLayers.Format.WCSDescribeCoverage.v1_1_0 = OpenLayers.Class(
                 gridCRS.gridCS = this.getChildValue(node);
             },
             "SupportedCRS": function(node, description) {
-                if(!!!description.supportedCRSs)
+                if(!!!description.supportedCRSs) {
                     description.supportedCRSs = [];
+                }
+
                 var crs = this.getChildValue(node);
                 description.supportedCRSs.push(crs);
             },
             "SupportedFormat": function(node, description) {
-                if(!!!description.supportedFormats)
+                if(!!!description.supportedFormats) {
                     description.supportedFormats = [];
+                }
+
                 var format = this.getChildValue(node);
                 description.supportedFormats.push(format);
             }
-        }, OpenLayers.Format.WCSDescribeCoverage.v1.prototype.readers["wcs"]),
+        },
         "ows": OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]
     },
 

tests/Format/WCSDescribeCoverage.html

@@ -8,27 +8,6 @@
 
         var parser = new OpenLayers.Format.WCSDescribeCoverage();
 
-        // // version 1.0.0
-        // // Save original reader
-        // var _v1_0_0 = OpenLayers.Format.WCSDescribeCoverage.v1_0_0.prototype.read;
-        // OpenLayers.Format.WCSDescribeCoverage.v1_0_0.prototype.read = function() {
-        //     t.ok(true, "Version 1.0.0 detected");
-        //     return {};
-        // }
-        //
-        // var text =
-        //     '<?xml version="1.0" encoding="UTF-8"?>' +
-        //     '<CoverageDescription xmlns="http://www.opengis.net/wcs" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0.0" updateSequence="0" xsi:schemaLocation="http://www.opengis.net/wcs http://schemas.opengis.net/wcs/1.0.0/describeCoverage.xsd">';
-        //
-        // var res = parser.read(text);
-        // t.eq(res.version, "1.0.0", "version 1.0.0 written to result object");
-        //
-        // // Restore original reader
-        // OpenLayers.Format.WCSDescribeCoverage.v1_0_0.prototype.read = _v1_0_0;
-
-
-        // version 1.1.0
-
         // Save original reader
         var _v1_1_0 = OpenLayers.Format.WCSDescribeCoverage.v1_1_0.prototype.read;
 

tests/Format/WFSCapabilities.html

@@ -11,7 +11,7 @@
         // version 1.0.0
 
         // Save original reader
-        var _v1_0_0 = OpenLayers.Format.WCSCapabilities.v1_0_0.prototype.read;
+        var _v1_0_0 = OpenLayers.Format.WFSCapabilities.v1_0_0.prototype.read;
 
         OpenLayers.Format.WFSCapabilities.v1_0_0.prototype.read = function() {
             t.ok(true, "Version 1.0.0 detected");
@@ -25,13 +25,13 @@
         t.eq(res.version, "1.0.0", "version 1.0.0 written to result object");
 
         // Restore original reader
-        OpenLayers.Format.WCSCapabilities.v1_1_0.prototype.read = _v1_0_0;
+        OpenLayers.Format.WFSCapabilities.v1_1_0.prototype.read = _v1_0_0;
 
 
         // version 1.1.0
 
         // Save original reader
-        var _v1_1_0 = OpenLayers.Format.WCSCapabilities.v1_1_0.prototype.read;
+        var _v1_1_0 = OpenLayers.Format.WFSCapabilities.v1_1_0.prototype.read;
 
         OpenLayers.Format.WFSCapabilities.v1_1_0.prototype.read = function() {
             t.ok(true, "Version 1.1.0 detected");
@@ -45,7 +45,7 @@
         t.eq(res.version, "1.1.0", "version 1.1.0 written to result object");
 
         // Restore original reader
-        OpenLayers.Format.WCSCapabilities.v1_1_0.prototype.read = _v1_1_0;        
+        OpenLayers.Format.WFSCapabilities.v1_1_0.prototype.read = _v1_1_0;        
     }
 
     </script>