Skip to content

Commit

Permalink
[WMSServer] Fix QgsServerWMS and remove absolute path in qgs files
Browse files Browse the repository at this point in the history
  • Loading branch information
tcoupin committed Jul 26, 2018
1 parent 0c18d3b commit 1feb971
Show file tree
Hide file tree
Showing 7 changed files with 873 additions and 859 deletions.
10 changes: 5 additions & 5 deletions tests/testdata/qgis_server/getcapabilities.txt
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ Content-Type: text/xml; charset=utf-8
<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"/>
<Layer queryable="1">
<Name>testlayer</Name>
<Title>testlayer</Title>
<Name>testlayer2</Name>
<Title>testlayer2</Title>
<CRS>CRS:84</CRS>
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
Expand Down Expand Up @@ -217,9 +217,9 @@ Content-Type: text/xml; charset=utf-8
</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"/>
<Layer queryable="1">
<Name>testlayer</Name>
<Title>testlayer</Title>
<Layer queryable="0">
<Name>testlayer3</Name>
<Title>testlayer3</Title>
<CRS>CRS:84</CRS>
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
Expand Down
8 changes: 4 additions & 4 deletions tests/testdata/qgis_server/getcontext.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Content-Type: text/xml; charset=utf-8
</ows:BoundingBox>
</General>
<ResourceList>
<Layer group="groupwithoutshortname" hidden="true" queryable="true" id="testlayer" name="testlayer" opacity="1">
<ows:Title>testlayer</ows:Title>
<Layer group="groupwithoutshortname" hidden="true" queryable="false" id="testlayer3" name="testlayer3" opacity="1">
<ows:Title>testlayer3</ows:Title>
<ows:OutputFormat>image/png</ows:OutputFormat>
<Server default="true" service="urn:ogc:serviceType:WMS" version="1.3.0">
<OnlineResource xlink:href="https://www.qgis.org/?*****"/>
Expand All @@ -26,8 +26,8 @@ Content-Type: text/xml; charset=utf-8
</Style>
</StyleList>
</Layer>
<Layer group="groupwithshortname" hidden="true" queryable="true" id="testlayer" name="testlayer" opacity="1">
<ows:Title>testlayer</ows:Title>
<Layer group="groupwithshortname" hidden="true" queryable="true" id="testlayer2" name="testlayer2" opacity="1">
<ows:Title>testlayer2</ows:Title>
<ows:OutputFormat>image/png</ows:OutputFormat>
<Server default="true" service="urn:ogc:serviceType:WMS" version="1.3.0">
<OnlineResource xlink:href="https://www.qgis.org/?*****"/>
Expand Down
16 changes: 8 additions & 8 deletions tests/testdata/qgis_server/getprojectsettings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ Content-Type: text/xml; charset=utf-8
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
<TreeName>groupwithshortname</TreeName>
<Layer geometryType="Point" queryable="1" displayField="id" visible="1">
<Name>testlayer</Name>
<Title>testlayer</Title>
<Name>testlayer2</Name>
<Title>testlayer2</Title>
<CRS>CRS:84</CRS>
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
Expand All @@ -236,7 +236,7 @@ Content-Type: text/xml; charset=utf-8
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
</LegendURL>
</Style>
<TreeName>testlayer</TreeName>
<TreeName>testlayer2</TreeName>
<Attributes>
<Attribute precision="0" type="qlonglong" editType="TextEdit" typeName="Integer64" name="id" comment="" length="10"/>
<Attribute precision="0" type="QString" editType="TextEdit" typeName="String" name="name" comment="" length="10"/>
Expand All @@ -259,9 +259,9 @@ Content-Type: text/xml; charset=utf-8
<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"/>
<TreeName>groupwithoutshortname</TreeName>
<Layer geometryType="Point" queryable="1" displayField="id" visible="1">
<Name>testlayer</Name>
<Title>testlayer</Title>
<Layer geometryType="Point" queryable="0" displayField="id" visible="1">
<Name>testlayer3</Name>
<Title>testlayer3</Title>
<CRS>CRS:84</CRS>
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
Expand All @@ -281,7 +281,7 @@ Content-Type: text/xml; charset=utf-8
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
</LegendURL>
</Style>
<TreeName>testlayer</TreeName>
<TreeName>testlayer3</TreeName>
<Attributes>
<Attribute precision="0" type="qlonglong" editType="" typeName="Integer64" name="id" comment="" length="10"/>
<Attribute precision="0" type="QString" editType="" typeName="String" name="name" comment="" length="10"/>
Expand All @@ -290,6 +290,6 @@ Content-Type: text/xml; charset=utf-8
</Layer>
</Layer>
</Layer>
<LayerDrawingOrder>testlayer,testlayer,testlayer èé,layer_with_short_name</LayerDrawingOrder>
<LayerDrawingOrder>testlayer3,testlayer2,testlayer èé,layer_with_short_name</LayerDrawingOrder>
</Capability>
</WMS_Capabilities>
10 changes: 5 additions & 5 deletions tests/testdata/qgis_server/wms_getcapabilities_1_1_1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ Content-Type: text/xml; charset=utf-8
<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"/>
<Layer queryable="1">
<Name>testlayer</Name>
<Title>testlayer</Title>
<Name>testlayer2</Name>
<Title>testlayer2</Title>
<SRS>CRS:84</SRS>
<SRS>EPSG:4326</SRS>
<SRS>EPSG:3857</SRS>
Expand All @@ -187,9 +187,9 @@ Content-Type: text/xml; charset=utf-8
<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"/>
<Layer queryable="1">
<Name>testlayer</Name>
<Title>testlayer</Title>
<Layer queryable="0">
<Name>testlayer3</Name>
<Title>testlayer3</Title>
<SRS>CRS:84</SRS>
<SRS>EPSG:4326</SRS>
<SRS>EPSG:3857</SRS>
Expand Down
10 changes: 5 additions & 5 deletions tests/testdata/qgis_server/wms_getcapabilities_1_3_0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ Content-Type: text/xml; charset=utf-8
<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"/>
<Layer queryable="1">
<Name>testlayer</Name>
<Title>testlayer</Title>
<Name>testlayer2</Name>
<Title>testlayer2</Title>
<CRS>CRS:84</CRS>
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
Expand Down Expand Up @@ -217,9 +217,9 @@ Content-Type: text/xml; charset=utf-8
</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"/>
<Layer queryable="1">
<Name>testlayer</Name>
<Title>testlayer</Title>
<Layer queryable="0">
<Name>testlayer3</Name>
<Title>testlayer3</Title>
<CRS>CRS:84</CRS>
<CRS>EPSG:4326</CRS>
<CRS>EPSG:3857</CRS>
Expand Down
Loading

0 comments on commit 1feb971

Please sign in to comment.