From c4ae6ef9b41e170fffd1cc4961713301461cb6ce Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 20 Aug 2021 09:17:00 +0200 Subject: [PATCH] all tests corrected and adjusted --- cara/apps/calculator/model_generator.py | 3 ++- cara/data.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py index 492d7018..013756a6 100644 --- a/cara/apps/calculator/model_generator.py +++ b/cara/apps/calculator/model_generator.py @@ -270,7 +270,8 @@ class FormData: # set location self.weather_station_location = data.location_to_weather_stn(self.location_coordinates)[1] - data.local_temperatures = data.location_celcius_per_hour(self.location_coordinates) + data.local_tempatures = data.location_celcius_per_hour(self.location_coordinates) + print(data.local_tempatures) inside_temp = models.PiecewiseConstant((0, 24), (293,)) outside_temp = data.Temperatures[str(month)] diff --git a/cara/data.py b/cara/data.py index fc00adfc..d13a8884 100644 --- a/cara/data.py +++ b/cara/data.py @@ -5,7 +5,7 @@ import urllib.request from pathlib import Path from scipy.spatial import cKDTree import os - +import typing weather_debug = False @@ -45,7 +45,7 @@ def location_to_weather_stn(location_loc): return (station_array[ii[0]][0], station_array[ii[0]][1], station_array[ii[0]][2], station_array[ii[0]][3]) -def location_celcius_per_hour(location: object) -> object: +def location_celcius_per_hour(location: object) -> typing.Dict[str, typing.List[float]]: # expects a tuple (lat, long) # returns a json format set of weather data w_station = location_to_weather_stn(location)