0001-use-entrouvert.org-GIS-instead-of-openstreetmap.org-.patch
| tests/test_api.py | ||
|---|---|---|
| 2471 | 2471 |
resp = get_app(pub).get('/api/reverse-geocoding?lat=0&lon=0')
|
| 2472 | 2472 |
assert resp.content_type == 'application/json' |
| 2473 | 2473 |
assert resp.body == json.dumps({'address': 'xxx'})
|
| 2474 |
assert urlopen.call_args[0][0] == 'http://nominatim.openstreetmap.org/reverse?zoom=18&format=json&addressdetails=1&lat=0&lon=0&accept-language=en'
|
|
| 2474 |
assert urlopen.call_args[0][0] == 'https://nominatim.entrouvert.org/reverse?zoom=18&format=json&addressdetails=1&lat=0&lon=0&accept-language=en'
|
|
| 2475 | 2475 | |
| 2476 | 2476 |
pub.site_options.add_section('options')
|
| 2477 | 2477 |
pub.site_options.set('options', 'nominatim_reverse_zoom_level', '16')
|
| 2478 | 2478 |
pub.site_options.write(open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w')) |
| 2479 | 2479 |
resp = get_app(pub).get('/api/reverse-geocoding?lat=0&lon=0')
|
| 2480 |
assert urlopen.call_args[0][0] == 'http://nominatim.openstreetmap.org/reverse?zoom=16&format=json&addressdetails=1&lat=0&lon=0&accept-language=en'
|
|
| 2480 |
assert urlopen.call_args[0][0] == 'https://nominatim.entrouvert.org/reverse?zoom=16&format=json&addressdetails=1&lat=0&lon=0&accept-language=en'
|
|
| 2481 | 2481 | |
| 2482 | 2482 |
pub.site_options.set('options', 'nominatim_key', 'KEY')
|
| 2483 | 2483 |
pub.site_options.write(open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w')) |
| 2484 | 2484 |
resp = get_app(pub).get('/api/reverse-geocoding?lat=0&lon=0')
|
| 2485 |
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'
|
|
| 2485 |
assert urlopen.call_args[0][0] == 'https://nominatim.entrouvert.org/reverse?zoom=16&key=KEY&format=json&addressdetails=1&lat=0&lon=0&accept-language=en'
|
|
| 2486 | 2486 | |
| 2487 | 2487 |
pub.site_options.set('options', 'reverse_geocoding_service_url', 'http://reverse.example.net/?param=value')
|
| 2488 | 2488 |
pub.site_options.write(open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w')) |
| ... | ... | |
| 2558 | 2558 |
resp = get_app(pub).get('/api/geocoding?q=test')
|
| 2559 | 2559 |
assert resp.content_type == 'application/json' |
| 2560 | 2560 |
assert resp.body == json.dumps([{'lat': 0, 'lon': 0}])
|
| 2561 |
assert urlopen.call_args[0][0] == 'http://nominatim.openstreetmap.org/search?format=json&q=test&accept-language=en'
|
|
| 2561 |
assert urlopen.call_args[0][0] == 'https://nominatim.entrouvert.org/search?format=json&q=test&accept-language=en'
|
|
| 2562 | 2562 | |
| 2563 | 2563 |
pub.site_options.add_section('options')
|
| 2564 | 2564 |
pub.site_options.set('options', 'nominatim_key', 'KEY')
|
| 2565 | 2565 |
pub.site_options.write(open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w')) |
| 2566 | 2566 |
resp = get_app(pub).get('/api/geocoding?q=test')
|
| 2567 |
assert urlopen.call_args[0][0] == 'http://nominatim.openstreetmap.org/search?key=KEY&format=json&q=test&accept-language=en'
|
|
| 2567 |
assert urlopen.call_args[0][0] == 'https://nominatim.entrouvert.org/search?key=KEY&format=json&q=test&accept-language=en'
|
|
| 2568 | 2568 | |
| 2569 | 2569 |
pub.site_options.set('options', 'geocoding_service_url', 'http://reverse.example.net/?param=value')
|
| 2570 | 2570 |
pub.site_options.write(open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w')) |
| tests/test_backoffice_pages.py | ||
|---|---|---|
| 1092 | 1092 |
assert 'Plot on a Map' in resp.body |
| 1093 | 1093 |
resp = resp.click('Plot on a Map')
|
| 1094 | 1094 |
assert 'data-geojson-url' in resp.body |
| 1095 |
assert 'tile.openstreetmap.org/' in resp.body
|
|
| 1095 |
assert 'tiles.entrouvert.org/' in resp.body
|
|
| 1096 | 1096 | |
| 1097 | 1097 |
if not pub.site_options.has_section('options'):
|
| 1098 | 1098 |
pub.site_options.add_section('options')
|
| tests/test_workflows.py | ||
|---|---|---|
| 2564 | 2564 |
http_get_page.return_value = (None, 200, |
| 2565 | 2565 |
json.dumps([{'lat':'48.8337085','lon':'2.3233693'}]), None)
|
| 2566 | 2566 |
item.perform(formdata) |
| 2567 |
assert 'http://nominatim.openstreetmap.org/search' in http_get_page.call_args[0][0]
|
|
| 2567 |
assert 'https://nominatim.entrouvert.org/search' in http_get_page.call_args[0][0]
|
|
| 2568 | 2568 |
assert urllib2.quote('169 rue du chateau, paris') in http_get_page.call_args[0][0]
|
| 2569 | 2569 |
assert int(formdata.geolocations['base']['lat']) == 48 |
| 2570 | 2570 |
assert int(formdata.geolocations['base']['lon']) == 2 |
| ... | ... | |
| 2575 | 2575 |
http_get_page.return_value = (None, 200, |
| 2576 | 2576 |
json.dumps([{'lat':'48.8337085', 'lon':'2.3233693'}]), None)
|
| 2577 | 2577 |
item.perform(formdata) |
| 2578 |
assert 'http://nominatim.openstreetmap.org/search' in http_get_page.call_args[0][0]
|
|
| 2578 |
assert 'https://nominatim.entrouvert.org/search' in http_get_page.call_args[0][0]
|
|
| 2579 | 2579 |
assert urllib2.quote('169 rue du chateau, paris') in http_get_page.call_args[0][0]
|
| 2580 | 2580 |
assert 'key=KEY' in http_get_page.call_args[0][0] |
| 2581 | 2581 |
assert int(formdata.geolocations['base']['lat']) == 48 |
| wcs/qommon/publisher.py | ||
|---|---|---|
| 938 | 938 |
"<a href='https://openstreetmap.org'>OpenStreetMap</a> contributors, "\ |
| 939 | 939 |
"<a href='http://creativecommons.org/licenses/by-sa/2.0/'>CC-BY-SA</a>") |
| 940 | 940 |
attrs['data-tile-urltemplate'] = self.get_site_option('map-tile-urltemplate') or \
|
| 941 |
'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
|
|
| 941 |
'https://tiles.entrouvert.org/hdm/{z}/{x}/{y}.png'
|
|
| 942 | 942 |
return attrs |
| 943 | 943 | |
| 944 | 944 |
def get_reverse_geocoding_service_url(self): |
| 945 | 945 |
url = self.get_site_option('reverse_geocoding_service_url')
|
| 946 | 946 |
if url: |
| 947 | 947 |
return url |
| 948 |
url = self.get_site_option('nominatim_url') or 'http://nominatim.openstreetmap.org'
|
|
| 948 |
url = self.get_site_option('nominatim_url') or 'https://nominatim.entrouvert.org'
|
|
| 949 | 949 |
url += '/reverse' |
| 950 | 950 |
reverse_zoom_level = self.get_site_option('nominatim_reverse_zoom_level') or 18
|
| 951 | 951 |
url += '?zoom=%s' % reverse_zoom_level |
| ... | ... | |
| 958 | 958 |
url = self.get_site_option('geocoding_service_url')
|
| 959 | 959 |
if url: |
| 960 | 960 |
return url |
| 961 |
url = self.get_site_option('nominatim_url') or 'http://nominatim.openstreetmap.org'
|
|
| 961 |
url = self.get_site_option('nominatim_url') or 'https://nominatim.entrouvert.org'
|
|
| 962 | 962 |
url += '/search' |
| 963 | 963 |
key = self.get_site_option('nominatim_key')
|
| 964 | 964 |
if key: |
| 965 |
- |
|