Support multiple featureTypes with a different featureNS

2015-03-04 15:02:04 +01:00
parent b05ead4056
commit b698fe9968
5 changed files with 152 additions and 17 deletions
--- a/externs/olx.js
+++ b/externs/olx.js
@@ -1679,7 +1679,7 @@ olx.format.KMLOptions.prototype.defaultStyle;


 /**
- * @typedef {{featureNS: (string|undefined),
+ * @typedef {{featureNS: (Object.<string, string>|string|undefined),
 *     featureType: (Array.<string>|string|undefined),
 *     srsName: string,
 *     surface: (boolean|undefined),
@@ -1694,7 +1694,7 @@ olx.format.GMLOptions;

 /**
 * Feature namespace. If not defined will be derived from GML.
- * @type {string|undefined}
+ * @type {Object.<string, string>|string|undefined}
 * @api stable
 */
 olx.format.GMLOptions.prototype.featureNS;
@@ -1782,7 +1782,7 @@ olx.format.GPXOptions.prototype.readExtensions;


 /**
- * @typedef {{featureNS: string,
+ * @typedef {{featureNS: (Object.<string, string>|string|undefined),
 *     featureType: (Array.<string>|string|undefined),
 *     gmlFormat: (ol.format.GMLBase|undefined),
 *     schemaLocation: (string|undefined)}}
@@ -1793,7 +1793,7 @@ olx.format.WFSOptions;

 /**
 * The namespace URI used for features.
- * @type {string}
+ * @type {Object.<string, string>|string|undefined}
 * @api stable
 */
 olx.format.WFSOptions.prototype.featureNS;
--- a/src/ol/format/gml/gmlbaseformat.js
+++ b/src/ol/format/gml/gmlbaseformat.js
@@ -51,7 +51,7 @@ ol.format.GMLBase = function(opt_options) {

  /**
   * @protected
-   * @type {string|undefined}
+   * @type {Object.<string, string>|string|undefined}
   */
  this.featureNS = options.featureNS;

@@ -107,33 +107,52 @@ ol.format.GMLBase.prototype.readFeaturesInternal = function(node, objectStack) {
    var context = objectStack[0];
    goog.asserts.assert(goog.isObject(context));
    var featureType = context['featureType'];
-    var i, ii, featureNS;
+    var featureNS = context['featureNS'];
+    var i, ii, prefix = 'p', defaultPrefix = 'p0';
    if (!goog.isDef(featureType) && goog.isDefAndNotNull(node.childNodes)) {
-      featureType = [];
+      featureType = [], featureNS = {};
      for (i = 0, ii = node.childNodes.length; i < ii; ++i) {
        var child = node.childNodes[i];
        if (child.nodeType === 1) {
          var ft = child.nodeName.split(':').pop();
          if (goog.array.indexOf(featureType, ft) === -1) {
-            featureType.push(ft);
-            if (!goog.isDef(featureNS)) {
-              featureNS = child.namespaceURI;
+            var key;
+            if (!goog.object.contains(featureNS, child.namespaceURI)) {
+              key = prefix + goog.object.getCount(featureNS);
+              featureNS[key] = child.namespaceURI;
+            } else {
+              key = goog.object.findKey(featureNS, function(value) {
+                return value === child.namespaceURI;
+              });
            }
+            featureType.push(key + ':' + ft);
          }
        }
      }
      context['featureType'] = featureType;
      context['featureNS'] = featureNS;
    }
-    var parsers = {};
+    if (goog.isString(featureNS)) {
+      var ns = featureNS;
+      featureNS = {};
+      featureNS[defaultPrefix] = ns;
+    }
    var parsersNS = {};
    var featureTypes = goog.isArray(featureType) ? featureType : [featureType];
-    for (i = 0, ii = featureTypes.length; i < ii; ++i) {
-      parsers[featureTypes[i]] = (localName == 'featureMembers') ?
-          ol.xml.makeArrayPusher(this.readFeatureElement, this) :
-          ol.xml.makeReplacer(this.readFeatureElement, this);
+    for (var p in featureNS) {
+      var parsers = {};
+      for (i = 0, ii = featureTypes.length; i < ii; ++i) {
+        var featurePrefix = featureTypes[i].indexOf(':') === -1 ?
+            defaultPrefix : featureTypes[i].split(':')[0];
+        if (featurePrefix === p) {
+          parsers[featureTypes[i].split(':').pop()] =
+              (localName == 'featureMembers') ?
+              ol.xml.makeArrayPusher(this.readFeatureElement, this) :
+              ol.xml.makeReplacer(this.readFeatureElement, this);
+        }
+      }
+      parsersNS[featureNS[p]] = parsers;
    }
-    parsersNS[context['featureNS']] = parsers;
    features = ol.xml.pushParseAndPop([], parsersNS, node, objectStack);
  }
  if (!goog.isDef(features)) {
--- a/src/ol/format/wfsformat.js
+++ b/src/ol/format/wfsformat.js
@@ -37,7 +37,7 @@ ol.format.WFS = function(opt_options) {

  /**
   * @private
-   * @type {string}
+   * @type {Object.<string, string>|string|undefined}
   */
  this.featureNS_ = options.featureNS;

--- a/test/spec/ol/format/gml/multiple-typenames-ns.xml
+++ b/test/spec/ol/format/gml/multiple-typenames-ns.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wfs:FeatureCollection xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:it.geosolutions="http://www.geo-solutions.it"
+    xmlns:cite="http://www.opengeospatial.net/cite" xmlns:ogc="http://www.opengis.net/ogc"
+    xmlns:tiger="http://www.census.gov" xmlns:sde="http://geoserver.sf.net"
+    xmlns:topp="http://www.openplans.org/topp" xmlns:wfs="http://www.opengis.net/wfs"
+    xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:sf="http://www.openplans.org/spearfish" xmlns:gml="http://www.opengis.net/gml"
+    xmlns:nurc="http://www.nurc.nato.int" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    numberOfFeatures="874" timeStamp="2015-03-04T09:53:58.763Z"
+    xsi:schemaLocation="http://www.openplans.org/topp http://localhost:8080/geoserver/wfs?service=WFS&amp;version=1.1.0&amp;request=DescribeFeatureType&amp;typeName=topp%3Astates http://www.openplans.org/spearfish http://localhost:8080/geoserver/wfs?service=WFS&amp;version=1.1.0&amp;request=DescribeFeatureType&amp;typeName=sf%3Aroads http://www.opengis.net/wfs http://localhost:8080/geoserver/schemas/wfs/1.1.0/wfs.xsd">
+    <gml:featureMembers>
+        <topp:states gml:id="states.1">
+            <topp:the_geom>
+                <gml:MultiSurface srsDimension="2" srsName="EPSG:4326">
+                    <gml:surfaceMember>
+                        <gml:Polygon srsDimension="2">
+                            <gml:exterior>
+                                <gml:LinearRing srsDimension="2">
+                                    <gml:posList>37.51099000000001 -88.071564 37.476273000000006
+                                        -88.087883 37.442852 -88.311707 37.40930899999999 -88.359177
+                                        37.51099000000001 -88.071564</gml:posList>
+                                </gml:LinearRing>
+                            </gml:exterior>
+                        </gml:Polygon>
+                    </gml:surfaceMember>
+                </gml:MultiSurface>
+            </topp:the_geom>
+            <topp:STATE_NAME>Illinois</topp:STATE_NAME>
+            <topp:STATE_FIPS>17</topp:STATE_FIPS>
+            <topp:SUB_REGION>E N Cen</topp:SUB_REGION>
+            <topp:STATE_ABBR>IL</topp:STATE_ABBR>
+            <topp:LAND_KM>143986.61</topp:LAND_KM>
+            <topp:WATER_KM>1993.335</topp:WATER_KM>
+            <topp:PERSONS>1.1430602E7</topp:PERSONS>
+            <topp:FAMILIES>2924880.0</topp:FAMILIES>
+            <topp:HOUSHOLD>4202240.0</topp:HOUSHOLD>
+            <topp:MALE>5552233.0</topp:MALE>
+            <topp:FEMALE>5878369.0</topp:FEMALE>
+            <topp:WORKERS>4199206.0</topp:WORKERS>
+            <topp:DRVALONE>3741715.0</topp:DRVALONE>
+            <topp:CARPOOL>652603.0</topp:CARPOOL>
+            <topp:PUBTRANS>538071.0</topp:PUBTRANS>
+            <topp:EMPLOYED>5417967.0</topp:EMPLOYED>
+            <topp:UNEMPLOY>385040.0</topp:UNEMPLOY>
+            <topp:SERVICE>1360159.0</topp:SERVICE>
+            <topp:MANUAL>828906.0</topp:MANUAL>
+            <topp:P_MALE>0.486</topp:P_MALE>
+            <topp:P_FEMALE>0.514</topp:P_FEMALE>
+            <topp:SAMP_POP>1747776.0</topp:SAMP_POP>
+        </topp:states>
+        <sf:roads gml:id="roads.1">
+            <sf:the_geom>
+                <gml:MultiLineString srsDimension="2" srsName="EPSG:4326">
+                    <gml:lineStringMember>
+                        <gml:LineString srsDimension="2">
+                            <gml:posList>37.51099000000001 -88.071564 37.476273000000006
+                                -88.087883 37.442852 -88.311707 37.40930899999999 -88.359177
+                                37.51099000000001 -88.071564</gml:posList>
+                        </gml:LineString>
+                    </gml:lineStringMember>
+                </gml:MultiLineString>
+            </sf:the_geom>
+            <sf:cat>5</sf:cat>
+            <sf:label>unimproved road</sf:label>
+        </sf:roads>
+    </gml:featureMembers>
+</wfs:FeatureCollection>
--- a/test/spec/ol/format/gmlformat.test.js
+++ b/test/spec/ol/format/gmlformat.test.js
@@ -1150,6 +1150,54 @@ describe('ol.format.GML3', function() {

  });

+  describe('when parsing multiple feature types / namespaces', function() {
+
+    var features;
+    before(function(done) {
+      var url = 'spec/ol/format/gml/multiple-typenames-ns.xml';
+      afterLoadText(url, function(xml) {
+        try {
+          features = new ol.format.GML({
+            featureNS: {
+              'topp': 'http://www.openplans.org/topp',
+              'sf': 'http://www.openplans.org/spearfish'
+            },
+            featureType: ['topp:states', 'sf:roads']
+          }).readFeatures(xml);
+        } catch (e) {
+          done(e);
+        }
+        done();
+      });
+    });
+
+    it('reads all features', function() {
+      expect(features.length).to.be(2);
+    });
+
+  });
+
+  describe('when parsing multiple feature types / namespaces', function() {
+
+    var features;
+    before(function(done) {
+      var url = 'spec/ol/format/gml/multiple-typenames-ns.xml';
+      afterLoadText(url, function(xml) {
+        try {
+          features = new ol.format.GML().readFeatures(xml);
+        } catch (e) {
+          done(e);
+        }
+        done();
+      });
+    });
+
+    it('reads all features with autoconfigure', function() {
+      expect(features.length).to.be(2);
+    });
+
+  });
+
 });