Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[Server] Update WMS tests for round extent in GetCapabilities
  • Loading branch information
rldhont committed Nov 21, 2019
1 parent e9251a5 commit 59b83de
Show file tree
Hide file tree
Showing 8 changed files with 176 additions and 176 deletions.
2 changes: 1 addition & 1 deletion tests/src/python/test_qgsserver_wms.py
Expand Up @@ -312,7 +312,7 @@ def test_getcapabilities_owslib(self):
f.close()

# clean header in doc
doc = doc.replace('Content-Length: 6575\n', '')
doc = doc.replace('Content-Length: 15066\n', '')
doc = doc.replace('Content-Type: text/xml; charset=utf-8\n\n', '')
doc = doc.replace('<?xml version="1.0" encoding="utf-8"?>\n', '')

Expand Down
86 changes: 43 additions & 43 deletions tests/testdata/qgis_server/getcapabilities.txt
@@ -1,4 +1,4 @@
Content-Length: 6575
Content-Length: 15066
Content-Type: text/xml; charset=utf-8

<?xml version="1.0" encoding="utf-8"?>
Expand Down Expand Up @@ -105,13 +105,13 @@ Content-Type: text/xml; charset=utf-8
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>8.20315</westBoundLongitude>
<eastBoundLongitude>8.20416</eastBoundLongitude>
<southBoundLatitude>44.9012</southBoundLatitude>
<northBoundLatitude>44.9016</northBoundLatitude>
<westBoundLongitude>8.203154</westBoundLongitude>
<eastBoundLongitude>8.204165</eastBoundLongitude>
<southBoundLatitude>44.901236</southBoundLatitude>
<northBoundLatitude>44.901599</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox maxy="5.60604e+06" maxx="913283" miny="5.60599e+06" CRS="EPSG:3857" minx="913171"/>
<BoundingBox maxy="8.20416" maxx="44.9016" miny="8.20315" CRS="EPSG:4326" minx="44.9012"/>
<BoundingBox maxy="5606043.446" maxx="913283.462" miny="5605986.581" CRS="EPSG:3857" minx="913170.942"/>
<BoundingBox maxy="8.204165" maxx="44.901599" miny="8.203154" CRS="EPSG:4326" minx="44.901236"/>
<Name>QGIS Test Project</Name>
<KeywordList>
<Keyword vocabulary="ISO">infoMapAccessService</Keyword>
Expand All @@ -124,13 +124,13 @@ Content-Type: text/xml; charset=utf-8
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>8.20346</westBoundLongitude>
<eastBoundLongitude>8.20355</eastBoundLongitude>
<southBoundLatitude>44.9014</southBoundLatitude>
<northBoundLatitude>44.9015</northBoundLatitude>
<westBoundLongitude>8.203459</westBoundLongitude>
<eastBoundLongitude>8.203547</eastBoundLongitude>
<southBoundLatitude>44.901394</southBoundLatitude>
<northBoundLatitude>44.901483</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
<BoundingBox maxy="5606025.238" maxx="913214.675" miny="5606011.456" CRS="EPSG:3857" minx="913204.912"/>
<BoundingBox maxy="8.203547" maxx="44.901483" miny="8.203459" CRS="EPSG:4326" minx="44.901394"/>
<Style>
<Name>default</Name>
<Title>default</Title>
Expand All @@ -148,13 +148,13 @@ Content-Type: text/xml; charset=utf-8
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>8.20346</westBoundLongitude>
<eastBoundLongitude>8.20355</eastBoundLongitude>
<southBoundLatitude>44.9014</southBoundLatitude>
<northBoundLatitude>44.9015</northBoundLatitude>
<westBoundLongitude>8.203459</westBoundLongitude>
<eastBoundLongitude>8.203547</eastBoundLongitude>
<southBoundLatitude>44.901394</southBoundLatitude>
<northBoundLatitude>44.901483</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
<BoundingBox maxy="5606025.238" maxx="913214.675" miny="5606011.456" CRS="EPSG:3857" minx="913204.912"/>
<BoundingBox maxy="8.203547" maxx="44.901483" miny="8.203459" CRS="EPSG:4326" minx="44.901394"/>
<Style>
<Name>default</Name>
<Title>default</Title>
Expand All @@ -172,27 +172,27 @@ Content-Type: text/xml; charset=utf-8
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>8.20346</westBoundLongitude>
<eastBoundLongitude>8.20355</eastBoundLongitude>
<southBoundLatitude>44.9014</southBoundLatitude>
<northBoundLatitude>44.9015</northBoundLatitude>
<westBoundLongitude>8.203459</westBoundLongitude>
<eastBoundLongitude>8.203548</eastBoundLongitude>
<southBoundLatitude>44.901394</southBoundLatitude>
<northBoundLatitude>44.901483</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
<BoundingBox maxy="5606025.239" maxx="913214.676" miny="5606011.456" CRS="EPSG:3857" minx="913204.911"/>
<BoundingBox maxy="8.203548" maxx="44.901483" miny="8.203459" CRS="EPSG:4326" minx="44.901394"/>
<Layer queryable="1">
<Name>testlayer2</Name>
<Title>testlayer2</Title>
<CRS>CRS:84</CRS>
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>8.20346</westBoundLongitude>
<eastBoundLongitude>8.20355</eastBoundLongitude>
<southBoundLatitude>44.9014</southBoundLatitude>
<northBoundLatitude>44.9015</northBoundLatitude>
<westBoundLongitude>8.203459</westBoundLongitude>
<eastBoundLongitude>8.203547</eastBoundLongitude>
<southBoundLatitude>44.901394</southBoundLatitude>
<northBoundLatitude>44.901483</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
<BoundingBox maxy="5606025.238" maxx="913214.675" miny="5606011.456" CRS="EPSG:3857" minx="913204.912"/>
<BoundingBox maxy="8.203547" maxx="44.901483" miny="8.203459" CRS="EPSG:4326" minx="44.901394"/>
<Style>
<Name>default</Name>
<Title>default</Title>
Expand All @@ -210,27 +210,27 @@ Content-Type: text/xml; charset=utf-8
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>8.20346</westBoundLongitude>
<eastBoundLongitude>8.20355</eastBoundLongitude>
<southBoundLatitude>44.9014</southBoundLatitude>
<northBoundLatitude>44.9015</northBoundLatitude>
<westBoundLongitude>8.203459</westBoundLongitude>
<eastBoundLongitude>8.203548</eastBoundLongitude>
<southBoundLatitude>44.901394</southBoundLatitude>
<northBoundLatitude>44.901483</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
<BoundingBox maxy="5606025.239" maxx="913214.676" miny="5606011.456" CRS="EPSG:3857" minx="913204.911"/>
<BoundingBox maxy="8.203548" maxx="44.901483" miny="8.203459" CRS="EPSG:4326" minx="44.901394"/>
<Layer queryable="0">
<Name>testlayer3</Name>
<Title>testlayer3</Title>
<CRS>CRS:84</CRS>
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>8.20346</westBoundLongitude>
<eastBoundLongitude>8.20355</eastBoundLongitude>
<southBoundLatitude>44.9014</southBoundLatitude>
<northBoundLatitude>44.9015</northBoundLatitude>
<westBoundLongitude>8.203459</westBoundLongitude>
<eastBoundLongitude>8.203547</eastBoundLongitude>
<southBoundLatitude>44.901394</southBoundLatitude>
<northBoundLatitude>44.901483</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
<BoundingBox maxy="5606025.238" maxx="913214.675" miny="5606011.456" CRS="EPSG:3857" minx="913204.912"/>
<BoundingBox maxy="8.203547" maxx="44.901483" miny="8.203459" CRS="EPSG:4326" minx="44.901394"/>
<Style>
<Name>default</Name>
<Title>default</Title>
Expand Down
28 changes: 14 additions & 14 deletions tests/testdata/qgis_server/getcapabilities_inspire.txt
@@ -1,4 +1,4 @@
Content-Length: 7202
Content-Length: 7714
Content-Type: text/xml; charset=utf-8

<?xml version="1.0" encoding="utf-8"?>
Expand Down Expand Up @@ -119,20 +119,20 @@ Content-Type: text/xml; charset=utf-8
<inspire_common:Language>ita</inspire_common:Language>
</inspire_common:ResponseLanguage>
</inspire_vs:ExtendedCapabilities>
<Layer>
<Layer queryable="1">
<Title>QGIS Test Project</Title>
<Abstract>QGIS Test Project</Abstract>
<CRS>CRS:84</CRS>
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>8.20315</westBoundLongitude>
<eastBoundLongitude>8.20416</eastBoundLongitude>
<southBoundLatitude>44.9012</southBoundLatitude>
<northBoundLatitude>44.9016</northBoundLatitude>
<westBoundLongitude>8.203154</westBoundLongitude>
<eastBoundLongitude>8.204165</eastBoundLongitude>
<southBoundLatitude>44.901236</southBoundLatitude>
<northBoundLatitude>44.901599</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox maxy="5.60604e+06" maxx="913283" miny="5.60599e+06" CRS="EPSG:3857" minx="913171"/>
<BoundingBox maxy="8.20416" maxx="44.9016" miny="8.20315" CRS="EPSG:4326" minx="44.9012"/>
<BoundingBox maxy="5606043.446" maxx="913283.462" miny="5605986.581" CRS="EPSG:3857" minx="913170.942"/>
<BoundingBox maxy="8.204165" maxx="44.901599" miny="8.203154" CRS="EPSG:4326" minx="44.901236"/>
<Name>QGIS Test Project</Name>
<KeywordList>
<Keyword vocabulary="ISO">infoMapAccessService</Keyword>
Expand All @@ -145,13 +145,13 @@ Content-Type: text/xml; charset=utf-8
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>8.20346</westBoundLongitude>
<eastBoundLongitude>8.20355</eastBoundLongitude>
<southBoundLatitude>44.9014</southBoundLatitude>
<northBoundLatitude>44.9015</northBoundLatitude>
<westBoundLongitude>8.203459</westBoundLongitude>
<eastBoundLongitude>8.203547</eastBoundLongitude>
<southBoundLatitude>44.901394</southBoundLatitude>
<northBoundLatitude>44.901483</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
<BoundingBox maxy="5606025.238" maxx="913214.675" miny="5606011.456" CRS="EPSG:3857" minx="913204.912"/>
<BoundingBox maxy="8.203547" maxx="44.901483" miny="8.203459" CRS="EPSG:4326" minx="44.901394"/>
<Style>
<Name>default</Name>
<Title>default</Title>
Expand Down
46 changes: 23 additions & 23 deletions tests/testdata/qgis_server/wms_getcapabilities_1_1_1.txt
@@ -1,4 +1,4 @@
*****
Content-Length: 12432
Content-Type: text/xml; charset=utf-8

<?xml version="1.0" encoding="utf-8"?>
Expand Down Expand Up @@ -104,9 +104,9 @@ Content-Type: text/xml; charset=utf-8
<SRS>CRS:84</SRS>
<SRS>EPSG:4326</SRS>
<SRS>EPSG:3857</SRS>
<LatLonBoundingBox maxy="44.9016" maxx="8.20416" miny="44.9012" minx="8.20315"/>
<BoundingBox maxy="5.60604e+06" SRS="EPSG:3857" maxx="913283" miny="5.60599e+06" minx="913171"/>
<BoundingBox maxy="44.9016" SRS="EPSG:4326" maxx="8.20416" miny="44.9012" minx="8.20315"/>
<LatLonBoundingBox maxy="44.901599" maxx="8.204165" miny="44.901236" minx="8.203154"/>
<BoundingBox maxy="5606043.446" SRS="EPSG:3857" maxx="913283.462" miny="5605986.581" minx="913170.942"/>
<BoundingBox maxy="44.901599" SRS="EPSG:4326" maxx="8.204165" miny="44.901236" minx="8.203154"/>
<Name>QGIS Test Project</Name>
<KeywordList>
<Keyword vocabulary="ISO">infoMapAccessService</Keyword>
Expand All @@ -118,15 +118,15 @@ Content-Type: text/xml; charset=utf-8
<SRS>CRS:84</SRS>
<SRS>EPSG:4326</SRS>
<SRS>EPSG:3857</SRS>
<LatLonBoundingBox maxy="44.9015" maxx="8.20355" miny="44.9014" minx="8.20346"/>
<BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
<BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
<LatLonBoundingBox maxy="44.901483" maxx="8.203547" miny="44.901394" minx="8.203459"/>
<BoundingBox maxy="5606025.238" SRS="EPSG:3857" maxx="913214.675" miny="5606011.456" minx="913204.912"/>
<BoundingBox maxy="44.901483" SRS="EPSG:4326" maxx="8.203547" miny="44.901394" minx="8.203459"/>
<Style>
<Name>default</Name>
<Title>default</Title>
<LegendURL>
<Format>image/png</Format>
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server/test_project.qgs&amp;SERVICE=WMS&amp;VERSION=1.1.1&amp;REQUEST=GetLegendGraphic&amp;LAYER=layer_with_short_name&amp;FORMAT=image/png&amp;STYLE=default" xmlns:xlink="http://www.w3.org/1999/xlink"/>
</LegendURL>
</Style>
</Layer>
Expand All @@ -137,9 +137,9 @@ Content-Type: text/xml; charset=utf-8
<SRS>CRS:84</SRS>
<SRS>EPSG:4326</SRS>
<SRS>EPSG:3857</SRS>
<LatLonBoundingBox maxy="44.9015" maxx="8.20355" miny="44.9014" minx="8.20346"/>
<BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
<BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
<LatLonBoundingBox maxy="44.901483" maxx="8.203547" miny="44.901394" minx="8.203459"/>
<BoundingBox maxy="5606025.238" SRS="EPSG:3857" maxx="913214.675" miny="5606011.456" minx="913204.912"/>
<BoundingBox maxy="44.901483" SRS="EPSG:4326" maxx="8.203547" miny="44.901394" minx="8.203459"/>
<Style>
<Name>default</Name>
<Title>default</Title>
Expand All @@ -156,18 +156,18 @@ Content-Type: text/xml; charset=utf-8
<SRS>CRS:84</SRS>
<SRS>EPSG:4326</SRS>
<SRS>EPSG:3857</SRS>
<LatLonBoundingBox maxy="44.9015" maxx="8.20355" miny="44.9014" minx="8.20346"/>
<BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
<BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
<LatLonBoundingBox maxy="44.901483" maxx="8.203548" miny="44.901394" minx="8.203459"/>
<BoundingBox maxy="5606025.239" SRS="EPSG:3857" maxx="913214.676" miny="5606011.456" minx="913204.911"/>
<BoundingBox maxy="44.901483" SRS="EPSG:4326" maxx="8.203548" miny="44.901394" minx="8.203459"/>
<Layer queryable="1">
<Name>testlayer2</Name>
<Title>testlayer2</Title>
<SRS>CRS:84</SRS>
<SRS>EPSG:4326</SRS>
<SRS>EPSG:3857</SRS>
<LatLonBoundingBox maxy="44.9015" maxx="8.20355" miny="44.9014" minx="8.20346"/>
<BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
<BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
<LatLonBoundingBox maxy="44.901483" maxx="8.203547" miny="44.901394" minx="8.203459"/>
<BoundingBox maxy="5606025.238" SRS="EPSG:3857" maxx="913214.675" miny="5606011.456" minx="913204.912"/>
<BoundingBox maxy="44.901483" SRS="EPSG:4326" maxx="8.203547" miny="44.901394" minx="8.203459"/>
<Style>
<Name>default</Name>
<Title>default</Title>
Expand All @@ -184,18 +184,18 @@ Content-Type: text/xml; charset=utf-8
<SRS>CRS:84</SRS>
<SRS>EPSG:4326</SRS>
<SRS>EPSG:3857</SRS>
<LatLonBoundingBox maxy="44.9015" maxx="8.20355" miny="44.9014" minx="8.20346"/>
<BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
<BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
<LatLonBoundingBox maxy="44.901483" maxx="8.203548" miny="44.901394" minx="8.203459"/>
<BoundingBox maxy="5606025.239" SRS="EPSG:3857" maxx="913214.676" miny="5606011.456" minx="913204.911"/>
<BoundingBox maxy="44.901483" SRS="EPSG:4326" maxx="8.203548" miny="44.901394" minx="8.203459"/>
<Layer queryable="0">
<Name>testlayer3</Name>
<Title>testlayer3</Title>
<SRS>CRS:84</SRS>
<SRS>EPSG:4326</SRS>
<SRS>EPSG:3857</SRS>
<LatLonBoundingBox maxy="44.9015" maxx="8.20355" miny="44.9014" minx="8.20346"/>
<BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
<BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
<LatLonBoundingBox maxy="44.901483" maxx="8.203547" miny="44.901394" minx="8.203459"/>
<BoundingBox maxy="5606025.238" SRS="EPSG:3857" maxx="913214.675" miny="5606011.456" minx="913204.912"/>
<BoundingBox maxy="44.901483" SRS="EPSG:4326" maxx="8.203547" miny="44.901394" minx="8.203459"/>
<Style>
<Name>default</Name>
<Title>default</Title>
Expand Down

0 comments on commit 59b83de

Please sign in to comment.