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

[svn at osgeo.org]

Author: assefa
Date: 2009-11-13 15:44:13 -0500 (Fri, 13 Nov 2009)
New Revision: 9548

Added:
   trunk/msautotest/wxs/expected/wms_get_map_multi_polygon_filter.png
Modified:
   trunk/msautotest/wxs/wms_sld.map
Log:
support multi-polygons geometries for filters embedded in an SLD (#3097)

Added: trunk/msautotest/wxs/expected/wms_get_map_multi_polygon_filter.png
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/wxs/expected/wms_get_map_multi_polygon_filter.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/msautotest/wxs/wms_sld.map
===================================================================
--- trunk/msautotest/wxs/wms_sld.map	2009-11-13 20:39:50 UTC (rev 9547)
+++ trunk/msautotest/wxs/wms_sld.map	2009-11-13 20:44:13 UTC (rev 9548)
@@ -61,6 +61,10 @@
 #
 # 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]
+#
+#
+# Generate map image using and sld with a multi-polygon filter encoding
+# RUN_PARMS: wms_get_map_multi_polygon_filter.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=road&sld_body=%3CStyledLayerDescriptor+version%3D%221.0.0%22%3E+%3CNamedLayer%3E+%3CName%3Eroad%3C%2FName%3E+%3CUserStyle%3E+%3CTitle%3Exxx%3C%2FTitle%3E+%3CFeatureTypeStyle%3E%3CRule%3E%3Csld%3AName%3Edefault%3C%2Fsld%3AName%3E%3Cogc%3AFilter+xmlns%3Aogc%3D%22http%3A%2F%2Fwww.opengis.net%2Fogc%22%3E%3Cogc%3AIntersects%3E%3Cogc%3APropertyName%3Egeometry%3C%2Fogc%3APropertyName%3E%3Cgml%3AMultiPolygon+srsName%3D%22EPSG%3A42304%22%3E%3Cgml%3ApolygonMember%3E%3Cgml%3APolygon%3E%3Cgml%3AouterBoundaryIs%3E%3Cgml%3ALinearRing%3E%3Cgml%3Acoordinates%3E2475215%2C289715+2630749%2C289715+2630749%2C402603+2475215%2C402603+2475215%2C289715%3C%2Fgml%3Acoordinates%3E%3C%2Fgml%3ALinearRing%3E%3C%2Fgml%3AouterBoundaryIs%3E%3C%2Fgml%3APolygon%3E%3C%2Fgml%3ApolygonMember%3E%3Cgml%3ApolygonMember%3E%3Cgml%3APolygon%3E%3Cgml%3AouterBoundaryIs%3E%3Cgml%3ALinearRing%3E%3Cgml%3Acoordinates%3E2241915%2C-29714+2411664%2C-29714++2411664%2C83173+2241915%2C83173+2241915%2C-29714%3C%2Fgml%3Acoordinates%3E%3C%2Fgml%3ALinearRing%3E%3C%2Fgml%3AouterBoundaryIs%3E%3C%2Fgml%3APolygon%3E%3C%2Fgml%3ApolygonMember%3E%3C%2Fgml%3AMultiPolygon%3E%3C%2Fogc%3AIntersects%3E%3C%2Fogc%3AFilter%3E%3CLineSymbolizer%3E+%3CGeometry%3E+%3CPropertyName%3Ecenter-line%3C%2FPropertyName%3E+%3C%2FGeometry%3E%3CStroke%3E%3CCssParameter+name%3D%22stroke%22%3E%230000ff%3C%2FCssParameter%3E%3C%2FStroke%3E%3C%2FLineSymbolizer%3E%3C%2FRule%3E%3C%2FFeatureTypeStyle%3E%3C%2FUserStyle%3E%3C%2FNamedLayer%3E%3C%2FStyledLayerDescriptor%3E" > [RESULT_DEMIME]
 
 MAP