From d7e44f80a64234e6ef6880e34253574e84f90cf4 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 26 Oct 2022 15:39:27 +0200
Subject: [PATCH] fix: Handling missing params
---
app/app.py | 3 ++-
app/weatherdata_utils.py | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/app.py b/app/app.py
index 0195abb..5363219 100644
--- a/app/app.py
+++ b/app/app.py
@@ -36,7 +36,8 @@ def get_weather_data():
# Period first
weather_data = filter_period(weather_data,time_start,time_end)
# Parameters next
- weather_data = filter_params(weather_data, parameters)
+ if parameters is not None:
+ weather_data = filter_params(weather_data, parameters)
# Aggregation?
return weather_data.as_dict()
diff --git a/app/weatherdata_utils.py b/app/weatherdata_utils.py
index f438fb0..8ed9445 100644
--- a/app/weatherdata_utils.py
+++ b/app/weatherdata_utils.py
@@ -21,7 +21,10 @@ def filter_params(weather_data, params):
#print(params)
include_columns_indexes = []
for param in params:
- include_columns_indexes.append(weather_data.weatherParameters.index(param))
+ try:
+ include_columns_indexes.append(weather_data.weatherParameters.index(param))
+ except ValueError:
+ pass
for lwd in weather_data.locationWeatherData:
# Transpose the matrix
# Referring to this: https://stackoverflow.com/questions/8421337/rotating-a-two-dimensional-array-in-python
--
GitLab