[mapserver-commits] r10968 - in trunk/msautotest/query: . expected
include
svn at osgeo.org
svn at osgeo.org
Tue Feb 8 00:59:32 EST 2011
Author: sdlime
Date: 2011-02-07 21:59:32 -0800 (Mon, 07 Feb 2011)
New Revision: 10968
Added:
trunk/msautotest/query/expected/querymap_test001.gif
trunk/msautotest/query/expected/querymap_test002.gif
trunk/msautotest/query/expected/querymap_test003.gif
trunk/msautotest/query/expected/querymap_test004.gif
trunk/msautotest/query/expected/querymap_test005.gif
trunk/msautotest/query/expected/querymap_test006.gif
trunk/msautotest/query/expected/querymap_test007.gif
trunk/msautotest/query/expected/querymap_test008.gif
trunk/msautotest/query/expected/querymap_test009.gif
trunk/msautotest/query/expected/querymap_test010.gif
trunk/msautotest/query/expected/querymap_test011.gif
trunk/msautotest/query/include/indx_q100kpy4_shapefile.map
trunk/msautotest/query/querymap.map
Modified:
trunk/msautotest/query/query.map
Log:
Added query map tests that mirror the templated query tests.
Added: trunk/msautotest/query/expected/querymap_test001.gif
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/expected/querymap_test001.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/expected/querymap_test002.gif
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/expected/querymap_test002.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/expected/querymap_test003.gif
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/expected/querymap_test003.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/expected/querymap_test004.gif
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/expected/querymap_test004.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/expected/querymap_test005.gif
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/expected/querymap_test005.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/expected/querymap_test006.gif
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/expected/querymap_test006.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/expected/querymap_test007.gif
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/expected/querymap_test007.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/expected/querymap_test008.gif
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/expected/querymap_test008.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/expected/querymap_test009.gif
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/expected/querymap_test009.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/expected/querymap_test010.gif
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/expected/querymap_test010.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/expected/querymap_test011.gif
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/query/expected/querymap_test011.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/query/include/indx_q100kpy4_shapefile.map
===================================================================
--- trunk/msautotest/query/include/indx_q100kpy4_shapefile.map (rev 0)
+++ trunk/msautotest/query/include/indx_q100kpy4_shapefile.map 2011-02-08 05:59:32 UTC (rev 10968)
@@ -0,0 +1,9 @@
+ DATA 'data/indx_q100kpy4'
+ STATUS OFF
+ TYPE POLYGON
+ CLASS
+ STYLE
+ OUTLINECOLOR 100 255 100
+ END
+ END
+ TEMPLATE 'void'
Modified: trunk/msautotest/query/query.map
===================================================================
--- trunk/msautotest/query/query.map 2011-02-08 05:38:55 UTC (rev 10967)
+++ trunk/msautotest/query/query.map 2011-02-08 05:59:32 UTC (rev 10968)
@@ -1,7 +1,7 @@
#
# Test CGI Query Modes (+templated output)
#
-# REQUIRES: INPUT=SHAPEFILE OUTPUT=PNG SUPPORTS=GEOS
+# REQUIRES: INPUT=SHAPEFILE
#
# Test 1: simple mode=nquery, one layer, rect-based
# RUN_PARMS: query_test001.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&mapext=420000+5120000+582000+5200000&qlayer=bdry_counpy2' > [RESULT_DEMIME]
@@ -62,13 +62,9 @@
LAYER
NAME 'indx_q100kpy4'
- DATA 'data/indx_q100kpy4'
- STATUS OFF
- TYPE QUERY
METADATA
qstring_validation_pattern '.'
END
- TEMPLATE 'void'
+ INCLUDE 'include/indx_q100kpy4_shapefile.map'
END
END
-
\ No newline at end of file
Added: trunk/msautotest/query/querymap.map
===================================================================
--- trunk/msautotest/query/querymap.map (rev 0)
+++ trunk/msautotest/query/querymap.map 2011-02-08 05:59:32 UTC (rev 10968)
@@ -0,0 +1,70 @@
+#
+# Test CGI Query Modes (+image output)
+#
+# REQUIRES: INPUT=SHAPEFILE OUTPUT=GIF
+#
+# Test 1: simple mode=nquery, one layer, rect-based
+# RUN_PARMS: querymap_test001.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&mapext=420000+5120000+582000+5200000&qlayer=bdry_counpy2' > [RESULT_DEMIME]
+#
+# Test 2: simple mode=nquery, multiple layers, rect-based
+# RUN_PARMS: querymap_test002.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&mapext=420000+5120000+582000+5200000&layers=all' > [RESULT_DEMIME]
+#
+# Test 3: simple mode=nquery, one layer, point-based
+# RUN_PARMS: querymap_test003.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=query&qlayer=bdry_counpy2&mapxy=467000+5259000' > [RESULT_DEMIME]
+#
+# Test 4: simple mode=nquery, multiple layers, point-based
+# RUN_PARMS: querymap_test004.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&mapxy=467000+5259000&layers=all' > [RESULT_DEMIME]
+#
+# Test 5: simple mode=nquery, one layer, point-based (image coords)
+# RUN_PARMS: querymap_test005.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&imgext=420000+5120000+582000+5200000&imgsize=300+300&imgxy=150+150&qlayer=bdry_counpy2' > [RESULT_DEMIME]
+#
+# Test 6: simple mode=nquery, multiple layers, point-based (image coords)
+# RUN_PARMS: querymap_test006.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&imgext=420000+5120000+582000+5200000&imgsize=300+300&imgxy=150+150&layers=all' > [RESULT_DEMIME]
+#
+# Test 7: simple mode=itemnquery (regex)
+# RUN_PARMS: querymap_test007.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=itemnquery&qlayer=bdry_counpy2&qstring=/^Ca/&qitem=cty_name' > [RESULT_DEMIME]
+#
+# Test 8: simple mode=itemquery (logical expression)
+# RUN_PARMS: querymap_test008.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=itemnquery&qlayer=bdry_counpy2&qstring=("[cty_name]"%20%3D%20"Carlton")' > [RESULT_DEMIME]
+#
+# Test 9: simple mode=featurequery
+# RUN_PARMS: querymap_test009.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=featurequery&slayer=bdry_counpy2&mapxy=467000+5259000&qlayer=indx_q100kpy4' > [RESULT_DEMIME]
+#
+# Test 10: simple mode=nquery w/shape, multiple layers
+# RUN_PARMS: querymap_test010.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&mapshape=468000+5185000+510700+5250000+520500+5111000+468000+5185000&layers=all' > [RESULT_DEMIME]
+#
+# Test 11: simple mode=nquery w/shape as WKT, multiple layers
+# RUN_PARMS: querymap_test011.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=nquery&mapshape=POLYGON((468000+5185000,510700+5250000,520500+5111000,468000+5185000))&layers=all' > [RESULT_DEMIME]
+#
+MAP
+ NAME 'query'
+ EXTENT 125000 4785000 789000 5489000
+ UNITS METERS
+
+ WEB
+ QUERYFORMAT GIF
+ END
+
+ QUERYMAP
+ STATUS ON
+ SIZE 300 300
+ STYLE SELECTED
+ END
+
+ LAYER
+ NAME 'bdry_counpy2'
+ METADATA
+ qstring_validation_pattern '.'
+ END
+ INCLUDE 'include/bdry_counpy2_shapefile.map'
+ END
+
+ LAYER
+ NAME 'indx_q100kpy4'
+ METADATA
+ qstring_validation_pattern '.'
+ END
+ INCLUDE 'include/indx_q100kpy4_shapefile.map'
+ END
+END
+
\ No newline at end of file
More information about the mapserver-commits
mailing list