Merge branch 'master' into tidy_id_and_api_key

Author: Emlyn Price

CHANGELOG.md

@@ -5,7 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 + Remove deprecated `new_old` and `future_old` functions.
-+ Add `__str__` functions to `Timestep`, `Element`, `Day`, `Site`.
++ Add `__str__` functions to `Timestep`, `Element`, `Day`, `Site`
++ Add element to `Forecast` to track if forecast is daily or 3 hourly
 + Change `id` variable in `Forecast`, `Observation`, `Site` to `location_id`.
 + Change `id` variable in `Element` to `field_code`.
 

datapoint/Manager.py

@@ -304,7 +304,7 @@ def get_nearest_forecast_site(self, latitude,  longitude):
                     float(longitude),
                     float(latitude))
 
-            if ((distance == None) or (new_distance < distance)):
+            if ((distance is None) or (new_distance < distance)):
                 distance = new_distance
                 nearest = site
 
@@ -327,13 +327,13 @@ def get_forecast_for_site(self, site_id, frequency="daily"):
         """
         data = self.__call_api(site_id, {"res": frequency})
         params = data['SiteRep']['Wx']['Param']
-        forecast = Forecast()
+        forecast = Forecast(frequency=frequency)
 
         # If the 'Location' key is missing, there is no data for the site,
         # raise an error.
         if 'Location' not in data['SiteRep']['DV']:
             err_string = ('DataPoint has not returned any data for the'
-                          'requested site.' )
+                          'requested site.')
             raise APIException(err_string)
 
         # Check if the other keys we need are in the data returned from the
@@ -456,7 +456,6 @@ def get_forecast_for_site(self, site_id, frequency="daily"):
 
         return forecast
 
-
     def get_observation_sites(self):
         """
         This function returns a list of Site objects for which observations are available.
@@ -528,7 +527,7 @@ def get_observations_for_site(self, site_id, frequency='hourly'):
             Returns hourly observations for the previous 24 hours
             """
 
-            data = self.__call_api(site_id,{"res":frequency}, OBSERVATION_URL)
+            data = self.__call_api(site_id,{"res": frequency}, OBSERVATION_URL)
 
             params = data['SiteRep']['Wx']['Param']
             observation = Observation()

tests/unit/test_forecast.py

@@ -6,7 +6,7 @@
 class TestForecast(unittest.TestCase):
 
     def setUp(self):
-        self.forecast_3hrly = datapoint.Forecast.Forecast()
+        self.forecast_3hrly = datapoint.Forecast.Forecast(frequency='3hourly')
 
         test_day_0 = datapoint.Day.Day()
         test_day_0.date = datetime.datetime(2020, 3, 3, tzinfo=datetime.timezone.utc)
@@ -47,7 +47,7 @@ def setUp(self):
             ts.date = datetime.datetime(2020, 3, 4, 2*i, tzinfo=datetime.timezone.utc)
             test_day_1.timesteps.append(ts)
 
-        self.forecast_daily = datapoint.Forecast.Forecast()
+        self.forecast_daily = datapoint.Forecast.Forecast(frequency='daily')
 
         self.forecast_daily.days.append(test_day_0)
         self.forecast_daily.days.append(test_day_1)