0002-okina-calculate-distance-for-each-stop-point-43137.patch

Thomas Noël, 25 mai 2020 23:52

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

Subject: [PATCH 2/2] okina: calculate distance for each stop point (#43137)

 passerelle/apps/okina/models.py | 18 +++++++++++++++---
 tests/test_okina.py             |  2 ++
 2 files changed, 17 insertions(+), 3 deletions(-)

     import json
     from pyproj import Geod
     from django.db import models
     from django.http import HttpResponse
     from django.utils.http import urlencode
-...
                     'mode': {'description': _('Search mode: CLOSE_SCHOLAR (default) = 3km, FAR_ALL = 15km')},
                 })
         def search(self, request, lat, lon, institution, address='', mode='CLOSE_SCHOLAR'):
             lat = float(lat.replace(',', '.'))
             lon = float(lon.replace(',', '.'))
             payload = {
                     'from-lat': lat.replace(',', '.'),
                     'from-long': lon.replace(',', '.'),
                     'from-lat': '%s' % lat,
                     'from-long': '%s' % lon,
                     'from-address': address,
                     'institution-id': institution,
                     'type': mode,
-...
             for stop in stops:
                 stop['id'] = '%s' % stop['id']
                 stop['text'] = stop['commercial_name']
                 stop['latlon'] = '%s;%s' % (stop.get('latitude') or '0.00', stop.get('longitude') or '0.00')
                 try:
                     slat = float(stop.get('latitude'))
                     slon = float(stop.get('longitude'))
                     geod = Geod(ellps='WGS84')
                     stop['distance'] = int(geod.inv(lon, lat, slon, slat)[2])
                 except (ValueError, TypeError):
                     slat = slon = 0.0
                     stop['distance'] = None
                 stop['latlon'] = '%s;%s' % (slat, slon)
             return {'data': stops}
         @endpoint(name='stop-areas',

             assert resp.json['data'][0]['id'] == '3312'
             assert resp.json['data'][0]['text'] == 'Le Grand Verger'
             assert resp.json['data'][0]['latlon'] == '46.8444186;1.708197'
             assert resp.json['data'][0]['distance'] == 1826
             # french decimals
             resp = app.get(endpoint + '?lat=46,8&lon=1,71&address=nowhere&mode=FAR_ALL&institution=280',
                            status=200)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0002-okina-calculate-distance-for-each-stop-point-43137.patch