merge with master

Author: Bart van den Eijnden

lib/OpenLayers.js

@@ -319,6 +319,10 @@
                 "OpenLayers/Format/WCSCapabilities/v1.js",
                 "OpenLayers/Format/WCSCapabilities/v1_0_0.js",
                 "OpenLayers/Format/WCSCapabilities/v1_1_0.js",
+                "OpenLayers/Format/WCSDescribeCoverage.js",
+                "OpenLayers/Format/WCSDescribeCoverage/v1.js",
+                "OpenLayers/Format/WCSDescribeCoverage/v1_0_0.js",
+                "OpenLayers/Format/WCSDescribeCoverage/v1_1_0.js",
                 "OpenLayers/Format/WFSCapabilities.js",
                 "OpenLayers/Format/WFSCapabilities/v1.js",
                 "OpenLayers/Format/WFSCapabilities/v1_0_0.js",

lib/OpenLayers/Format/GML/v3.js

@@ -137,7 +137,10 @@ OpenLayers.Format.GML.v3 = OpenLayers.Class(OpenLayers.Format.GML.Base, {
                         coords[1], coords[0], coords[2]
                     );
                 }
-                obj.points = [point];
+                if(!!!obj.points) {
+                    obj.points = [];
+                }
+                obj.points.push(point);
             },
             "posList": function(node, obj) {
                 var str = this.getChildValue(node).replace(
@@ -228,6 +231,7 @@ OpenLayers.Format.GML.v3 = OpenLayers.Class(OpenLayers.Format.GML.Base, {
                 if(!container.components) {
                     container.components = [];
                 }
+
                 var min = obj.points[0];
                 var max = obj.points[1];
                 container.components.push(

lib/OpenLayers/Format/OWSCommon/v1.js

@@ -131,6 +131,9 @@ OpenLayers.Format.OWSCommon.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
             "Voice": function(node, phone) {
                 phone.voice = this.getChildValue(node);
             },
+            "Facsimile": function(node, phone) {
+                phone.facsimile = this.getChildValue(node);
+            },
             "Address": function(node, contactInfo) {
                 contactInfo.address = {};
                 this.readChildNodes(node, contactInfo.address);

lib/OpenLayers/Format/WCSCapabilities/v1_0_0.js

@@ -14,10 +14,11 @@
  * 
  * Inherits from:
  *  - <OpenLayers.Format.WCSCapabilities.v1>
+ *  - <OpenLayers.Format.GML.v3>
  */
 OpenLayers.Format.WCSCapabilities.v1_0_0 = OpenLayers.Class(
-    OpenLayers.Format.WCSCapabilities.v1, {
-    
+    OpenLayers.Format.GML.v3, OpenLayers.Format.WCSCapabilities.v1, {
+
     /**
      * Constructor: OpenLayers.Format.WCSCapabilities.v1_0_0
      * Create a new parser for WCS capabilities version 1.0.0.
@@ -45,55 +46,61 @@ OpenLayers.Format.WCSCapabilities.v1_0_0 = OpenLayers.Class(
      * errorProperty is undefined on the returned object, the document will be
      * run through an OGCExceptionReport parser.
      */
-    errorProperty: "service",
+    errorProperty: "serviceIdentification",
 
     /**
      * Property: readers
      * Contains public functions, grouped by namespace prefix, that will
      *     be applied when a namespaced node is found matching the function
      *     name.  The function will be applied in the scope of this parser
      *     with two arguments: the node being read and a context object passed
-     *     from the parent.
+     *     from the parent.  Where possible, the 1.0.0 readers attempt to make
+     *     their output compatible with 1.1.0 to reduce client complexity.
      */
     readers: {
         "wcs": {
-             "WCS_Capabilities": function(node, obj) {          
+            "WCS_Capabilities": function(node, obj) {
                 this.readChildNodes(node, obj);
             },
             "Service": function(node, obj) {
-                obj.service = {};
-                this.readChildNodes(node, obj.service);
-            },
-            "name": function(node, service) {  
-                service.name = this.getChildValue(node);
-            },
-            "label": function(node, service) {  
-                service.label = this.getChildValue(node);
+                var children = {};
+                this.readChildNodes(node, children);
+
+                // Rearrange things a little to get a tree that is
+                // compatible with 1.1.0
+                var providerName = children.serviceContact.providerName;
+                delete children.serviceContact.providerName;
+
+                obj.serviceProvider = { 
+                    providerName:   providerName,
+                    serviceContact: children.serviceContact };
+                children.serviceContact = undefined;
+                obj.serviceIdentification = children;
             },
-            "keywords": function(node, service) { 
-                service.keywords = []; 
-                this.readChildNodes(node, service.keywords);
+            "keywords": function(node, serviceIdentification) { 
+                serviceIdentification.keywords = []; 
+                this.readChildNodes(node, serviceIdentification.keywords);
             },
             "keyword": function(node, keywords) { 
                 // Append the keyword to the keywords list
                 keywords.push(this.getChildValue(node));      
             },
-            "responsibleParty": function(node, service) {
-                service.responsibleParty = {};
-                this.readChildNodes(node, service.responsibleParty);   
+            "responsibleParty": function(node, serviceIdentification) {
+                serviceIdentification.serviceContact = {};
+                this.readChildNodes(node, serviceIdentification.serviceContact);   
             },
-            "individualName": function(node, responsibleParty) {
-                responsibleParty.individualName = this.getChildValue(node);
+            "individualName": function(node, serviceContact) {
+                serviceContact.individualName = this.getChildValue(node);
             },
-            "organisationName": function(node, responsibleParty) {
-                responsibleParty.organisationName = this.getChildValue(node);
+            "organisationName": function(node, serviceContact) {
+                serviceContact.providerName = this.getChildValue(node);
             },
-            "positionName": function(node, responsibleParty) {
-                responsibleParty.positionName = this.getChildValue(node);
+            "positionName": function(node, serviceContact) {
+                serviceContact.positionName = this.getChildValue(node);
             },
-            "contactInfo": function(node, responsibleParty) {
-                responsibleParty.contactInfo = {};
-                this.readChildNodes(node, responsibleParty.contactInfo);
+            "contactInfo": function(node, serviceContact) {
+                serviceContact.contactInfo = {};
+                this.readChildNodes(node, serviceContact.contactInfo);
             },
             "phone": function(node, contactInfo) {
                 contactInfo.phone = {};
@@ -124,11 +131,11 @@ OpenLayers.Format.WCSCapabilities.v1_0_0 = OpenLayers.Class(
             "electronicMailAddress": function(node, address) {
                 address.electronicMailAddress = this.getChildValue(node);
             },
-            "fees": function(node, service) {
-                service.fees = this.getChildValue(node);
+            "fees": function(node, serviceIdentification) {
+                serviceIdentification.fees = this.getChildValue(node);
             },
-            "accessConstraints": function(node, service) {
-                service.accessConstraints = this.getChildValue(node);
+            "accessConstraints": function(node, serviceIdentification) {
+                serviceIdentification.accessConstraints = this.getChildValue(node);
             },
             "ContentMetadata": function(node, obj) {
                 obj.contentMetadata = [];
@@ -139,11 +146,27 @@ OpenLayers.Format.WCSCapabilities.v1_0_0 = OpenLayers.Class(
                 this.readChildNodes(node, coverageOfferingBrief);
                 contentMetadata.push(coverageOfferingBrief);
             },
-            "name": function(node, coverageOfferingBrief) {
-                coverageOfferingBrief.name = this.getChildValue(node);
+            "name": function(node, serviceOrCoverageOfferingBrief) {
+                // 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);
+                }
+                else {      // node.parentNode.nodeName === "CoverageOfferingBrief"
+                    // We're parsing a dataset
+                    serviceOrCoverageOfferingBrief.identifier = this.getChildValue(node);
+                }
             },
-            "label": function(node, coverageOfferingBrief) {
-                coverageOfferingBrief.label = this.getChildValue(node);
+            "label": function(node, serviceOrCoverageOfferingBrief) {
+                // 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);
+                }
+                else {      // node.parentNode.nodeName === "CoverageOfferingBrief"
+                    // We"re parsing a dataset
+                    serviceOrCoverageOfferingBrief.title = this.getChildValue(node);
+                }
             },
             "lonLatEnvelope": function(node, coverageOfferingBrief) {
                 var nodeList = this.getElementsByTagNameNS(node, "http://www.opengis.net/gml", "pos");
@@ -153,16 +176,18 @@ OpenLayers.Format.WCSCapabilities.v1_0_0 = OpenLayers.Class(
                     var min = {};
                     var max = {};
 
-                    OpenLayers.Format.GML.v3.prototype.readers["gml"].pos.apply(this, [nodeList[0], min]);
-                    OpenLayers.Format.GML.v3.prototype.readers["gml"].pos.apply(this, [nodeList[1], max]);
+                    this.xy = true; // Affirm we don't want our coordinates switched around
+                    this.readers.gml.pos.apply(this, [nodeList[0], min]);
+                    this.readers.gml.pos.apply(this, [nodeList[1], max]);
 
                     coverageOfferingBrief.lonLatEnvelope = {};
                     coverageOfferingBrief.lonLatEnvelope.srsName = node.getAttribute("srsName");
                     coverageOfferingBrief.lonLatEnvelope.min = min.points[0];
                     coverageOfferingBrief.lonLatEnvelope.max = max.points[0];
                 }
             }
-        }
+        },
+        "gml": OpenLayers.Format.GML.v3.prototype.readers["gml"]
     },
 
     CLASS_NAME: "OpenLayers.Format.WCSCapabilities.v1_0_0" 

lib/OpenLayers/Format/WCSCapabilities/v1_1_0.js

@@ -101,7 +101,19 @@ OpenLayers.Format.WCSCapabilities.v1_1_0 = OpenLayers.Class(
                 }
             }
         }, OpenLayers.Format.WCSCapabilities.v1.prototype.readers["wcs"]),
-        "ows": OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]
+        "ows": OpenLayers.Util.applyDefaults({
+            // ows puts keywords in a dictionary, which doesn't make a
+            // lot of sense in this context; we just want a list, so we'll
+            // override this aspect of the ows parsing.
+            "Keywords": function(node, serviceIdentification) {
+                serviceIdentification.keywords = [];
+                this.readChildNodes(node, serviceIdentification.keywords);
+            },
+            "Keyword": function(node, keywords) {
+                // Append the keyword to the keywords list
+                keywords.push(this.getChildValue(node));   
+            }
+        }, OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"])
     },
 
     CLASS_NAME: "OpenLayers.Format.WCSCapabilities.v1_1_0" 

lib/OpenLayers/Format/WCSDescribeCoverage.js

@@ -0,0 +1,47 @@
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for 
+ * full list of contributors). Published under the 2-clause BSD license.
+ * See license.txt in the OpenLayers distribution or repository for the
+ * full text of the license. */
+
+/**
+ * @requires OpenLayers/Format/XML/VersionedOGC.js
+ */
+
+/**
+ * Class: OpenLayers.Format.WCSDescribeCoverage
+ * Parse results from WCS DescribeCoverage request.
+ * 
+ * Inherits from:
+ *  - <OpenLayers.Format.XML.VersionedOGC>
+ */
+OpenLayers.Format.WCSDescribeCoverage = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC, {
+    
+    /**
+     * APIProperty: defaultVersion
+     * {String} Version number to assume if none found.  Default is "1.1.0".
+     */
+    defaultVersion: "1.1.0",
+
+    /**
+     * Constructor: OpenLayers.Format.WCSDescribeCoverage
+     * Create a new parser for WCS DescribeCoverage response.
+     *
+     * Parameters:
+     * options - {Object} An optional object whose properties will be set on
+     *     this instance.
+     */
+
+    /**
+     * APIMethod: read
+     * Read response data from a string, and return a list of coverage descriptions. 
+     * 
+     * Parameters: 
+     * data - {String} or {DOMElement} data to read/parse.
+     *
+     * Returns:
+     * {Array} List of coverage descriptions.
+     */
+   
+    CLASS_NAME: "OpenLayers.Format.WCSDescribeCoverage" 
+
+});

lib/OpenLayers/Format/WCSDescribeCoverage/v1.js

@@ -0,0 +1,60 @@
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for 
+ * full list of contributors). Published under the 2-clause BSD license.
+ * See license.txt in the OpenLayers distribution or repository for the
+ * full text of the license. */
+
+/**
+ * @requires OpenLayers/Format/WCSCapabilities.js
+ * @requires OpenLayers/Format/XML.js
+ */
+
+/**
+ * Class: OpenLayers.Format.WCSDescribeCoverage.v1
+ * Abstract class not to be instantiated directly.
+ * 
+ * Inherits from:
+ *  - <OpenLayers.Format.XML>
+ */
+OpenLayers.Format.WCSDescribeCoverage.v1 = OpenLayers.Class(
+    OpenLayers.Format.XML, {
+
+    regExes: {
+        trimSpace: (/^\s*|\s*$/g),
+        splitSpace: (/\s+/)
+    },
+
+    /**
+     * Property: defaultPrefix
+     */
+    defaultPrefix: "wcs",
+
+    /**
+     * APIMethod: read
+     *
+     * Parameters:
+     * data - {DOMElement|String} A WCS DescribeCoverage document.
+     *
+     * Returns:
+     * {Object} An object representing the WCS DescribeCoverage response.
+     */
+    read: function(data) {
+        if(typeof data == "string") { 
+            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
+        }
+        if(data && data.nodeType == 9) {
+            data = data.documentElement;
+        }
+        var schema = {};
+        if (data.nodeName.split(":").pop() === 'ExceptionReport') {
+            // an exception must have occurred, so parse it
+            var parser = new OpenLayers.Format.OGCExceptionReport();
+            schema.error = parser.read(data);
+        } else {
+            this.readNode(data, schema);
+        }
+        return schema;
+    },
+
+    CLASS_NAME: "OpenLayers.Format.WCSDescribeCoverage.v1" 
+
+});