0001-opengis-adapt-typename-parameter-to-server-version-3.patch

Nicolas Roche, 09 January 2020 05:53 PM

View differences: inline side by side

Subject: [PATCH] opengis: adapt typename parameter to server version (#38851)

 passerelle/apps/opengis/models.py | 12 ++++++++++--
 tests/test_opengis.py             | 29 +++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

         def get_wfs_service_version(self, renew=False):
             return self.get_service_version('wfs', self.wfs_service_url, renew=renew)
         def get_typename_label(self):
             version_str = self.get_wfs_service_version()
             version_tuple = tuple(int(x) for x in version_str.split('.'))
             if version_tuple <= (1, 1, 0):
                 return 'TYPENAME'
             else:
                 return 'TYPENAMES'
         def check_status(self):
             if self.wms_service_url:
                 response = self.requests.get(
-...
                 'VERSION': self.get_wfs_service_version(),
                 'SERVICE': 'WFS',
                 'REQUEST': 'GetFeature',
                 'TYPENAMES': type_names,
                 self.get_typename_label(): type_names,
                 'PROPERTYNAME': property_name,
                 'OUTPUTFORMAT': 'json',
+            }
-...
                 'VERSION': self.get_wfs_service_version(),
                 'SERVICE': 'WFS',
                 'REQUEST': 'GetFeature',
                 'TYPENAMES': self.query_layer,
                 self.get_typename_label(): self.query_layer,
                 'OUTPUTFORMAT': 'json',
                 'CQL_FILTER': cql_filter
+            }

         </ows:ServiceIdentification>
     </wfs:WFS_Capabilities>'''
     FAKE_SERVICE_CAPABILITIES_V1_0_0 = '''<?xml version="1.0" encoding="UTF-8"?>
     <wfs:WFS_Capabilities version="1.0.0"
            xmlns:wfs="http://www.opengis.net/wfs/2.0"
            xmlns:ows="http://www.opengis.net/ows/1.1">
         <ows:ServiceIdentification>
             <ows:Title/><ows:Abstract/>
             <ows:ServiceType>WFS</ows:ServiceType><ows:ServiceTypeVersion>1.0.0</ows:ServiceTypeVersion><ows:Fees/>
             <ows:AccessConstraints/>
         </ows:ServiceIdentification>
     </wfs:WFS_Capabilities>'''
     FAKE_FEATURES_JSON = '''
+    {
         "features": [
-...
             return utils.FakedResponse(status_code=200, content=FAKE_SERVICE_CAPABILITIES)
         return utils.FakedResponse(status_code=200, content=FAKE_FEATURES_JSON)
     def geoserver_responses_v1_0_0(url, **kwargs):
         if kwargs['params'].get('request') == 'GetCapabilities':
             return utils.FakedResponse(status_code=200, content=FAKE_SERVICE_CAPABILITIES_V1_0_0)
         return utils.FakedResponse(status_code=200, content=FAKE_FEATURES_JSON)
     def geoserver_responses_errors(url, **kwargs):
         if kwargs['params'].get('request') == 'GetCapabilities':
-...
         assert '<ows:' in result['data']['content']
     @pytest.mark.parametrize("server_responses, version, typename_label", [
         (geoserver_responses_v1_0_0, '1.0.0', 'TYPENAME'),
         (geoserver_responses, '2.0.0', 'TYPENAMES')])
     @mock.patch('passerelle.utils.Request.get')
     def test_typename_parameter_upgrade(mocked_get, server_responses, version, typename_label, app, connector):
         endpoint = utils.generic_endpoint_url('opengis', 'features', slug=connector.slug)
         assert endpoint == '/opengis/test/features'
         mocked_get.side_effect = server_responses
         resp = app.get(endpoint, params={'type_names': '...', 'property_name': '...'})
         assert mocked_get.call_args[1]['params']['REQUEST'] == 'GetFeature'
         assert mocked_get.call_args[1]['params']['VERSION'] == version
         assert typename_label in mocked_get.call_args[1]['params'].keys()
     @mock.patch('passerelle.utils.Request.get')
     def test_reverse_geocoding(mocked_get, app, connector):
         connector.search_radius = 45
+    -

Project

General

Profile

Produits Entr'ouvert » Passerelle

0001-opengis-adapt-typename-parameter-to-server-version-3.patch