[mapserver-commits] r8813 - in branches/branch-5-2/msautotest/wxs: . etc

Thu Mar 19 14:31:58 EDT 2009

Author: sdlime
Date: 2009-03-19 14:31:58 -0400 (Thu, 19 Mar 2009)
New Revision: 8813

Modified:
   branches/branch-5-2/msautotest/wxs/etc/symbols.sym
   branches/branch-5-2/msautotest/wxs/wcs_simple.map
   branches/branch-5-2/msautotest/wxs/wfs_filter.map
   branches/branch-5-2/msautotest/wxs/wfs_simple.map
   branches/branch-5-2/msautotest/wxs/wms_simple.map
   branches/branch-5-2/msautotest/wxs/wms_sld.map
   branches/branch-5-2/msautotest/wxs/wms_time1.map
   branches/branch-5-2/msautotest/wxs/wms_time2.map
   branches/branch-5-2/msautotest/wxs/wms_time_pattern.map
   branches/branch-5-2/msautotest/wxs/wms_time_pattern_12_13_test.map
Log:
Added leading MAP/SYMBOLSET tokens to the WXS autotest files.

Modified: branches/branch-5-2/msautotest/wxs/etc/symbols.sym
===================================================================

--- branches/branch-5-2/msautotest/wxs/etc/symbols.sym	2009-03-19 18:23:14 UTC (rev 8812)
+++ branches/branch-5-2/msautotest/wxs/etc/symbols.sym	2009-03-19 18:31:58 UTC (rev 8813)
@@ -1,3 +1,5 @@
+SYMBOLSET
+
 Symbol
 Name 'tent'
 Type VECTOR
@@ -153,3 +155,5 @@
   ANTIALIAS true
   CHARACTER "&#125;"
 END
+
+END
\ No newline at end of file

Modified: branches/branch-5-2/msautotest/wxs/wcs_simple.map
===================================================================
--- branches/branch-5-2/msautotest/wxs/wcs_simple.map	2009-03-19 18:23:14 UTC (rev 8812)
+++ branches/branch-5-2/msautotest/wxs/wcs_simple.map	2009-03-19 18:31:58 UTC (rev 8813)
@@ -77,6 +77,7 @@
 # GetCoverage to GDPNG 1.1 (Test non-GDAL output)
 # RUN_PARMS: wcs_getcov_gdpng8_11.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.0&REQUEST=GetCoverage&FORMAT=image/png;%20mode=8bit&BOUNDINGBOX=0,-121.48874388968,0.0027058261133485,-121.48516027717,urn:ogc:def:crs:EPSG::4326&IDENTIFIER=grey&GridCS=urn:ogc:def:crs:OGC::imageCRS&GridType=urn:ogc:def:method:WCS:1.1:2dGridIn2dCrs&GridOrigin=0.0027058261133485,-121.48874388968&GridOffsets=-0.0003,0.0003" > [RESULT]
 #
+MAP
 
 NAME TEST
 SIZE 400 300

Modified: branches/branch-5-2/msautotest/wxs/wfs_filter.map
===================================================================
--- branches/branch-5-2/msautotest/wxs/wfs_filter.map	2009-03-19 18:23:14 UTC (rev 8812)
+++ branches/branch-5-2/msautotest/wxs/wfs_filter.map	2009-03-19 18:31:58 UTC (rev 8813)
@@ -97,6 +97,7 @@
 # Verify INTERSECTS Results:  Prince Edward Island
 # RUN_PARMS: wfs_filter_intersects_line.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=province&FILTER=<Filter><Intersect><PropertyName>Geometry</PropertyName><gml:LineString><gml:coordinates>-62.94,46.61 -62.74,45.83</gml:coordinates></gml:LineString></Intersect></Filter>" > [RESULT]
 #
+MAP
 
 NAME WFS_FILTER
 STATUS ON

Modified: branches/branch-5-2/msautotest/wxs/wfs_simple.map
===================================================================
--- branches/branch-5-2/msautotest/wxs/wfs_simple.map	2009-03-19 18:23:14 UTC (rev 8812)
+++ branches/branch-5-2/msautotest/wxs/wfs_simple.map	2009-03-19 18:31:58 UTC (rev 8813)
@@ -55,6 +55,7 @@
 # Get Feature by id
 # RUN_PARMS: wfs11_get_feature_id.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=province&featureid=province.Quebec" > [RESULT]
 #
+MAP
 
 NAME WFS_TEST
 STATUS ON

Modified: branches/branch-5-2/msautotest/wxs/wms_simple.map
===================================================================
--- branches/branch-5-2/msautotest/wxs/wms_simple.map	2009-03-19 18:23:14 UTC (rev 8812)
+++ branches/branch-5-2/msautotest/wxs/wms_simple.map	2009-03-19 18:31:58 UTC (rev 8813)
@@ -26,10 +26,8 @@
 # RUN_PARMS: wms_get_map_polygon.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-67.5725,42.3683,-58.9275,48.13&FORMAT=image/png&WIDTH=300&HEIGHT=200&STYLES=&LAYERS=road" > [RESULT_DEMIME]
 #
 #
- 
+MAP
 
-
-
 NAME WMS_TEST
 STATUS ON
 SIZE 400 300

Modified: branches/branch-5-2/msautotest/wxs/wms_sld.map
===================================================================
--- branches/branch-5-2/msautotest/wxs/wms_sld.map	2009-03-19 18:23:14 UTC (rev 8812)
+++ branches/branch-5-2/msautotest/wxs/wms_sld.map	2009-03-19 18:31:58 UTC (rev 8813)
@@ -58,10 +58,8 @@
 #
 # Generate map image with multi layers and one sld for all layers
 # RUN_PARMS: wms_get_map_multi_layers_one_sld_on_all_layers.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-68.125,42,-58.375,48.5&FORMAT=image/png&WIDTH=300&HEIGHT=200&STYLES=&LAYERS=province,road,popplace&sld_body=<StyledLayerDescriptor version=%221.0.0%22><NamedLayer><Name>Province</Name><UserStyle><Title>xxx</Title><FeatureTypeStyle><Rule><PolygonSymbolizer><Geometry><PropertyName>the_area</PropertyName></Geometry><Fill><CssParameter name=%22fill%22>#D3D3D3</CssParameter></Fill><Stroke><CssParameter name=%22stroke%22>#0000ff</CssParameter><CssParameter name=%22stroke-width%22>2.0</CssParameter></Stroke></PolygonSymbolizer></Rule></FeatureTypeStyle></UserStyle></NamedLayer><NamedLayer><Name>road</Name><UserStyle><Title>xxx</Title><FeatureTypeStyle><Rule><Filter><PropertyIsEqualTo><PropertyName>LPOLY_</PropertyName><Literal>0</Literal></PropertyIsEqualTo></Filter><LineSymbolizer><Geometry><PropertyName>center-line</PropertyName></Geometry><Stroke><CssParameter name=%22stroke%22>#0000ff</CssParameter><CssParameter name=%22stroke-width%22>4.0</CssParameter></Stroke></LineSymbolizer><LineSymbolizer><Geometry><PropertyName>center-line</PropertyName></Geometry><Stroke><CssParameter name=%22stroke%22>#ff0000</CssParameter><CssParameter name=%22stroke-width%22>2.0</CssParameter></Stroke></LineSymbolizer><TextSymbolizer><Geometry><PropertyName>locatedAt</PropertyName></Geometry><Label>NAME_E</Label><Font><CssParameter name=%22font-family%22>times</CssParameter><CssParameter name=%22font-style%22>italic</CssParameter><CssParameter name=%22font-weight%22>bold</CssParameter><CssParameter name=%22font-size%22>10</CssParameter></Font><Fill><CssParameter name=%22fill%22>#FF0000</CssParameter></Fill><LabelPlacement><PointPlacement><AnchorPoint><AnchorPointX>0.1</AnchorPointX><AnchorPointY>0.1</AnchorPointY></AnchorPoint><Displacement><DisplacementX>0.1</DisplacementX><DisplacementY>0.2</DisplacementY></Displacement><Rotation>20</Rotation></PointPlacement></LabelPlacement></TextSymbolizer></Rule><Rule><Filter><PropertyIsEqualTo><PropertyName>LPOLY_</PropertyName><Literal>3</Literal></PropertyIsEqualTo></Filter><LineSymbolizer><Geometry><PropertyName>center-line</PropertyName></Geometry><Stroke><CssParameter name=%22stroke%22>#0000ff</CssParameter><CssParameter name=%22stroke-width%22>2.0</CssParameter></Stroke></LineSymbolizer></Rule></FeatureTypeStyle></UserStyle></NamedLayer><NamedLayer><Name>popplace</Name><UserStyle><Title>xxx</Title><FeatureTypeStyle><Rule><PointSymbolizer><Geometry><PropertyName>locatedAt</PropertyName></Geometry><Graphic><Mark><WellKnownName>star</WellKnownName><Fill><CssParameter name=%22fill%22>#F0E68C</CssParameter></Fill></Mark><Size>11.0</Size></Graphic></PointSymbolizer><TextSymbolizer><Geometry><PropertyName>locatedAt</PropertyName></Geometry><Label>NAME</Label><Font><CssParameter name=%22font-family%22>times</CssParameter><CssParameter name=%22font-style%22>italic</CssParameter><CssParameter name=%22font-weight%22>bold</CssParameter><CssParameter name=%22font-size%22>2</CssParameter></Font><Fill><CssParameter name=%22fill%22>#F0B000</CssParameter></Fill><LabelPlacement><PointPlacement><AnchorPoint><AnchorPointX>0.1</AnchorPointX><AnchorPointY>0.1</AnchorPointY></AnchorPoint><Displacement><DisplacementX>0.1</DisplacementX><DisplacementY>0.2</DisplacementY></Displacement><Rotation>10</Rotation></PointPlacement></LabelPlacement></TextSymbolizer></Rule></FeatureTypeStyle></UserStyle></NamedLayer></StyledLayerDescriptor>" > [RESULT_DEMIME]
+MAP
 
-
-
-
 NAME WMS_SLD
 STATUS ON
 SIZE 400 300

Modified: branches/branch-5-2/msautotest/wxs/wms_time1.map
===================================================================
--- branches/branch-5-2/msautotest/wxs/wms_time1.map	2009-03-19 18:23:14 UTC (rev 8812)
+++ branches/branch-5-2/msautotest/wxs/wms_time1.map	2009-03-19 18:31:58 UTC (rev 8813)
@@ -47,6 +47,7 @@
 #
 # RUN_PARMS: wms_time_no_default_value.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=" > [RESULT]
 #
+MAP
 
 NAME WMS_TIME_EXTENTS_RESOLUTION_NO_DEFAULT
 STATUS ON

Modified: branches/branch-5-2/msautotest/wxs/wms_time2.map
===================================================================
--- branches/branch-5-2/msautotest/wxs/wms_time2.map	2009-03-19 18:23:14 UTC (rev 8812)
+++ branches/branch-5-2/msautotest/wxs/wms_time2.map	2009-03-19 18:31:58 UTC (rev 8813)
@@ -10,6 +10,7 @@
 #
 # RUN_PARMS: wms_time_default_value.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=" > [RESULT_DEMIME]
 #
+MAP
 
 NAME WMS_TIME_DEFAULT_VALUE
 STATUS ON

Modified: branches/branch-5-2/msautotest/wxs/wms_time_pattern.map
===================================================================
--- branches/branch-5-2/msautotest/wxs/wms_time_pattern.map	2009-03-19 18:23:14 UTC (rev 8812)
+++ branches/branch-5-2/msautotest/wxs/wms_time_pattern.map	2009-03-19 18:31:58 UTC (rev 8813)
@@ -239,7 +239,7 @@
 #
 # RUN_PARMS: wms_time_pattern15d.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern15&Time=2004-01-01Z/2004-01-02Z,2004-01-03Z/2004-01-04Z" > [RESULT_DEMIME]
 #
-
+MAP
 #
 #
 #

Modified: branches/branch-5-2/msautotest/wxs/wms_time_pattern_12_13_test.map
===================================================================
--- branches/branch-5-2/msautotest/wxs/wms_time_pattern_12_13_test.map	2009-03-19 18:23:14 UTC (rev 8812)
+++ branches/branch-5-2/msautotest/wxs/wms_time_pattern_12_13_test.map	2009-03-19 18:31:58 UTC (rev 8813)
@@ -40,6 +40,7 @@
 #
 # RUN_PARMS: wms_time_pattern13d.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern13&Time=T14:10:00/T15:10:00,T16:10:00/T17:10:00" > [RESULT_DEMIME]
 #
+MAP
 
 NAME WMS_TIME_SPECIFIC_PATTERN
 STATUS ON

