0001-use-entrouvert.org-GIS-of-openstreetmap.org-13241.patch

Thomas Noël, 19 février 2019 16:05

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

Subject: [PATCH] use entrouvert.org GIS of openstreetmap.org (#13241)

 tests/test_api.py              | 6 +++---
 tests/test_backoffice_pages.py | 2 +-
 tests/test_workflows.py        | 4 ++--
 wcs/qommon/publisher.py        | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

             resp = get_app(pub).get('/api/reverse-geocoding?lat=0&lon=0')
             assert resp.content_type == 'application/json'
             assert resp.body == json.dumps({'address': 'xxx'})
             assert urlopen.call_args[0][0] == 'http://nominatim.openstreetmap.org/reverse?zoom=18&format=json&addressdetails=1&lat=0&lon=0&accept-language=en'
             assert urlopen.call_args[0][0] == 'http://nominatim.entrouvert.org/reverse?zoom=18&format=json&addressdetails=1&lat=0&lon=0&accept-language=en'
             pub.site_options.add_section('options')
             pub.site_options.set('options', 'nominatim_reverse_zoom_level', '16')
             pub.site_options.write(open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w'))
             resp = get_app(pub).get('/api/reverse-geocoding?lat=0&lon=0')
             assert urlopen.call_args[0][0] == 'http://nominatim.openstreetmap.org/reverse?zoom=16&format=json&addressdetails=1&lat=0&lon=0&accept-language=en'
             assert urlopen.call_args[0][0] == 'http://nominatim.entrouvert.org/reverse?zoom=16&format=json&addressdetails=1&lat=0&lon=0&accept-language=en'
             pub.site_options.set('options', 'nominatim_key', 'KEY')
             pub.site_options.write(open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w'))
             resp = get_app(pub).get('/api/reverse-geocoding?lat=0&lon=0')
             assert urlopen.call_args[0][0] == 'http://nominatim.openstreetmap.org/reverse?zoom=16&key=KEY&format=json&addressdetails=1&lat=0&lon=0&accept-language=en'
             assert urlopen.call_args[0][0] == 'http://nominatim.entrouvert.org/reverse?zoom=16&key=KEY&format=json&addressdetails=1&lat=0&lon=0&accept-language=en'
             pub.site_options.set('options', 'reverse_geocoding_service_url', 'http://reverse.example.net/?param=value')
             pub.site_options.write(open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w'))

         assert 'Plot on a Map' in resp.body
         resp = resp.click('Plot on a Map')
         assert 'data-geojson-url' in resp.body
         assert 'tile.openstreetmap.org/' in resp.body
         assert 'tiles.entrouvert.org/' in resp.body
         if not pub.site_options.has_section('options'):
             pub.site_options.add_section('options')

             http_get_page.return_value = (None, 200,
                     json.dumps([{'lat':'48.8337085','lon':'2.3233693'}]), None)
             item.perform(formdata)
             assert 'http://nominatim.openstreetmap.org/search' in http_get_page.call_args[0][0]
             assert 'http://nominatim.entrouvert.org/search' in http_get_page.call_args[0][0]
             assert urllib2.quote('169 rue du chateau, paris') in http_get_page.call_args[0][0]
             assert int(formdata.geolocations['base']['lat']) == 48
             assert int(formdata.geolocations['base']['lon']) == 2
-...
             http_get_page.return_value = (None, 200,
                     json.dumps([{'lat':'48.8337085', 'lon':'2.3233693'}]), None)
             item.perform(formdata)
             assert 'http://nominatim.openstreetmap.org/search' in http_get_page.call_args[0][0]
             assert 'http://nominatim.entrouvert.org/search' in http_get_page.call_args[0][0]
             assert urllib2.quote('169 rue du chateau, paris') in http_get_page.call_args[0][0]
             assert 'key=KEY' in http_get_page.call_args[0][0]
             assert int(formdata.geolocations['base']['lat']) == 48

                       "<a href='https://openstreetmap.org'>OpenStreetMap</a> contributors, "\
                       "<a href='http://creativecommons.org/licenses/by-sa/2.0/'>CC-BY-SA</a>")
             attrs['data-tile-urltemplate'] = self.get_site_option('map-tile-urltemplate') or \
                     'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
                     'https://tiles.entrouvert.org/hdm/{z}/{x}/{y}.png'
             return attrs
         def get_reverse_geocoding_service_url(self):
             url = self.get_site_option('reverse_geocoding_service_url')
             if url:
                 return url
             url = self.get_site_option('nominatim_url') or 'http://nominatim.openstreetmap.org'
             url = self.get_site_option('nominatim_url') or 'http://nominatim.entrouvert.org'
             url += '/reverse'
             reverse_zoom_level = self.get_site_option('nominatim_reverse_zoom_level') or 18
             url += '?zoom=%s' % reverse_zoom_level
-...
             url = self.get_site_option('geocoding_service_url')
             if url:
                 return url
             url = self.get_site_option('nominatim_url') or 'http://nominatim.openstreetmap.org'
             url = self.get_site_option('nominatim_url') or 'http://nominatim.entrouvert.org'
             url += '/search'
             key = self.get_site_option('nominatim_key')
             if key:
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-use-entrouvert.org-GIS-of-openstreetmap.org-13241.patch