Update WMS dimensions test control images

qgis · Feb 5, 2021 · 40bd2a8 · 40bd2a8
1 parent 6231303
commit 40bd2a8
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 26 deletions.
diff --git a/...is_server/WMS_GetMap_Dimension_All_NoValue/WMS_GetMap_Dimension_All_NoValue.png b/...is_server/WMS_GetMap_Dimension_All_NoValue/WMS_GetMap_Dimension_All_NoValue.png
diff --git a/...tMap_Dimension_Elevation_MixValues/WMS_GetMap_Dimension_Elevation_MixValues.png b/...tMap_Dimension_Elevation_MixValues/WMS_GetMap_Dimension_Elevation_MixValues.png
diff --git a/..._Dimension_Elevation_MultiValues/WMS_GetMap_Dimension_Elevation_MultiValues.png b/..._Dimension_Elevation_MultiValues/WMS_GetMap_Dimension_Elevation_MultiValues.png
diff --git a/...on_RangeElevation_Value/WMS_GetMap_Dimension_Elevation_RangeElevation_Value.png b/...on_RangeElevation_Value/WMS_GetMap_Dimension_Elevation_RangeElevation_Value.png
diff --git a/...ap_Dimension_Elevation_RangeValue/WMS_GetMap_Dimension_Elevation_RangeValue.png b/...ap_Dimension_Elevation_RangeValue/WMS_GetMap_Dimension_Elevation_RangeValue.png
diff --git a/...levation_RangeValue_Filter/WMS_GetMap_Dimension_Elevation_RangeValue_Filter.png b/...levation_RangeValue_Filter/WMS_GetMap_Dimension_Elevation_RangeValue_Filter.png
diff --git a/...r/WMS_GetMap_Dimension_Elevation_Value/WMS_GetMap_Dimension_Elevation_Value.png b/...r/WMS_GetMap_Dimension_Elevation_Value/WMS_GetMap_Dimension_Elevation_Value.png
diff --git a/...sion_RangeElevation_MixValues/WMS_GetMap_Dimension_RangeElevation_MixValues.png b/...sion_RangeElevation_MixValues/WMS_GetMap_Dimension_RangeElevation_MixValues.png
diff --git a/..._RangeElevation_MultiValues/WMS_GetMap_Dimension_RangeElevation_MultiValues.png b/..._RangeElevation_MultiValues/WMS_GetMap_Dimension_RangeElevation_MultiValues.png
diff --git a/...on_RangeElevation_RangeValue/WMS_GetMap_Dimension_RangeElevation_RangeValue.png b/...on_RangeElevation_RangeValue/WMS_GetMap_Dimension_RangeElevation_RangeValue.png
diff --git a/...ap_Dimension_RangeElevation_Value/WMS_GetMap_Dimension_RangeElevation_Value.png b/...ap_Dimension_RangeElevation_Value/WMS_GetMap_Dimension_RangeElevation_Value.png
diff --git a/tests/testdata/qgis_server_accesscontrol/results/getcapabilities_wms_dimension.txt b/tests/testdata/qgis_server_accesscontrol/results/getcapabilities_wms_dimension.txt
@@ -1,16 +1,16 @@
-Content-Length: 9182
+Content-Length: 8886
 Content-Type: text/xml; charset=utf-8
 
 <?xml version="1.0" encoding="utf-8"?>
-<WMS_Capabilities xmlns:qgs="http://www.qgis.org/wms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd http://www.qgis.org/wms https://www.qgis.org/?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;SERVICE=WMS&amp;REQUEST=GetSchemaExtension" xmlns:sld="http://www.opengis.net/sld" version="1.3.0" xmlns="http://www.opengis.net/wms">
+<WMS_Capabilities xmlns:qgs="http://www.qgis.org/wms" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd http://www.qgis.org/wms https://www.qgis.org/?MAP=/root/QGIS/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;SERVICE=WMS&amp;REQUEST=GetSchemaExtension" xmlns="http://www.opengis.net/wms" version="1.3.0" xmlns:sld="http://www.opengis.net/sld" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <Service>
   <Name>WMS</Name>
   <Title>QGIS Server WMS Dimension test</Title>
   <Abstract><![CDATA[Simple test app for WMS dimension]]></Abstract>
   <KeywordList>
    <Keyword vocabulary="ISO">infoMapAccessService</Keyword>
   </KeywordList>
-  <OnlineResource xlink:href="https://www.qgis.org/?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"/>
+  <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.qgis.org/?MAP=/root/QGIS/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs" xlink:type="simple"/>
   <ContactInformation>
    <ContactPersonPrimary>
     <ContactPerson>Rene Luc DHONT</ContactPerson>
@@ -29,7 +29,7 @@ Content-Type: text/xml; charset=utf-8
     <DCPType>
      <HTTP>
       <Get>
-       <OnlineResource xlink:href="https://www.qgis.org/?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"/>
+       <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.qgis.org/?MAP=/root/QGIS/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;" xlink:type="simple"/>
       </Get>
      </HTTP>
     </DCPType>
@@ -44,7 +44,7 @@ Content-Type: text/xml; charset=utf-8
     <DCPType>
      <HTTP>
       <Get>
-       <OnlineResource xlink:href="https://www.qgis.org/?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"/>
+       <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.qgis.org/?MAP=/root/QGIS/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;" xlink:type="simple"/>
       </Get>
      </HTTP>
     </DCPType>
@@ -60,7 +60,7 @@ Content-Type: text/xml; charset=utf-8
     <DCPType>
      <HTTP>
       <Get>
-       <OnlineResource xlink:href="https://www.qgis.org/?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"/>
+       <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.qgis.org/?MAP=/root/QGIS/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;" xlink:type="simple"/>
       </Get>
      </HTTP>
     </DCPType>
@@ -72,7 +72,7 @@ Content-Type: text/xml; charset=utf-8
     <DCPType>
      <HTTP>
       <Get>
-       <OnlineResource xlink:href="https://www.qgis.org/?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"/>
+       <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.qgis.org/?MAP=/root/QGIS/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;" xlink:type="simple"/>
       </Get>
      </HTTP>
     </DCPType>
@@ -82,7 +82,7 @@ Content-Type: text/xml; charset=utf-8
     <DCPType>
      <HTTP>
       <Get>
-       <OnlineResource xlink:href="https://www.qgis.org/?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"/>
+       <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.qgis.org/?MAP=/root/QGIS/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;" xlink:type="simple"/>
       </Get>
      </HTTP>
     </DCPType>
@@ -92,7 +92,7 @@ Content-Type: text/xml; charset=utf-8
     <DCPType>
      <HTTP>
       <Get>
-       <OnlineResource xlink:href="https://www.qgis.org/?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"/>
+       <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.qgis.org/?MAP=/root/QGIS/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;" xlink:type="simple"/>
       </Get>
      </HTTP>
     </DCPType>
@@ -101,7 +101,7 @@ Content-Type: text/xml; charset=utf-8
   <Exception>
    <Format>XML</Format>
   </Exception>
-  <sld:UserDefinedSymbolization UserStyle="1" RemoteWFS="0" RemoteWCS="0" InlineFeature="0" UserLayer="0" SupportSLD="1"/>
+  <sld:UserDefinedSymbolization InlineFeature="0" RemoteWCS="0" RemoteWFS="0" SupportSLD="1" UserStyle="1" UserLayer="0"/>
   <Layer queryable="1">
    <Name>QGIS Server WMS Dimensions</Name>
    <Title>QGIS Server WMS Dimension test</Title>
@@ -118,8 +118,8 @@ Content-Type: text/xml; charset=utf-8
     <southBoundLatitude>-69.957839</southBoundLatitude>
     <northBoundLatitude>84.307877</northBoundLatitude>
    </EX_GeographicBoundingBox>
-   <BoundingBox miny="-174.766579" maxy="177.930822" minx="-69.957839" maxx="84.307877" CRS="EPSG:4326"/>
-   <BoundingBox miny="-11055007" maxy="19143773" minx="-20609694" maxx="20961936" CRS="EPSG:3857"/>
+   <BoundingBox CRS="EPSG:4326" maxx="84.307877" minx="-69.957839" miny="-174.766579" maxy="177.930822"/>
+   <BoundingBox CRS="EPSG:3857" maxx="20961936" minx="-20609694" miny="-11055007" maxy="19143773"/>
    <Layer queryable="1">
     <Name>Contours</Name>
     <Title>Contours</Title>
@@ -132,17 +132,17 @@ Content-Type: text/xml; charset=utf-8
      <southBoundLatitude>29.999996</southBoundLatitude>
      <northBoundLatitude>60</northBoundLatitude>
     </EX_GeographicBoundingBox>
-    <BoundingBox miny="-28.761387" maxy="0.000001" minx="29.999996" maxx="60" CRS="EPSG:4326"/>
-    <BoundingBox miny="3503549.353" maxy="8399737.89" minx="-3201702.942" maxx="0.001" CRS="EPSG:3857"/>
+    <BoundingBox CRS="EPSG:4326" maxx="60" minx="29.999996" miny="-28.761387" maxy="0.000001"/>
+    <BoundingBox CRS="EPSG:3857" maxx="0.001" minx="-3201702.942" miny="3503549.353" maxy="8399737.89"/>
     <Style>
      <Name>default</Name>
      <Title>default</Title>
      <LegendURL>
       <Format>image/png</Format>
-      <OnlineResource xlink:href="https://www.qgis.org/?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=Contours&amp;FORMAT=image/png&amp;STYLE=default&amp;SLD_VERSION=1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"/>
+      <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.qgis.org/?MAP=/root/QGIS/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=Contours&amp;FORMAT=image/png&amp;STYLE=default&amp;SLD_VERSION=1.1.0" xlink:type="simple"/>
      </LegendURL>
     </Style>
-    <Dimension name="elevation" units="meters" unitSymbol="m" nearestValue="0" multipleValues="1">0, 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000</Dimension>
+    <Dimension name="elevation" multipleValues="1" units="meters" unitSymbol="m" nearestValue="0">0, 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000</Dimension>
    </Layer>
    <Layer queryable="1">
     <Name>Slopes</Name>
@@ -151,22 +151,22 @@ Content-Type: text/xml; charset=utf-8
     <CRS>EPSG:3857</CRS>
     <CRS>EPSG:4326</CRS>
     <EX_GeographicBoundingBox>
-     <westBoundLongitude>-9.403751</westBoundLongitude>
+     <westBoundLongitude>-9.40375</westBoundLongitude>
      <eastBoundLongitude>0.000001</eastBoundLongitude>
-     <southBoundLatitude>36.066665</southBoundLatitude>
-     <northBoundLatitude>43.756257</northBoundLatitude>
+     <southBoundLatitude>36.0667</southBoundLatitude>
+     <northBoundLatitude>43.7562</northBoundLatitude>
     </EX_GeographicBoundingBox>
-    <BoundingBox miny="-9.403751" maxy="0.000001" minx="36.066665" maxx="43.756257" CRS="EPSG:4326"/>
-    <BoundingBox miny="4309798.344" maxy="5427799.41" minx="-1046820.709" maxx="0.001" CRS="EPSG:3857"/>
+    <BoundingBox CRS="EPSG:4326" maxx="43.7562" minx="36.0667" miny="-9.40375" maxy="0.000001"/>
+    <BoundingBox CRS="EPSG:3857" maxx="0.001" minx="-1046820.662" miny="4309803.074" maxy="5427790.763"/>
     <Style>
      <Name>default</Name>
      <Title>default</Title>
      <LegendURL>
       <Format>image/png</Format>
-      <OnlineResource xlink:href="https://www.qgis.org/?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=Slopes&amp;FORMAT=image/png&amp;STYLE=default&amp;SLD_VERSION=1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"/>
+      <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.qgis.org/?MAP=/root/QGIS/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=Slopes&amp;FORMAT=image/png&amp;STYLE=default&amp;SLD_VERSION=1.1.0" xlink:type="simple"/>
      </LegendURL>
     </Style>
-    <Dimension name="range_elevation" units="meters" unitSymbol="m" nearestValue="0" multipleValues="1">0, 500, 1000, 1500, 2000, 2500, 3000</Dimension>
+    <Dimension name="range_elevation" multipleValues="1" units="meters" unitSymbol="m" nearestValue="0">0, 500, 1000, 1500, 2000, 2500, 3000</Dimension>
    </Layer>
    <Layer queryable="1">
     <Name>dem</Name>
@@ -180,14 +180,14 @@ Content-Type: text/xml; charset=utf-8
      <southBoundLatitude>29.999999</southBoundLatitude>
      <northBoundLatitude>60</northBoundLatitude>
     </EX_GeographicBoundingBox>
-    <BoundingBox miny="-30" maxy="0.000001" minx="29.999999" maxx="60" CRS="EPSG:4326"/>
-    <BoundingBox miny="3503549.843" maxy="8399737.89" minx="-3339584.724" maxx="0.001" CRS="EPSG:3857"/>
+    <BoundingBox CRS="EPSG:4326" maxx="60" minx="29.999999" miny="-30" maxy="0.000001"/>
+    <BoundingBox CRS="EPSG:3857" maxx="0.001" minx="-3339584.724" miny="3503549.843" maxy="8399737.89"/>
     <Style>
      <Name>default</Name>
      <Title>default</Title>
      <LegendURL>
       <Format>image/png</Format>
-      <OnlineResource xlink:href="https://www.qgis.org/?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=dem&amp;FORMAT=image/png&amp;STYLE=default&amp;SLD_VERSION=1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple"/>
+      <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.qgis.org/?MAP=/root/QGIS/tests/testdata/qgis_server_accesscontrol/project_with_dimensions.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=dem&amp;FORMAT=image/png&amp;STYLE=default&amp;SLD_VERSION=1.1.0" xlink:type="simple"/>
      </LegendURL>
     </Style>
    </Layer>