Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
with
211 additions
and 185 deletions.
- +19 −29 src/server/services/wms/qgswmsrenderer.cpp
- +2 −1 tests/src/python/test_qgsserver_wms_getfeatureinfo.py
- +14 −11 tests/testdata/qgis_server/wms_getfeatureinfo_alias_json.txt
- +13 −10 tests/testdata/qgis_server/wms_getfeatureinfo_exclude_attribute_json.txt
- +14 −11 tests/testdata/qgis_server/wms_getfeatureinfo_geojson.txt
- +20 −12 tests/testdata/qgis_server/wms_getfeatureinfo_geometry_json.txt
- +34 −31 tests/testdata/qgis_server/wms_getfeatureinfo_group_name_areas.txt
- +14 −11 tests/testdata/qgis_server/wms_getfeatureinfo_json.txt
- +62 −54 tests/testdata/qgis_server/wms_getfeatureinfo_multiple_json.txt
- +19 −15 tests/testdata/qgis_server/wms_getfeatureinfo_raster_json.txt
@@ -1,15 +1,18 @@ | ||
***** | ||
Content-Type: application/json; charset=utf-8 | ||
|
||
{"type": "FeatureCollection", | ||
"features":[ | ||
{ | ||
"type":"Feature", | ||
"id":"fields_alias.2", | ||
"geometry":null, | ||
"properties":{ | ||
"alias_id":3, | ||
"alias_name":"three", | ||
"utf8nameè":"three èé↓" | ||
} | ||
}]} | ||
"features": [ | ||
{ | ||
"geometry": null, | ||
"id": "fields_alias.2", | ||
"properties": { | ||
"alias_id": 3, | ||
"alias_name": "three", | ||
"utf8nameè": "three èé↓" | ||
}, | ||
"type": "Feature" | ||
} | ||
], | ||
"type": "FeatureCollection" | ||
} |
@@ -1,14 +1,17 @@ | ||
***** | ||
Content-Type: application/json; charset=utf-8 | ||
|
||
{"type": "FeatureCollection", | ||
"features":[ | ||
{ | ||
"type":"Feature", | ||
"id":"exclude_attribute.2", | ||
"geometry":null, | ||
"properties":{ | ||
"id":3, | ||
"utf8nameè":"three èé↓" | ||
} | ||
}]} | ||
"features": [ | ||
{ | ||
"geometry": null, | ||
"id": "exclude_attribute.2", | ||
"properties": { | ||
"id": 3, | ||
"utf8nameè": "three èé↓" | ||
}, | ||
"type": "Feature" | ||
} | ||
], | ||
"type": "FeatureCollection" | ||
} |
@@ -1,15 +1,18 @@ | ||
***** | ||
Content-Type: application/geo+json; charset=utf-8 | ||
|
||
{"type": "FeatureCollection", | ||
"features":[ | ||
{ | ||
"type":"Feature", | ||
"id":"testlayer èé.2", | ||
"geometry":null, | ||
"properties":{ | ||
"id":3, | ||
"name":"three", | ||
"utf8nameè":"three èé↓" | ||
} | ||
}]} | ||
"features": [ | ||
{ | ||
"geometry": null, | ||
"id": "testlayer èé.2", | ||
"properties": { | ||
"id": 3, | ||
"name": "three", | ||
"utf8nameè": "three èé↓" | ||
}, | ||
"type": "Feature" | ||
} | ||
], | ||
"type": "FeatureCollection" | ||
} |
@@ -1,16 +1,24 @@ | ||
***** | ||
Content-Type: application/json; charset=utf-8 | ||
|
||
{"type": "FeatureCollection", | ||
"features":[ | ||
{ | ||
"type":"Feature", | ||
"id":"testlayer èé.2", | ||
"geometry": | ||
{"type": "Point", "coordinates": [913204.9128, 5606011.4565]}, | ||
"properties":{ | ||
"id":3, | ||
"name":"three", | ||
"utf8nameè":"three èé↓" | ||
} | ||
}]} | ||
"features": [ | ||
{ | ||
"geometry": { | ||
"coordinates": [ | ||
913204.9128, | ||
5606011.4565 | ||
], | ||
"type": "Point" | ||
}, | ||
"id": "testlayer èé.2", | ||
"properties": { | ||
"id": 3, | ||
"name": "three", | ||
"utf8nameè": "three èé↓" | ||
}, | ||
"type": "Feature" | ||
} | ||
], | ||
"type": "FeatureCollection" | ||
} |
@@ -1,34 +1,37 @@ | ||
Content-Length: 753 | ||
***** | ||
Content-Type: application/json; charset=utf-8 | ||
|
||
{"type": "FeatureCollection", | ||
"features":[ | ||
{ | ||
"type":"Feature", | ||
"id":"as_areas.18", | ||
"geometry":null, | ||
"properties":{ | ||
"fid":18, | ||
"gid":34, | ||
"datum":"2013-06-11", | ||
"bearbeiter":"scholle-b", | ||
"veranstaltung":"", | ||
"beschriftung":"", | ||
"name":"", | ||
"flaechentyp":"Schraffur", | ||
"farbe":"255 0 0", | ||
"schraff_width":"2", | ||
"schraff_width_prt":"6.00", | ||
"schraff_size":"10", | ||
"schraff_size_prt":"30.00", | ||
"schraff_winkel":"45", | ||
"umrissfarbe":"0 0 0", | ||
"umrisstyp":"durchgezogen", | ||
"umrissstaerke":"1", | ||
"umrissstaerke_prt":"3.00", | ||
"umfang":758.4703, | ||
"flaeche":12879, | ||
"bemerkung":"", | ||
"last_change":"2013-06-11 10:03:45.52301+02" | ||
} | ||
}]} | ||
"features": [ | ||
{ | ||
"geometry": null, | ||
"id": "as_areas.18", | ||
"properties": { | ||
"bearbeiter": "scholle-b", | ||
"bemerkung": "", | ||
"beschriftung": "", | ||
"datum": "2013-06-11", | ||
"farbe": "255 0 0", | ||
"fid": 18, | ||
"flaeche": 12879.0, | ||
"flaechentyp": "Schraffur", | ||
"gid": 34, | ||
"last_change": "2013-06-11 10:03:45.52301+02", | ||
"name": "", | ||
"schraff_size": "10", | ||
"schraff_size_prt": "30.00", | ||
"schraff_width": "2", | ||
"schraff_width_prt": "6.00", | ||
"schraff_winkel": "45", | ||
"umfang": 758.4703, | ||
"umrissfarbe": "0 0 0", | ||
"umrissstaerke": "1", | ||
"umrissstaerke_prt": "3.00", | ||
"umrisstyp": "durchgezogen", | ||
"veranstaltung": "" | ||
}, | ||
"type": "Feature" | ||
} | ||
], | ||
"type": "FeatureCollection" | ||
} |
@@ -1,15 +1,18 @@ | ||
***** | ||
Content-Type: application/json; charset=utf-8 | ||
|
||
{"type": "FeatureCollection", | ||
"features":[ | ||
{ | ||
"type":"Feature", | ||
"id":"testlayer èé.2", | ||
"geometry":null, | ||
"properties":{ | ||
"id":3, | ||
"name":"three", | ||
"utf8nameè":"three èé↓" | ||
} | ||
}]} | ||
"features": [ | ||
{ | ||
"geometry": null, | ||
"id": "testlayer èé.2", | ||
"properties": { | ||
"id": 3, | ||
"name": "three", | ||
"utf8nameè": "three èé↓" | ||
}, | ||
"type": "Feature" | ||
} | ||
], | ||
"type": "FeatureCollection" | ||
} |
Oops, something went wrong.