Permalink
Browse files

Improve testing of wms_layer_groups by putting a mapfile layer that i…

…s a non-leaf in the group hieararchy
  • Loading branch information...
rouault committed Apr 13, 2018
1 parent b74a3f4 commit 7cf9b5f8c89b74105b7adbc64139fa7a3bc31f2e
@@ -101,9 +101,9 @@
<Title>TESTGROUP</Title>
<Abstract>TESTGROUP</Abstract>
<SRS>EPSG:4326</SRS>
<LatLonBoundingBox minx="0" miny="0" maxx="100" maxy="100" />
<LatLonBoundingBox minx="0" miny="0" maxx="100" maxy="150" />
<BoundingBox SRS="EPSG:4326"
minx="0" miny="0" maxx="100" maxy="100" />
minx="0" miny="0" maxx="100" maxy="150" />
<Layer>
<Name>g1</Name>
<Title>g1</Title>
@@ -164,6 +164,29 @@
</Layer>
</Layer>
</Layer>
<Layer queryable="0" opaque="0" cascaded="0">
<Name>g3</Name>
<Title>My g3</Title>
<!-- WARNING: Optional LatLonBoundingBox could not be established for this layer. Consider setting the EXTENT in the LAYER object, or wms_extent metadata. Also check that your data exists in the DATA statement -->
<MetadataURL type="ISOTC211/19115">
<Format>text/xml</Format>
<OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo?request=GetMetadata&amp;layer=g3"/>
</MetadataURL>
<Layer>
<Name>sg4</Name>
<Title>sg4</Title>
<Layer queryable="0" opaque="0" cascaded="0">
<Name>g3sg4</Name>
<!-- WARNING: Mandatory metadata '..._title' was missing in this context. -->
<Title>g3sg4</Title>
<!-- WARNING: Optional LatLonBoundingBox could not be established for this layer. Consider setting the EXTENT in the LAYER object, or wms_extent metadata. Also check that your data exists in the DATA statement -->
<MetadataURL type="ISOTC211/19115">
<Format>text/xml</Format>
<OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo?request=GetMetadata&amp;layer=g3sg4"/>
</MetadataURL>
</Layer>
</Layer>
</Layer>
</Layer>
</Capability>
</WMT_MS_Capabilities>
View
Binary file not shown.
Binary file not shown.
@@ -7,11 +7,12 @@
# RUN_PARMS: wms_layer_groups_caps111.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities" > [RESULT_DEVERSION] [RESULT_DEMIME]
# GetMap all
# RUN_PARMS: wms_layer_groups_map_all.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=EPSG:4326&BBOX=0,0,100,100&WIDTH=100&HEIGHT=100&LAYERS=TESTGROUP&STYLES=&FORMAT=image/png" > [RESULT_DEMIME]
# RUN_PARMS: wms_layer_groups_map_all.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=EPSG:4326&BBOX=0,0,150,100&WIDTH=100&HEIGHT=150&LAYERS=TESTGROUP&STYLES=&FORMAT=image/png" > [RESULT_DEMIME]
# RUN_PARMS: wms_layer_groups_map_g1.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=EPSG:4326&BBOX=0,0,100,100&WIDTH=100&HEIGHT=100&LAYERS=g1&STYLES=&FORMAT=image/png" > [RESULT_DEMIME]
# RUN_PARMS: wms_layer_groups_map_sg1.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=EPSG:4326&BBOX=0,0,100,100&WIDTH=100&HEIGHT=100&LAYERS=sg1&STYLES=&FORMAT=image/png" > [RESULT_DEMIME]
# RUN_PARMS: wms_layer_groups_map_sg2.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=EPSG:4326&BBOX=0,0,100,100&WIDTH=100&HEIGHT=100&LAYERS=sg2&STYLES=&FORMAT=image/png" > [RESULT_DEMIME]
# RUN_PARMS: wms_layer_groups_map_g2sg3l1.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=EPSG:4326&BBOX=0,0,100,100&WIDTH=100&HEIGHT=100&LAYERS=g2sg3l1&STYLES=&FORMAT=image/png" > [RESULT_DEMIME]
# RUN_PARMS: wms_layer_groups_map_g3.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=EPSG:4326&BBOX=0,0,150,100&WIDTH=100&HEIGHT=150&LAYERS=g3&STYLES=&FORMAT=image/png" > [RESULT_DEMIME]
MAP
@@ -21,7 +22,7 @@ MAP
MAXSIZE 2048
SIZE 100 100
EXTENT 0 0 100 100
EXTENT 0 0 100 150
UNITS dd
WEB
METADATA
@@ -104,4 +105,40 @@ MAP
FEATURE POINTS 50 70 END END
END
LAYER
TYPE POINT
NAME "g3"
STATUS ON
METADATA
"wms_title" "My g3"
END
CLASS
LABEL
TEXT "g3"
COLOR 0 0 0
SIZE 8
POSITION cc
END
END
FEATURE POINTS 50 90 END END
END
LAYER
TYPE POINT
NAME "g3sg4"
STATUS ON
METADATA
"wms_layer_group" "/g3/sg4"
END
CLASS
LABEL
TEXT "g3/sg4/l1"
COLOR 0 0 0
SIZE 8
POSITION cc
END
END
FEATURE POINTS 50 110 END END
END
END

0 comments on commit 7cf9b5f

Please sign in to comment.