[mapserver-commits] r10624 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Tue Oct 19 11:51:07 EDT 2010
Author: warmerdam
Date: 2010-10-19 08:51:07 -0700 (Tue, 19 Oct 2010)
New Revision: 10624
Added:
trunk/msautotest/wxs/expected/wfsogr10_ograuto.xml
trunk/msautotest/wxs/expected/wfsogr11_caps.xml
trunk/msautotest/wxs/expected/wfsogr11_ogrgml.xml
Modified:
trunk/msautotest/wxs/expected/wfsogr10_caps.xml
trunk/msautotest/wxs/expected/wfsogr10_csvstream.txt
trunk/msautotest/wxs/expected/wfsogr10_gml2.xml
trunk/msautotest/wxs/expected/wfsogr10_midmif.txt
trunk/msautotest/wxs/expected/wfsogr10_ogrgml.xml
trunk/msautotest/wxs/wfs_ogr.map
Log:
more tests, including WFS 1.1 (#3570)
Modified: trunk/msautotest/wxs/expected/wfsogr10_caps.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_caps.xml 2010-10-19 15:49:01 UTC (rev 10623)
+++ trunk/msautotest/wxs/expected/wfsogr10_caps.xml 2010-10-19 15:51:07 UTC (rev 10624)
@@ -59,7 +59,6 @@
<CSV/>
<CSVSTREAM/>
<OGRGML/>
- <OGRGMLSTREAM/>
<SHAPEZIP/>
<MIDMIF/>
</ResultFormat>
Modified: trunk/msautotest/wxs/expected/wfsogr10_csvstream.txt
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_csvstream.txt 2010-10-19 15:49:01 UTC (rev 10623)
+++ trunk/msautotest/wxs/expected/wfsogr10_csvstream.txt 2010-10-19 15:51:07 UTC (rev 10624)
@@ -1,4 +1,4 @@
Content-Type: text/csv; streamed
-WKT,FNODE_,TNODE_,LPOLY_,RPOLY_,LENGTH,ROAD_,ROAD_ID,F_CODE,NAME_E,NAME_F
-"LINESTRING (-60.201189792961586 46.102354406835836 0,-60.22203990695251 46.101246346098861 0,-60.242066599783321 46.097807469452071 0,-60.26248817949871 46.10046243986185 0,-60.302916095741153 46.10953640399341 0,-60.317500401724708 46.115654968046151 0,-60.338340466865311 46.124390858000147 0,-60.351258604383098 46.135729469595994 0,-60.35166078709053 46.151702162290846 0)",613,1511,0,0, 14862.892,1521,1521,67,,
+WKT,FNODE_,TNODE_,LPOLY_,RPOLY_,LENGTH,ROAD_ID,F_CODE,NAME_E,NAME_F
+"LINESTRING (-60.201189792961586 46.102354406835836 0,-60.22203990695251 46.101246346098861 0,-60.242066599783321 46.097807469452071 0,-60.26248817949871 46.10046243986185 0,-60.302916095741153 46.10953640399341 0,-60.317500401724708 46.115654968046151 0,-60.338340466865311 46.124390858000147 0,-60.351258604383098 46.135729469595994 0,-60.35166078709053 46.151702162290846 0)",613,1511,0,0, 14862.892,1521,67,,
Modified: trunk/msautotest/wxs/expected/wfsogr10_gml2.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_gml2.xml 2010-10-19 15:49:01 UTC (rev 10623)
+++ trunk/msautotest/wxs/expected/wfsogr10_gml2.xml 2010-10-19 15:51:07 UTC (rev 10624)
@@ -31,7 +31,6 @@
<ms:LPOLY_>0</ms:LPOLY_>
<ms:RPOLY_>0</ms:RPOLY_>
<ms:LENGTH>14862.892</ms:LENGTH>
- <ms:ROAD_>1521</ms:ROAD_>
<ms:ROAD_ID>1521</ms:ROAD_ID>
<ms:F_CODE>67</ms:F_CODE>
<ms:NAME_E></ms:NAME_E>
Modified: trunk/msautotest/wxs/expected/wfsogr10_midmif.txt
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_midmif.txt 2010-10-19 15:49:01 UTC (rev 10623)
+++ trunk/msautotest/wxs/expected/wfsogr10_midmif.txt 2010-10-19 15:51:07 UTC (rev 10624)
@@ -5,7 +5,7 @@
Content-Type: application/binary
Content-Transfer-Encoding: binary
-613,1511,0,0,14862.892,1521,1521,67,"",""
+613,1511,0,0,14862.892,1521,67,"",""
--xxOGRBoundaryxx
Content-Disposition: attachment; filename=result.mif
@@ -16,13 +16,12 @@
Charset "Neutral"
Delimiter ","
CoordSys Earth Projection 1, 104
-Columns 10
+Columns 9
FNODE_ Integer
TNODE_ Integer
LPOLY_ Integer
RPOLY_ Integer
LENGTH Float
- ROAD_ Integer
ROAD_ID Integer
F_CODE Integer
NAME_E Char(26)
Added: trunk/msautotest/wxs/expected/wfsogr10_ograuto.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_ograuto.xml (rev 0)
+++ trunk/msautotest/wxs/expected/wfsogr10_ograuto.xml 2010-10-19 15:51:07 UTC (rev 10624)
@@ -0,0 +1,89 @@
+Content-Type: multipart/mixed; boundary=xxOGRBoundaryxx
+
+--xxOGRBoundaryxx
+Content-Disposition: attachment; filename=result.gml
+Content-Type: application/binary
+Content-Transfer-Encoding: binary
+
+<?xml version="1.0" encoding="utf-8" ?>
+<ogr:FeatureCollection
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://ogr.maptools.org/ result.xsd"
+ xmlns:ogr="http://ogr.maptools.org/"
+ xmlns:gml="http://www.opengis.net/gml">
+ <gml:boundedBy>
+ <gml:Box>
+ <gml:coord><gml:X>-64.0523554055784</gml:X><gml:Y>46.98084304633409</gml:Y></gml:coord>
+ <gml:coord><gml:X>-64.0523554055784</gml:X><gml:Y>46.98084304633409</gml:Y></gml:coord>
+ </gml:Box>
+ </gml:boundedBy>
+
+ <gml:featureMember>
+ <ogr:popplace fid="F0">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>-64.052355405578396,46.980843046334087,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>BACMK</ogr:UNIQUE_KEY>
+ <ogr:NAME>Tignish</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>1</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+</ogr:FeatureCollection>
+
+--xxOGRBoundaryxx
+Content-Disposition: attachment; filename=result.xsd
+Content-Type: application/binary
+Content-Transfer-Encoding: binary
+
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://ogr.maptools.org/" xmlns:ogr="http://ogr.maptools.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="1.0">
+<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/2.1.2/feature.xsd"/>
+<xs:element name="FeatureCollection" type="ogr:FeatureCollectionType" substitutionGroup="gml:_FeatureCollection"/>
+<xs:complexType name="FeatureCollectionType">
+ <xs:complexContent>
+ <xs:extension base="gml:AbstractFeatureCollectionType">
+ <xs:attribute name="lockId" type="xs:string" use="optional"/>
+ <xs:attribute name="scope" type="xs:string" use="optional"/>
+ </xs:extension>
+ </xs:complexContent>
+</xs:complexType>
+<xs:element name="popplace" type="ogr:popplace_Type" substitutionGroup="gml:_Feature"/>
+<xs:complexType name="popplace_Type">
+ <xs:complexContent>
+ <xs:extension base="gml:AbstractFeatureType">
+ <xs:sequence>
+ <xs:element name="geometryProperty" type="gml:PointPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="UNIQUE_KEY" nillable="true" minOccurs="0" maxOccurs="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="5"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="NAME" nillable="true" minOccurs="0" maxOccurs="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="50"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="CAPITAL" nillable="true" minOccurs="0" maxOccurs="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:totalDigits value="3"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="POP_CLASS" nillable="true" minOccurs="0" maxOccurs="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:totalDigits value="3"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+</xs:complexType>
+</xs:schema>
+
+--xxOGRBoundaryxx--
Modified: trunk/msautotest/wxs/expected/wfsogr10_ogrgml.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_ogrgml.xml 2010-10-19 15:49:01 UTC (rev 10623)
+++ trunk/msautotest/wxs/expected/wfsogr10_ogrgml.xml 2010-10-19 15:51:07 UTC (rev 10624)
@@ -26,7 +26,6 @@
<ogr:LPOLY_>0</ogr:LPOLY_>
<ogr:RPOLY_>0</ogr:RPOLY_>
<ogr:LENGTH>14862.892</ogr:LENGTH>
- <ogr:ROAD_>1521</ogr:ROAD_>
<ogr:ROAD_ID>1521</ogr:ROAD_ID>
<ogr:F_CODE>67</ogr:F_CODE>
<ogr:NAME_E></ogr:NAME_E>
@@ -94,13 +93,6 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
- <xs:element name="ROAD_" nillable="true" minOccurs="0" maxOccurs="1">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:totalDigits value="11"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
<xs:element name="ROAD_ID" nillable="true" minOccurs="0" maxOccurs="1">
<xs:simpleType>
<xs:restriction base="xs:integer">
Added: trunk/msautotest/wxs/expected/wfsogr11_caps.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr11_caps.xml (rev 0)
+++ trunk/msautotest/wxs/expected/wfsogr11_caps.xml 2010-10-19 15:51:07 UTC (rev 10624)
@@ -0,0 +1,180 @@
+Content-type: text/xml
+
+<?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" updateSequence="123" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
+ <ows:ServiceIdentification>
+ <ows:Title>Test simple wfs</ows:Title>
+ <ows:Abstract>Test WFS Abstract</ows:Abstract>
+ <ows:Keywords>
+ <ows:Keyword>ogc</ows:Keyword>
+ <ows:Keyword>wfs</ows:Keyword>
+ <ows:Keyword>gml</ows:Keyword>
+ <ows:Keyword>om</ows:Keyword>
+ </ows:Keywords>
+ <ows:ServiceType codeSpace="OGC">OGC WFS</ows:ServiceType>
+ <ows:ServiceTypeVersion>1.1.0</ows:ServiceTypeVersion>
+ <ows:Fees>none</ows:Fees>
+ <ows:AccessConstraints>none</ows:AccessConstraints>
+ </ows:ServiceIdentification>
+ <ows:ServiceProvider>
+ <ows:ProviderName>MapServer</ows:ProviderName>
+ <ows:ProviderSite xlink:type="simple" xlink:href="http://localhost"/>
+ <ows:ServiceContact>
+ <ows:IndividualName>Tom Kralidis</ows:IndividualName>
+ <ows:PositionName>self</ows:PositionName>
+ <ows:ContactInfo>
+ <ows:Phone>
+ <ows:Voice>+xx-xxx-xxx-xxxx</ows:Voice>
+ <ows:Facsimile>+xx-xxx-xxx-xxxx</ows:Facsimile>
+ </ows:Phone>
+ <ows:Address>
+ <ows:DeliveryPoint>123 SomeRoad Road</ows:DeliveryPoint>
+ <ows:City>Toronto</ows:City>
+ <ows:AdministrativeArea>Ontario</ows:AdministrativeArea>
+ <ows:PostalCode>xxx-xxx</ows:PostalCode>
+ <ows:Country>Canada</ows:Country>
+ <ows:ElectronicMailAddress>tomkralidis at xxxxxxx.xxx</ows:ElectronicMailAddress>
+ </ows:Address>
+ <ows:OnlineResource xlink:type="simple" xlink:href="http://localhost"/>
+ <ows:HoursOfService>0800h - 1600h EST</ows:HoursOfService>
+ <ows:ContactInstructions>during hours of service</ows:ContactInstructions>
+ </ows:ContactInfo>
+ <ows:Role>staff</ows:Role>
+ </ows:ServiceContact>
+ </ows:ServiceProvider>
+ <ows:OperationsMetadata>
+ <ows:Operation name="GetCapabilities">
+ <ows:DCP>
+ <ows:HTTP>
+ <ows:Get xlink:type="simple" xlink:href="http://localhost/path/to/wfs_simple?"/>
+ <ows:Post xlink:type="simple" xlink:href="http://localhost/path/to/wfs_simple?"/>
+ </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://localhost/path/to/wfs_simple?"/>
+ <ows:Post xlink:type="simple" xlink:href="http://localhost/path/to/wfs_simple?"/>
+ </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://localhost/path/to/wfs_simple?"/>
+ <ows:Post xlink:type="simple" xlink:href="http://localhost/path/to/wfs_simple?"/>
+ </ows:HTTP>
+ </ows:DCP>
+ <ows:Parameter name="resultType">
+ <ows:Value>results</ows:Value>
+ <ows:Value>hits</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="outputFormat">
+ <ows:Value>text/xml; subtype=gml/3.1.1</ows:Value>
+ <ows:Value>text/csv</ows:Value>
+ <ows:Value>text/csv; streamed</ows:Value>
+ <ows:Value>text/xml; subtype=gml/2.1.2; driver=ogr</ows:Value>
+ <ows:Value>application/shapefile</ows:Value>
+ <ows:Value>MIDMIF</ows:Value>
+ </ows:Parameter>
+ </ows:Operation>
+ </ows:OperationsMetadata>
+ <FeatureTypeList>
+ <Operations>
+ <Operation>Query</Operation>
+ </Operations>
+ <FeatureType>
+ <Name>road</Name>
+ <Title>road</Title>
+ <DefaultSRS>urn:ogc:def:crs:EPSG::4326</DefaultSRS>
+ <OtherSRS>urn:ogc:def:crs:EPSG::4269</OtherSRS>
+ <OtherSRS>urn:ogc:def:crs:EPSG::3978</OtherSRS>
+ <OutputFormats>
+ <Format>text/xml; subtype=gml/3.1.1</Format>
+ <Format>text/csv</Format>
+ <Format>text/csv; streamed</Format>
+ <Format>text/xml; subtype=gml/2.1.2; driver=ogr</Format>
+ <Format>application/shapefile</Format>
+ <Format>MIDMIF</Format>
+ </OutputFormats>
+ <ows:WGS84BoundingBox dimensions="2">
+ <ows:LowerCorner>-66.633317770969 42.382053788395</ows:LowerCorner>
+ <ows:UpperCorner>-59.292113839180 48.295511938680</ows:UpperCorner>
+ </ows:WGS84BoundingBox>
+ </FeatureType>
+ <FeatureType>
+ <Name>popplace</Name>
+ <Title>popplace</Title>
+ <DefaultSRS>urn:ogc:def:crs:EPSG::4326</DefaultSRS>
+ <OtherSRS>urn:ogc:def:crs:EPSG::4269</OtherSRS>
+ <OtherSRS>urn:ogc:def:crs:EPSG::3978</OtherSRS>
+ <OutputFormats>
+ <Format>text/xml; subtype=gml/3.1.1</Format>
+ <Format>text/csv</Format>
+ <Format>text/xml; subtype=gml/2.1.2; driver=ogr</Format>
+ <Format>application/shapefile</Format>
+ <Format>MIDMIF</Format>
+ </OutputFormats>
+ <ows:WGS84BoundingBox dimensions="2">
+ <ows:LowerCorner>-66.328616887533 42.5631251681</ows:LowerCorner>
+ <ows:UpperCorner>-59.688212172925 47.941250727064</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:EID/>
+ <ogc:FID/>
+ </ogc:Id_Capabilities>
+ </ogc:Filter_Capabilities>
+</wfs:WFS_Capabilities>
Added: trunk/msautotest/wxs/expected/wfsogr11_ogrgml.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr11_ogrgml.xml (rev 0)
+++ trunk/msautotest/wxs/expected/wfsogr11_ogrgml.xml 2010-10-19 15:51:07 UTC (rev 10624)
@@ -0,0 +1,332 @@
+Content-Type: multipart/mixed; boundary=xxOGRBoundaryxx
+
+--xxOGRBoundaryxx
+Content-Disposition: attachment; filename=result.gml
+Content-Type: application/binary
+Content-Transfer-Encoding: binary
+
+<?xml version="1.0" encoding="utf-8" ?>
+<ogr:FeatureCollection
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://ogr.maptools.org/ result.xsd"
+ xmlns:ogr="http://ogr.maptools.org/"
+ xmlns:gml="http://www.opengis.net/gml">
+ <gml:boundedBy>
+ <gml:Box>
+ <gml:coord><gml:X>2279399</gml:X><gml:Y>-55344.50390625</gml:Y></gml:coord>
+ <gml:coord><gml:X>2600377</gml:X><gml:Y>461586.8125</gml:Y></gml:coord>
+ </gml:Box>
+ </gml:boundedBy>
+
+ <gml:featureMember>
+ <ogr:popplace fid="F0">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2281604.25,340848.9375,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>BACMK</ogr:UNIQUE_KEY>
+ <ogr:NAME>Tignish</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>1</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F1">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2503805.5,427872.65625,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CAGYX</ogr:UNIQUE_KEY>
+ <ogr:NAME>Cheticamp</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F2">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2499190.0,194088.234375,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CBIKA</ogr:UNIQUE_KEY>
+ <ogr:NAME>Sheet Harbour</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F3">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2434957.0,347013.59375,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>BACII</ogr:UNIQUE_KEY>
+ <ogr:NAME>Souris</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F4">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2578914.25,292073.09375,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CAGBW</ogr:UNIQUE_KEY>
+ <ogr:NAME>Canso</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F5">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2536072.75,311524.96875,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CBELL</ogr:UNIQUE_KEY>
+ <ogr:NAME>Port Hawkesbury</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F6">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2494520.0,285855.40625,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CAATB</ogr:UNIQUE_KEY>
+ <ogr:NAME>Antigonish</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F7">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2348711.75,204294.0625,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CBKDH</ogr:UNIQUE_KEY>
+ <ogr:NAME>Springhill</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F8">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2377598.0,135734.703125,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CBPAK</ogr:UNIQUE_KEY>
+ <ogr:NAME>Windsor</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F9">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2398677.25,70608.140625,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CAWAZ</ogr:UNIQUE_KEY>
+ <ogr:NAME>Lunenburg</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F10">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2388340.0,19784.322265625,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CAUWZ</ogr:UNIQUE_KEY>
+ <ogr:NAME>Liverpool</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F11">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2313364.75,98278.921875,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CAZHC</ogr:UNIQUE_KEY>
+ <ogr:NAME>Middleton</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F12">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2279399,39858,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CAJOA</ogr:UNIQUE_KEY>
+ <ogr:NAME>Digby</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F13">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2359906.5,-30454.435546875,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CBIKP</ogr:UNIQUE_KEY>
+ <ogr:NAME>Shelburne</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F14">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2325561.75,294362.25,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>BADSZ</ogr:UNIQUE_KEY>
+ <ogr:NAME>Summerside</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>3</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F15">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2600377.0,419421.71875,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CBQFA</ogr:UNIQUE_KEY>
+ <ogr:NAME>Glace Bay</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>3</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F16">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2449341.5,253906.09375,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CBBJR</ogr:UNIQUE_KEY>
+ <ogr:NAME>New Glasgow</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>3</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F17">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2418051.5,205002.203125,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CBMKT</ogr:UNIQUE_KEY>
+ <ogr:NAME>Truro</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>3</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F18">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2329295.75,218397.28125,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CAAOO</ogr:UNIQUE_KEY>
+ <ogr:NAME>Amherst</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>3</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F19">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2345781.25,130999.546875,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CASWE</ogr:UNIQUE_KEY>
+ <ogr:NAME>Kentville</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>3</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F20">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2382666.75,60910.9375,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CAFBR</ogr:UNIQUE_KEY>
+ <ogr:NAME>Bridgewater</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>3</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F21">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2294923.75,-55344.50390625,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CBPIB</ogr:UNIQUE_KEY>
+ <ogr:NAME>Yarmouth</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>3</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F22">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2574240.0,416102.34375,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CBLHE</ogr:UNIQUE_KEY>
+ <ogr:NAME>Sydney Mines</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>3</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F23">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2587598.0,404010.53125,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CBLGX</ogr:UNIQUE_KEY>
+ <ogr:NAME>Sydney</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>4</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F24">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2437026.0,130358.3515625,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CAIYJ</ogr:UNIQUE_KEY>
+ <ogr:NAME>Dartmouth</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>5</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F25">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2402416.5,461586.8125,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>EGIIG</ogr:UNIQUE_KEY>
+ <ogr:NAME>Fatima</ogr:NAME>
+ <ogr:CAPITAL>0</ogr:CAPITAL>
+ <ogr:POP_CLASS>2</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F26">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2378567.25,305099.78125,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>BAARG</ogr:UNIQUE_KEY>
+ <ogr:NAME>Charlottetown</ogr:NAME>
+ <ogr:CAPITAL>2</ogr:CAPITAL>
+ <ogr:POP_CLASS>3</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ogr:popplace fid="F27">
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2431943.75,118985.3828125,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:UNIQUE_KEY>CAPHL</ogr:UNIQUE_KEY>
+ <ogr:NAME>Halifax</ogr:NAME>
+ <ogr:CAPITAL>2</ogr:CAPITAL>
+ <ogr:POP_CLASS>6</ogr:POP_CLASS>
+ </ogr:popplace>
+ </gml:featureMember>
+</ogr:FeatureCollection>
+
+--xxOGRBoundaryxx
+Content-Disposition: attachment; filename=result.xsd
+Content-Type: application/binary
+Content-Transfer-Encoding: binary
+
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://ogr.maptools.org/" xmlns:ogr="http://ogr.maptools.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="1.0">
+<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/2.1.2/feature.xsd"/>
+<xs:element name="FeatureCollection" type="ogr:FeatureCollectionType" substitutionGroup="gml:_FeatureCollection"/>
+<xs:complexType name="FeatureCollectionType">
+ <xs:complexContent>
+ <xs:extension base="gml:AbstractFeatureCollectionType">
+ <xs:attribute name="lockId" type="xs:string" use="optional"/>
+ <xs:attribute name="scope" type="xs:string" use="optional"/>
+ </xs:extension>
+ </xs:complexContent>
+</xs:complexType>
+<xs:element name="popplace" type="ogr:popplace_Type" substitutionGroup="gml:_Feature"/>
+<xs:complexType name="popplace_Type">
+ <xs:complexContent>
+ <xs:extension base="gml:AbstractFeatureType">
+ <xs:sequence>
+ <xs:element name="geometryProperty" type="gml:PointPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="UNIQUE_KEY" nillable="true" minOccurs="0" maxOccurs="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="5"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="NAME" nillable="true" minOccurs="0" maxOccurs="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="50"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="CAPITAL" nillable="true" minOccurs="0" maxOccurs="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:totalDigits value="3"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="POP_CLASS" nillable="true" minOccurs="0" maxOccurs="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:totalDigits value="3"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+</xs:complexType>
+</xs:schema>
+
+--xxOGRBoundaryxx--
Modified: trunk/msautotest/wxs/wfs_ogr.map
===================================================================
--- trunk/msautotest/wxs/wfs_ogr.map 2010-10-19 15:49:01 UTC (rev 10623)
+++ trunk/msautotest/wxs/wfs_ogr.map 2010-10-19 15:51:07 UTC (rev 10624)
@@ -3,6 +3,11 @@
#
# REQUIRES: SUPPORTS=WFS INPUT=OGR
#
+# Some tests in this sequence will be quite sensitive to the GDAL/OGR version.
+# The tests are currently expected to run with GDAL/OGR 1.8 (prerelease)
+#
+# WFS 1.0
+#
# Do formats show up in the Capabilities
# RUN_PARMS: wfsogr10_caps.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetCapabilities" > [RESULT_DEVERSION]
#
@@ -15,10 +20,21 @@
# Generate dump streamed directly to CSV
# RUN_PARMS: wfsogr10_csvstream.txt [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road&featureid=road.1521&OUTPUTFORMAT=CSVSTREAM" > [RESULT]
#
-# Generate dump streamed directly to OGR GML
+# Generate dump streamed directly to OGR GML from memory.
# RUN_PARMS: wfsogr10_ogrgml.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road&featureid=road.1521&OUTPUTFORMAT=OGRGML" > [RESULT]
#
+# OGR GML from OGR layer to test OGR "auto" support. Also tests aliasing.
+# RUN_PARMS: wfsogr10_ograuto.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&featureid=popplace.BACMK&OUTPUTFORMAT=OGRGML" > [RESULT]
#
+#
+# WFS 1.1
+#
+# Do formats show up in the Capabilities
+# RUN_PARMS: wfsogr11_caps.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.1.0&REQUEST=GetCapabilities" > [RESULT_DEVERSION]
+#
+# Generate dump streamed directly to OGR GML from memory.
+# RUN_PARMS: wfsogr11_ogrgml.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=popplace&OUTPUTFORMAT=text/xml; subtype=gml/2.1.2; driver=ogr&srsName=urn:ogc:def:crs:EPSG::3978" > [RESULT]
+#
MAP
@@ -60,23 +76,16 @@
OUTPUTFORMAT
NAME "OGRGML"
DRIVER "OGR/GML"
+ MIMETYPE "text/xml; subtype=gml/2.1.2; driver=ogr"
FORMATOPTION "STORAGE=memory"
FORMATOPTION "FORM=multipart"
FORMATOPTION "FILENAME=result.gml"
END
OUTPUTFORMAT
- NAME "OGRGMLSTREAM"
- DRIVER "OGR/GML"
- MIMETYPE "text/xml; subtype=gml/2.1.2"
- FORMATOPTION "STORAGE=stream"
- FORMATOPTION "FILENAME=result.gml"
-END
-
-OUTPUTFORMAT
NAME "SHAPEZIP"
DRIVER "OGR/ESRI Shapefile"
- MIMETYPE "application/zip"
+ MIMETYPE "application/shapefile"
FORMATOPTION "STORAGE=filesystem"
FORMATOPTION "FORM=zip"
FORMATOPTION "FILENAME=result.zip"
@@ -145,6 +154,7 @@
"wfs_featureid" "ROAD_ID"
"wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgmlstream,shapezip,midmif"
"gml_include_items" "all"
+ "gml_exclude_items" "ROAD_"
"gml_types" "auto"
END
TYPE LINE
@@ -166,8 +176,10 @@
"wfs_title" "popplace"
"wfs_description" "populated places"
"wfs_featureid" "UNIQUE_KEY"
- "wfs_getfeature_formatlist" "csv,ogrgml,shapezip"
- "gml_include_items" "all"
+ "wfs_getfeature_formatlist" "csv,ogrgml,shapezip,midmif"
+ "gml_include_items" "NAME,UNIQUE_KEY,CAPITAL,POP_RANGE"
+ "gml_POP_RANGE_alias" "POP_CLASS"
+ "gml_types" "auto"
END
TYPE POINT
STATUS ON
More information about the mapserver-commits
mailing list