sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[WMSServer] Fix QgsServerWMS and remove absolute path in qgs files

Browse Source
This commit is contained in:
Thibault Coupin 2018-07-26 21:51:25 +02:00
parent 0c18d3bc0a
commit 1feb971daf
7 changed files with 902 additions and 888 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/testdata/qgis_server/getcapabilities.txt vendored
View File

@ -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>
@ -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>

8
tests/testdata/qgis_server/getcontext.txt vendored
View File

@ -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/?*****"/>
@ -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/?*****"/>

16
tests/testdata/qgis_server/getprojectsettings.txt vendored
View File

@ -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>
@ -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"/>
@ -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>
@ -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"/>
@ -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
tests/testdata/qgis_server/wms_getcapabilities_1_1_1.txt vendored
View File

@ -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>
@ -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>

10
tests/testdata/qgis_server/wms_getcapabilities_1_3_0.txt vendored
View File

@ -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>
@ -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>

1720
tests/testdata/qgis_server_accesscontrol/project_groups.qgs vendored
View File

File diff suppressed because it is too large Load Diff

16
tests/testdata/qgis_server_project/project.qgs vendored
View File

@ -176,8 +176,8 @@
<noDataList bandNo="8" useSrcNoData="0"/>
<noDataList bandNo="9" useSrcNoData="0"/>
</noData>
<map-layer-style-manager current="défaut">
<map-layer-style name="défaut"/>
<map-layer-style-manager current="default">
<map-layer-style name="default"/>
</map-layer-style-manager>
<pipe>
<rasterrenderer alphaBand="-1" redBand="1" opacity="1" greenBand="2" type="multibandcolor" blueBand="3">
@ -267,8 +267,8 @@
<dataDependencies/>
<legend type="default-vector"/>
<expressionfields/>
<map-layer-style-manager current="défaut">
<map-layer-style name="défaut"/>
<map-layer-style-manager current="default">
<map-layer-style name="default"/>
</map-layer-style-manager>
<auxiliaryLayer/>
<renderer-v2 forceraster="0" type="categorizedSymbol" attr="Name" enableorderby="0" symbollevels="0">
@ -489,8 +489,8 @@ def my_form_open(dialog, layer, feature):
<dataDependencies/>
<legend type="default-vector"/>
<expressionfields/>
<map-layer-style-manager current="défaut">
<map-layer-style name="défaut"/>
<map-layer-style-manager current="default">
<map-layer-style name="default"/>
</map-layer-style-manager>
<auxiliaryLayer/>
<renderer-v2 forceraster="0" type="categorizedSymbol" attr="Class" enableorderby="0" symbollevels="0">
@ -792,8 +792,8 @@ def my_form_open(dialog, layer, feature):
<dataDependencies/>
<legend type="default-vector"/>
<expressionfields/>
<map-layer-style-manager current="défaut">
<map-layer-style name="défaut"/>
<map-layer-style-manager current="default">
<map-layer-style name="default"/>
</map-layer-style-manager>
<auxiliaryLayer/>
<renderer-v2 forceraster="0" type="categorizedSymbol" attr="Name" enableorderby="0" symbollevels="0">