equationoftime 4.1.1 → 4.1.2

data/ext/{ceot/eot.c → eot/ceot.c}

@@ -1,4 +1,4 @@
-#include "eot.h"
+#include "ceot.h"
 
 
 double mlSun(double t)

data/ext/{ceot/ceot.c → eot/eot.c}

@@ -1,5 +1,5 @@
 #include "ruby.h"
-#include "eot.h"
+#include "ceot.h"
 
 #ifndef DBL2NUM
 # define DBL2NUM(dbl) rb_float_new(dbl)
@@ -39,7 +39,7 @@ VALUE func_cosZ(VALUE klass, VALUE vz) {
 
 VALUE cEot;
 void
-Init_ceot(void) {
+Init_eot(void) {
 
   VALUE cEot = rb_define_class("Eot", rb_cObject);
   id_status = rb_intern("@status");

data/ext/{ceot → eot}/extconf.rb

@@ -1,5 +1,5 @@
 require "mkmf"
 #create_makefile('ceot')
-extension_name = 'ceot'
+extension_name = 'eot/eot'
 dir_config(extension_name)
 create_makefile(extension_name)

data/lib/eot.rb

@@ -1,7 +1,8 @@
 # eot.rb
 
-require 'ceot'
+
 require 'eot/version'
+require 'eot/eot'
 require 'eot/constants'
 require 'eot/init'
 require 'eot/utilities'

data/lib/eot/angles.rb

@@ -4,7 +4,7 @@ require 'celes'
 
 class Eot
   include Math
-  # From angles.rb:<br> 
+  # From angles.rb:    
   # Apparent solar longitude = true longitude - aberation   
   def al_Sun()    
     #Celes.anp(tl_Sun() - 0.00569 * D2R - 0.00478 * D2R * sin(omega()))
@@ -13,7 +13,7 @@ class Eot
   alias_method  :apparent_longitude, :al_Sun 
   alias_method  :alsun, :al_Sun
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # delta epsilon
   # component of equation of equinox 
   def angle_delta_epsilon()    
@@ -21,7 +21,7 @@ class Eot
   end
    alias_method  :delta_epsilon, :angle_delta_epsilon
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # one time component to total equation of time
   def angle_delta_oblique()           
     al(@ma, @ta, Celes.faom03(@ta)) - ra_Sun()        
@@ -29,7 +29,7 @@ class Eot
   alias_method :delta_t_ecliptic, :angle_delta_oblique
   alias_method :delta_oblique, :angle_delta_oblique
   
-  # From angles.rb:<br> 
+  # From angles.rb:    
   # one time component to total equation of time
   def angle_delta_orbit()           
     @ma - Celes.anp(@ma + eqc( @ma, @ta )) 
@@ -38,14 +38,14 @@ class Eot
   alias_method :delta_orbit, :angle_delta_orbit
   
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # component of equation of equinox
   def angle_delta_psi()   
     Celes.nut06a(@ajd, 0)[ 0 ]
   end
   alias_method :delta_psi, :angle_delta_psi
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # total equation of time  
   def angle_equation_of_time()    
     #~ @ma = ma_Sun()    
@@ -53,7 +53,7 @@ class Eot
   end
   alias_method :eot, :angle_equation_of_time 
 
-  # From angles.rb:<br>
+  # From angles.rb:   
   # equation of centre
   # added to mean anomaly to get true anomaly. 
   def center()      
@@ -75,7 +75,7 @@ class Eot
   end
   alias_method :equation_of_center, :center
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # cosine apparent longitude
   # could be useful when dividing 
   def cosine_al_Sun()    
@@ -84,7 +84,7 @@ class Eot
   alias_method :cosine_apparent_longitude, :cosine_al_Sun
   alias_method :cosalsun, :cosine_al_Sun
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # cosine true longitude
   # used in solar right ascension  
   def cosine_tl_Sun()    
@@ -92,7 +92,7 @@ class Eot
   end
   alias_method :cosine_true_longitude, :cosine_tl_Sun
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # cosine true obliquity
   # used in solar right ascension and equation of equinox 
   def cosine_to_Earth()    
@@ -100,7 +100,7 @@ class Eot
   end
   alias_method :cosine_true_obliquity, :cosine_to_Earth
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # solar declination
   def dec_Sun()   
     asin( sin(Celes.nut06a(@ajd, 0)[ 1 ] + Celes.obl06(@ajd, 0)) * 
@@ -109,7 +109,7 @@ class Eot
   alias_method :declination, :dec_Sun
   
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # eccentricity of elliptical Earth orbit around Sun
   # Horners' calculation method  
   def eccentricity_Earth()
@@ -118,7 +118,7 @@ class Eot
   end
   alias_method :eccentricity_earth_orbit, :eccentricity_Earth
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # equation of equinox
   # used for true longitude of Aries 
   # Depricated by Celes.gst06a()  
@@ -127,7 +127,7 @@ class Eot
   end
   
 
-  # From angles.rb:<br>
+  # From angles.rb:   
   # angle geometric mean longitude
   # needed to get true longitude for low accuracy.  
   def gml_Sun()    
@@ -138,7 +138,7 @@ class Eot
   end
   alias_method :geometric_mean_longitude, :gml_Sun
 
-  # From angles.rb:<br>
+  # From angles.rb:   
   # horizon angle for provided geo coordinates
   # used for angles from transit to horizons  
   def ha_Sun()
@@ -151,7 +151,7 @@ class Eot
   end
   alias_method :horizon_angle, :ha_Sun  
  
-  # From angles.rb:<br>
+  # From angles.rb:   
   # angle of Suns' mean anomaly
   # calculated in nutation.rb via celes function
   # sets ta attribute for the rest the methods needing it.
@@ -164,7 +164,7 @@ class Eot
   end
   alias_method :mean_anomaly, :ma_Sun
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # Mean equinox point where right ascension is measured from as zero hours.
   # # see http://www.iausofa.org/publications/aas04.pdf 
   def ml_Aries()   
@@ -188,7 +188,7 @@ class Eot
   end
   alias_method :mean_longitude_aries, :ml_Aries
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # mean obliquity of Earth  
   def mo_Earth()     
 #    [ -0.0000000434, -0.000000576,  0.00200340, 
@@ -198,7 +198,7 @@ class Eot
   alias_method :mean_obliquity_of_ecliptic, :mo_Earth
   alias_method :mean_obliquity, :mo_Earth
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # omega is a component of nutation and used 
   # in apparent longitude 
   # omega is the longitude of the mean ascending node of the lunar orbit 
@@ -208,7 +208,7 @@ class Eot
     Celes.faom03(@ta)      
   end
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # solar right ascension
   def ra_Sun()    
     y0 = sin( al(@ma, @ta, Celes.faom03(@ta)) ) * cos( Celes.nut06a(@ajd, 0)[ 1 ] + 
@@ -217,7 +217,7 @@ class Eot
   end
   alias_method :right_ascension, :ra_Sun
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # sine apparent longitude
   # used in solar declination  
   def sine_al_Sun()
@@ -225,7 +225,7 @@ class Eot
   end
   alias_method :sine_apparent_longitude, :sine_al_Sun
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # sine true longitude
   # used in solar right ascension 
   def sine_tl_Sun()    
@@ -233,14 +233,14 @@ class Eot
   end
   alias_method :sine_true_longitude, :sine_tl_Sun
   
-# From angles.rb:<br>
+# From angles.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
 
-  # From angles.rb:<br>
+  # From angles.rb:   
   # angle true anomaly
   # used in equation of time  
   def ta_Sun()     
@@ -248,7 +248,7 @@ class Eot
   end
   alias_method :true_anomaly, :ta_Sun 
 
-  # From angles.rb:<br>
+  # From angles.rb:   
   # true longitude of equinox 'first point of aries'
   # considers nutation 
   def tl_Aries()     
@@ -259,7 +259,7 @@ class Eot
   end
   alias_method :true_longitude_aries, :tl_Aries  
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # angle of true longitude sun
   # used in equation of time 
   def tl_Sun()   
@@ -270,7 +270,7 @@ class Eot
   alias_method :ecliptic_longitude, :tl_Sun
   alias_method :lambda, :tl_Sun
   
-  # From angles.rb:<br>
+  # From angles.rb:   
   # true obliquity considers nutation  
   def to_Earth()   
     Celes.nut06a(@ajd, 0)[ 1 ] + Celes.obl06(@ajd, 0)     
@@ -283,7 +283,7 @@ end
 
 if __FILE__ == $PROGRAM_NAME
 
-  spec = File.expand_path('../../../tests/minitest', __FILE__)
+  spec = File.expand_path('../../../test/', __FILE__)
   $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
   require 'angles_spec'
   require 'aliased_angles_spec'

data/lib/eot/constants.rb

@@ -158,6 +158,8 @@ end
 
 if __FILE__ == $PROGRAM_NAME
 
+  gem 'minitest'
+  require 'minitest/autorun'
   spec = File.expand_path('../../../tests/minitest', __FILE__)
   $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
   require 'constants_spec'

data/lib/eot/displays.rb

@@ -2,7 +2,7 @@
 
 class Eot
 
-  # From displays.rb<br>
+  # From displays.rb  
   # String formatter for d:m:s display 
   def degrees_to_s( radians = 0.0 )
     radians.nil? ? radians = 0.0 : radians
@@ -41,7 +41,7 @@ class Eot
       "%3.3d" % absolute_milli_seconds_integer
   end  
   
-  # From displays.rb<br>
+  # From displays.rb  
   # String formatter for + and - time 
   def show_minutes(min = 0.0)
     min.nil? ? min = 0.0 : min
@@ -55,20 +55,20 @@ class Eot
     time.strftime("#{sign}%M:%S.%3N")
   end
 
-  # From displays.rb<br>
+  # From displays.rb  
   # String for time now
   def show_now(now = now(Time.now.utc))
     show_minutes(now)
   end  
   
-  # From displays.rb<br>
+  # From displays.rb  
   # String format of apparent longitude 
   def string_al_Sun()
     degrees_to_s( al_Sun() )
   end
   alias_method :apparent_longitude_string, :string_al_Sun
 
-  # From displays.rb<br>
+  # 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
@@ -84,32 +84,32 @@ class Eot
   end 
   alias_method :julian_period_day_fraction_to_time, :string_day_fraction_to_time 
 
-  # From displays.rb<br>
+  # From displays.rb  
   # String format of declination 
   def string_dec_Sun()
     degrees_to_s( dec_Sun() )
   end
   alias_method :declination_string, :string_dec_Sun
   
-  # From displays.rb<br>
+  # From displays.rb  
   # String format for delta oblique
   def string_delta_oblique()
     show_minutes(delta_oblique())
   end
   
-  # From displays.rb<br>
+  # From displays.rb  
   # String format for delta orbit
   def string_delta_orbit()
     show_minutes(delta_orbit())
   end
   
-  # From displays.rb<br>
+  # From displays.rb  
   # String format for centre
   def string_eqc()
     degrees_to_s( center())
   end
   
-  # From displays.rb<br>
+  # From displays.rb  
   # Equation of time output for minutes and seconds
   def string_eot()    
     eot = time_eot()  
@@ -130,7 +130,7 @@ class Eot
   end 
   alias_method :display_equation_of_time, :string_eot 
   
-  # From displays.rb<br>
+  # From displays.rb  
   # String format conversion of jd to date
   def string_jd_to_date( jd = DJ00 )
     jd = check_jd_zero( jd )
@@ -138,28 +138,28 @@ class Eot
   end 
   alias_method :jd_to_date_string, :string_jd_to_date 
 
-  # From displays.rb<br>
+  # From displays.rb  
   # String format of mean anomaly    
   def string_ma_Sun()
     degrees_to_s( @ma )
   end
   alias_method :mean_anomaly_string, :string_ma_Sun 
 
-  # From displays.rb<br>
+  # From displays.rb  
   # String format of right ascension
   def string_ra_Sun()
     degrees_to_s( ra_Sun() )
   end
   alias_method :right_ascension_string, :string_ra_Sun     
 
-  # From displays.rb<br>
+  # From displays.rb  
   # String format of true anomaly  
   def string_ta_Sun( )
     degrees_to_s( ta_Sun() )
   end
   alias_method :true_anomaly_string, :string_ta_Sun
 
-  # From displays.rb<br>
+  # From displays.rb  
   # String formatter for h:m:s display 
   def string_time( dt = DT2000 )
     dt = check_t_zero( dt )
@@ -190,14 +190,14 @@ class Eot
   end
   alias_method :display_time_string, :string_time    
 
-  # From displays.rb<br>
+  # From displays.rb  
   # String format of true longitude 
   def string_tl_Sun()
     degrees_to_s( tl_Sun() )
   end
   alias_method :true_longitude_string, :string_tl_Sun 
 
-  # From displays.rb<br>
+  # From displays.rb  
   # String format of true obliquity 
   def string_to_Earth()
     degrees_to_s( to_Earth() )

data/lib/eot/geo_lat_lng_smt.rb

@@ -1,7 +1,8 @@
 # geo_lat_lng_smt.rb
 
-require 'multi_xml'
+# require 'multi_xml'
 require 'rest-client'
+require 'json'
 
   # class for location lookup 
   # in geo_lat_lng_smt.rb 
@@ -25,46 +26,40 @@ class GeoLatLng
   # Longitude returned
   attr_accessor :lng
 
-  # Base Google URL
-  attr_reader :base
-
   # Instance variables
   def initialize
        
-    @base           = "http://maps.googleapis.com/maps/api/geocode/xml?sensor=false&address="
+    @base           = "http://maps.googleapis.com/maps/api/geocode/json?address="
+    # @base           = "http://maps.googleapis.com/maps/api/geocode/xml?sensor=false&address="
     @default_us     = "3333 Coyote Hill Road, Palo Alto, CA, 94304, USA"#do you copy? :D
     @default_int    = "Blackheath Ave, London SE10 8XJ, UK"
     @lat            = 0.0
     @lng            = 0.0
-    MultiXml.parser = :rexml#:libxml#:ox # :nokogiri
-    @addr           = @default_int
+    # MultiXml.parser = :rexml#:libxml#:ox # :nokogiri
+    @addr = @default_int
     
   end   
 
   # set address  
-  def addr=(addr = @default_int)
-    @addr = addr
-  end  
+  #def addr=(addr = @default_int)
+  #  @addr = addr
+  #end  
 
   # coordinates lookup   
-  def get_coordinates_from_address       
-    res        = RestClient.get(
-                                URI.encode(
-                                           "#{ @base }#{ @addr }"
-                                          )
-                               )    
-    parsed_res = MultiXml.parse( res )
-    result     = parsed_res[ "GeocodeResponse" ][ "result" ]
-    status     = parsed_res[ "GeocodeResponse" ][ "status" ] 
+  def get_coordinates_from_address
+    addr         = URI.escape( @base + @addr )      
+    resrc        = RestClient.get( addr )     
+    parsed_resrc = JSON.parse(resrc)#MultiXml.parse( res )
+    #~ result     = parsed_res[ "GeocodeResponse" ][ "result" ]
+    results     = parsed_resrc["results"] 
+    #~ status     = parsed_res#[ "GeocodeResponse" ][ "status" ] 
+    status     = parsed_resrc[ "status" ] 
     if status != "OK"      
-      @default_int      
-    else      
-      if result.count != 4          
-        @default_int          
-      else
-        @lat   = parsed_res[ "GeocodeResponse" ][ "result" ][ "geometry" ][ "location" ][ "lat" ].to_f
-        @lng   = parsed_res[ "GeocodeResponse" ][ "result" ][ "geometry" ][ "location" ][ "lng" ].to_f
-      end
+      @addr = @default_int      
+    else      	    
+      @lat   = results[0]["geometry"]["location"][ "lat" ].to_f
+      @lng  = results[0]["geometry"]["location"][ "lng" ].to_f
+      
     end
     
   end
@@ -72,10 +67,28 @@ class GeoLatLng
 end
 
 if __FILE__ == $PROGRAM_NAME
-
-  spec = File.expand_path('../../../tests/minitest', __FILE__)
-  $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
-  require 'geo_spec'
+	
+  lib = File.expand_path('../../../lib', __FILE__)
+  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+  
+  require 'eot'
+  eot = Eot.new
+  p eot.addr
+  p eot.latitude
+  p eot.longitude
+  geo = GeoLatLng.new()
+  p geo.addr
+  p geo.lat
+  p geo.lng
+  geo.get_coordinates_from_address()
+  p geo.lat
+  p geo.lng
+  #~ gem 'minitest'
+  #~ require 'minitest/autorun'
+  #~ spec = File.expand_path('../../../test/', __FILE__)
+  #~ $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
+  #~ require 'geo_spec'
+  system 'rake test'
   
 end