From 6ad0d9147c06146d40fca059e9fe737650174add Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 22 Oct 2020 18:17:08 +0200
Subject: [PATCH] TMSS-244: added method convenience urls for todays sun
rise/set at the corep
---
SAS/TMSS/src/tmss/tmssapp/views.py | 10 +++++++---
SAS/TMSS/src/tmss/urls.py | 1 +
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/SAS/TMSS/src/tmss/tmssapp/views.py b/SAS/TMSS/src/tmss/tmssapp/views.py
index b39ff314b0d..e7cf25eff62 100644
--- a/SAS/TMSS/src/tmss/tmssapp/views.py
+++ b/SAS/TMSS/src/tmss/tmssapp/views.py
@@ -112,11 +112,15 @@ def lst(request):
# todo: do we want to return a dict, so users can make sure their parameters were parsed correctly instead?
return HttpResponse(str(lst_lon), content_type='text/plain')
-def get_sun_rise_and_set_at_lofar_center(request, timestamp:str=None):
+def get_todays_sun_rise_and_set_at_lofar_center(request) -> JsonResponse:
+ return get_sun_rise_and_set_at_lofar_center(request, datetime.utcnow())
+
+def get_sun_rise_and_set_at_lofar_center(request, timestamp:None) -> JsonResponse:
if timestamp is None:
timestamp = datetime.utcnow()
- else:
- timestamp = dateutil.parser.parse(timestamp) # isot to datetime
+
+ if isinstance(timestamp, str):
+ timestamp = dateutil.parser.parse(timestamp)
sun_rise, sun_set = sun_rise_and_set_at_lofar_center(timestamp)
return JsonResponse({'sun_rise': formatDatetime(sun_rise),
diff --git a/SAS/TMSS/src/tmss/urls.py b/SAS/TMSS/src/tmss/urls.py
index adc65cfd501..beed359a895 100644
--- a/SAS/TMSS/src/tmss/urls.py
+++ b/SAS/TMSS/src/tmss/urls.py
@@ -67,6 +67,7 @@ urlpatterns = [
path('station_groups/<str:template_name>/<str:template_version>/<str:station_group>', views.get_stations_in_group, name='get_stations_in_group'), #TODO: how to make trailing slash optional?
path('station_groups/<str:template_name>/<str:template_version>/<str:station_group>/', views.get_stations_in_group, name='get_stations_in_group'),
path('sun_rise_and_set/<str:timestamp>', views.get_sun_rise_and_set_at_lofar_center, name='get_sun_rise_and_set_at_lofar_center'),
+ path('todays_sun_rise_and_set', views.get_todays_sun_rise_and_set_at_lofar_center, name='get_todays_sun_rise_and_set_at_lofar_center'),
path(r'util/utc', views.utc, name="system-utc"),
path(r'util/lst', views.lst, name="conversion-lst"),
path('__debug__/', include(debug_toolbar.urls)),
--
GitLab