Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge pull request #8924 from elpaso/bugfix-20927-server_exp_filter
Server WFS EXP_FILTER bugfixes Cherry-picked from master 0e0146d
- Loading branch information
1 parent
da4a0c0
commit bc4ccd0
Showing
11 changed files
with
183 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_FID_one_1_0_0.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8 | ||
|
||
<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=testlayer&OUTPUTFORMAT=XMLSCHEMA"> | ||
<gml:boundedBy> | ||
<gml:Box srsName="EPSG:4326"> | ||
<gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates> | ||
</gml:Box> | ||
</gml:boundedBy> | ||
<gml:featureMember> | ||
<qgs:testlayer fid="testlayer.0"> | ||
<gml:boundedBy> | ||
<gml:Box srsName="EPSG:4326"> | ||
<gml:coordinates cs="," ts=" ">8.20349634,44.90148253 8.20349634,44.90148253</gml:coordinates> | ||
</gml:Box> | ||
</gml:boundedBy> | ||
<qgs:geometry> | ||
<Point xmlns="http://www.opengis.net/gml" srsName="EPSG:4326"> | ||
<coordinates xmlns="http://www.opengis.net/gml" cs="," ts=" ">8.20349634,44.90148253</coordinates> | ||
</Point> | ||
</qgs:geometry> | ||
<qgs:id>1</qgs:id> | ||
<qgs:name>one</qgs:name> | ||
<qgs:utf8nameè>one èé</qgs:utf8nameè> | ||
</qgs:testlayer> | ||
</gml:featureMember> | ||
</wfs:FeatureCollection> |
26 changes: 26 additions & 0 deletions
26
tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_gml_bbox_one_1_0_0.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8 | ||
|
||
<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=testlayer&OUTPUTFORMAT=XMLSCHEMA"> | ||
<gml:boundedBy> | ||
<gml:Box srsName="EPSG:4326"> | ||
<gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates> | ||
</gml:Box> | ||
</gml:boundedBy> | ||
<gml:featureMember> | ||
<qgs:testlayer fid="testlayer.0"> | ||
<gml:boundedBy> | ||
<gml:Box srsName="EPSG:4326"> | ||
<gml:coordinates cs="," ts=" ">8.20349634,44.90148253 8.20349634,44.90148253</gml:coordinates> | ||
</gml:Box> | ||
</gml:boundedBy> | ||
<qgs:geometry> | ||
<Point xmlns="http://www.opengis.net/gml" srsName="EPSG:4326"> | ||
<coordinates xmlns="http://www.opengis.net/gml" cs="," ts=" ">8.20349634,44.90148253</coordinates> | ||
</Point> | ||
</qgs:geometry> | ||
<qgs:id>1</qgs:id> | ||
<qgs:name>one</qgs:name> | ||
<qgs:utf8nameè>one èé</qgs:utf8nameè> | ||
</qgs:testlayer> | ||
</gml:featureMember> | ||
</wfs:FeatureCollection> |
26 changes: 26 additions & 0 deletions
26
tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_gml_bbox_three_1_0_0.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8 | ||
|
||
<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=testlayer&OUTPUTFORMAT=XMLSCHEMA"> | ||
<gml:boundedBy> | ||
<gml:Box srsName="EPSG:4326"> | ||
<gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates> | ||
</gml:Box> | ||
</gml:boundedBy> | ||
<gml:featureMember> | ||
<qgs:testlayer fid="testlayer.2"> | ||
<gml:boundedBy> | ||
<gml:Box srsName="EPSG:4326"> | ||
<gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20345931,44.90139484</gml:coordinates> | ||
</gml:Box> | ||
</gml:boundedBy> | ||
<qgs:geometry> | ||
<Point xmlns="http://www.opengis.net/gml" srsName="EPSG:4326"> | ||
<coordinates xmlns="http://www.opengis.net/gml" cs="," ts=" ">8.20345931,44.90139484</coordinates> | ||
</Point> | ||
</qgs:geometry> | ||
<qgs:id>3</qgs:id> | ||
<qgs:name>three</qgs:name> | ||
<qgs:utf8nameè>three èé↓</qgs:utf8nameè> | ||
</qgs:testlayer> | ||
</gml:featureMember> | ||
</wfs:FeatureCollection> |
7 changes: 7 additions & 0 deletions
7
tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_invalid_expression_1_0_0.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
Content-Length: 229 | ||
Content-Type: text/xml; charset=utf-8 | ||
|
||
<ServiceExceptionReport xmlns="http://www.opengis.net/ogc" version="1.2.0"> | ||
<ServiceException code="RequestNotWellFormed">The EXP_FILTER expression has errors: | ||
Function is not known</ServiceException> | ||
</ServiceExceptionReport> |
8 changes: 8 additions & 0 deletions
8
tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_syntax_error_1_0_0.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
Content-Length: 320 | ||
Content-Type: text/xml; charset=utf-8 | ||
|
||
<ServiceExceptionReport xmlns="http://www.opengis.net/ogc" version="1.2.0"> | ||
<ServiceException code="RequestNotWellFormed">The EXP_FILTER expression has errors: | ||
syntax error, unexpected NAME, expecting COMMA or ')' | ||
syntax error, unexpected Unknown_CHARACTER, expecting $end</ServiceException> | ||
</ServiceExceptionReport> |
26 changes: 26 additions & 0 deletions
26
tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_two_1_0_0.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8 | ||
|
||
<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=testlayer&OUTPUTFORMAT=XMLSCHEMA"> | ||
<gml:boundedBy> | ||
<gml:Box srsName="EPSG:4326"> | ||
<gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates> | ||
</gml:Box> | ||
</gml:boundedBy> | ||
<gml:featureMember> | ||
<qgs:testlayer fid="testlayer.1"> | ||
<gml:boundedBy> | ||
<gml:Box srsName="EPSG:4326"> | ||
<gml:coordinates cs="," ts=" ">8.20354699,44.90143568 8.20354699,44.90143568</gml:coordinates> | ||
</gml:Box> | ||
</gml:boundedBy> | ||
<qgs:geometry> | ||
<Point xmlns="http://www.opengis.net/gml" srsName="EPSG:4326"> | ||
<coordinates xmlns="http://www.opengis.net/gml" cs="," ts=" ">8.20354699,44.90143568</coordinates> | ||
</Point> | ||
</qgs:geometry> | ||
<qgs:id>2</qgs:id> | ||
<qgs:name>two</qgs:name> | ||
<qgs:utf8nameè>two àò</qgs:utf8nameè> | ||
</qgs:testlayer> | ||
</gml:featureMember> | ||
</wfs:FeatureCollection> |
26 changes: 26 additions & 0 deletions
26
tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_wrong_FID_one_1_0_0.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8 | ||
|
||
<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=testlayer&OUTPUTFORMAT=XMLSCHEMA"> | ||
<gml:boundedBy> | ||
<gml:Box srsName="EPSG:4326"> | ||
<gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates> | ||
</gml:Box> | ||
</gml:boundedBy> | ||
<gml:featureMember> | ||
<qgs:testlayer fid="testlayer.0"> | ||
<gml:boundedBy> | ||
<gml:Box srsName="EPSG:4326"> | ||
<gml:coordinates cs="," ts=" ">8.20349634,44.90148253 8.20349634,44.90148253</gml:coordinates> | ||
</gml:Box> | ||
</gml:boundedBy> | ||
<qgs:geometry> | ||
<Point xmlns="http://www.opengis.net/gml" srsName="EPSG:4326"> | ||
<coordinates xmlns="http://www.opengis.net/gml" cs="," ts=" ">8.20349634,44.90148253</coordinates> | ||
</Point> | ||
</qgs:geometry> | ||
<qgs:id>1</qgs:id> | ||
<qgs:name>one</qgs:name> | ||
<qgs:utf8nameè>one èé</qgs:utf8nameè> | ||
</qgs:testlayer> | ||
</gml:featureMember> | ||
</wfs:FeatureCollection> |