Skip to content

Commit 30dade8

Browse files
committed
give Forecast json data not response
1 parent 6129ca2 commit 30dade8

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

datahub/Forecast.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@
22
from datetime import datetime, timedelta
33

44
class Forecast():
5-
def __init__(self, frequency=None, response=None):
5+
def __init__(self, frequency=None, data=None):
66
if frequency is None:
77
raise Exception("No frequency provided")
8-
if response is None:
9-
raise Exception("No response provided")
8+
if data is None:
9+
raise Exception("No data provided")
1010
self.frequency = frequency
11-
if response.status_code != 200:
12-
raise Exception("Response not OK")
1311

14-
self.response = response.json()
12+
self.data = data
1513

1614
#Format incoming response
1715
self.days = []
1816
if frequency == "daily":
1917
#Format for daily frequency
20-
for day in self.response['features'][0]['properties']['timeSeries']:
18+
for day in self.data['features'][0]['properties']['timeSeries']:
2119
self.days.append({
2220
"time": day['time'],
2321
"daySignificantWeather": weather_codes[day['daySignificantWeatherCode']],
@@ -67,7 +65,7 @@ def __init__(self, frequency=None, response=None):
6765
})
6866
else:
6967
#Split hourly and three hourly time series into days
70-
time_series = self.response['features'][0]['properties']['timeSeries']
68+
time_series = self.data['features'][0]['properties']['timeSeries']
7169
self.days = split_days(time_series)
7270

7371
#Convert mslp to hPa

datahub/Manager.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,7 @@ def get_forecast(self, latitude=None, longitude=None, frequency="daily"):
2323

2424
url = self.base_url.format(frequency, latitude, longitude)
2525
response = requests.get(url, headers=self.headers)
26-
return Forecast(frequency=frequency, response=response)
26+
if response.status_code != 200:
27+
raise Exception("Response not OK")
28+
data = response.json()
29+
return Forecast(frequency=frequency, data=data)

0 commit comments

Comments
 (0)