Skip to content

Commit 1b6ed5f

Browse files
pblottierepblottiere
committedJan 28, 2019
Update expected files for unit tests
·
ltr-3_40final-3_6_0
1 parent 7f19cb8 commit 1b6ed5f

File tree

7 files changed

+420
-97
lines changed

7 files changed

+420
-97
lines changed
 

‎tests/src/python/test_qgsserver_wms_getfeatureinfo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ def testGetFeatureInfoJSON(self):
445445
# simple test without geometry and info_format=application/geo+json
446446
self.wms_request_compare('GetFeatureInfo',
447447
'&layers=testlayer%20%C3%A8%C3%A9&styles=&' +
448-
'info_format=application%2Fgeo+json&transparent=true&' +
448+
'info_format=application%2Fgeo%2Bjson&transparent=true&' +
449449
'width=600&height=400&srs=EPSG%3A3857&bbox=913190.6389747962%2C' +
450450
'5606005.488876367%2C913235.426296057%2C5606035.347090538&' +
451451
'query_layers=testlayer%20%C3%A8%C3%A9&X=190&Y=320',

‎tests/testdata/qgis_server/getcapabilities.txt

Lines changed: 117 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,30 @@ Content-Type: text/xml; charset=utf-8
136136
<Title>default</Title>
137137
<LegendURL>
138138
<Format>image/png</Format>
139-
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?MAP=tests/testdata/qgis_server/test_project.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=layer_with_short_name&amp;FORMAT=image/png&amp;STYLE=default" xmlns:xlink="http://www.w3.org/1999/xlink"/>
139+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
140+
</LegendURL>
141+
</Style>
142+
</Layer>
143+
<Layer queryable="1">
144+
<Name>landsat</Name>
145+
<Title>landsat</Title>
146+
<CRS>CRS:84</CRS>
147+
<CRS>EPSG:4326</CRS>
148+
<CRS>EPSG:3857</CRS>
149+
<EX_GeographicBoundingBox>
150+
<westBoundLongitude>17.9243</westBoundLongitude>
151+
<eastBoundLongitude>18.0457</eastBoundLongitude>
152+
<southBoundLatitude>30.1519</southBoundLatitude>
153+
<northBoundLatitude>30.2573</northBoundLatitude>
154+
</EX_GeographicBoundingBox>
155+
<BoundingBox maxy="3.53666e+06" maxx="2.00883e+06" miny="3.52308e+06" CRS="EPSG:3857" minx="1.99532e+06"/>
156+
<BoundingBox maxy="18.0457" maxx="30.2573" miny="17.9243" CRS="EPSG:4326" minx="30.1519"/>
157+
<Style>
158+
<Name>default</Name>
159+
<Title>default</Title>
160+
<LegendURL>
161+
<Format>image/png</Format>
162+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
140163
</LegendURL>
141164
</Style>
142165
</Layer>
@@ -160,7 +183,55 @@ Content-Type: text/xml; charset=utf-8
160183
<Title>default</Title>
161184
<LegendURL>
162185
<Format>image/png</Format>
163-
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?MAP=tests/testdata/qgis_server/test_project.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=testlayer èé&amp;FORMAT=image/png&amp;STYLE=default" xmlns:xlink="http://www.w3.org/1999/xlink"/>
186+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
187+
</LegendURL>
188+
</Style>
189+
</Layer>
190+
<Layer queryable="1">
191+
<Name>fields_alias</Name>
192+
<Title>A test vector layer</Title>
193+
<Abstract>A test vector layer with unicode òà</Abstract>
194+
<CRS>CRS:84</CRS>
195+
<CRS>EPSG:4326</CRS>
196+
<CRS>EPSG:3857</CRS>
197+
<EX_GeographicBoundingBox>
198+
<westBoundLongitude>8.20346</westBoundLongitude>
199+
<eastBoundLongitude>8.20355</eastBoundLongitude>
200+
<southBoundLatitude>44.9014</southBoundLatitude>
201+
<northBoundLatitude>44.9015</northBoundLatitude>
202+
</EX_GeographicBoundingBox>
203+
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
204+
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
205+
<Style>
206+
<Name>default</Name>
207+
<Title>default</Title>
208+
<LegendURL>
209+
<Format>image/png</Format>
210+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
211+
</LegendURL>
212+
</Style>
213+
</Layer>
214+
<Layer queryable="1">
215+
<Name>exclude_attribute</Name>
216+
<Title>A test vector layer</Title>
217+
<Abstract>A test vector layer with unicode òà</Abstract>
218+
<CRS>CRS:84</CRS>
219+
<CRS>EPSG:4326</CRS>
220+
<CRS>EPSG:3857</CRS>
221+
<EX_GeographicBoundingBox>
222+
<westBoundLongitude>8.20346</westBoundLongitude>
223+
<eastBoundLongitude>8.20355</eastBoundLongitude>
224+
<southBoundLatitude>44.9014</southBoundLatitude>
225+
<northBoundLatitude>44.9015</northBoundLatitude>
226+
</EX_GeographicBoundingBox>
227+
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
228+
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
229+
<Style>
230+
<Name>default</Name>
231+
<Title>default</Title>
232+
<LegendURL>
233+
<Format>image/png</Format>
234+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
164235
</LegendURL>
165236
</Style>
166237
</Layer>
@@ -180,28 +251,28 @@ Content-Type: text/xml; charset=utf-8
180251
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
181252
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
182253
<Layer queryable="1">
183-
<Name>testlayer2</Name>
184-
<Title>testlayer2</Title>
185-
<CRS>CRS:84</CRS>
186-
<CRS>EPSG:4326</CRS>
187-
<CRS>EPSG:3857</CRS>
188-
<EX_GeographicBoundingBox>
189-
<westBoundLongitude>8.20346</westBoundLongitude>
190-
<eastBoundLongitude>8.20355</eastBoundLongitude>
191-
<southBoundLatitude>44.9014</southBoundLatitude>
192-
<northBoundLatitude>44.9015</northBoundLatitude>
193-
</EX_GeographicBoundingBox>
194-
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
195-
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
196-
<Style>
197-
<Name>default</Name>
198-
<Title>default</Title>
199-
<LegendURL>
200-
<Format>image/png</Format>
201-
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
202-
</LegendURL>
203-
</Style>
204-
</Layer>
254+
<Name>testlayer2</Name>
255+
<Title>testlayer2</Title>
256+
<CRS>CRS:84</CRS>
257+
<CRS>EPSG:4326</CRS>
258+
<CRS>EPSG:3857</CRS>
259+
<EX_GeographicBoundingBox>
260+
<westBoundLongitude>8.20346</westBoundLongitude>
261+
<eastBoundLongitude>8.20355</eastBoundLongitude>
262+
<southBoundLatitude>44.9014</southBoundLatitude>
263+
<northBoundLatitude>44.9015</northBoundLatitude>
264+
</EX_GeographicBoundingBox>
265+
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
266+
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
267+
<Style>
268+
<Name>default</Name>
269+
<Title>default</Title>
270+
<LegendURL>
271+
<Format>image/png</Format>
272+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
273+
</LegendURL>
274+
</Style>
275+
</Layer>
205276
</Layer>
206277
<Layer>
207278
<Name>groupwithoutshortname</Name>
@@ -218,28 +289,28 @@ Content-Type: text/xml; charset=utf-8
218289
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
219290
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
220291
<Layer queryable="0">
221-
<Name>testlayer3</Name>
222-
<Title>testlayer3</Title>
223-
<CRS>CRS:84</CRS>
224-
<CRS>EPSG:4326</CRS>
225-
<CRS>EPSG:3857</CRS>
226-
<EX_GeographicBoundingBox>
227-
<westBoundLongitude>8.20346</westBoundLongitude>
228-
<eastBoundLongitude>8.20355</eastBoundLongitude>
229-
<southBoundLatitude>44.9014</southBoundLatitude>
230-
<northBoundLatitude>44.9015</northBoundLatitude>
231-
</EX_GeographicBoundingBox>
232-
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
233-
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
234-
<Style>
235-
<Name>default</Name>
236-
<Title>default</Title>
237-
<LegendURL>
238-
<Format>image/png</Format>
239-
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
240-
</LegendURL>
241-
</Style>
242-
</Layer>
292+
<Name>testlayer3</Name>
293+
<Title>testlayer3</Title>
294+
<CRS>CRS:84</CRS>
295+
<CRS>EPSG:4326</CRS>
296+
<CRS>EPSG:3857</CRS>
297+
<EX_GeographicBoundingBox>
298+
<westBoundLongitude>8.20346</westBoundLongitude>
299+
<eastBoundLongitude>8.20355</eastBoundLongitude>
300+
<southBoundLatitude>44.9014</southBoundLatitude>
301+
<northBoundLatitude>44.9015</northBoundLatitude>
302+
</EX_GeographicBoundingBox>
303+
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
304+
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
305+
<Style>
306+
<Name>default</Name>
307+
<Title>default</Title>
308+
<LegendURL>
309+
<Format>image/png</Format>
310+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
311+
</LegendURL>
312+
</Style>
313+
</Layer>
243314
</Layer>
244315
</Layer>
245316
</Capability>

‎tests/testdata/qgis_server/getcontext.txt

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,34 @@ Content-Type: text/xml; charset=utf-8
3939
</Style>
4040
</StyleList>
4141
</Layer>
42+
<Layer hidden="true" queryable="true" id="exclude_attribute" name="exclude_attribute" opacity="1">
43+
<ows:Title>A test vector layer</ows:Title>
44+
<ows:OutputFormat>image/png</ows:OutputFormat>
45+
<Server default="true" service="urn:ogc:serviceType:WMS" version="1.3.0">
46+
<OnlineResource xlink:href="https://www.qgis.org/?*****"/>
47+
</Server>
48+
<ows:Abstract>A test vector layer with unicode òà</ows:Abstract>
49+
<StyleList>
50+
<Style current="true">
51+
<Name>default</Name>
52+
<Title>default</Title>
53+
</Style>
54+
</StyleList>
55+
</Layer>
56+
<Layer hidden="true" queryable="true" id="fields_alias" name="fields_alias" opacity="1">
57+
<ows:Title>A test vector layer</ows:Title>
58+
<ows:OutputFormat>image/png</ows:OutputFormat>
59+
<Server default="true" service="urn:ogc:serviceType:WMS" version="1.3.0">
60+
<OnlineResource xlink:href="https://www.qgis.org/?*****"/>
61+
</Server>
62+
<ows:Abstract>A test vector layer with unicode òà</ows:Abstract>
63+
<StyleList>
64+
<Style current="true">
65+
<Name>default</Name>
66+
<Title>default</Title>
67+
</Style>
68+
</StyleList>
69+
</Layer>
4270
<Layer hidden="true" queryable="true" id="testlayer_èé" name="testlayer èé" opacity="1">
4371
<ows:Title>A test vector layer</ows:Title>
4472
<ows:OutputFormat>image/png</ows:OutputFormat>
@@ -53,6 +81,19 @@ Content-Type: text/xml; charset=utf-8
5381
</Style>
5482
</StyleList>
5583
</Layer>
84+
<Layer hidden="true" queryable="true" id="landsat" name="landsat" opacity="1">
85+
<ows:Title>landsat</ows:Title>
86+
<ows:OutputFormat>image/png</ows:OutputFormat>
87+
<Server default="true" service="urn:ogc:serviceType:WMS" version="1.3.0">
88+
<OnlineResource xlink:href="https://www.qgis.org/?*****"/>
89+
</Server>
90+
<StyleList>
91+
<Style current="true">
92+
<Name>default</Name>
93+
<Title>default</Title>
94+
</Style>
95+
</StyleList>
96+
</Layer>
5697
<Layer hidden="true" queryable="true" id="layer_with_short_name" name="layer_with_short_name" opacity="1">
5798
<ows:Title>A Layer with a short name</ows:Title>
5899
<ows:OutputFormat>image/png</ows:OutputFormat>
@@ -68,4 +109,4 @@ Content-Type: text/xml; charset=utf-8
68109
</StyleList>
69110
</Layer>
70111
</ResourceList>
71-
</OWSContext>
112+
</OWSContext>

‎tests/testdata/qgis_server/getprojectsettings.txt

Lines changed: 85 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Content-Length: 6939
1+
*****
22
Content-Type: text/xml; charset=utf-8
33

44
<?xml version="1.0" encoding="utf-8"?>
@@ -168,6 +168,30 @@ Content-Type: text/xml; charset=utf-8
168168
<Attribute precision="0" type="QString" editType="TextEdit" typeName="String" name="utf8nameè" comment="" length="13"/>
169169
</Attributes>
170170
</Layer>
171+
<Layer queryable="1" visible="1">
172+
<Name>landsat</Name>
173+
<Title>landsat</Title>
174+
<CRS>CRS:84</CRS>
175+
<CRS>EPSG:4326</CRS>
176+
<CRS>EPSG:3857</CRS>
177+
<EX_GeographicBoundingBox>
178+
<westBoundLongitude>17.9243</westBoundLongitude>
179+
<eastBoundLongitude>18.0457</eastBoundLongitude>
180+
<southBoundLatitude>30.1519</southBoundLatitude>
181+
<northBoundLatitude>30.2573</northBoundLatitude>
182+
</EX_GeographicBoundingBox>
183+
<BoundingBox maxy="3.53666e+06" maxx="2.00883e+06" miny="3.52308e+06" CRS="EPSG:3857" minx="1.99532e+06"/>
184+
<BoundingBox maxy="18.0457" maxx="30.2573" miny="17.9243" CRS="EPSG:4326" minx="30.1519"/>
185+
<Style>
186+
<Name>default</Name>
187+
<Title>default</Title>
188+
<LegendURL>
189+
<Format>image/png</Format>
190+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
191+
</LegendURL>
192+
</Style>
193+
<TreeName>landsat</TreeName>
194+
</Layer>
171195
<Layer geometryType="Point" queryable="1" displayField="name" visible="1">
172196
<Name>testlayer èé</Name>
173197
<Title>A test vector layer</Title>
@@ -198,6 +222,65 @@ Content-Type: text/xml; charset=utf-8
198222
<Attribute precision="0" type="QString" editType="TextEdit" typeName="String" name="utf8nameè" comment="" length="13"/>
199223
</Attributes>
200224
</Layer>
225+
<Layer geometryType="Point" queryable="1" displayField="alias_name" visible="1">
226+
<Name>fields_alias</Name>
227+
<Title>A test vector layer</Title>
228+
<Abstract>A test vector layer with unicode òà</Abstract>
229+
<CRS>CRS:84</CRS>
230+
<CRS>EPSG:4326</CRS>
231+
<CRS>EPSG:3857</CRS>
232+
<EX_GeographicBoundingBox>
233+
<westBoundLongitude>8.20346</westBoundLongitude>
234+
<eastBoundLongitude>8.20355</eastBoundLongitude>
235+
<southBoundLatitude>44.9014</southBoundLatitude>
236+
<northBoundLatitude>44.9015</northBoundLatitude>
237+
</EX_GeographicBoundingBox>
238+
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
239+
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
240+
<Style>
241+
<Name>default</Name>
242+
<Title>default</Title>
243+
<LegendURL>
244+
<Format>image/png</Format>
245+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
246+
</LegendURL>
247+
</Style>
248+
<TreeName>fields_alias</TreeName>
249+
<Attributes>
250+
<Attribute precision="0" type="qlonglong" editType="TextEdit" typeName="Integer64" alias="alias_id" name="id" comment="" length="10"/>
251+
<Attribute precision="0" type="QString" editType="TextEdit" typeName="String" alias="alias_name" name="name" comment="" length="10"/>
252+
<Attribute precision="0" type="QString" editType="TextEdit" typeName="String" name="utf8nameè" comment="" length="13"/>
253+
</Attributes>
254+
</Layer>
255+
<Layer geometryType="Point" queryable="1" displayField="name" visible="1">
256+
<Name>exclude_attribute</Name>
257+
<Title>A test vector layer</Title>
258+
<Abstract>A test vector layer with unicode òà</Abstract>
259+
<CRS>CRS:84</CRS>
260+
<CRS>EPSG:4326</CRS>
261+
<CRS>EPSG:3857</CRS>
262+
<EX_GeographicBoundingBox>
263+
<westBoundLongitude>8.20346</westBoundLongitude>
264+
<eastBoundLongitude>8.20355</eastBoundLongitude>
265+
<southBoundLatitude>44.9014</southBoundLatitude>
266+
<northBoundLatitude>44.9015</northBoundLatitude>
267+
</EX_GeographicBoundingBox>
268+
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
269+
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
270+
<Style>
271+
<Name>default</Name>
272+
<Title>default</Title>
273+
<LegendURL>
274+
<Format>image/png</Format>
275+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
276+
</LegendURL>
277+
</Style>
278+
<TreeName>exclude_attribute</TreeName>
279+
<Attributes>
280+
<Attribute precision="0" type="qlonglong" editType="TextEdit" typeName="Integer64" name="id" comment="" length="10"/>
281+
<Attribute precision="0" type="QString" editType="TextEdit" typeName="String" name="utf8nameè" comment="" length="13"/>
282+
</Attributes>
283+
</Layer>
201284
<Layer mutuallyExclusive="0" visible="1">
202285
<Name>group_name</Name>
203286
<Title>Group title</Title>
@@ -290,6 +373,6 @@ Content-Type: text/xml; charset=utf-8
290373
</Layer>
291374
</Layer>
292375
</Layer>
293-
<LayerDrawingOrder>testlayer3,testlayer2,testlayer èé,layer_with_short_name</LayerDrawingOrder>
376+
<LayerDrawingOrder>testlayer3,testlayer2,exclude_attribute,fields_alias,testlayer èé,landsat,layer_with_short_name</LayerDrawingOrder>
294377
</Capability>
295378
</WMS_Capabilities>

‎tests/testdata/qgis_server/wms_getcapabilities_1_1_1.txt

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,24 @@ Content-Type: text/xml; charset=utf-8
130130
</LegendURL>
131131
</Style>
132132
</Layer>
133+
<Layer queryable="1">
134+
<Name>landsat</Name>
135+
<Title>landsat</Title>
136+
<SRS>CRS:84</SRS>
137+
<SRS>EPSG:4326</SRS>
138+
<SRS>EPSG:3857</SRS>
139+
<LatLonBoundingBox maxy="30.2573" maxx="18.0457" miny="30.1519" minx="17.9243"/>
140+
<BoundingBox maxy="3.53666e+06" SRS="EPSG:3857" maxx="2.00883e+06" miny="3.52308e+06" minx="1.99532e+06"/>
141+
<BoundingBox maxy="30.2573" SRS="EPSG:4326" maxx="18.0457" miny="30.1519" minx="17.9243"/>
142+
<Style>
143+
<Name>default</Name>
144+
<Title>default</Title>
145+
<LegendURL>
146+
<Format>image/png</Format>
147+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
148+
</LegendURL>
149+
</Style>
150+
</Layer>
133151
<Layer queryable="1">
134152
<Name>testlayer èé</Name>
135153
<Title>A test vector layer</Title>
@@ -149,6 +167,44 @@ Content-Type: text/xml; charset=utf-8
149167
</LegendURL>
150168
</Style>
151169
</Layer>
170+
<Layer queryable="1">
171+
<Name>fields_alias</Name>
172+
<Title>A test vector layer</Title>
173+
<Abstract>A test vector layer with unicode òà</Abstract>
174+
<SRS>CRS:84</SRS>
175+
<SRS>EPSG:4326</SRS>
176+
<SRS>EPSG:3857</SRS>
177+
<LatLonBoundingBox maxy="44.9015" maxx="8.20355" miny="44.9014" minx="8.20346"/>
178+
<BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
179+
<BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
180+
<Style>
181+
<Name>default</Name>
182+
<Title>default</Title>
183+
<LegendURL>
184+
<Format>image/png</Format>
185+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
186+
</LegendURL>
187+
</Style>
188+
</Layer>
189+
<Layer queryable="1">
190+
<Name>exclude_attribute</Name>
191+
<Title>A test vector layer</Title>
192+
<Abstract>A test vector layer with unicode òà</Abstract>
193+
<SRS>CRS:84</SRS>
194+
<SRS>EPSG:4326</SRS>
195+
<SRS>EPSG:3857</SRS>
196+
<LatLonBoundingBox maxy="44.9015" maxx="8.20355" miny="44.9014" minx="8.20346"/>
197+
<BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
198+
<BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
199+
<Style>
200+
<Name>default</Name>
201+
<Title>default</Title>
202+
<LegendURL>
203+
<Format>image/png</Format>
204+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
205+
</LegendURL>
206+
</Style>
207+
</Layer>
152208
<Layer>
153209
<Name>group_name</Name>
154210
<Title>Group title</Title>

‎tests/testdata/qgis_server/wms_getcapabilities_1_3_0.txt

Lines changed: 117 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,30 @@ Content-Type: text/xml; charset=utf-8
136136
<Title>default</Title>
137137
<LegendURL>
138138
<Format>image/png</Format>
139-
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?MAP=tests/testdata/qgis_server/test_project.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=layer_with_short_name&amp;FORMAT=image/png&amp;STYLE=default" xmlns:xlink="http://www.w3.org/1999/xlink"/>
139+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
140+
</LegendURL>
141+
</Style>
142+
</Layer>
143+
<Layer queryable="1">
144+
<Name>landsat</Name>
145+
<Title>landsat</Title>
146+
<CRS>CRS:84</CRS>
147+
<CRS>EPSG:4326</CRS>
148+
<CRS>EPSG:3857</CRS>
149+
<EX_GeographicBoundingBox>
150+
<westBoundLongitude>17.9243</westBoundLongitude>
151+
<eastBoundLongitude>18.0457</eastBoundLongitude>
152+
<southBoundLatitude>30.1519</southBoundLatitude>
153+
<northBoundLatitude>30.2573</northBoundLatitude>
154+
</EX_GeographicBoundingBox>
155+
<BoundingBox maxy="3.53666e+06" maxx="2.00883e+06" miny="3.52308e+06" CRS="EPSG:3857" minx="1.99532e+06"/>
156+
<BoundingBox maxy="18.0457" maxx="30.2573" miny="17.9243" CRS="EPSG:4326" minx="30.1519"/>
157+
<Style>
158+
<Name>default</Name>
159+
<Title>default</Title>
160+
<LegendURL>
161+
<Format>image/png</Format>
162+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
140163
</LegendURL>
141164
</Style>
142165
</Layer>
@@ -160,7 +183,55 @@ Content-Type: text/xml; charset=utf-8
160183
<Title>default</Title>
161184
<LegendURL>
162185
<Format>image/png</Format>
163-
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?MAP=tests/testdata/qgis_server/test_project.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=testlayer èé&amp;FORMAT=image/png&amp;STYLE=default" xmlns:xlink="http://www.w3.org/1999/xlink"/>
186+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
187+
</LegendURL>
188+
</Style>
189+
</Layer>
190+
<Layer queryable="1">
191+
<Name>fields_alias</Name>
192+
<Title>A test vector layer</Title>
193+
<Abstract>A test vector layer with unicode òà</Abstract>
194+
<CRS>CRS:84</CRS>
195+
<CRS>EPSG:4326</CRS>
196+
<CRS>EPSG:3857</CRS>
197+
<EX_GeographicBoundingBox>
198+
<westBoundLongitude>8.20346</westBoundLongitude>
199+
<eastBoundLongitude>8.20355</eastBoundLongitude>
200+
<southBoundLatitude>44.9014</southBoundLatitude>
201+
<northBoundLatitude>44.9015</northBoundLatitude>
202+
</EX_GeographicBoundingBox>
203+
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
204+
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
205+
<Style>
206+
<Name>default</Name>
207+
<Title>default</Title>
208+
<LegendURL>
209+
<Format>image/png</Format>
210+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
211+
</LegendURL>
212+
</Style>
213+
</Layer>
214+
<Layer queryable="1">
215+
<Name>exclude_attribute</Name>
216+
<Title>A test vector layer</Title>
217+
<Abstract>A test vector layer with unicode òà</Abstract>
218+
<CRS>CRS:84</CRS>
219+
<CRS>EPSG:4326</CRS>
220+
<CRS>EPSG:3857</CRS>
221+
<EX_GeographicBoundingBox>
222+
<westBoundLongitude>8.20346</westBoundLongitude>
223+
<eastBoundLongitude>8.20355</eastBoundLongitude>
224+
<southBoundLatitude>44.9014</southBoundLatitude>
225+
<northBoundLatitude>44.9015</northBoundLatitude>
226+
</EX_GeographicBoundingBox>
227+
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
228+
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
229+
<Style>
230+
<Name>default</Name>
231+
<Title>default</Title>
232+
<LegendURL>
233+
<Format>image/png</Format>
234+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
164235
</LegendURL>
165236
</Style>
166237
</Layer>
@@ -180,28 +251,28 @@ Content-Type: text/xml; charset=utf-8
180251
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
181252
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
182253
<Layer queryable="1">
183-
<Name>testlayer2</Name>
184-
<Title>testlayer2</Title>
185-
<CRS>CRS:84</CRS>
186-
<CRS>EPSG:4326</CRS>
187-
<CRS>EPSG:3857</CRS>
188-
<EX_GeographicBoundingBox>
189-
<westBoundLongitude>8.20346</westBoundLongitude>
190-
<eastBoundLongitude>8.20355</eastBoundLongitude>
191-
<southBoundLatitude>44.9014</southBoundLatitude>
192-
<northBoundLatitude>44.9015</northBoundLatitude>
193-
</EX_GeographicBoundingBox>
194-
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
195-
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
196-
<Style>
197-
<Name>default</Name>
198-
<Title>default</Title>
199-
<LegendURL>
200-
<Format>image/png</Format>
201-
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
202-
</LegendURL>
203-
</Style>
204-
</Layer>
254+
<Name>testlayer2</Name>
255+
<Title>testlayer2</Title>
256+
<CRS>CRS:84</CRS>
257+
<CRS>EPSG:4326</CRS>
258+
<CRS>EPSG:3857</CRS>
259+
<EX_GeographicBoundingBox>
260+
<westBoundLongitude>8.20346</westBoundLongitude>
261+
<eastBoundLongitude>8.20355</eastBoundLongitude>
262+
<southBoundLatitude>44.9014</southBoundLatitude>
263+
<northBoundLatitude>44.9015</northBoundLatitude>
264+
</EX_GeographicBoundingBox>
265+
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
266+
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
267+
<Style>
268+
<Name>default</Name>
269+
<Title>default</Title>
270+
<LegendURL>
271+
<Format>image/png</Format>
272+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
273+
</LegendURL>
274+
</Style>
275+
</Layer>
205276
</Layer>
206277
<Layer>
207278
<Name>groupwithoutshortname</Name>
@@ -218,28 +289,28 @@ Content-Type: text/xml; charset=utf-8
218289
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
219290
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
220291
<Layer queryable="0">
221-
<Name>testlayer3</Name>
222-
<Title>testlayer3</Title>
223-
<CRS>CRS:84</CRS>
224-
<CRS>EPSG:4326</CRS>
225-
<CRS>EPSG:3857</CRS>
226-
<EX_GeographicBoundingBox>
227-
<westBoundLongitude>8.20346</westBoundLongitude>
228-
<eastBoundLongitude>8.20355</eastBoundLongitude>
229-
<southBoundLatitude>44.9014</southBoundLatitude>
230-
<northBoundLatitude>44.9015</northBoundLatitude>
231-
</EX_GeographicBoundingBox>
232-
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
233-
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
234-
<Style>
235-
<Name>default</Name>
236-
<Title>default</Title>
237-
<LegendURL>
238-
<Format>image/png</Format>
239-
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
240-
</LegendURL>
241-
</Style>
242-
</Layer>
292+
<Name>testlayer3</Name>
293+
<Title>testlayer3</Title>
294+
<CRS>CRS:84</CRS>
295+
<CRS>EPSG:4326</CRS>
296+
<CRS>EPSG:3857</CRS>
297+
<EX_GeographicBoundingBox>
298+
<westBoundLongitude>8.20346</westBoundLongitude>
299+
<eastBoundLongitude>8.20355</eastBoundLongitude>
300+
<southBoundLatitude>44.9014</southBoundLatitude>
301+
<northBoundLatitude>44.9015</northBoundLatitude>
302+
</EX_GeographicBoundingBox>
303+
<BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
304+
<BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
305+
<Style>
306+
<Name>default</Name>
307+
<Title>default</Title>
308+
<LegendURL>
309+
<Format>image/png</Format>
310+
<OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
311+
</LegendURL>
312+
</Style>
313+
</Layer>
243314
</Layer>
244315
</Layer>
245316
</Capability>

‎tests/testdata/qgis_server/wms_getfeatureinfo_json.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
*****
22
Content-Type: application/json; charset=utf-8
33

4-
{"layers":[{
4+
{
5+
"layers":[{
56
"name": "testlayer èé",
67
"type": "FeatureCollection",
78
"features":[

0 commit comments

Comments
 (0)
Please sign in to comment.