Skip to content

Commit 1feb971

Browse files
tcoupintcoupin
committedJul 26, 2018
[WMSServer] Fix QgsServerWMS and remove absolute path in qgs files
·
ltr-3_40final-3_4_0
1 parent 0c18d3b commit 1feb971

File tree

7 files changed

+873
-859
lines changed

7 files changed

+873
-859
lines changed
 

‎tests/testdata/qgis_server/getcapabilities.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ Content-Type: text/xml; charset=utf-8
180180
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
181181
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
182182
<Layer queryable="1">
183-
<Name>testlayer</Name>
184-
<Title>testlayer</Title>
183+
<Name>testlayer2</Name>
184+
<Title>testlayer2</Title>
185185
<CRS>CRS:84</CRS>
186186
<CRS>EPSG:4326</CRS>
187187
<CRS>EPSG:3857</CRS>
@@ -217,9 +217,9 @@ Content-Type: text/xml; charset=utf-8
217217
</EX_GeographicBoundingBox>
218218
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
219219
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
220-
<Layer queryable="1">
221-
<Name>testlayer</Name>
222-
<Title>testlayer</Title>
220+
<Layer queryable="0">
221+
<Name>testlayer3</Name>
222+
<Title>testlayer3</Title>
223223
<CRS>CRS:84</CRS>
224224
<CRS>EPSG:4326</CRS>
225225
<CRS>EPSG:3857</CRS>

‎tests/testdata/qgis_server/getcontext.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Content-Type: text/xml; charset=utf-8
1313
</ows:BoundingBox>
1414
</General>
1515
<ResourceList>
16-
<Layer group="groupwithoutshortname" hidden="true" queryable="true" id="testlayer" name="testlayer" opacity="1">
17-
<ows:Title>testlayer</ows:Title>
16+
<Layer group="groupwithoutshortname" hidden="true" queryable="false" id="testlayer3" name="testlayer3" opacity="1">
17+
<ows:Title>testlayer3</ows:Title>
1818
<ows:OutputFormat>image/png</ows:OutputFormat>
1919
<Server default="true" service="urn:ogc:serviceType:WMS" version="1.3.0">
2020
<OnlineResource xlink:href="https://www.qgis.org/?*****"/>
@@ -26,8 +26,8 @@ Content-Type: text/xml; charset=utf-8
2626
</Style>
2727
</StyleList>
2828
</Layer>
29-
<Layer group="groupwithshortname" hidden="true" queryable="true" id="testlayer" name="testlayer" opacity="1">
30-
<ows:Title>testlayer</ows:Title>
29+
<Layer group="groupwithshortname" hidden="true" queryable="true" id="testlayer2" name="testlayer2" opacity="1">
30+
<ows:Title>testlayer2</ows:Title>
3131
<ows:OutputFormat>image/png</ows:OutputFormat>
3232
<Server default="true" service="urn:ogc:serviceType:WMS" version="1.3.0">
3333
<OnlineResource xlink:href="https://www.qgis.org/?*****"/>

‎tests/testdata/qgis_server/getprojectsettings.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ Content-Type: text/xml; charset=utf-8
215215
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
216216
<TreeName>groupwithshortname</TreeName>
217217
<Layer geometryType="Point" queryable="1" displayField="id" visible="1">
218-
<Name>testlayer</Name>
219-
<Title>testlayer</Title>
218+
<Name>testlayer2</Name>
219+
<Title>testlayer2</Title>
220220
<CRS>CRS:84</CRS>
221221
<CRS>EPSG:4326</CRS>
222222
<CRS>EPSG:3857</CRS>
@@ -236,7 +236,7 @@ Content-Type: text/xml; charset=utf-8
236236
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
237237
</LegendURL>
238238
</Style>
239-
<TreeName>testlayer</TreeName>
239+
<TreeName>testlayer2</TreeName>
240240
<Attributes>
241241
<Attribute precision="0" type="qlonglong" editType="TextEdit" typeName="Integer64" name="id" comment="" length="10"/>
242242
<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
259259
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
260260
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
261261
<TreeName>groupwithoutshortname</TreeName>
262-
<Layer geometryType="Point" queryable="1" displayField="id" visible="1">
263-
<Name>testlayer</Name>
264-
<Title>testlayer</Title>
262+
<Layer geometryType="Point" queryable="0" displayField="id" visible="1">
263+
<Name>testlayer3</Name>
264+
<Title>testlayer3</Title>
265265
<CRS>CRS:84</CRS>
266266
<CRS>EPSG:4326</CRS>
267267
<CRS>EPSG:3857</CRS>
@@ -281,7 +281,7 @@ Content-Type: text/xml; charset=utf-8
281281
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
282282
</LegendURL>
283283
</Style>
284-
<TreeName>testlayer</TreeName>
284+
<TreeName>testlayer3</TreeName>
285285
<Attributes>
286286
<Attribute precision="0" type="qlonglong" editType="" typeName="Integer64" name="id" comment="" length="10"/>
287287
<Attribute precision="0" type="QString" editType="" typeName="String" name="name" comment="" length="10"/>
@@ -290,6 +290,6 @@ Content-Type: text/xml; charset=utf-8
290290
</Layer>
291291
</Layer>
292292
</Layer>
293-
<LayerDrawingOrder>testlayer,testlayer,testlayer èé,layer_with_short_name</LayerDrawingOrder>
293+
<LayerDrawingOrder>testlayer3,testlayer2,testlayer èé,layer_with_short_name</LayerDrawingOrder>
294294
</Capability>
295295
</WMS_Capabilities>

‎tests/testdata/qgis_server/wms_getcapabilities_1_1_1.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ Content-Type: text/xml; charset=utf-8
160160
<BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
161161
<BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
162162
<Layer queryable="1">
163-
<Name>testlayer</Name>
164-
<Title>testlayer</Title>
163+
<Name>testlayer2</Name>
164+
<Title>testlayer2</Title>
165165
<SRS>CRS:84</SRS>
166166
<SRS>EPSG:4326</SRS>
167167
<SRS>EPSG:3857</SRS>
@@ -187,9 +187,9 @@ Content-Type: text/xml; charset=utf-8
187187
<LatLonBoundingBox maxy="44.9015" maxx="8.20355" miny="44.9014" minx="8.20346"/>
188188
<BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
189189
<BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
190-
<Layer queryable="1">
191-
<Name>testlayer</Name>
192-
<Title>testlayer</Title>
190+
<Layer queryable="0">
191+
<Name>testlayer3</Name>
192+
<Title>testlayer3</Title>
193193
<SRS>CRS:84</SRS>
194194
<SRS>EPSG:4326</SRS>
195195
<SRS>EPSG:3857</SRS>

‎tests/testdata/qgis_server/wms_getcapabilities_1_3_0.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ Content-Type: text/xml; charset=utf-8
180180
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
181181
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
182182
<Layer queryable="1">
183-
<Name>testlayer</Name>
184-
<Title>testlayer</Title>
183+
<Name>testlayer2</Name>
184+
<Title>testlayer2</Title>
185185
<CRS>CRS:84</CRS>
186186
<CRS>EPSG:4326</CRS>
187187
<CRS>EPSG:3857</CRS>
@@ -217,9 +217,9 @@ Content-Type: text/xml; charset=utf-8
217217
</EX_GeographicBoundingBox>
218218
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
219219
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
220-
<Layer queryable="1">
221-
<Name>testlayer</Name>
222-
<Title>testlayer</Title>
220+
<Layer queryable="0">
221+
<Name>testlayer3</Name>
222+
<Title>testlayer3</Title>
223223
<CRS>CRS:84</CRS>
224224
<CRS>EPSG:4326</CRS>
225225
<CRS>EPSG:3857</CRS>

‎tests/testdata/qgis_server_accesscontrol/project_groups.qgs

Lines changed: 838 additions & 824 deletions
Large diffs are not rendered by default.

‎tests/testdata/qgis_server_project/project.qgs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@
176176
<noDataList bandNo="8" useSrcNoData="0"/>
177177
<noDataList bandNo="9" useSrcNoData="0"/>
178178
</noData>
179-
<map-layer-style-manager current="défaut">
180-
<map-layer-style name="défaut"/>
179+
<map-layer-style-manager current="default">
180+
<map-layer-style name="default"/>
181181
</map-layer-style-manager>
182182
<pipe>
183183
<rasterrenderer alphaBand="-1" redBand="1" opacity="1" greenBand="2" type="multibandcolor" blueBand="3">
@@ -267,8 +267,8 @@
267267
<dataDependencies/>
268268
<legend type="default-vector"/>
269269
<expressionfields/>
270-
<map-layer-style-manager current="défaut">
271-
<map-layer-style name="défaut"/>
270+
<map-layer-style-manager current="default">
271+
<map-layer-style name="default"/>
272272
</map-layer-style-manager>
273273
<auxiliaryLayer/>
274274
<renderer-v2 forceraster="0" type="categorizedSymbol" attr="Name" enableorderby="0" symbollevels="0">
@@ -489,8 +489,8 @@ def my_form_open(dialog, layer, feature):
489489
<dataDependencies/>
490490
<legend type="default-vector"/>
491491
<expressionfields/>
492-
<map-layer-style-manager current="défaut">
493-
<map-layer-style name="défaut"/>
492+
<map-layer-style-manager current="default">
493+
<map-layer-style name="default"/>
494494
</map-layer-style-manager>
495495
<auxiliaryLayer/>
496496
<renderer-v2 forceraster="0" type="categorizedSymbol" attr="Class" enableorderby="0" symbollevels="0">
@@ -792,8 +792,8 @@ def my_form_open(dialog, layer, feature):
792792
<dataDependencies/>
793793
<legend type="default-vector"/>
794794
<expressionfields/>
795-
<map-layer-style-manager current="défaut">
796-
<map-layer-style name="défaut"/>
795+
<map-layer-style-manager current="default">
796+
<map-layer-style name="default"/>
797797
</map-layer-style-manager>
798798
<auxiliaryLayer/>
799799
<renderer-v2 forceraster="0" type="categorizedSymbol" attr="Name" enableorderby="0" symbollevels="0">

0 commit comments

Comments
 (0)
Please sign in to comment.