Running code

meteoDaniel · Dec 16, 2018 · c265c7c · c265c7c
1 parent f53d022
commit c265c7c
Show file tree

Hide file tree

Showing 10 changed files with 271 additions and 307 deletions.
diff --git a/.idea/dictionaries/imac.xml b/.idea/dictionaries/imac.xml
diff --git a/.idea/insuranceDataProject.iml b/.idea/insuranceDataProject.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/example_Report_dirty.zip b/example_Report_dirty.zip
diff --git a/src/DataHandler/aemetDataBaseConfig.py b/src/DataHandler/aemetDataBaseConfig.py
@@ -1,9 +1,9 @@
 AEMET_BASE_URL = 'https://opendata.aemet.es/opendata/api/valores/climatologicos/diarios/datos/fechaini/'
-AEMET_MID_URL = '/?api_key='
+AEMET_MID_URL = '?api_key='
 AEMET_MID_URL_2 = '/fechafin/'
 AEMET_API_KEY = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJkLmxhc3NhaG5AbWV0ZW9jb250cm9sLmRlIiwianRpIjoiMjkzNWFkZ" \
                 "TQtNWEyZi00MDVmLTg1ZWUtMWFmOWRiMzliNzA3IiwiaXNzIjoiQUVNRVQiLCJpYXQiOjE1MTI1NDQ3NDcsInVz" \
                 "ZXJJZCI6IjI5MzVhZGU0LTVhMmYtNDA1Zi04NWVlLTFhZjlkYjM5YjcwNyIsInJvbGUiOiIifQ.UEl1igKehaT0" \
                 "-BXn9nY7CxQMJ9d2d4DbvYxFijX5Jho"
-AEMET_STORAGE = '/home/d.lassahn/Schreibtisch/Wetterberatung/insuranceDataProject/data/AEMET_DATA/'
+AEMET_STORAGE = '/Users/imac/Desktop/Wetterberatung/insuranceDataProject/data/AEMET_DATA/'
 AEMET_STATION_LIST = '/data/stations_list/stations_spain.json'
diff --git a/src/DataHandler/aemetDataHandler.py b/src/DataHandler/aemetDataHandler.py
@@ -39,8 +39,8 @@ def get_aemet_climate_data(start_date: datetime,
         else:
             url_request = AEMET_BASE_URL + month.strftime('%Y-%m-%dT00:00:00UTC') + \
                           AEMET_MID_URL_2 + (month+timedelta(days=32)).replace(
-                day=1).strftime('%Y-%m-%dT00:00:00UTC') + AEMET_MID_URL + \
-                          station_id_str + AEMET_API_KEY
+                day=1).strftime('%Y-%m-%dT00:00:00UTC') + station_id_str \
+                          + AEMET_MID_URL + AEMET_API_KEY
             loader(url_request, request_json)
             try:
                 answer = pd.read_json(request_json, typ='series')

diff --git a/src/DataHandler/dataServices.py b/src/DataHandler/dataServices.py
@@ -6,7 +6,7 @@
 import time
 
 def loader(url_request, output):
-    os.system('wget ' + url_request + ' -O ' + output)
+    os.system('wget --no-check-certificate ' + url_request + ' -O ' + output)
 
 
 

diff --git a/src/ToolBox/server_answer.json b/src/ToolBox/server_answer.json