[mapserver-commits] r10630 - in trunk/msautotest/wxs: . expected

svn at osgeo.org svn at osgeo.org
Tue Oct 19 19:27:30 EDT 2010 

Author: warmerdam
Date: 2010-10-19 16:27:30 -0700 (Tue, 19 Oct 2010)
New Revision: 10630

Added:
   trunk/msautotest/wxs/expected/wfsogr10_multi.xml
   trunk/msautotest/wxs/expected/wfsogr11_ogrgml_ll.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_ograuto.xml
   trunk/msautotest/wxs/expected/wfsogr10_ogrgml.xml
   trunk/msautotest/wxs/expected/wfsogr11_caps.xml
   trunk/msautotest/wxs/wfs_ogr.map
Log:
various improvements and new tests (#3570)

Modified: trunk/msautotest/wxs/expected/wfsogr10_caps.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_caps.xml	2010-10-19 23:01:20 UTC (rev 10629)
+++ trunk/msautotest/wxs/expected/wfsogr10_caps.xml	2010-10-19 23:27:30 UTC (rev 10630)
@@ -83,15 +83,21 @@
     <FeatureType>
         <Name>road</Name>
         <Title>road</Title>
-        <SRS>EPSG:4326</SRS>
-        <LatLongBoundingBox minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
+        <SRS>EPSG:3978</SRS>
+        <LatLongBoundingBox minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
     </FeatureType>
     <FeatureType>
         <Name>popplace</Name>
         <Title>popplace</Title>
-        <SRS>EPSG:4326</SRS>
-        <LatLongBoundingBox minx="-66.3286" miny="42.5631" maxx="-59.6882" maxy="47.9413" />
+        <SRS>EPSG:3978</SRS>
+        <LatLongBoundingBox minx="2.2794e+06" miny="-55344.5" maxx="2.60038e+06" maxy="461587" />
     </FeatureType>
+    <FeatureType>
+        <Name>multi</Name>
+        <Title>multi</Title>
+        <SRS>EPSG:27700</SRS>
+        <LatLongBoundingBox minx="0" miny="0" maxx="100" maxy="100" />
+    </FeatureType>
 </FeatureTypeList>
 
 <ogc:Filter_Capabilities>

Modified: trunk/msautotest/wxs/expected/wfsogr10_csvstream.txt
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_csvstream.txt	2010-10-19 23:01:20 UTC (rev 10629)
+++ trunk/msautotest/wxs/expected/wfsogr10_csvstream.txt	2010-10-19 23:27:30 UTC (rev 10630)
@@ -1,4 +1,4 @@
 Content-Type: text/csv; streamed
 
 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,,
+"LINESTRING (2589745.5 402556.25 0,2588416.5 401601.0625 0,2587278.5 400455.71875 0,2585757.5 399880.53125 0,2582523.25 399110.65625 0,2581190.5 399107.1875 0,2579286.75 399102.1875 0,2577761.5 399669.40625 0,2576803.5 401189.875 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 23:01:20 UTC (rev 10629)
+++ trunk/msautotest/wxs/expected/wfsogr10_gml2.xml	2010-10-19 23:27:30 UTC (rev 10630)
@@ -10,20 +10,20 @@
    xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/WFS-basic.xsd 
                        http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=road&amp;OUTPUTFORMAT=XMLSCHEMA">
       <gml:boundedBy>
-      	<gml:Box srsName="EPSG:4326">
-      		<gml:coordinates>-60.351661,46.097807 -60.201190,46.151702</gml:coordinates>
+      	<gml:Box srsName="EPSG:3978">
+      		<gml:coordinates>2576803.500000,399102.187500 2589745.500000,402556.250000</gml:coordinates>
       	</gml:Box>
       </gml:boundedBy>
     <gml:featureMember>
       <ms:road fid="road.1521">
         <gml:boundedBy>
-        	<gml:Box srsName="EPSG:4326">
-        		<gml:coordinates>-60.351661,46.097807 -60.201190,46.151702</gml:coordinates>
+        	<gml:Box srsName="EPSG:3978">
+        		<gml:coordinates>2576803.500000,399102.187500 2589745.500000,402556.250000</gml:coordinates>
         	</gml:Box>
         </gml:boundedBy>
         <ms:msGeometry>
-        <gml:LineString srsName="EPSG:4326">
-          <gml:coordinates>-60.201190,46.102354 -60.222040,46.101246 -60.242067,46.097807 -60.262488,46.100462 -60.302916,46.109536 -60.317500,46.115655 -60.338340,46.124391 -60.351259,46.135729 -60.351661,46.151702 </gml:coordinates>
+        <gml:LineString srsName="EPSG:3978">
+          <gml:coordinates>2589745.500000,402556.250000 2588416.500000,401601.062500 2587278.500000,400455.718750 2585757.500000,399880.531250 2582523.250000,399110.656250 2581190.500000,399107.187500 2579286.750000,399102.187500 2577761.500000,399669.406250 2576803.500000,401189.875000 </gml:coordinates>
         </gml:LineString>
         </ms:msGeometry>
         <ms:FNODE_>613</ms:FNODE_>

Modified: trunk/msautotest/wxs/expected/wfsogr10_midmif.txt
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_midmif.txt	2010-10-19 23:01:20 UTC (rev 10629)
+++ trunk/msautotest/wxs/expected/wfsogr10_midmif.txt	2010-10-19 23:27:30 UTC (rev 10630)
@@ -15,7 +15,7 @@
 Version 300
 Charset "Neutral"
 Delimiter ","
-CoordSys Earth Projection 1, 104
+CoordSys NonEarth Units "m"
 Columns 9
   FNODE_ Integer
   TNODE_ Integer
@@ -29,15 +29,15 @@
 Data
 
 Pline 9
--60.2011897929616 46.1023544068358
--60.2220399069525 46.1012463460989
--60.2420665997833 46.0978074694521
--60.2624881794987 46.1004624398619
--60.3029160957412 46.1095364039934
--60.3175004017247 46.1156549680462
--60.3383404668653 46.1243908580001
--60.3512586043831 46.135729469596
--60.3516607870905 46.1517021622908
+2589745.5 402556.25
+2588416.5 401601.0625
+2587278.5 400455.71875
+2585757.5 399880.53125
+2582523.25 399110.65625
+2581190.5 399107.1875
+2579286.75 399102.1875
+2577761.5 399669.40625
+2576803.5 401189.875
     Pen (1,2,0)
 
 --xxOGRBoundaryxx--

Added: trunk/msautotest/wxs/expected/wfsogr10_multi.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_multi.xml	                        (rev 0)
+++ trunk/msautotest/wxs/expected/wfsogr10_multi.xml	2010-10-19 23:27:30 UTC (rev 10630)
@@ -0,0 +1,86 @@
+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>0</gml:X><gml:Y>0</gml:Y></gml:coord>
+      <gml:coord><gml:X>100</gml:X><gml:Y>100</gml:Y></gml:coord>
+    </gml:Box>
+  </gml:boundedBy>
+                                                                                      
+  <gml:featureMember>
+    <ogr:multi fid="F0">
+      <ogr:geometryProperty><gml:MultiPolygon><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0,0 0,10,0 10,0,0 0,0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs><gml:innerBoundaryIs><gml:LinearRing><gml:coordinates>1,1,0 2,2,0 2,1,0 1,1,0</gml:coordinates></gml:LinearRing></gml:innerBoundaryIs></gml:Polygon></gml:polygonMember><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>100,50,0 50,100,0 100,100,0 100,50,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
+      <ogr:ID>4</ogr:ID>
+      <ogr:NAME>mp</ogr:NAME>
+      <ogr:WKT>MULTIPOLYGON(((0 0,0 10,10 0,0 0),(1 1,2 2,2 1,1 1)),((100 50,50 100,100 100)))</ogr:WKT>
+    </ogr:multi>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:multi fid="F1">
+      <ogr:geometryProperty><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>30,0,0 30,10,0 40,10,0 40,0,0 3,0,0 30,0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs><gml:innerBoundaryIs><gml:LinearRing><gml:coordinates>31,1,0 32,2,0 32,1,0 31,1,0</gml:coordinates></gml:LinearRing></gml:innerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+      <ogr:ID>5</ogr:ID>
+      <ogr:NAME>poly</ogr:NAME>
+      <ogr:WKT>POLYGON((30 0,30 10,40 10,40 0,3 0),(31 1,32 2,32 1,31 1))</ogr:WKT>
+    </ogr:multi>
+  </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="multi" type="ogr:multi_Type" substitutionGroup="gml:_Feature"/>
+<xs:complexType name="multi_Type">
+  <xs:complexContent>
+    <xs:extension base="gml:AbstractFeatureType">
+      <xs:sequence>
+        <xs:element name="geometryProperty" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="ID" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="NAME" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="WKT" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+      </xs:sequence>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+</xs:schema>
+
+--xxOGRBoundaryxx--

Modified: trunk/msautotest/wxs/expected/wfsogr10_ograuto.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_ograuto.xml	2010-10-19 23:01:20 UTC (rev 10629)
+++ trunk/msautotest/wxs/expected/wfsogr10_ograuto.xml	2010-10-19 23:27:30 UTC (rev 10630)
@@ -13,14 +13,14 @@
      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:coord><gml:X>2281604.25</gml:X><gml:Y>340848.9375</gml:Y></gml:coord>
+      <gml:coord><gml:X>2281604.25</gml:X><gml:Y>340848.9375</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: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>

Modified: trunk/msautotest/wxs/expected/wfsogr10_ogrgml.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_ogrgml.xml	2010-10-19 23:01:20 UTC (rev 10629)
+++ trunk/msautotest/wxs/expected/wfsogr10_ogrgml.xml	2010-10-19 23:27:30 UTC (rev 10630)
@@ -13,14 +13,14 @@
      xmlns:gml="http://www.opengis.net/gml">
   <gml:boundedBy>
     <gml:Box>
-      <gml:coord><gml:X>-60.35166078709053</gml:X><gml:Y>46.09780746945207</gml:Y></gml:coord>
-      <gml:coord><gml:X>-60.20118979296159</gml:X><gml:Y>46.15170216229085</gml:Y></gml:coord>
+      <gml:coord><gml:X>2576803.5</gml:X><gml:Y>399102.1875</gml:Y></gml:coord>
+      <gml:coord><gml:X>2589745.5</gml:X><gml:Y>402556.25</gml:Y></gml:coord>
     </gml:Box>
   </gml:boundedBy>
-                        
+                                                        
   <gml:featureMember>
     <ogr:road fid="F0">
-      <ogr:geometryProperty><gml:LineString><gml:coordinates>-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</gml:coordinates></gml:LineString></ogr:geometryProperty>
+      <ogr:geometryProperty><gml:LineString><gml:coordinates>2589745.5,402556.25,0 2588416.5,401601.0625,0 2587278.5,400455.71875,0 2585757.5,399880.53125,0 2582523.25,399110.65625,0 2581190.5,399107.1875,0 2579286.75,399102.1875,0 2577761.5,399669.40625,0 2576803.5,401189.875,0</gml:coordinates></gml:LineString></ogr:geometryProperty>
       <ogr:FNODE_>613</ogr:FNODE_>
       <ogr:TNODE_>1511</ogr:TNODE_>
       <ogr:LPOLY_>0</ogr:LPOLY_>

Modified: trunk/msautotest/wxs/expected/wfsogr11_caps.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr11_caps.xml	2010-10-19 23:01:20 UTC (rev 10629)
+++ trunk/msautotest/wxs/expected/wfsogr11_caps.xml	2010-10-19 23:27:30 UTC (rev 10630)
@@ -55,7 +55,7 @@
       </ows:Parameter>
       <ows:Parameter name="AcceptVersions">
         <ows:Value>1.0.0</ows:Value>
-        <ows:Value> 1.1.0</ows:Value>
+        <ows:Value>1.1.0</ows:Value>
       </ows:Parameter>
       <ows:Parameter name="AcceptFormats">
         <ows:Value>text/xml</ows:Value>
@@ -102,9 +102,7 @@
     <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>
+      <DefaultSRS>urn:ogc:def:crs:EPSG::3978</DefaultSRS>
       <OutputFormats>
         <Format>text/xml; subtype=gml/3.1.1</Format>
         <Format>text/csv</Format>
@@ -121,9 +119,7 @@
     <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>
+      <DefaultSRS>urn:ogc:def:crs:EPSG::3978</DefaultSRS>
       <OutputFormats>
         <Format>text/xml; subtype=gml/3.1.1</Format>
         <Format>text/csv</Format>
@@ -136,6 +132,22 @@
         <ows:UpperCorner>-59.688212172925 47.941250727064</ows:UpperCorner>
       </ows:WGS84BoundingBox>
     </FeatureType>
+    <FeatureType>
+      <Name>multi</Name>
+      <Title>multi</Title>
+      <DefaultSRS>urn:ogc:def:crs:EPSG::27700</DefaultSRS>
+      <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>-7.5565511747376 49.766185807900</ows:LowerCorner>
+        <ows:UpperCorner>-7.5550662965057 49.767147580574</ows:UpperCorner>
+      </ows:WGS84BoundingBox>
+    </FeatureType>
   </FeatureTypeList>
   <ogc:Filter_Capabilities>
     <ogc:Spatial_Capabilities>

Added: trunk/msautotest/wxs/expected/wfsogr11_ogrgml_ll.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr11_ogrgml_ll.xml	                        (rev 0)
+++ trunk/msautotest/wxs/expected/wfsogr11_ogrgml_ll.xml	2010-10-19 23:27:30 UTC (rev 10630)
@@ -0,0 +1,8 @@
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.1.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
+  <ows:Exception exceptionCode="InvalidParameterValue" locator="typename">
+    <ows:ExceptionText>msWFSGetFeature(): WFS server error. Invalid GetFeature Request:Invalid SRS.  Please check the capabilities and reformulate your request.</ows:ExceptionText>
+  </ows:Exception>
+</ows:ExceptionReport>

Modified: trunk/msautotest/wxs/wfs_ogr.map
===================================================================
--- trunk/msautotest/wxs/wfs_ogr.map	2010-10-19 23:01:20 UTC (rev 10629)
+++ trunk/msautotest/wxs/wfs_ogr.map	2010-10-19 23:27:30 UTC (rev 10630)
@@ -27,14 +27,21 @@
 # RUN_PARMS: wfsogr10_ograuto.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&featureid=popplace.BACMK&OUTPUTFORMAT=OGRGML" > [RESULT]
 #
 #
+# Test handling of multi-polygons and regular polygons
+# RUN_PARMS: wfsogr10_multi.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=multi&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.
+# WFS 1.1 request in EPSG:3978
 # 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]
 #
+# WFS 1.1 request in EPSG:4326
+# RUN_PARMS: wfsogr11_ogrgml_ll.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::4326" > [RESULT]
+#
 
 MAP
 
@@ -112,7 +119,7 @@
     "ows_updatesequence"   "123"
     "wfs_title"		   "Test simple wfs"
     "wfs_onlineresource"   "http://localhost/path/to/wfs_simple?"
-    "wfs_srs"		   "EPSG:4326 EPSG:4269 EPSG:3978"
+#    "wfs_srs"		   "EPSG:4326 EPSG:4269 EPSG:3978 EPSG:27700"
     "ows_abstract"    "Test WFS Abstract"
     "ows_keywordlist" "ogc,wfs,gml,om"
     "ows_service_onlineresource" "http://localhost"
@@ -137,7 +144,7 @@
 END
 
 PROJECTION
-  "init=epsg:4326"
+  "+proj=latlong +datum=WGS84"
 END
 
 
@@ -190,5 +197,28 @@
   DUMP TRUE
 END # Layer
 
+LAYER
+  NAME multi
+  CONNECTIONTYPE OGR
+  CONNECTION "data/multi.csv" 
+  
+  METADATA
+    "wfs_title"         "multi"
+    "wfs_description"   "multi-geometry testing"
+    "wfs_featureid"     "ID"
+    "wfs_srs"           "EPSG:27700"
+    "wfs_getfeature_formatlist" "csv,ogrgml,shapezip,midmif"
+    "gml_include_items" "all"
+    "gml_types"         "auto"
+    "wfs_geomtype"      "Geometry"
+  END
+  TYPE POLYGON
+  STATUS ON
+  PROJECTION
+    "init=epsg:27700"
+  END
 
+  DUMP TRUE
+END
+
 END # Map File

More information about the mapserver-commits mailing list