[mapserver-commits] r10644 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Fri Oct 22 15:50:23 EDT 2010
Author: warmerdam
Date: 2010-10-22 12:50:23 -0700 (Fri, 22 Oct 2010)
New Revision: 10644
Added:
trunk/msautotest/wxs/expected/wfsogr10_twolayer.xml
Modified:
trunk/msautotest/wxs/expected/wfsogr10_caps.xml
trunk/msautotest/wxs/expected/wfsogr10_midmif.txt
trunk/msautotest/wxs/expected/wfsogr11_caps.xml
trunk/msautotest/wxs/wfs_ogr.map
Log:
test two layer output via ogr (#3570)
Modified: trunk/msautotest/wxs/expected/wfsogr10_caps.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_caps.xml 2010-10-22 14:02:49 UTC (rev 10643)
+++ trunk/msautotest/wxs/expected/wfsogr10_caps.xml 2010-10-22 19:50:23 UTC (rev 10644)
@@ -61,6 +61,7 @@
<OGRGML/>
<SHAPEZIP/>
<MIDMIF/>
+ <MultiMIDMIF/>
<geojson/>
</ResultFormat>
<DCPType>
Modified: trunk/msautotest/wxs/expected/wfsogr10_midmif.txt
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_midmif.txt 2010-10-22 14:02:49 UTC (rev 10643)
+++ trunk/msautotest/wxs/expected/wfsogr10_midmif.txt 2010-10-22 19:50:23 UTC (rev 10644)
@@ -1,13 +1,6 @@
Content-Type: multipart/mixed; boundary=xxOGRBoundaryxx
--xxOGRBoundaryxx
-Content-Disposition: attachment; filename=result.mid
-Content-Type: application/binary
-Content-Transfer-Encoding: binary
-
-613,1511,0,0,14862.892,1521,67,"",""
-
---xxOGRBoundaryxx
Content-Disposition: attachment; filename=result.mif
Content-Type: application/binary
Content-Transfer-Encoding: binary
@@ -40,4 +33,11 @@
2576803.5 401189.875
Pen (1,2,0)
+--xxOGRBoundaryxx
+Content-Disposition: attachment; filename=result.mid
+Content-Type: application/binary
+Content-Transfer-Encoding: binary
+
+613,1511,0,0,14862.892,1521,67,"",""
+
--xxOGRBoundaryxx--
Added: trunk/msautotest/wxs/expected/wfsogr10_twolayer.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_twolayer.xml (rev 0)
+++ trunk/msautotest/wxs/expected/wfsogr10_twolayer.xml 2010-10-22 19:50:23 UTC (rev 10644)
@@ -0,0 +1,95 @@
+Content-Type: multipart/mixed; boundary=xxOGRBoundaryxx
+
+--xxOGRBoundaryxx
+Content-Disposition: attachment; filename=road.mif
+Content-Type: application/binary
+Content-Transfer-Encoding: binary
+
+Version 300
+Charset "Neutral"
+Delimiter ","
+CoordSys NonEarth Units "m"
+Columns 9
+ FNODE_ Integer
+ TNODE_ Integer
+ LPOLY_ Integer
+ RPOLY_ Integer
+ LENGTH Float
+ ROAD_ID Integer
+ F_CODE Integer
+ NAME_E Char(26)
+ NAME_F Char(26)
+Data
+
+Pline 5
+2280710.5 34889.78515625
+2280279.75 36437.48046875
+2280385.5 37863.453125
+2280649.5 39078.1796875
+2281886.75 40764.59375
+ Pen (1,2,0)
+Pline 3
+2281531.25 33374.8828125
+2281204 34140.06640625
+2280710.5 34889.78515625
+ Pen (1,2,0)
+Pline 21
+2280710.5 34889.78515625
+2278700.25 34289.77734375
+2277367 34095.06640625
+2275273.5 32945.04296875
+2273560.25 32367.904296875
+2271657.5 31028.1015625
+2270706.25 30262.994140625
+2269185 28924.431640625
+2267664.25 27395.267578125
+2266717 24724.93359375
+2266150.5 22436.806640625
+2265203 19957.0703125
+2264825.25 18431.611328125
+2264069.5 15380.8896484375
+2263694.25 12712.42578125
+2263316 11377.5546875
+2262749.25 8899.0517578125
+2262562 7374.19482421875
+2262183.75 6229.76904296875
+2261995.75 5086.12451171875
+2261430.5 1845.39770507812
+ Pen (1,2,0)
+
+--xxOGRBoundaryxx
+Content-Disposition: attachment; filename=road.mid
+Content-Type: application/binary
+Content-Transfer-Encoding: binary
+
+1030,1024,3,3,6371.089,670,68,"",""
+1034,1030,3,3,1729.789,673,68,"",""
+1030,1064,3,3,41747.066,693,68,"",""
+
+--xxOGRBoundaryxx
+Content-Disposition: attachment; filename=popplace.mif
+Content-Type: application/binary
+Content-Transfer-Encoding: binary
+
+Version 300
+Charset "Neutral"
+Delimiter ","
+CoordSys NonEarth Units "m"
+Columns 4
+ UNIQUE_KEY Char(5)
+ NAME Char(50)
+ CAPITAL Integer
+ POP_CLASS Integer
+Data
+
+Point 2279399 39858
+ Symbol (35,0,12)
+
+--xxOGRBoundaryxx
+Content-Disposition: attachment; filename=popplace.mid
+Content-Type: application/binary
+Content-Transfer-Encoding: binary
+
+"CAJOA","Digby",0,2
+
+--xxOGRBoundaryxx--
Modified: trunk/msautotest/wxs/expected/wfsogr11_caps.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr11_caps.xml 2010-10-22 14:02:49 UTC (rev 10643)
+++ trunk/msautotest/wxs/expected/wfsogr11_caps.xml 2010-10-22 19:50:23 UTC (rev 10644)
@@ -92,6 +92,7 @@
<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:Value>MultiMIDMIF</ows:Value>
<ows:Value>application/json; subtype=geojson</ows:Value>
</ows:Parameter>
</ows:Operation>
@@ -111,6 +112,7 @@
<Format>text/xml; subtype=gml/2.1.2; driver=ogr</Format>
<Format>application/shapefile</Format>
<Format>MIDMIF</Format>
+ <Format>MultiMIDMIF</Format>
</OutputFormats>
<ows:WGS84BoundingBox dimensions="2">
<ows:LowerCorner>-66.633317770969 42.382053788395</ows:LowerCorner>
@@ -127,6 +129,7 @@
<Format>text/xml; subtype=gml/2.1.2; driver=ogr</Format>
<Format>application/shapefile</Format>
<Format>MIDMIF</Format>
+ <Format>MultiMIDMIF</Format>
<Format>application/json; subtype=geojson</Format>
</OutputFormats>
<ows:WGS84BoundingBox dimensions="2">
Modified: trunk/msautotest/wxs/wfs_ogr.map
===================================================================
--- trunk/msautotest/wxs/wfs_ogr.map 2010-10-22 14:02:49 UTC (rev 10643)
+++ trunk/msautotest/wxs/wfs_ogr.map 2010-10-22 19:50:23 UTC (rev 10644)
@@ -32,6 +32,8 @@
# Test non-OGR "template" output.
# RUN_PARMS: wfsogr10_template.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=popplace&OUTPUTFORMAT=geojson" > [RESULT]
#
+# Test fetching from two layers with a filter.
+# RUN_PARMS: wfsogr10_twolayer.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=popplace,road&OUTPUTFORMAT=MultiMIDMIF&FILTER=(<Filter><BBOX><PropertyName>POINT</PropertyName><Box+srsName=%22EPSG:4326%22><coordinates>-65.86,44.56+-65.76,44.68</coordinates></Box></BBOX></Filter>)(<Filter><BBOX><PropertyName>POINT</PropertyName><Box+srsName=%22EPSG:4326%22><coordinates>-65.86,44.56+-65.76,44.68</coordinates></Box></BBOX></Filter>)" > [RESULT]
#
# WFS 1.1
#
@@ -115,12 +117,21 @@
FORMATOPTION "FILENAME=result.mif"
END
+OUTPUTFORMAT
+ NAME "MultiMIDMIF"
+ DRIVER "OGR/MapInfo File"
+ FORMATOPTION "STORAGE=filesystem"
+ FORMATOPTION "FORM=multipart"
+ FORMATOPTION "DSCO:FORMAT=MIF"
+ FORMATOPTION "FILENAME=result"
+END
+
#
# Start of web interface definition
#
WEB
- IMAGEPATH "/tmp/ms_tmp/"
+ IMAGEPATH "tmp/"
IMAGEURL "/ms_tmp/"
METADATA
@@ -171,7 +182,7 @@
"ows_title" "road"
"ows_description" "road"
"wfs_featureid" "ROAD_ID"
- "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgmlstream,shapezip,midmif"
+ "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgmlstream,shapezip,midmif,multimidmif"
"gml_include_items" "all"
"gml_exclude_items" "ROAD_"
"gml_types" "auto"
@@ -196,7 +207,7 @@
"wfs_title" "popplace"
"wfs_description" "populated places"
"wfs_featureid" "UNIQUE_KEY"
- "wfs_getfeature_formatlist" "csv,ogrgml,shapezip,midmif,geojson"
+ "wfs_getfeature_formatlist" "csv,ogrgml,shapezip,midmif,multimidmif,geojson"
"gml_include_items" "NAME,UNIQUE_KEY,CAPITAL,POP_RANGE"
"gml_POP_RANGE_alias" "POP_CLASS"
"gml_types" "auto"
More information about the mapserver-commits
mailing list