Skip to content
Snippets Groups Projects
Verified Commit a7b23024 authored by Owen Graham's avatar Owen Graham
Browse files

Factor out `get_link()` from plot functions

parent 44d0d0b4
No related branches found
No related tags found
No related merge requests found
......@@ -93,8 +93,7 @@ def plot_boxplot():
return row[field]
for year in years:
json_link = get_link(name, year) + '.jsonld'
data = read_data(name, year, json_link)
data = read_data(name, year)
selected_data = data[:, field]
plot_data.append(selected_data)
......@@ -125,9 +124,8 @@ def plot():
name = get_query('name')
year = get_query('year', to=year_type)
field = get_query('field', to=field_type)
json_link = get_link(name, year) + '.jsonld'
units = field_units[field]
data = read_data(name, year, json_link)
data = read_data(name, year)
fig, axes = plt.subplots()
fig.set_figheight(6)
fig.set_figwidth(12)
......@@ -163,8 +161,7 @@ def plot_overlay():
return [row for row in rows if (row[0].month, row[0].day) != (2, 29)]
for dset in datasets:
dset.json_link = get_link(dset.name, dset.year) + '.jsonld'
raw_data = read_data(dset.name, dset.year, dset.json_link)
raw_data = read_data(dset.name, dset.year)
dset.data = np.array(ignore_feb_29(raw_data))
fig, axes = plt.subplots()
......@@ -266,8 +263,8 @@ def get_record_link():
return get_link(name, year)
def get_resources(json_link):
doc = jsonld.flatten(json_link)
def get_resources(link):
doc = jsonld.flatten(link + '.jsonld')
for i in doc:
types = i.get('@type', [])
if DISTRIBUTION not in types:
......@@ -284,9 +281,9 @@ def get_resources(json_link):
yield url
def read_data(name, year, json_link):
def read_data(name, year):
daily_data = []
resource_list = get_resources(json_link)
resource_list = get_resources(get_link(name, year))
for url in resource_list:
data = urlopen(url)
if name == 'South Pole Station':
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment