aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2016-06-23 19:41:56 +0200
committerMattias Andrée <maandree@kth.se>2016-06-23 19:41:56 +0200
commit81fa2b997a7eed326803514f80702ab7b5f0b162 (patch)
tree4bf37437c83ffc7791383b0b48fa655d54fd9113
parentupdate dist (diff)
downloadsolar-python-81fa2b997a7eed326803514f80702ab7b5f0b162.tar.gz
solar-python-81fa2b997a7eed326803514f80702ab7b5f0b162.tar.bz2
solar-python-81fa2b997a7eed326803514f80702ab7b5f0b162.tar.xz
Fix definition of neutrical/astronomical twilight and add amateur astronomical twilight/dusk/dawn
Signed-off-by: Mattias Andrée <maandree@kth.se>
-rw-r--r--src/solar_python.py16
1 files 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`