equationoftime 4.1.2 → 4.1.4

data/lib/eot/time_displays.rb

@@ -0,0 +1,105 @@
+# class Eot file = time_displays.rb
+class Eot
+  # From displays.rb
+  # String formatter for + and - time
+  def show_minutes(min = 0.0)
+    min.nil? ? min = 0.0 : min
+    time = Time.utc(1, 1, 1, 0, 0, 0, 0.0)
+    time += (min.abs * 60.0)
+    sign = sign_min(min)
+    time.strftime("#{sign}%M:%S.%3N")
+  end
+
+  # From displays.rb
+  # String for time now
+  def show_now(now = now(Time.now.utc))
+    show_minutes(now)
+  end
+
+  # From displays.rb
+  # String formatter for fraction of Julian day number
+  def string_day_fraction_to_time(jpd_time = 0.0)
+    jpd_time.nil? ? jpd_time = 0.0 : jpd_time
+    fraction = jpd_time + 0.5 - Integer(jpd_time)
+    h = Integer(fraction * DAY_HOURS)
+    m = Integer((fraction - h / DAY_HOURS) * DAY_MINUTES)
+    s = Integer((fraction - h / 24.0 - m / DAY_MINUTES) * DAY_SECONDS)
+    format('%02d', h)   +
+    ':'              +
+    format('%02d', m) +
+    ':'              +
+    format('%02d', s)
+  end
+  alias_method :julian_period_day_fraction_to_time, :string_day_fraction_to_time
+
+  def sign_min(min)
+    if min < 0.0
+      sign = '-'
+    else
+      sign = '+'
+    end
+    sign
+  end
+
+  # From displays.rb
+  # Equation of time output for minutes and seconds
+  def string_eot
+    min_eot = time_eot
+    sign = sign_min(min_eot)
+    eot = min_eot.abs
+    minutes = Integer(eot)
+    seconds = (eot - minutes) * 60.0
+    decimal_seconds = (seconds - Integer(seconds)) * 100.0
+    min = format('%02d', minutes)
+    sec = format('%02d', seconds)
+    dec_sec = format('%01d', decimal_seconds)
+    sign << min << 'm, ' << sec << '.' << dec_sec << 's'
+  end
+  alias_method :display_equation_of_time, :string_eot
+
+  # From displays.rb
+  # String format conversion of jd to date
+  def string_jd_to_date(jd = DJ00)
+    jd = check_jd_zero(jd)
+    Date.jd(jd).to_s
+  end
+  alias_method :jd_to_date_string, :string_jd_to_date
+
+  def format_time(h, m, s, ds)
+    format('%02d', h)   +
+                 ':' +
+    format('%02d', m) +
+                 ':' +
+    format('%02d', s) +
+                 '.' +
+    format('%3.3d', ds)
+  end
+
+  def dt_parts(val)
+    h = val.hour
+    m  = val.min
+    s  = val.sec
+    is = Integer(s)
+    ds = Integer((s - is).round(3) * 1000.0)
+    [h, m, is, ds]
+  end
+
+  def float_parts(val)
+    hours = Integer(val % DAY_HOURS)
+    mins = 60.0 * (val % DAY_HOURS - hours)
+    imins = Integer(mins)
+    secs = 60.0 * (mins - imins)
+    isecs = Integer(secs)
+    ds    = Integer((secs - isecs).round(3) * 1000.0)
+    [hours, imins, isecs, ds]
+  end
+
+  # From displays.rb
+  # String formatter for h:m:s display
+  def string_time(dt = DT2000)
+    dt = check_t_zero(dt)
+    dt.class == DateTime ? ta = dt_parts(dt) : ta = float_parts(dt)
+    format_time(ta[0], ta[1], ta[2], ta[3])
+  end
+  alias_method :display_time_string, :string_time
+end

data/lib/eot/times.rb

@@ -1,121 +1,118 @@
-# times.rb
-
-class Eot    
-
-  # From times.rb:  
-  # Pass in an AJD number
-  # Returns a DateTime object
-  def ajd_to_datetime(ajd)
-    DateTime.jd(ajd + 0.5)
-  end
-
-  # From times.rb:  
-  # Uses @ajd attribute
-  # Returns EOT as an AJD Julian number
-  def eot_jd
-    time_eot() / DAY_MINUTES 
-  end
-
-  # From times.rb:  
-  # Uses @ajd and @longitude attributes
-  # Returns DateTime object of local noon or solar transit
-  def local_noon_dt()
-    ajd_to_datetime(@ajd - @longitude / 360.0 - eot_jd())
-  end
-  
-  # From times.rb:  
-  # Uses @ajd and @longitude attributes
-  # Returns DateTime object of local mean noon or solar transit
-  def mean_local_noon_dt()
-    ajd_to_datetime(@ajd - @longitude / 360.0)
-  end
-  
-  # From times.rb:  
-  # sets @ajd to DateTime.now
-  # Returns EOT (equation of time) now in decimal minutes form
-  def now()
-    @ajd = DateTime.now.to_time.utc.to_datetime.ajd
-    @ta = (@ajd - DJ00)/DJC
-    time_eot()
-  end
-
-  # From times.rb:  
-  # Uses @ajd attribute
-  # Returns a DateTime object of local sunrise
-  def sunrise_dt()                    
-    ajd_to_datetime(sunrise_jd())     
-  end
-
-  # From times.rb:   
-  # Uses @ajd attribute
-  # Returns Sunrise as a Julian Day Number
-  def sunrise_jd()    
-    local_noon_dt().ajd - ha_Sun() * R2D / 360.0
-  end 	
-
-  # From times.rb:  
-  # Uses @ajd attribute
-  # Returns a DateTime object of local sunset
-  def sunset_dt()                                                   
-    ajd_to_datetime(sunset_jd())      
-  end
-
-  # From times.rb:  
-  # Uses @ajd attribute
-  # Returns Sunset as a Julian Day Number
-  def sunset_jd()
-    local_noon_dt().ajd + ha_Sun() * R2D / 360.0 
-  end
-  
-  # From times.rb:  
-  # Uses @ajd attribute
-  # Returns Oblique component of EOT in decimal minutes time  
-  def time_delta_oblique()         
-    (tl_Sun() - ra_Sun()) * R2D * SM        
-  end
-
-  # From times.rb:  
-  # Uses @ajd attribute
-  # Returns Orbit component of EOT in decimal minutes time 
-  def time_delta_orbit()      
-    (@ma - ta_Sun()) * R2D * SM
-  end  
-  
-  # From times.rb:  
-  # Uses @ajd attribute
-  # Returns EOT as a float for decimal minutes time
-  def time_eot()
-    eot() * R2D * SM	  
-  end
-
-  # From times.rb:  
-  # All calculations with ( ta )  were based on this.
-  # Julian Century Time is a fractional century
-  # Julian Day Number DJ00 is subtracted from the JDN or AJDN and then divided
-  # by days in a Julian Century.
-  # Deprecated 
-  def time_julian_century()
-    t1 = ( @ajd - DJ00 ) / DJC
-    # t2 = t1 * t1
-    # t3 = t1 * t2
-    # t4 = t2 * t2
-    # t5 = t2 * t3
-    # t6 = t3 * t3
-    # t7 = t3 * t4
-    # t8 = t4 * t4
-    # t9 = t4 * t5
-    # t10 = t5 * t5
-#    @ta = [ t1, t2, t3, t4, t5, t6, t7, t8, t9, t10 ] 
-    @ta = t1     
-  end
-  alias_method :time_julian_centurey, :time_julian_century  
-      
-end
-
-if __FILE__ == $PROGRAM_NAME
-
-  spec = File.expand_path('../../../tests/minitest', __FILE__)
-  $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
-  require 'times_spec'
-
-end
+# class Eot file = times.rb
+class Eot
+  # From times.rb:
+  # Pass in an AJD number
+  # Returns a DateTime object
+  def ajd_to_datetime(ajd)
+    DateTime.jd(ajd + 0.5)
+  end
+
+  # From times.rb:
+  # Uses @ajd attribute
+  # Returns EOT as an AJD Julian number
+  def eot_jd
+    time_eot / DAY_MINUTES
+  end
+
+  # From times.rb:
+  # Uses @ajd and @longitude attributes
+  # Returns DateTime object of local noon or solar transit
+  def local_noon_dt
+    ajd_to_datetime(@ajd - @longitude / 360.0 - eot_jd)
+  end
+
+  # From times.rb:
+  # Uses @ajd and @longitude attributes
+  # Returns DateTime object of local mean noon or solar transit
+  def mean_local_noon_dt
+    ajd_to_datetime(@ajd - @longitude / 360.0)
+  end
+
+  # From times.rb:
+  # sets @ajd to DateTime.now
+  # Returns EOT (equation of time) now in decimal minutes form
+  def now
+    @ajd = DateTime.now.to_time.utc.to_datetime.ajd
+    @ta = (@ajd - DJ00) / DJC
+    time_eot
+  end
+
+  # From times.rb:
+  # Uses @ajd attribute
+  # Returns a DateTime object of local sunrise
+  def sunrise_dt
+    ajd_to_datetime(sunrise_jd)
+  end
+
+  # From times.rb:
+  # Uses @ajd attribute
+  # Returns Sunrise as a Julian Day Number
+  def sunrise_jd
+    local_noon_dt.ajd - ha_sun * R2D / 360.0
+  end
+
+  # From times.rb:
+  # Uses @ajd attribute
+  # Returns a DateTime object of local sunset
+  def sunset_dt
+    ajd_to_datetime(sunset_jd)
+  end
+
+  # From times.rb:
+  # Uses @ajd attribute
+  # Returns Sunset as a Julian Day Number
+  def sunset_jd
+    local_noon_dt.ajd + ha_sun * R2D / 360.0
+  end
+
+  # From times.rb:
+  # Uses @ajd attribute
+  # Returns Oblique component of EOT in decimal minutes time
+  def time_delta_oblique
+    (tl_sun - ra_sun) * R2D * SM
+  end
+
+  # From times.rb:
+  # Uses @ajd attribute
+  # Returns Orbit component of EOT in decimal minutes time
+  def time_delta_orbit
+    (@ma - ta_sun) * R2D * SM
+  end
+
+  # From times.rb:
+  # Uses @ajd attribute
+  # Returns EOT as a float for decimal minutes time
+  def time_eot
+    eot * R2D * SM
+  end
+
+  # From times.rb:
+  # All calculations with ( ta )  were based on this.
+  # Julian Century Time is a fractional century
+  # Julian Day Number DJ00 is subtracted from the JDN or AJDN and then divided
+  # by days in a Julian Century.
+  # Deprecated
+  def time_julian_century
+    t1 = (@ajd - DJ00) / DJC
+    # t2 = t1 * t1
+    # t3 = t1 * t2
+    # t4 = t2 * t2
+    # t5 = t2 * t3
+    # t6 = t3 * t3
+    # t7 = t3 * t4
+    # t8 = t4 * t4
+    # t9 = t4 * t5
+    # t10 = t5 * t5
+    # @ta = [ t1, t2, t3, t4, t5, t6, t7, t8, t9, t10 ]
+    @ta = t1
+  end
+  alias_method :time_julian_centurey, :time_julian_century
+end
+
+if __FILE__ == $PROGRAM_NAME
+
+  spec = File.expand_path('../../../tests/minitest', __FILE__)
+  $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
+  require 'times_spec'
+
+end

data/lib/eot/trigometric.rb

@@ -0,0 +1,51 @@
+# class Eot file = trigometric.rb
+class Eot
+  include Math
+  # From trigometric.rb:
+  # cosine apparent longitude
+  # could be useful when dividing
+  def cosine_al_sun
+    cos(al(@ma, @ta, Celes.faom03(@ta)))
+  end
+  alias_method :cosine_apparent_longitude, :cosine_al_sun
+  alias_method :cosalsun, :cosine_al_sun
+
+  # From trigometric.rb:
+  # cosine true longitude
+  # used in solar right ascension
+  def cosine_tl_sun
+    cos(tl(@ma, @ta))
+  end
+  alias_method :cosine_true_longitude, :cosine_tl_sun
+
+  # From trigometric.rb:
+  # cosine true obliquity
+  # used in solar right ascension and equation of equinox
+  def cosine_to_earth
+    cos(Celes.nut06a(@ajd, 0)[1] + Celes.obl06(@ajd, 0))
+  end
+  alias_method :cosine_true_obliquity, :cosine_to_earth
+
+  # From trigometric.rb:
+  # sine apparent longitude
+  # used in solar declination
+  def sine_al_sun
+    sin(al(@ma, @ta, Celes.faom03(@ta)))
+  end
+  alias_method :sine_apparent_longitude, :sine_al_sun
+
+  # From trigometric.rb:
+  # sine true longitude
+  # used in solar right ascension
+  def sine_tl_sun
+    sin(tl(@ma, @ta))
+  end
+  alias_method :sine_true_longitude, :sine_tl_sun
+
+  # From trigometric.rb:
+  # sine true obliquity angle of Earth
+  # used in solar declination
+  def sine_to_earth
+    sin(Celes.nut06a(@ajd, 0)[1] + Celes.obl06(@ajd, 0))
+  end
+end

data/lib/eot/utilities.rb

@@ -1,50 +1,49 @@
-# utilities.rb
-
-class Eot
-  # From utilities.rb:  
-  # A check for default J2000
-  # sets default when arg is nil
-  def check_jd_nil( jd = DJ00 )
-    jd.nil? ? jd = DJ00 : jd
-  end
-
-  # From utilities.rb:  
-  # A check for default J2000
-  # sets default when arg is zero
-  def check_jd_zero( jd = DJ00 )
-    jd == 0 ? jd = DJ00 : jd = check_jd_nil( jd )
-  end
-
-  # From utilities.rb:  
-  # A check for default DT2000
-  # sets default when arg is nil
-  def check_t_nil( dt = DT2000 )
-    dt.nil? ? dt = DT2000 : dt
-  end
-
-  # From utilities.rb:  
-  # A check for default DT2000
-  # sets default when arg is zero
-  def check_t_zero( dt = DT2000 )
-    dt == 0 ? dt = DT2000 : dt = check_t_nil( dt )
-  end
-
-  # From utilities.rb:  
-  # Keeps large angles in range of 360.0
-  # aliased by truncate
-  def mod_360( x = 0.0 )
-    x.nil? ? x = 0.0 : x
-    360.0 * ( x / 360.0 - Integer( x / 360.0 ) )
-  end
-  alias_method :truncate, :mod_360
-
-end
-
-if __FILE__ == $PROGRAM_NAME
-
-  spec = File.expand_path('../../../tests/minitest', __FILE__)
-  $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
-  require 'utilities_spec'
-  require 'aliased_utilities_spec'
-
-end
+# utilities.rb
+# class Eot
+class Eot
+  # From utilities.rb:
+  # A check for default J2000
+  # sets default when arg is nil
+  def check_jd_nil(jd = DJ00)
+    jd.nil? ? DJ00 : jd
+  end
+
+  # From utilities.rb:
+  # A check for default J2000
+  # sets default when arg is zero
+  def check_jd_zero(jd = DJ00)
+    jd == 0 ? DJ00 : check_jd_nil(jd)
+  end
+
+  # From utilities.rb:
+  # A check for default DT2000
+  # sets default when arg is nil
+  def check_t_nil(dt = DT2000)
+    dt.nil? ? DT2000 : dt
+  end
+
+  # From utilities.rb:
+  # A check for default DT2000
+  # sets default when arg is zero
+  def check_t_zero(dt = DT2000)
+    dt == 0 ? DT2000 : check_t_nil(dt)
+  end
+
+  # From utilities.rb:
+  # Keeps large angles in range of 360.0
+  # aliased by truncate
+  def mod_360(x = 0.0)
+    x.nil? ? x = 0.0 : x
+    360.0 * (x / 360.0 - Integer(x / 360.0))
+  end
+  alias_method :truncate, :mod_360
+end
+
+if __FILE__ == $PROGRAM_NAME
+
+  spec = File.expand_path('../../../tests/minitest', __FILE__)
+  $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
+  require 'utilities_spec'
+  require 'aliased_utilities_spec'
+
+end

data/lib/eot/version.rb

@@ -1,3 +1,4 @@
+# class Eot file = version.rb
 class Eot
-  VERSION = "4.1.2"
-end
+  VERSION = '4.1.4'
+end

data/lib/eot.rb

@@ -1,13 +1,19 @@
 # eot.rb
-
-
+# require 'multi_xml'
+require 'addressable/uri'
+require 'rest-client'
+require 'json'
+require 'celes'
+require 'date'
 require 'eot/version'
 require 'eot/eot'
 require 'eot/constants'
 require 'eot/init'
 require 'eot/utilities'
 require 'eot/angles'
+require 'eot/deltas'
+require 'eot/trigometric'
 require 'eot/times'
-require 'eot/displays'
-require 'eot/nutation'
-require 'eot/geo_lat_lng_smt'
+require 'eot/angle_displays'
+require 'eot/time_displays'
+require 'eot/geo_lat_lng_smt'