0001-opengis-add-reverse-geocoding-based-on-WFS-21558.patch

Serghei Mihai (congés, retour 15/05), 01 mars 2018 18:44

Voir les différences: en ligne côte à côte

Subject: [PATCH] opengis: add reverse geocoding based on WFS (#21558)

 .../opengis/migrations/0005_auto_20180227_1531.py  |  20 ++++
 passerelle/apps/opengis/models.py                  |  63 ++++++++++++
 tests/test_opengis.py                              | 113 +++++++++++++++++++++
 3 files changed, 196 insertions(+)
 create mode 100644 passerelle/apps/opengis/migrations/0005_auto_20180227_1531.py

     # -*- coding: utf-8 -*-
     from __future__ import unicode_literals
     from django.db import migrations, models
     import jsonfield.fields
     class Migration(migrations.Migration):
         dependencies = [
             ('opengis', '0004_auto_20180219_1613'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='opengis',
                 name='search_radius',
                 field=models.IntegerField(default=5, verbose_name='Radius for point search'),
             ),
+        ]

         query_layer = models.CharField(_('Query Layer'), max_length=256)
         projection = models.CharField(_('GIS projection'), choices=PROJECTIONS,
                                       default='EPSG:3857', max_length=16)
         search_radius = models.IntegerField(_('Radius for point search'), default=5)
         attributes_mapping = (('road', ('road', 'road_name', 'street', 'street_name', 'voie', 'nom_voie', 'rue')),
                               ('city', ('city', 'city_name', 'town', 'town_name', 'commune', 'nom_commune', 'ville', 'nom_ville')),
                               ('house_number', ('house_number', 'number', 'numero', 'numero_voie', 'numero_rue')),
                               ('postcode', ('postcode', 'postalCode', 'zipcode', 'codepostal', 'cp', 'code_postal', 'code_post')),
                               ('country', ('country', 'country_name', 'pays', 'nom_pays'))
+                              )
         class Meta:
             verbose_name = _('OpenGIS')
-...
             return HttpResponse(
                     self.requests.get(self.wms_service_url, params=params, cache_duration=300).content,
                     content_type='image/png')
         @endpoint(perm='can_access', description=_('Get feature info'))
         def reverse(self, request, lat, lon):
             result = None
             if self.projection != 'epsg:4326':
                 wgs84 = pyproj.Proj(init='epsg:4326')
                 target_projection = pyproj.Proj(init=self.projection)
                 lon, lat = pyproj.transform(wgs84, target_projection, lon, lat)
             cql_filter = 'DWITHIN(the_geom,Point(%s %s),%s,meters)' % (lon, lat, self.search_radius)
             params = {
                 'VERSION': self.get_wfs_service_version(),
                 'SERVICE': 'WFS',
                 'REQUEST': 'GetFeature',
                 'TYPENAMES': self.query_layer,
                 'OUTPUTFORMAT': 'json',
                 'CQL_FILTER': cql_filter
+            }
             response = self.requests.get(self.wfs_service_url, params=params)
             min_lon_diff = None
             min_lat_diff = None
             closest_feature = {}
             for feature in response.json().get('features'):
                 if not feature['geometry']['type'] == 'Point':
                     continue  # skip unknown
                 lon_diff = abs(float(lon) - float(feature['geometry']['coordinates'][0]))
                 lat_diff = abs(float(lat) - float(feature['geometry']['coordinates'][1]))
                 if min_lon_diff is None and min_lat_diff is None:
                     min_lon_diff = lon_diff
                     min_lat_diff = lat_diff
                 if lon_diff <= min_lon_diff and lat_diff <= min_lat_diff:
                     closest_feature = feature
             if closest_feature:
                 result = {}
                 point_lon = closest_feature['geometry']['coordinates'][0]
                 point_lat = closest_feature['geometry']['coordinates'][1]
                 if self.projection != 'epsg:4326':
                     point_lon, point_lat = pyproj.transform(target_projection, wgs84,
                                                             point_lon, point_lat)
                 result['lon'] = str(point_lon)
                 result['lat'] = str(point_lat)
                 result['address'] = {}
                 for attribute, properties in self.attributes_mapping:
                     if request.GET.get(attribute):
                         result['address'][attribute] = request.GET[attribute]
                         continue
                     for field in properties:
                         if closest_feature['properties'].get(field):
                             result['address'][attribute] = unicode(closest_feature['properties'][field])
                             break
             return result

     FAKE_ERROR = u'<ows:ExceptionReport xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0.0" xsi:schemaLocation="http://www.opengis.net/ows/1.1 https://sigmetropole.lametro.fr/geoserver/schemas/ows/1.1.0/owsAll.xsd">\n  <ows:Exception exceptionCode="NoApplicableCode">\n    <ows:ExceptionText>Could not parse CQL filter list.\nEncountered &amp;quot;BIS&amp;quot; at line 1, column 129.\nWas expecting one of:\n    &amp;lt;EOF&amp;gt; \n    &amp;quot;and&amp;quot; ...\n    &amp;quot;or&amp;quot; ...\n    &amp;quot;;&amp;quot; ...\n    &amp;quot;/&amp;quot; ...\n    &amp;quot;*&amp;quot; ...\n    &amp;quot;+&amp;quot; ...\n    &amp;quot;-&amp;quot; ...\n     Parsing : strEqualsIgnoreCase(nom_commune, &amp;apos;Grenoble&amp;apos;) = true AND strEqualsIgnoreCase(nom_voie, &amp;apos;rue albert recoura&amp;apos;) = true AND numero=8 BIS.</ows:ExceptionText>\n  </ows:Exception>\n</ows:ExceptionReport>\n'
     FAKE_GEOLOCATED_FEATURE = '''{
         "crs": {
             "properties": {
                 "name": "urn:ogc:def:crs:EPSG::3945"
             },
             "type": "name"
         },
         "features": [
+            {
                 "geometry": {
                     "coordinates": [
                         1914059.51,
                         4224699.2
                     ],
                     "type": "Point"
                 },
                 "geometry_name": "the_geom",
                 "properties": {
                     "code_insee": 38185,
                     "code_post": 38000,
                     "nom_afnor": "BOULEVARD EDOUARD REY",
                     "nom_commune": "Grenoble",
                     "nom_voie": "boulevard \u00e9douard rey",
                     "numero": 17
                 },
                 "type": "Feature"
             },
+            {
                 "geometry": {
                     "coordinates": [
                         1914042.47,
                         4224665.2
                     ],
                     "type": "Point"
                 },
                 "geometry_name": "the_geom",
                 "properties": {
                     "code_insee": 38185,
                     "code_post": 38000,
                     "nom_commune": "Grenoble",
                     "nom_voie": "place victor hugo",
                     "numero": 2
                 },
                 "type": "Feature"
             },
+            {
                 "geometry": {
                     "coordinates": [
                         1914035.7,
                         4224700.42
                     ],
                     "type": "Point"
                 },
                 "geometry_name": "the_geom",
                 "properties": {
                     "code_insee": 38185,
                     "code_post": 38000,
                     "nom_commune": "Grenoble",
                     "nom_voie": "boulevard \u00e9douard rey",
                     "numero": 28
                 },
                 "type": "Feature"
             },
+            {
                 "geometry": {
                     "coordinates": [
                         1914018.64,
                         4224644.61
                     ],
                     "type": "Point"
                 },
                 "geometry_name": "the_geom",
                 "properties": {
                     "code_insee": 38185,
                     "code_post": 38000,
                     "nom_commune": "Grenoble",
                     "nom_voie": "place victor hugo",
                     "numero": 4
                 },
                 "type": "Feature"
+            }
         ],
         "totalFeatures": 4,
         "type": "FeatureCollection"
     }'''
     @pytest.fixture
     def connector(db):
-...
         assert result['err'] == 1
         assert result['err_desc'] == 'OpenGIS Error: unparsable error'
         assert '<ows:' in result['data']['content']
     @mock.patch('passerelle.utils.Request.get')
     def test_reverse_geocoding(mocked_get, app, connector):
         connector.search_radius = 45
         connector.projection = 'EPSG:3945'
         connector.save()
         endpoint = utils.generic_endpoint_url('opengis', 'reverse', slug=connector.slug)
         assert endpoint == '/opengis/test/reverse'
         mocked_get.return_value = utils.FakedResponse(content=FAKE_GEOLOCATED_FEATURE, status_code=200)
         resp = app.get(endpoint, params={'lat':'45.1895752129513', 'lon': '5.72438938399621'})
         assert mocked_get.call_args[1]['params']['CQL_FILTER'] == 'DWITHIN(the_geom,Point(1914042.47393 4224665.19751),45,meters)'
         assert resp.json['lon'] == '5.72438933506'
         assert resp.json['lat'] == '45.1895752366'
         assert resp.json['address']['house_number'] == '2'
         assert resp.json['address']['road'] == 'place victor hugo'
         assert resp.json['address']['postcode'] == '38000'
         assert resp.json['address']['city'] == 'Grenoble'
         assert 'country' not in resp.json['address']
         resp = app.get(endpoint, params={'lat':'45.1895752129513', 'lon': '5.72438938399621', 'country': 'France'})
         assert resp.json['address']['country'] == 'France'
         connector.projection = 'EPSG:4326'
         connector.search_radius = 10
         connector.save()
         resp = app.get(endpoint, params={'lat':'45.183784', 'lon': '5.714885'})
         assert mocked_get.call_args[1]['params']['CQL_FILTER'] == 'DWITHIN(the_geom,Point(5.714885 45.183784),10,meters)'
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-opengis-add-reverse-geocoding-based-on-WFS-21558.patch