mk_sunmoon 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73b07a2e353f23c02f3b3f81df5a8e8627b48320
-  data.tar.gz: e4ce92fc88c1365104e6876ed64a3d570b6962df
+  metadata.gz: fedaa4c974693e551cd74527c8ec2d30d892d4cc
+  data.tar.gz: a896f85395d724780530c003619f02eb8c2b50e4
 SHA512:
-  metadata.gz: dcd38b0bf57a188390faa5ead0ef487463c3ffeade680a0d751ebd7484439279497cf85b41d5f5d7d4bd5535462ec83a19f6e1865b228fe263feecf7c5371721
-  data.tar.gz: aeda53957dc63572db12b6602f28b0441f764fc4ffe91552262723e329353347dccffa09f1be45f174ed8dcd8e20be6c25fe145fda6084124876c445e656e12a
+  metadata.gz: d55dcdfd0450cd2d0acb17a367732323bf1d6f91fa7cd989c719262d23eea8491df71e8605857de36e8691714aa38171a4fb28c6322cbe7d5e5aada50df2b623
+  data.tar.gz: fad6ad0cea6bf0bd3832cbc005f109052ba688d010aecae8efb6f2ed14e8c698a1e07f2bbbad50e0ce83e5f6b60c1cc8f69ab8dd6d48eb4e37c1b7fc5cc1f534

data/README.md

@@ -6,8 +6,8 @@ This is the gem library which calculates rise/set/meridian_passage of Sun and Mo
 
 ### Computable items
 
-Sunrise(time, azimath), Sunset(time, azimath), Sun's meridian passage(time, altitude),
-Moorise(time, azimath), Moonset(time, azimath), Moon's meridian passage(time, altitude),
+Sunrise(time, azimuth), Sunset(time, azimuth), Sun's meridian passage(time, altitude),
+Moorise(time, azimuth), Moonset(time, azimuth), Moon's meridian passage(time, altitude),
 
 ### Original Text
 
@@ -37,6 +37,12 @@ require 'mk_sunmoon'
 o = MkSunmoon.new("20160613", 35.47222222, 133.05055556, 0)
 exit unless o
 
+p o.year      # => 2016
+p o.month     # => 6
+p o.day       # => 13
+p o.lat       # => 35.47222222
+p o.lon       # => 133.05055556
+p o.alt       # => 0.0
 p o.sunrise   # => ["04:51:52", 60.3625538738466]
 p o.sunset    # => ["19:23:59", 299.679632987787]
 p o.sun_mp    # => ["12:07:52", 77.75865299128155]
@@ -45,6 +51,11 @@ p o.moonset   # => ["00:32:24", 272.8282647107956]
 p o.moon_mp   # => ["18:58:52", 54.1049869601976]
 ```
 
+When latitude and longitude which you set as arguments are formats like `999°99′99.999″`, You must convert degree formats like `999.9999°`. (e.g. 35°28′20″ -> 35.47222222°)
+
+If times and azimuth of Sunrise, Sunset are `--:--:--` and `---`, it means that those are "night of the midnight sun" or "polar night".  
+If times of Moonrise, Moonset, Moon Meridian Passase are `--:--:--`, it means that those phenomenons are occurred in the target date.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment. Run `bundle exec mk_sunmoon` to use the gem in this directory, ignoring other installed copies of this gem.

data/lib/mk_sunmoon/compute.rb

@@ -246,13 +246,18 @@ module MkSunmoon
     #=========================================================================
     def compute_sun(div)
       time_val = compute_time_sun(div)
-      time_str = val2hhmmss(time_val * 24.0)
-      jy = (@jd + time_val + @dt / 86400.0 - 2451545.0) / 365.25
-      lambda = compute_lambda_sun(jy)
-      if div == 2
-        angle = compute_height_ecliptic(jy, time_val, lambda, 0.0)
+      if time_val == 0.0
+        time_str = "--:--:--"
+        angle    = "---"
       else
-        angle = compute_angle_ecliptic(jy, time_val, lambda, 0.0)
+        time_str = val2hhmmss(time_val * 24.0)
+        jy = (@jd + time_val + @dt / 86400.0 - 2451545.0) / 365.25
+        lambda = compute_lambda_sun(jy)
+        if div == 2
+          angle = compute_height_ecliptic(jy, time_val, lambda, 0.0)
+        else
+          angle = compute_angle_ecliptic(jy, time_val, lambda, 0.0)
+        end
       end
       return [time_str, angle]
     end
@@ -283,7 +288,7 @@ module MkSunmoon
     end
 
     #=========================================================================
-    # 日の出/日の入/日の南中計算計算
+    # 日の出/日の入/日の南中計算
     #
     # @param:  div  (0: 出, 1: 入, 2: 南中)
     # @return: time (0.xxxx日)
@@ -297,22 +302,27 @@ module MkSunmoon
         lambda = compute_lambda_sun(jy)
         dist   = compute_dist_sun(jy)
         alpha, delta = eclip2equat(jy, lambda, 0.0)
-        r = 0.266994 / dist
-        diff = 0.0024428 / dist
-        height = -1 * r - Const::REFRACTION - @incl + diff
+        unless div == 2  # 南中のときは計算しない
+          r = 0.266994 / dist
+          diff = 0.0024428 / dist
+          height = -1 * r - Const::REFRACTION - @incl + diff
+        end
         time_sidereal = compute_sidereal_time(jy, t)
         hour_angle_diff = compute_hour_angle_diff(
           alpha, delta, time_sidereal, height, div
         )
+        return 0.0 if hour_angle_diff == 0.0
         # 仮定時刻に対する補正値
         rev = hour_angle_diff / 360.0
         t += rev
       end
+      # 日の出・入がない場合は 0 とする
+      t = 0.0 if t < 0.0 || t >= 1.0
       return t
     end
 
     #=========================================================================
-    # 月の出/月の入/月の南中計算計算
+    # 月の出/月の入/月の南中計算
     #
     # @param:  div  (0: 出, 1: 入, 2: 南中)
     # @return: time (0.xxxx日)
@@ -339,7 +349,7 @@ module MkSunmoon
         t += rev
       end
       # 月の出/月の入りがない場合は 0 とする
-      t = 0 if t < 0 || t >= 1
+      t = 0.0 if t < 0.0 || t >= 1.0
       return t
     end
 
@@ -616,33 +626,29 @@ module MkSunmoon
     # @param:  delta(Decl.) (赤緯)
     # @param:  time_sidereal(恒星時Θ(度))
     # @param:  height       (出没高度(度))
-    # @param:  kbn          (0: 出, 1: 入, 2: 南中)
+    # @param:  div          (0: 出, 1: 入, 2: 南中)
     # @return: hour angle difference (時角の差　dt)
     #=========================================================================
-    def compute_hour_angle_diff(alpha, delta, time_sidereal, height, kbn)
-      # 南中の場合は天体の時角を返す
-      if kbn == 2
+    def compute_hour_angle_diff(alpha, delta, time_sidereal, height, div)
+      if div == 2
         tk = 0
       else
         tk  = Math.sin(Const::PI_180 * height)
         tk -= Math.sin(Const::PI_180 * delta) * Math.sin(Const::PI_180 * @lat)
         tk /= Math.cos(Const::PI_180 * delta) * Math.cos(Const::PI_180 * @lat)
         # 出没点の時角
-        tk  = Math.acos(tk) / Const::PI_180
+        return 0.0 if tk.abs > 1
+        tk = Math.acos(tk) / Const::PI_180
         # tkは出のときマイナス、入のときプラス
-        tk = -tk if kbn == 0 && tk > 0
-        tk = -tk if kbn == 1 && tk < 0
+        tk = -tk if div == 0 && tk > 0
+        tk = -tk if div == 1 && tk < 0
       end
       # 天体の時角
       t = time_sidereal - alpha
       dt = tk - t
       # dtの絶対値を180°以下に調整
-      if dt >  180
-        while dt >  180; dt -= 360; end
-      end
-      if dt < -180
-        while dt < -180; dt += 360; end
-      end
+      while dt >  180.0; dt -= 360.0; end
+      while dt < -180.0; dt += 360.0; end
       return dt
     end
 

data/lib/mk_sunmoon/version.rb

@@ -1,3 +1,3 @@
 module MkSunmoon
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/mk_sunmoon.gemspec

@@ -6,7 +6,7 @@ require 'mk_sunmoon/version'
 Gem::Specification.new do |spec|
   spec.name          = "mk_sunmoon"
   spec.version       = MkSunmoon::VERSION
-  spec.authors       = ["mk-mode.com"]
+  spec.authors       = ["komasaru"]
   spec.email         = ["masaru@mk-mode.com"]
 
   spec.summary       = %q{Sunrise, Sunset, Moonrise, Moonset library.}

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: mk_sunmoon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
-- mk-mode.com
+- komasaru
 autorequire: 
 bindir: exe
 cert_chain: []