From b589c3affa8f0155a5ba31115f1b5c0a899e2c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Deuchnord?= Date: Sun, 20 Feb 2022 10:35:26 +0100 Subject: [PATCH] refactor: clean the code --- kosmorrolib/ephemerides.py | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/kosmorrolib/ephemerides.py b/kosmorrolib/ephemerides.py index 5149136..0b51683 100644 --- a/kosmorrolib/ephemerides.py +++ b/kosmorrolib/ephemerides.py @@ -222,29 +222,21 @@ def get_ephemerides( try: for aster in ASTERS: - rise_times, arr = find_discrete(start_time, end_time, is_risen(aster)) - - culmination_time, _ = find_maxima( - start_time, - end_time, - f=get_angle(aster), - epsilon=1.0 / 3600 / 24, - num=12, - ) - - if len(culmination_time) == 1: - culmination_time = culmination_time[0] - else: - culmination_time = None + times, risen_info = find_discrete(start_time, end_time, is_risen(aster)) + culmination_time, _ = find_maxima(start_time, end_time, get_angle(aster)) rise_time, set_time = None, None + culmination_time = ( + culmination_time[0] if len(culmination_time) == 1 else None + ) + + if len(times) > 0: + rise_time = times[0] if risen_info[0] else None + set_time = times[0] if not risen_info[0] else None - if len(rise_times) == 2: - rise_time = rise_times[0 if arr[0] else 1] - set_time = rise_times[1 if not arr[1] else 0] - elif len(rise_times) == 1: - rise_time = rise_times[0] if arr[0] else None - set_time = rise_times[0] if not arr[0] else None + if len(times) == 2: + rise_time = times[0 if risen_info[0] else 1] + set_time = times[1 if not risen_info[1] else 0] # Convert the Time instances to Python datetime objects if rise_time is not None: