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

[svn at osgeo.org]

Author: warmerdam
Date: 2010-10-19 16:59:16 -0700 (Tue, 19 Oct 2010)
New Revision: 10632

Added:
   trunk/msautotest/wxs/expected/wfsogr10_template.xml
Modified:
   trunk/msautotest/wxs/wfs_ogr.map
Log:
test template drivers too (#3570)

Added: trunk/msautotest/wxs/expected/wfsogr10_template.xml
===================================================================
Modified: trunk/msautotest/wxs/wfs_ogr.map
===================================================================
--- trunk/msautotest/wxs/wfs_ogr.map	2010-10-19 23:30:41 UTC (rev 10631)
+++ trunk/msautotest/wxs/wfs_ogr.map	2010-10-19 23:59:16 UTC (rev 10632)
@@ -26,11 +26,13 @@
 # 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]
 #
-#
 # 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]
 #
+# 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]
 #
+#
 # WFS 1.1
 #
 # Do formats show up in the Capabilities
@@ -57,7 +59,7 @@
   NAME "geojson"
   DRIVER "TEMPLATE"
   MIMETYPE "application/json; subtype=geojson"
-  FORMATOPTION "FILE=geojson.tmpl"
+  FORMATOPTION "FILE=../misc/rfc36.tmpl"
 END
 
 OUTPUTFORMAT
@@ -183,7 +185,7 @@
     "wfs_title"         "popplace"
     "wfs_description"   "populated places"
     "wfs_featureid"     "UNIQUE_KEY"
-    "wfs_getfeature_formatlist" "csv,ogrgml,shapezip,midmif"
+    "wfs_getfeature_formatlist" "csv,ogrgml,shapezip,midmif,geojson"
     "gml_include_items" "NAME,UNIQUE_KEY,CAPITAL,POP_RANGE"
     "gml_POP_RANGE_alias" "POP_CLASS"
     "gml_types"         "auto"