From 9c7b4b6b9ee91c0cf8b79e658ebf506d70369d46 Mon Sep 17 00:00:00 2001
From: Marc Jansen <jansen@terrestris.de>
Date: Wed, 30 Jul 2014 08:37:43 +0200
Subject: [PATCH] Fix WfsCapabilities reader for WFS 1.1.0.

See https://github.com/geoext/geoext2/issues/281. This is a port of the
approach taken in GeoExt 1: https://github.com/geoext/geoext/pull/30.
---
 src/GeoExt/data/reader/WfsCapabilities.js |  13 +-
 tests/data/reader/WfsCapabilities.html    |  20 +++
 tests/data/reader/WfsCapabilities.js      | 156 +++++++++++++++++++++-
 3 files changed, 187 insertions(+), 2 deletions(-)

diff --git a/src/GeoExt/data/reader/WfsCapabilities.js b/src/GeoExt/data/reader/WfsCapabilities.js
index 70e502e36..3d44c8abe 100644
--- a/src/GeoExt/data/reader/WfsCapabilities.js
+++ b/src/GeoExt/data/reader/WfsCapabilities.js
@@ -84,8 +84,19 @@ Ext.define('GeoExt.data.reader.WfsCapabilities', {
         var featureType, metadata, field, v, parts, layer;
         var layerOptions, protocolOptions;
 
+        var wfs11version = 1.1,
+            url,
+            opMeta;
+        if (parseFloat(data.version) >= wfs11version) {
+            // WFS 1.1.0 needs special treatment
+            opMeta = data.operationsMetadata;
+            url = opMeta && opMeta.GetFeature.dcp.http.post[0].url;
+        } else {
+            url = data.capability.request.getfeature.href.post;
+        }
+
         var protocolDefaults = {
-            url: data.capability.request.getfeature.href.post
+            url: url
         };
 
         var records = [];
diff --git a/tests/data/reader/WfsCapabilities.html b/tests/data/reader/WfsCapabilities.html
index 9e6300b9f..b27c2016a 100644
--- a/tests/data/reader/WfsCapabilities.html
+++ b/tests/data/reader/WfsCapabilities.html
@@ -53,6 +53,26 @@
             reader.destroy();
         }
 
+        /**
+         * See https://github.com/geoext/geoext2/issues/281 and
+         * https://github.com/geoext/geoext/pull/30
+         */
+        function test_readWFS11(t) {
+            t.plan(1);
+
+            var reader = Ext.create("GeoExt.data.reader.WfsCapabilities");
+            var records = reader.read({
+                responseXML : doc11,
+                responseText: true
+            });
+            var record = records.records[0];
+            var layer = record.getLayer();
+            var expectedUrl = "http://www2.dmsolutions.ca/cgi-bin/mswfs_gmap?";
+
+            t.eq(layer.protocol.url, expectedUrl,
+                    "[0] protocol has correct URL (WFS 1.1.0)");
+        }
+
         function test_read_layerOptions(t) {
             t.plan(6);
             var reader = Ext.create("GeoExt.data.reader.WfsCapabilities", {
diff --git a/tests/data/reader/WfsCapabilities.js b/tests/data/reader/WfsCapabilities.js
index 925e03678..a63ddbc21 100644
--- a/tests/data/reader/WfsCapabilities.js
+++ b/tests/data/reader/WfsCapabilities.js
@@ -326,4 +326,158 @@ var doc = (new OpenLayers.Format.XML).read(
         '</ogc:Scalar_Capabilities>'+
     '</ogc:Filter_Capabilities>'+
 '</WFS_Capabilities>'
-);
\ No newline at end of file
+);
+var doc11 = (new OpenLayers.Format.XML).read(
+'<?xml version="1.0" encoding="ISO-8859-1"?>' +
+'<wfs:WFS_Capabilities xmlns:gml="http://www.opengis.net/gml" xmlns:wfs="http://www.opengis.net/wfs" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogc="http://www.opengis.net/ogc" xmlns="http://www.opengis.net/wfs" version="1.1.0" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">' +
+'  <ows:ServiceIdentification>' +
+'    <ows:Title>GMap WMS Demo Server</ows:Title>' +
+'    <ows:Abstract/>' +
+'    <ows:ServiceType codeSpace="OGC">OGC WFS</ows:ServiceType>' +
+'    <ows:ServiceTypeVersion>1.1.0</ows:ServiceTypeVersion>' +
+'    <ows:Fees/>' +
+'    <ows:AccessConstraints/>' +
+'  </ows:ServiceIdentification>' +
+'  <ows:ServiceProvider>' +
+'    <ows:ProviderName/>' +
+'    <ows:ProviderSite xlink:type="simple" xlink:href=""/>' +
+'    <ows:ServiceContact>' +
+'      <ows:IndividualName/>' +
+'      <ows:PositionName/>' +
+'      <ows:ContactInfo>' +
+'        <ows:Phone>' +
+'          <ows:Voice/>' +
+'          <ows:Facsimile/>' +
+'        </ows:Phone>' +
+'        <ows:Address>' +
+'          <ows:DeliveryPoint/>' +
+'          <ows:City/>' +
+'          <ows:AdministrativeArea/>' +
+'          <ows:PostalCode/>' +
+'          <ows:Country/>' +
+'          <ows:ElectronicMailAddress/>' +
+'        </ows:Address>' +
+'        <ows:OnlineResource xlink:type="simple" xlink:href=""/>' +
+'        <ows:HoursOfService/>' +
+'        <ows:ContactInstructions/>' +
+'      </ows:ContactInfo>' +
+'      <ows:Role/>' +
+'    </ows:ServiceContact>' +
+'  </ows:ServiceProvider>' +
+'  <ows:OperationsMetadata>' +
+'    <ows:Operation name="GetCapabilities">' +
+'      <ows:DCP>' +
+'        <ows:HTTP>' +
+'          <ows:Get xlink:type="simple" xlink:href="http://www2.dmsolutions.ca/cgi-bin/mswfs_gmap?"/>' +
+'          <ows:Post xlink:type="simple" xlink:href="http://www2.dmsolutions.ca/cgi-bin/mswfs_gmap?"/>' +
+'        </ows:HTTP>' +
+'      </ows:DCP>' +
+'      <ows:Parameter name="service">' +
+'        <ows:Value>WFS</ows:Value>' +
+'      </ows:Parameter>' +
+'      <ows:Parameter name="AcceptVersions">' +
+'        <ows:Value>1.0.0</ows:Value>' +
+'        <ows:Value> 1.1.0</ows:Value>' +
+'      </ows:Parameter>' +
+'      <ows:Parameter name="AcceptFormats">' +
+'        <ows:Value>text/xml</ows:Value>' +
+'      </ows:Parameter>' +
+'    </ows:Operation>' +
+'    <ows:Operation name="DescribeFeatureType">' +
+'      <ows:DCP>' +
+'        <ows:HTTP>' +
+'          <ows:Get xlink:type="simple" xlink:href="http://www2.dmsolutions.ca/cgi-bin/mswfs_gmap?"/>' +
+'          <ows:Post xlink:type="simple" xlink:href="http://www2.dmsolutions.ca/cgi-bin/mswfs_gmap?"/>' +
+'        </ows:HTTP>' +
+'      </ows:DCP>' +
+'      <ows:Parameter name="outputFormat">' +
+'        <ows:Value>XMLSCHEMA</ows:Value>' +
+'        <ows:Value>text/xml; subtype=gml/2.1.2</ows:Value>' +
+'        <ows:Value>text/xml; subtype=gml/3.1.1</ows:Value>' +
+'      </ows:Parameter>' +
+'    </ows:Operation>' +
+'    <ows:Operation name="GetFeature">' +
+'      <ows:DCP>' +
+'        <ows:HTTP>' +
+'          <ows:Get xlink:type="simple" xlink:href="http://www2.dmsolutions.ca/cgi-bin/mswfs_gmap?"/>' +
+'          <ows:Post xlink:type="simple" xlink:href="http://www2.dmsolutions.ca/cgi-bin/mswfs_gmap?"/>' +
+'        </ows:HTTP>' +
+'      </ows:DCP>' +
+'      <ows:Parameter name="resultType">' +
+'        <ows:Value>results</ows:Value>' +
+'      </ows:Parameter>' +
+'      <ows:Parameter name="outputFormat">' +
+'        <ows:Value>text/xml; subtype=gml/3.1.1</ows:Value>' +
+'      </ows:Parameter>' +
+'    </ows:Operation>' +
+'  </ows:OperationsMetadata>' +
+'  <FeatureTypeList>' +
+'    <Operations>' +
+'      <Operation>Query</Operation>' +
+'    </Operations>' +
+'    <FeatureType>' +
+'      <Name>park</Name>' +
+'      <Title>Parks</Title>' +
+'      <DefaultSRS>EPSG:42304</DefaultSRS>' +
+'      <OutputFormats>' +
+'        <Format>text/xml; subtype=gml/3.1.1</Format>' +
+'      </OutputFormats>' +
+'      <ows:WGS84BoundingBox dimensions="2">' +
+'        <ows:LowerCorner>-173.433267989715 41.4271118471489</ows:LowerCorner>' +
+'        <ows:UpperCorner>-13.0481388603488 83.7465953038598</ows:UpperCorner>' +
+'      </ows:WGS84BoundingBox>' +
+'    </FeatureType>' +
+'    <FeatureType>' +
+'      <Name>popplace</Name>' +
+'      <Title>Cities</Title>' +
+'      <DefaultSRS>EPSG:42304</DefaultSRS>' +
+'      <OutputFormats>' +
+'        <Format>text/xml; subtype=gml/3.1.1</Format>' +
+'      </OutputFormats>' +
+'      <ows:WGS84BoundingBox dimensions="2">' +
+'        <ows:LowerCorner>-172.301407169865 36.354098687089</ows:LowerCorner>' +
+'        <ows:UpperCorner>-12.9698018843271 83.4831811841595</ows:UpperCorner>' +
+'      </ows:WGS84BoundingBox>' +
+'    </FeatureType>' +
+'  </FeatureTypeList>' +
+'  <ogc:Filter_Capabilities>' +
+'    <ogc:Spatial_Capabilities>' +
+'      <ogc:GeometryOperands>' +
+'        <ogc:GeometryOperand>gml:Point</ogc:GeometryOperand>' +
+'        <ogc:GeometryOperand>gml:LineString</ogc:GeometryOperand>' +
+'        <ogc:GeometryOperand>gml:Polygon</ogc:GeometryOperand>' +
+'        <ogc:GeometryOperand>gml:Envelope</ogc:GeometryOperand>' +
+'      </ogc:GeometryOperands>' +
+'      <ogc:SpatialOperators>' +
+'        <ogc:SpatialOperator name="Equals"/>' +
+'        <ogc:SpatialOperator name="Disjoint"/>' +
+'        <ogc:SpatialOperator name="Touches"/>' +
+'        <ogc:SpatialOperator name="Within"/>' +
+'        <ogc:SpatialOperator name="Overlaps"/>' +
+'        <ogc:SpatialOperator name="Crosses"/>' +
+'        <ogc:SpatialOperator name="Intersects"/>' +
+'        <ogc:SpatialOperator name="Contains"/>' +
+'        <ogc:SpatialOperator name="DWithin"/>' +
+'        <ogc:SpatialOperator name="Beyond"/>' +
+'        <ogc:SpatialOperator name="BBOX"/>' +
+'      </ogc:SpatialOperators>' +
+'    </ogc:Spatial_Capabilities>' +
+'    <ogc:Scalar_Capabilities>' +
+'      <ogc:LogicalOperators/>' +
+'      <ogc:ComparisonOperators>' +
+'        <ogc:ComparisonOperator>LessThan</ogc:ComparisonOperator>' +
+'        <ogc:ComparisonOperator>GreaterThan</ogc:ComparisonOperator>' +
+'        <ogc:ComparisonOperator>LessThanEqualTo</ogc:ComparisonOperator>' +
+'        <ogc:ComparisonOperator>GreaterThanEqualTo</ogc:ComparisonOperator>' +
+'        <ogc:ComparisonOperator>EqualTo</ogc:ComparisonOperator>' +
+'        <ogc:ComparisonOperator>NotEqualTo</ogc:ComparisonOperator>' +
+'        <ogc:ComparisonOperator>Like</ogc:ComparisonOperator>' +
+'        <ogc:ComparisonOperator>Between</ogc:ComparisonOperator>' +
+'      </ogc:ComparisonOperators>' +
+'    </ogc:Scalar_Capabilities>' +
+'    <ogc:Id_Capabilities>' +
+'      <ogc:FID/>' +
+'    </ogc:Id_Capabilities>' +
+'  </ogc:Filter_Capabilities>' +
+'</wfs:WFS_Capabilities>'
+);