Commit 11a177fb authored by Niklas Selke's avatar Niklas Selke
Browse files

major road: switched to our own instance; set default year to 2000;...

major road: switched to our own instance; set default year to 2000; htap_regions_tier1: added provenance information
parent 99594c91
Pipeline #98828 passed with stages
in 50 seconds
......@@ -165,7 +165,7 @@ DEFAULT_HIGHWAY_TYPES = 'motorway,trunk,primary,secondary,tertiary'
# only for debugging
DEFAULT_LAT = 48.869359 # home sweet home
DEFAULT_LON = 9.348595
DEFAULT_YEAR = 2012
DEFAULT_YEAR = 2000
DEFAULT_RELATIVE = False
DEFAULT_DESCRIPTION = False
DEFAULT_COUNTRY = 'DE'
......
......@@ -35,6 +35,10 @@ class AggSerializer(BaseSerializer):
('coordinates', [None, obj['lat']]),
])),
('properties', properties),
('provenance', 'The \'tier1\' region defined in the task force on hemispheric'
' transport of air pollution (TFHTAP) coordinated model studies'
' according to figure 4 of'
' https://publications.jrc.ec.europa.eu/repository/bitstream/JRC102552/lbna28255enn.pdf'),
])
return response
......@@ -14,7 +14,7 @@ import numpy as np
from geo_location_services.settings import DEBUG, DATA_DIR, USE_LOCAL_OVERPASS_DATA, DEFAULT_HIGHWAY_TYPES, MAX_ALLOWED_RADIUS
from utils.extraction_tools import build_radius_list
OVERPASS_URL = 'https://overpass-api.de/api/'
OVERPASS_URL = 'https://zam10222.zam.kfa-juelich.de/overpass/'
# definition of highway types for Overpass queries. See https://wiki.openstreetmap.org/wiki/Key:highway
HIGHWAY_TYPES = ['motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'unclassified',
......@@ -89,7 +89,7 @@ class OverpassRoadAPI():
url = OVERPASS_URL + qstring
if DEBUG:
print("### Overpass query url = ", url)
response = requests.get(url)
response = requests.get(url, verify=False)
# add response to cache
OverpassCache().set(response, lat, lon, radius, highway_types)
return response
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment