Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge pull request #5466 from mhugent/maptip_geometry_optional
[needs-docs] Make maptip and geometry attribute optional in featureinfo response
- Loading branch information
Showing
with
105 additions
and 14 deletions.
- +24 −0 src/server/services/wms/qgswmsparameters.cpp
- +15 −1 src/server/services/wms/qgswmsparameters.h
- +3 −3 src/server/services/wms/qgswmsrenderer.cpp
- +20 −0 tests/src/python/test_qgsserver_wms.py
- +1 −0 tests/testdata/qgis_server/test_project.qgs
- +21 −0 tests/testdata/qgis_server/wms_getfeatureinfo-text-html-geometry.txt
- +21 −0 tests/testdata/qgis_server/wms_getfeatureinfo-text-html-maptip.txt
- +0 −1 tests/testdata/qgis_server/wms_getfeatureinfo-text-html.txt
- +0 −1 tests/testdata/qgis_server/wms_getfeatureinfo-text-plain.txt
- +0 −2 tests/testdata/qgis_server/wms_getfeatureinfo-text-xml.txt
- +0 −1 tests/testdata/qgis_server/wms_getfeatureinfo_filter.txt
- +0 −2 tests/testdata/qgis_server/wms_getfeatureinfo_filter_or.txt
- +0 −2 tests/testdata/qgis_server/wms_getfeatureinfo_filter_or_utf8.txt
- +0 −1 tests/testdata/qgis_server/wms_getfeatureinfo_geometry_filter.txt
@@ -0,0 +1,21 @@ | ||
Content-Length: 512 | ||
Content-Type: text/html; charset=utf-8 | ||
|
||
<HEAD> | ||
<TITLE> GetFeatureInfo results </TITLE> | ||
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"> | ||
</HEAD> | ||
<BODY> | ||
<TABLE border=1 width=100%> | ||
<TR><TH width=25%>Layer</TH><TD>testlayer èé</TD></TR> | ||
</BR><TABLE border=1 width=100%> | ||
<TR><TH>Feature</TH><TD>2</TD></TR> | ||
<TR><TH>id</TH><TD>3</TD></TR> | ||
<TR><TH>name</TH><TD>three</TD></TR> | ||
<TR><TH>utf8nameè</TH><TD>three èé↓</TD></TR> | ||
<TR><TH>geometry</TH><TD>Point (913204.9128 5606011.4565)</TD></TR> | ||
</TABLE> | ||
</BR> | ||
</TABLE> | ||
<BR></BR> | ||
</BODY> |
@@ -0,0 +1,21 @@ | ||
Content-Length: 512 | ||
Content-Type: text/html; charset=utf-8 | ||
|
||
<HEAD> | ||
<TITLE> GetFeatureInfo results </TITLE> | ||
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"> | ||
</HEAD> | ||
<BODY> | ||
<TABLE border=1 width=100%> | ||
<TR><TH width=25%>Layer</TH><TD>testlayer èé</TD></TR> | ||
</BR><TABLE border=1 width=100%> | ||
<TR><TH>Feature</TH><TD>2</TD></TR> | ||
<TR><TH>id</TH><TD>3</TD></TR> | ||
<TR><TH>name</TH><TD>three</TD></TR> | ||
<TR><TH>utf8nameè</TH><TD>three èé↓</TD></TR> | ||
<TR><TH>maptip</TH><TD>Name: three</TD></TR> | ||
</TABLE> | ||
</BR> | ||
</TABLE> | ||
<BR></BR> | ||
</BODY> |