Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert "Add unit test for WFS GetFeature Within for EPSG 3857 and 'fa…
…ke' EPSG 3857."

This reverts commit fabdb64.
  • Loading branch information
elpaso committed Jun 5, 2020
1 parent e499e99 commit e167ec8
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 190 deletions.
75 changes: 5 additions & 70 deletions tests/src/python/test_qgsserver_wfs.py
Expand Up @@ -189,7 +189,7 @@ def test_wfs_getcapabilities_100_url(self):
self.assertEqual(
"onlineResource=\"my_wfs_advertised_url\"" in item, True)

def result_compare(self, file_name, error_msg_header, header, body, expectEqual=True):
def result_compare(self, file_name, error_msg_header, header, body):
self.assert_headers(header, body)
response = header + body
reference_path = self.testdata_path + file_name
Expand All @@ -202,11 +202,7 @@ def result_compare(self, file_name, error_msg_header, header, body, expectEqual=
self.assertXMLEqual(response, expected, msg="%s\n" %
(error_msg_header))

# If do not expect equal and pass the line above, should throw and assertion error.
if not expectEqual:
self.assertFalse(True, msg='It should get different result for %s.' % error_msg_header)

def wfs_getfeature_post_compare(self, requestid, request, expectEqual=True):
def wfs_getfeature_post_compare(self, requestid, request):
project = self.testdata_path + "test_project_wfs.qgs"
assert os.path.exists(project), "Project file not found: " + project

Expand All @@ -217,14 +213,11 @@ def wfs_getfeature_post_compare(self, requestid, request, expectEqual=True):
self.result_compare(
'wfs_getfeature_{}.txt'.format(requestid),
"GetFeature in POST for '{}' failed.".format(requestid),
header,
body,
expectEqual
header, body,
)

def test_getfeature_post(self):
tests = []
expectNotEqualTests = []

template = """<?xml version="1.0" encoding="UTF-8"?>
<wfs:GetFeature service="WFS" version="1.0.0" {} xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
Expand Down Expand Up @@ -266,7 +259,7 @@ def test_getfeature_post(self):

# Issue https://github.com/qgis/QGIS/issues/36398
# Check get feature within linear ring with srsName=EPSG:4326
within4326FilterTemplate = """<?xml version="1.0" encoding="UTF-8"?>
withinFilterTemplate = """<?xml version="1.0" encoding="UTF-8"?>
<wfs:GetFeature service="WFS" version="1.0.0" {} xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
<wfs:Query typeName="testlayer" srsName="EPSG:4326" xmlns:feature="http://www.qgis.org/gml">
<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">
Expand All @@ -290,62 +283,7 @@ def test_getfeature_post(self):
</wfs:Query>
</wfs:GetFeature>
"""
tests.append(('within4326FilterTemplate_post', within4326FilterTemplate.format("")))

# Keep the coordinate in 4326, but change the srsName to 3857 (should returns different result)
# The reference file (withinFake3857FilterTemplate_post.txt) is copied from within4326FilterTemplate_post.txt
withinFake3857FilterTemplate = """<?xml version="1.0" encoding="UTF-8"?>
<wfs:GetFeature service="WFS" version="1.0.0" {} xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
<wfs:Query typeName="testlayer" srsName="EPSG:4326" xmlns:feature="http://www.qgis.org/gml">
<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">
<Within>
<PropertyName>geometry</PropertyName>
<Polygon xmlns="http://www.opengis.net/gml" srsName="EPSG:4326">
<exterior>
<LinearRing srsName="EPSG:3857">
<posList srsDimension="2">
8 44
9 44
9 45
8 45
8 44
</posList>
</LinearRing>
</exterior>
</Polygon>
</Within>
</ogc:Filter>
</wfs:Query>
</wfs:GetFeature>
"""
expectNotEqualTests.append(('withinFake3857FilterTemplate_post', withinFake3857FilterTemplate.format("")))

# Now test with EPSG 3857 and proper 3857 coordinates
within3857FilterTemplate = """<?xml version="1.0" encoding="UTF-8"?>
<wfs:GetFeature service="WFS" version="1.0.0" {} xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
<wfs:Query typeName="testlayer" srsName="EPSG:4326" xmlns:feature="http://www.qgis.org/gml">
<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">
<Within>
<PropertyName>geometry</PropertyName>
<Polygon xmlns="http://www.opengis.net/gml" srsName="EPSG:4326">
<exterior>
<LinearRing srsName="EPSG:3857">
<posList srsDimension="2">
890555.93 5465442.18
1001875.42, 5465442.18
1001875.42, 5621521.49
890555.93, 5621521.49
890555.93 5465442.18
</posList>
</LinearRing>
</exterior>
</Polygon>
</Within>
</ogc:Filter>
</wfs:Query>
</wfs:GetFeature>
"""
tests.append(('within3857FilterTemplate_post', within3857FilterTemplate.format("")))
tests.append(('withinFilterTemplate_post', withinFilterTemplate.format("")))

srsTwoLayersTemplate = """<?xml version="1.0" encoding="UTF-8"?>
<wfs:GetFeature service="WFS" version="1.0.0" {} xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
Expand Down Expand Up @@ -480,9 +418,6 @@ def test_getfeature_post(self):
"""
tests.append(('nobbox_post', template.format("")))

for id, req in expectNotEqualTests:
self.wfs_getfeature_post_compare(id, req, expectEqual=False)

for id, req in tests:
self.wfs_getfeature_post_compare(id, req)

Expand Down

This file was deleted.

This file was deleted.

0 comments on commit e167ec8

Please sign in to comment.