Skip to content

Commit

Permalink
[Server] Update WMS tests for round extent in GetCapabilities
Browse files Browse the repository at this point in the history
  • Loading branch information
@rldhont
rldhont committed Nov 21, 2019
1 parent e5f93eb commit 983da1d
Show file tree
Hide file tree
Showing 8 changed files with 258 additions and 258 deletions.
2 changes: 1 addition & 1 deletion tests/src/python/test_qgsserver_wms.py
View file
Expand Up @@ -324,7 +324,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
128 changes: 64 additions & 64 deletions tests/testdata/qgis_server/getcapabilities.txt
View file
@@ -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 @@ -100,20 +100,20 @@ Content-Type: text/xml; charset=utf-8
<Format>XML</Format>
</Exception>
<sld:UserDefinedSymbolization SupportSLD="1" RemoteWCS="0" UserLayer="0" InlineFeature="0" RemoteWFS="0" UserStyle="1"/>
<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 @@ -126,13 +126,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 @@ -149,13 +149,13 @@ Content-Type: text/xml; charset=utf-8
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>17.9243</westBoundLongitude>
<eastBoundLongitude>18.0457</eastBoundLongitude>
<southBoundLatitude>30.1519</southBoundLatitude>
<northBoundLatitude>30.2573</northBoundLatitude>
<westBoundLongitude>17.924273</westBoundLongitude>
<eastBoundLongitude>18.045658</eastBoundLongitude>
<southBoundLatitude>30.151856</southBoundLatitude>
<northBoundLatitude>30.257289</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox maxy="3.53666e+06" maxx="2.00883e+06" miny="3.52308e+06" CRS="EPSG:3857" minx="1.99532e+06"/>
<BoundingBox maxy="18.0457" maxx="30.2573" miny="17.9243" CRS="EPSG:4326" minx="30.1519"/>
<BoundingBox maxy="3536664.948" maxx="2008833.414" miny="3523084.517" CRS="EPSG:3857" minx="1995320.991"/>
<BoundingBox maxy="18.045658" maxx="30.257289" miny="17.924273" CRS="EPSG:4326" minx="30.151856"/>
<Style>
<Name>default</Name>
<Title>default</Title>
Expand All @@ -173,13 +173,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 @@ -197,13 +197,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 @@ -221,13 +221,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 @@ -237,35 +237,35 @@ Content-Type: text/xml; charset=utf-8
</LegendURL>
</Style>
</Layer>
<Layer>
<Layer queryable="1">
<Name>group_name</Name>
<Title>Group title</Title>
<Abstract>Group abstract</Abstract>
<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.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 @@ -276,34 +276,34 @@ Content-Type: text/xml; charset=utf-8
</Style>
</Layer>
</Layer>
<Layer>
<Layer queryable="0">
<Name>groupwithoutshortname</Name>
<Title>groupwithoutshortname</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.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
View file
@@ -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 @@ -121,20 +121,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 @@ -147,13 +147,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

0 comments on commit 983da1d

Please sign in to comment.