From 81fa2b997a7eed326803514f80702ab7b5f0b162 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 23 Jun 2016 19:41:56 +0200 Subject: Fix definition of neutrical/astronomical twilight and add amateur astronomical twilight/dusk/dawn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/solar_python.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/solar_python.py b/src/solar_python.py index e316c96..ed60e87 100644 --- a/src/solar_python.py +++ b/src/solar_python.py @@ -40,6 +40,12 @@ SOLAR_ELEVATION_NAUTICAL_DUSK_DAWN = -12.0 nautical dawn, measured in degrees ''' +SOLAR_ELEVATION_AMATEUR_ASTRONOMICAL_DUSK_DAWN = -15.0 +''' +:float The Sun's elevation at amateur astronomical dusk + and amateur astronomical dawn, measured in degrees +''' + SOLAR_ELEVATION_ASTRONOMICAL_DUSK_DAWN = -18.0 ''' :float The Sun's elevation at astronomical dusk @@ -58,18 +64,24 @@ SOLAR_ELEVATION_RANGE_CIVIL_TWILIGHT = (-6.0, 0.0) during civil twilight, measured in degrees ''' -SOLAR_ELEVATION_RANGE_NAUTICAL_TWILIGHT = (-12.0, -6.0) +SOLAR_ELEVATION_RANGE_NAUTICAL_TWILIGHT = (-12.0, 0.0) ''' :(float, float) The Sun's lowest and highest elevation during nautical twilight, measured in degrees ''' -SOLAR_ELEVATION_RANGE_ASTRONOMICAL_TWILIGHT = (-18.0, -12.0) +SOLAR_ELEVATION_RANGE_ASTRONOMICAL_TWILIGHT = (-18.0, 0.0) ''' :(float, float) The Sun's lowest and highest elevation during astronomical twilight, measured in degrees ''' +SOLAR_ELEVATION_RANGE_AMATEUR_ASTRONOMICAL_TWILIGHT = (-18.0, -15.0) +''' +:(float, float) The Sun's lowest and highest elevation during + amateur astronomical twilight, measured in degrees +''' + # The following functions are used to calculate the result for `sun` -- cgit v1.2.3-70-g09d2