[mapserver-commits] r10636 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Tue Oct 19 21:30:57 EDT 2010
Author: warmerdam
Date: 2010-10-19 18:30:57 -0700 (Tue, 19 Oct 2010)
New Revision: 10636
Added:
trunk/msautotest/wxs/expected/wfsogr_wms_getfeatureinfo.xml
Modified:
trunk/msautotest/wxs/expected/wfsogr11_ogrgml.xml
trunk/msautotest/wxs/wfs_ogr.map
Log:
test WMS GetFeatureInfo via OGR (#3570)
Modified: trunk/msautotest/wxs/expected/wfsogr11_ogrgml.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr11_ogrgml.xml 2010-10-20 00:31:47 UTC (rev 10635)
+++ trunk/msautotest/wxs/expected/wfsogr11_ogrgml.xml 2010-10-20 01:30:57 UTC (rev 10636)
@@ -13,22 +13,13 @@
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:coord><gml:X>2434957</gml:X><gml:Y>194088.234375</gml:Y></gml:coord>
+ <gml:coord><gml:X>2503805.5</gml:X><gml:Y>427872.65625</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>
@@ -37,7 +28,7 @@
</ogr:popplace>
</gml:featureMember>
<gml:featureMember>
- <ogr:popplace fid="F2">
+ <ogr:popplace fid="F1">
<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>
@@ -46,7 +37,7 @@
</ogr:popplace>
</gml:featureMember>
<gml:featureMember>
- <ogr:popplace fid="F3">
+ <ogr:popplace fid="F2">
<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>
@@ -54,222 +45,6 @@
<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
Added: trunk/msautotest/wxs/expected/wfsogr_wms_getfeatureinfo.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr_wms_getfeatureinfo.xml (rev 0)
+++ trunk/msautotest/wxs/expected/wfsogr_wms_getfeatureinfo.xml 2010-10-20 01:30:57 UTC (rev 10636)
@@ -0,0 +1,5 @@
+Content-Disposition: attachment; filename=result.csv
+Content-Type: text/csv
+
+WKT,FNODE_,TNODE_,LPOLY_,RPOLY_,LENGTH,ROAD_ID,F_CODE,NAME_E,NAME_F
+"LINESTRING (2338814.75 297360.0625 0,2337206.5 298730.84375 0,2336062.5 299108.15625 0,2334345.5 300245.8125 0,2333200.75 301004.125 0,2331102.75 302330.9375 0,2329958.25 302898.84375 0,2328811.25 304800.1875 0,2328808.0 306324.40625 0,2329948.25 307661.75 0,2331091.25 307856.0625 0,2332233.25 308050.15625 0,2333376.5 308053.875 0,2334520.0 307867.15625 0,2336046.75 306538.46875 0,2337192.75 305208.5625 0,2337957.25 304258.40625 0,2339102.5 303309.5 0,2340245.75 302932.1875 0,2342722.5 302940.21875 0,2344055.0 303515.96875 0,2345959.0 304284.34375 0,2347290.5 305241.28125 0,2350142.25 308108.21875 0,2350900.5 310015.90625 0,2351851 310781 0,2353565.75 310977.15625 0,2355283.5 309458.5 0,2356047.5 308317.9375 0,2357381.75 307941.25 0,2359477.75 307948.03125 0,2361573.5 308145.25 0,2362716.0 308148.9375 0,2364240.75 308153.90625 0,2365382.75 308348.1875 0,2367668.0 308927.21875 0,2369189.5 310075.1875 0,2370906.0 309509.125 0,2372240.25 309132.4375 0,2373386.0 307993.125 0,23
74150.75 306471.375 0,2374915.25 305521.21875 0,2376255.25 302477.28125 0,2376921.25 301464.28125 0)",709,698,3,3, 74599.219,458,68,,
Modified: trunk/msautotest/wxs/wfs_ogr.map
===================================================================
--- trunk/msautotest/wxs/wfs_ogr.map 2010-10-20 00:31:47 UTC (rev 10635)
+++ trunk/msautotest/wxs/wfs_ogr.map 2010-10-20 01:30:57 UTC (rev 10636)
@@ -44,7 +44,13 @@
# 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]
#
+#
+# WMS 1.1 - GetFeatureInfo
+#
+# RUN_PARMS: wfsogr_wms_getfeatureinfo.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.1&service=WMS&request=GetFeatureInfo&srs=EPSG:3978&bbox=2250000,-71000,2620000,496000&format=image/png&layers=road&width=500&height=300&query_layers=road&info_format=text/csv&x=141&y=91&radius=100" > [RESULT]
+#
+
MAP
NAME WFS_OGROUT_TEST
@@ -122,6 +128,9 @@
"wfs_title" "Test simple wfs"
"wfs_onlineresource" "http://localhost/path/to/wfs_simple?"
# "wfs_srs" "EPSG:4326 EPSG:4269 EPSG:3978 EPSG:27700"
+ "wms_title" "Test simple wms"
+ "wms_onlineresource" "http://localhost/path/to/wms_simple?"
+ "wms_srs" "EPSG:4269 EPSG:4326 EPSG:3978"
"ows_abstract" "Test WFS Abstract"
"ows_keywordlist" "ogc,wfs,gml,om"
"ows_service_onlineresource" "http://localhost"
@@ -142,6 +151,7 @@
"ows_hoursofservice" "0800h - 1600h EST"
"ows_contactinstructions" "during hours of service"
"ows_role" "staff"
+ "wms_feature_info_mime_type" "text/csv"
END
END
@@ -158,20 +168,21 @@
NAME road
DATA road
METADATA
- "wfs_title" "road"
- "wfs_description" "road"
+ "ows_title" "road"
+ "ows_description" "road"
"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
+ END
TYPE LINE
STATUS ON
PROJECTION
"init=epsg:3978"
END
+ TEMPLATE "wfs_ogr.map"
DUMP TRUE
END # Layer
More information about the mapserver-commits
mailing list