Skip to content

Commit

Permalink
Test SLD NameLayer without UserStyle nor NamedStyle, with and without…
Browse files Browse the repository at this point in the history 
… LayerFeatureConstraints (MapServer/MapServer#4025)
  • Loading branch information
@rouault
rouault committed Oct 30, 2015
1 parent 29c22de commit 27e1e7b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
Binary file added wxs/expected/wms_get_map_namedlayer_nostyle_layerfeatureconstraints_postgis.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added wxs/expected/wms_get_map_namedlayer_nostyle_postgis.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions wxs/wms_sld_postgis.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,15 @@
# Generate map image by using multi styles using sld for the same layer
# RUN_PARMS: wms_get_map_multi_styles_sld_same_layer_postgis.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=EPSG:4326&WIDTH=560&HEIGHT=350&LAYERS=road_styles,road_styles,road_styles&FORMAT=image/png&BGCOLOR=0xFFFFFF&TRANSPARENT=FALSE&EXCEPTIONS=INIMAGE&BBOX=44.6139013125,-66.998804375,48.0904731875,-61.436289375&SLD_BODY=%3CStyledLayerDescriptor%20version%3D%221.0.0%22%3E%0A%3CNamedLayer%3E%0A%3CName%3Eroad_styles%3C%2FName%3E%0A%3CUserStyle%3E%0A%3CTitle%3Exxx%3C%2FTitle%3E%0A%3CFeatureTypeStyle%3E%0A%3CRule%3E%0A%3CLineSymbolizer%3E%0A%3CGeometry%3E%0A%3CPropertyName%3Ecenter-line%3C%2FPropertyName%3E%0A%3C%2FGeometry%3E%0A%3CStroke%3E%0A%3CCssParameter%20name%3D%22stroke%22%3E%23ff0000%3C%2FCssParameter%3E%0A%3CCssParameter%20name%3D%22stroke-width%22%3E16%3C%2FCssParameter%3E%0A%3C%2FStroke%3E%0A%3C%2FLineSymbolizer%3E%0A%3C%2FRule%3E%0A%3C%2FFeatureTypeStyle%3E%0A%3C%2FUserStyle%3E%0A%3C%2FNamedLayer%3E%0A%3CNamedLayer%3E%0A%3CName%3Eroad_styles%3C%2FName%3E%0A%3CUserStyle%3E%0A%3CTitle%3Exxx%3C%2FTitle%3E%0A%3CFeatureTypeStyle%3E%0A%3CRule%3E%0A%3CLineSymbolizer%3E%0A%3CGeometry%3E%0A%3CPropertyName%3Ecenter-line%3C%2FPropertyName%3E%0A%3C%2FGeometry%3E%0A%3CStroke%3E%0A%3CCssParameter%20name%3D%22stroke%22%3E%2300ff00%3C%2FCssParameter%3E%0A%3CCssParameter%20name%3D%22stroke-width%22%3E8%3C%2FCssParameter%3E%0A%3C%2FStroke%3E%0A%3C%2FLineSymbolizer%3E%0A%3C%2FRule%3E%0A%3C%2FFeatureTypeStyle%3E%0A%3C%2FUserStyle%3E%0A%3C%2FNamedLayer%3E%0A%3CNamedLayer%3E%0A%3CName%3Eroad_styles%3C%2FName%3E%0A%3CUserStyle%3E%0A%3CTitle%3Exxx%3C%2FTitle%3E%0A%3CFeatureTypeStyle%3E%0A%3CRule%3E%0A%3CLineSymbolizer%3E%0A%3CGeometry%3E%0A%3CPropertyName%3Ecenter-line%3C%2FPropertyName%3E%0A%3C%2FGeometry%3E%0A%3CStroke%3E%0A%3CCssParameter%20name%3D%22stroke%22%3E%230000ff%3C%2FCssParameter%3E%0A%3CCssParameter%20name%3D%22stroke-width%22%3E2%3C%2FCssParameter%3E%0A%3C%2FStroke%3E%0A%3C%2FLineSymbolizer%3E%0A%3C%2FRule%3E%0A%3C%2FFeatureTypeStyle%3E%0A%3C%2FUserStyle%3E%0A%3C%2FNamedLayer%3E%0A%3C%2FStyledLayerDescriptor%3E%0A" > [RESULT_DEMIME]

# Test NamedLayer without any style
# RUN_PARMS: wms_get_map_namedlayer_nostyle_postgis.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; mode=24bit&WIDTH=300&HEIGHT=200&STYLES=&LAYERS=road_styles&sld_body=<StyledLayerDescriptor version=%221.0.0%22><NamedLayer><Name>road_styles</Name></NamedLayer></StyledLayerDescriptor>" > [RESULT_DEMIME]

# Test NamedStyle
# RUN_PARMS: wms_get_map_namedstyle_postgis.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; mode=24bit&WIDTH=300&HEIGHT=200&STYLES=&LAYERS=road_styles&sld_body=<StyledLayerDescriptor version=%221.0.0%22><NamedLayer><Name>road_styles</Name><NamedStyle><Name>style_green</Name></NamedStyle></NamedLayer></StyledLayerDescriptor>" > [RESULT_DEMIME]

# Test NamedLayer without any style but with a LayerFeatureConstraints
# RUN_PARMS: wms_get_map_namedlayer_nostyle_layerfeatureconstraints_postgis.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; mode=24bit&WIDTH=300&HEIGHT=200&STYLES=&LAYERS=road_styles&sld_body=<StyledLayerDescriptor version=%221.0.0%22><NamedLayer><Name>road_styles</Name><LayerFeatureConstraints><FeatureTypeConstraint><Filter><PropertyIsLessThan><PropertyName>road_id</PropertyName><Literal>900</Literal></PropertyIsLessThan></Filter></FeatureTypeConstraint></LayerFeatureConstraints></NamedLayer></StyledLayerDescriptor>" > [RESULT_DEMIME]

# Test NamedStyle with a LayerFeatureConstraints
# RUN_PARMS: wms_get_map_namedstyle_layerfeatureconstraints_postgis.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; mode=24bit&WIDTH=300&HEIGHT=200&STYLES=&LAYERS=road_styles&sld_body=<StyledLayerDescriptor version=%221.0.0%22><NamedLayer><Name>road_styles</Name><LayerFeatureConstraints><FeatureTypeConstraint><Filter><PropertyIsLessThan><PropertyName>road_id</PropertyName><Literal>900</Literal></PropertyIsLessThan></Filter></FeatureTypeConstraint></LayerFeatureConstraints><NamedStyle><Name>style_green</Name></NamedStyle></NamedLayer></StyledLayerDescriptor>" > [RESULT_DEMIME]

Expand Down

0 comments on commit 27e1e7b

Please sign in to comment.