astronoby 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25e45175dabf69ffa0c98ffdf3e93cb21b9ce004fe4e0ffe61a4cfc92794ae44
-  data.tar.gz: 2d1ad05a74a171c71f6ff0a7fa7c3af1874f07379c8be407ff633d61ad4dd78e
+  metadata.gz: 2ab8b9191b1b2452c678389fbc4c1750c4080c8f3cddf55cf7aebad2d99a0da7
+  data.tar.gz: f823456f556792e1d2ea3747f3665c84442a907c3a08271df5f871204bd09f10
 SHA512:
-  metadata.gz: 74cdfbf511e8094bd410c67ed86eaff12f03124bec48c769eb3e6ebf1fd54870145a556cc82214db5147bd2c6e4631d0514973a76648d0e68d8770162401d338
-  data.tar.gz: 7a6c7f98fff52a04d60dc5c4eced47610900aa10a64f8016000b9294276d547d4d350ef0d269a25f42ae9b0078d110ad9b73884f3834e55a12084274f358ae15
+  metadata.gz: b14d2a19972991fecc5b0a12c15fe18f3a9a07d0e9fc705fe2d984af14e45ae82962332361e65dace20c27b5f6e05e19483385731770abe463a3bf28adcfb354
+  data.tar.gz: 725810244872e539789b23d2b28ce656781a1f9121fabc76c3e2ebc5c9e6616900bff852290cf8719a10feb7a06afa42f7d02f4e00ac3ba2dadc4dea47d6a24c

data/CHANGELOG.md

@@ -1,10 +1,27 @@
 # Changelog
 
-## 0.2.0 - 2024-03-24
+## 0.3.0 - 2024-03-29
 
 _If you are upgrading: please see [`UPGRADING.md`]._
 
-[`UPGRADING.md`]: https://github.com/rhannequin/astronoby/blob/main/UPGRADING.md
+### Improvements
+
+* Drop `Angle#==` ([#42])
+* Improved accuracy with Sun's location predictions ([#41])
+
+### Breaking changes
+
+* **breaking:** Difference between true and apparent ecliptic and equatorial
+  coordinates ([#41])
+* **breaking:** Rename `Angle::as_*` into `Angle::from_*` ([#43])
+
+[#41]: https://github.com/rhannequin/astronoby/pull/41
+[#42]: https://github.com/rhannequin/astronoby/pull/42
+[#43]: https://github.com/rhannequin/astronoby/pull/43
+
+## 0.2.0 - 2024-03-24
+
+_If you are upgrading: please see [`UPGRADING.md`]._
 
 ### Features
 
@@ -74,3 +91,5 @@ _If you are upgrading: please see [`UPGRADING.md`]._
 
 * Add `Astronoby::Angle`
 * Support angles in degrees and radians
+
+[`UPGRADING.md`]: https://github.com/rhannequin/astronoby/blob/main/UPGRADING.md

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    astronoby (0.2.0)
+    astronoby (0.3.0)
       matrix (~> 0.4.2)
       rake (~> 13.0)
       rspec (~> 3.0)

data/README.md

@@ -28,14 +28,53 @@ This library is still in heavy development. The public is not stable, please
 be aware new minor versions will probably lead to breaking changes until a
 major one is released.
 
+### Angle manipulation
+
+```rb
+angle1 = Astronoby::Angle.from_degrees(90)
+angle2 = Astronoby::Angle.from_radians(Astronoby::Angle::PI / 2)
+angle3 = Astronoby::Angle.from_hours(12)
+
+angle1 == angle2
+# => true
+
+angle1 < angle3
+# => true
+
+angle = angle1 + angle2 + angle3
+angle.cos
+# => 1.0
+```
+
+### Coordinates conversion
+
+```rb
+equatorial = Astronoby::Coordinates::Equatorial.new(
+  right_ascension: Astronoby::Angle.from_hms(17, 43, 54),
+  declination: Astronoby::Angle.from_dms(-22, 10, 0)
+)
+
+horizontal = equatorial.to_horizontal(
+  time: Time.new(2016, 1, 21, 21, 30, 0, "-05:00"),
+  latitude: Astronoby::Angle.from_degrees(38),
+  longitude: Astronoby::Angle.from_degrees(-78)
+)
+
+horizontal.altitude.str(:dms)
+# => "-73° 27′ 19.1557″"
+
+horizontal.azimuth.str(:dms)
+# => "+341° 33′ 21.587″"
+```
+
 ### Sun's location in the sky
 
 ```rb
 time = Time.utc(2023, 2, 17, 11, 0, 0)
 epoch = Astronoby::Epoch.from_time(time)
 
-latitude = Astronoby::Angle.as_degrees(48.8566)
-longitude = Astronoby::Angle.as_degrees(2.3522)
+latitude = Astronoby::Angle.from_degrees(48.8566)
+longitude = Astronoby::Angle.from_degrees(2.3522)
 
 sun = Astronoby::Sun.new(epoch: epoch)
 
@@ -45,10 +84,34 @@ horizontal_coordinates = sun.horizontal_coordinates(
 )
 
 horizontal_coordinates.altitude.degrees.to_f
-# => 27.502365130176567
+# => 27.50008242057459
 
 horizontal_coordinates.altitude.str(:dms)
-# => "+27° 30′ 8.5144″"
+# => "+27° 30′ 0.2967″"
+```
+
+### Sunrise and sunset times and azimuths
+
+```rb
+date = Date.new(2015, 2, 5)
+epoch = Astronoby::Epoch.from_time(date)
+observer = Astronoby::Observer.new(
+  latitude: Astronoby::Angle.from_degrees(38),
+  longitude: Astronoby::Angle.from_degrees(-78)
+)
+sun = Astronoby::Sun.new(epoch: epoch)
+
+sun.rising_time(observer: observer)
+# => 2015-02-05 12:13:26 UTC
+
+sun.rising_azimuth(observer: observer).str(:dms)
+# => "+109° 41′ 22.2585″"
+
+sun.setting_time(observer: observer)
+# => 2015-02-05 22:35:12 UTC
+
+sun.setting_azimuth(observer: observer).str(:dms)
+# => "+250° 18′ 37.7414″"
 ```
 
 ### Solstice and Equinox times
@@ -57,10 +120,10 @@ horizontal_coordinates.altitude.str(:dms)
 year = 2024
 
 Astronoby::EquinoxSolstice.march_equinox(year)
-# => 2024-03-20 03:05:00 UTC
+# => 2024-03-20 03:05:08 UTC
 
 Astronoby::EquinoxSolstice.june_solstice(year)
-# => 2024-06-20 20:50:14 UTC
+# => 2024-06-20 20:50:18 UTC
 ```
 
 ## Precision

data/UPGRADING.md

@@ -7,6 +7,56 @@ changes to it as long as a major version has not been released.
 If you are already using Astronoby and wish to follow the changes to its
 public API, please read the upgrading notes for each release.
 
+## Upgrading from 0.2.0 to 0.3.0
+
+### `Sun#ecliptic_coordinates` method removed (#41)
+
+Removed in favor of `#true_ecliptic_coordinates` and
+`#apparent_ecliptic_coordinates`.
+
+### `Coordinates::Ecliptic#to_horizontal` method removed (#41)
+
+Removed in favor of `#to_true_horizontal` and
+`#to_apparent_horizontal`.
+
+### `Sun#true_ecliptic_coordinates` method added (#41)
+
+Returns the true ecliptic coordinates for the date's epoch.
+
+### `Sun#apparent_ecliptic_coordinates` method added (#41)
+
+Returns the apparent ecliptic coordinates for the date's epoch, including
+corrections for the nutation and aberration.
+
+### `Coordinates::Ecliptic#to_true_horizontal` method added (#41)
+
+Returns the true equatorial coordinates for ths date's epoch.
+
+### `Coordinates::Ecliptic#to_apparent_horizontal` method added (#41)
+
+Returns the apparent equatorial coordinates for the date's epoch, including
+corrections for the obliquity.
+
+### `Angle::as_radians` renamed into `Angle::from_radians` (#43)
+
+Behaviour not changed.
+
+### `Angle::as_degrees` renamed into `Angle::from_degrees` (#43)
+
+Behaviour not changed.
+
+### `Angle::as_hours` renamed into `Angle::from_hours` (#43)
+
+Behaviour not changed.
+
+### `Angle::as_dms` renamed into `Angle::from_dms` (#43)
+
+Behaviour not changed.
+
+### `Angle::as_hms` renamed into `Angle::from_hms` (#43)
+
+Behaviour not changed.
+
 ## Upgrading from 0.1.0 to 0.2.0
 
 ### `Observer` class added (#29)

data/lib/astronoby/aberration.rb

@@ -17,13 +17,13 @@ module Astronoby
     #  Edition: Cambridge University Press
     #  Chapter: 36 - Aberration
     def apply
-      delta_longitude = Angle.as_degrees(
+      delta_longitude = Angle.from_degrees(
         -20.5 * (
           sun_longitude - @coordinates.longitude
         ).cos / @coordinates.latitude.cos / 3600
       )
 
-      delta_latitude = Angle.as_degrees(
+      delta_latitude = Angle.from_degrees(
         -20.5 *
         (sun_longitude - @coordinates.longitude).sin *
         @coordinates.latitude.sin / 3600
@@ -36,7 +36,10 @@ module Astronoby
     end
 
     def sun_longitude
-      @_sun_longitude ||= Sun.new(epoch: @epoch).ecliptic_coordinates.longitude
+      @_sun_longitude ||= Sun
+        .new(epoch: @epoch)
+        .true_ecliptic_coordinates
+        .longitude
     end
   end
 end

data/lib/astronoby/angle.rb

@@ -25,45 +25,45 @@ module Astronoby
         new(0)
       end
 
-      def as_radians(radians)
+      def from_radians(radians)
         normalized_radians = radians.remainder(FULL_CIRCLE_IN_RADIANS)
         new(normalized_radians)
       end
 
-      def as_degrees(degrees)
+      def from_degrees(degrees)
         radians = degrees / PI_IN_DEGREES * PI
-        as_radians(radians)
+        from_radians(radians)
       end
 
-      def as_hours(hours)
+      def from_hours(hours)
         radians = hours * RADIAN_PER_HOUR
-        as_radians(radians)
+        from_radians(radians)
       end
 
-      def as_hms(hour, minute, second)
+      def from_hms(hour, minute, second)
         hours = hour + minute / MINUTES_PER_HOUR + second / SECONDS_PER_HOUR
-        as_hours(hours)
+        from_hours(hours)
       end
 
-      def as_dms(degree, minute, second)
+      def from_dms(degree, minute, second)
         sign = degree.negative? ? -1 : 1
         degrees = degree.abs + minute / MINUTES_PER_HOUR + second / SECONDS_PER_HOUR
-        as_degrees(sign * degrees)
+        from_degrees(sign * degrees)
       end
 
       def asin(ratio)
         radians = Math.asin(ratio)
-        as_radians(radians)
+        from_radians(radians)
       end
 
       def acos(ratio)
         radians = Math.acos(ratio)
-        as_radians(radians)
+        from_radians(radians)
       end
 
       def atan(ratio)
         radians = Math.atan(ratio)
-        as_radians(radians)
+        from_radians(radians)
       end
     end
 
@@ -87,11 +87,11 @@ module Astronoby
     end
 
     def +(other)
-      self.class.as_radians(radians + other.radians)
+      self.class.from_radians(radians + other.radians)
     end
 
     def -(other)
-      self.class.as_radians(@radians - other.radians)
+      self.class.from_radians(@radians - other.radians)
     end
 
     def sin
@@ -118,20 +118,16 @@ module Astronoby
       radians.zero?
     end
 
-    def ==(other)
-      other.is_a?(self.class) && radians == other.radians
-    end
-    alias_method :eql?, :==
-
     def hash
       [radians, self.class].hash
     end
 
     def <=>(other)
-      return nil unless other.is_a?(self.class)
+      return unless other.is_a?(self.class)
 
       radians <=> other.radians
     end
+    alias_method :eql?, :==
 
     def str(format)
       case format

data/lib/astronoby/bodies/sun.rb

@@ -3,7 +3,7 @@
 module Astronoby
   class Sun
     SEMI_MAJOR_AXIS_IN_METERS = 149_598_500_000
-    ANGULAR_DIAMETER = Angle.as_degrees(0.533128)
+    ANGULAR_DIAMETER = Angle.from_degrees(0.533128)
     INTERPOLATION_FACTOR = BigDecimal("24.07")
 
     # Source:
@@ -19,8 +19,8 @@ module Astronoby
       epoch_at_noon = Epoch.from_time(noon)
       sun_at_noon = new(epoch: epoch_at_noon)
       equatorial_hours = sun_at_noon
-        .ecliptic_coordinates
-        .to_equatorial(epoch: epoch_at_noon)
+        .apparent_ecliptic_coordinates
+        .to_apparent_equatorial(epoch: epoch_at_noon)
         .right_ascension
         .hours
       gst = GreenwichSiderealTime
@@ -41,13 +41,24 @@ module Astronoby
       @epoch = epoch
     end
 
-    # @return [Astronoby::Coordinates::Ecliptic] Sun's ecliptic coordinates
-    def ecliptic_coordinates
+    def true_ecliptic_coordinates
       Coordinates::Ecliptic.new(
         latitude: Angle.zero,
-        longitude: Angle.as_degrees(
-          (true_anomaly + longitude_at_perigee).degrees % 360
-        )
+        longitude: true_longitude
+      )
+    end
+
+    def apparent_ecliptic_coordinates
+      nutation = Nutation.for_ecliptic_longitude(epoch: @epoch)
+      longitude_with_aberration = Aberration.for_ecliptic_coordinates(
+        coordinates: true_ecliptic_coordinates,
+        epoch: @epoch
+      ).longitude
+      apparent_longitude = nutation + longitude_with_aberration
+
+      Coordinates::Ecliptic.new(
+        latitude: Angle.zero,
+        longitude: apparent_longitude
       )
     end
 
@@ -59,8 +70,8 @@ module Astronoby
     def horizontal_coordinates(latitude:, longitude:)
       time = Epoch.to_utc(@epoch)
 
-      ecliptic_coordinates
-        .to_equatorial(epoch: @epoch)
+      apparent_ecliptic_coordinates
+        .to_apparent_equatorial(epoch: @epoch)
         .to_horizontal(time: time, latitude: latitude, longitude: longitude)
     end
 
@@ -83,7 +94,8 @@ module Astronoby
     # @param observer [Astronoby::Observer] Observer of the event
     # @return [Astronoby::Angle, nil] Azimuth of sunrise
     def rising_azimuth(observer:)
-      equatorial_coordinates = ecliptic_coordinates.to_equatorial(epoch: @epoch)
+      equatorial_coordinates = apparent_ecliptic_coordinates
+        .to_apparent_equatorial(epoch: @epoch)
       Body.new(equatorial_coordinates).rising_azimuth(
         latitude: observer.latitude,
         vertical_shift: vertical_shift
@@ -109,7 +121,8 @@ module Astronoby
     # @param observer [Astronoby::Observer] Observer of the event
     # @return [Astronoby::Angle, nil] Azimuth of sunset
     def setting_azimuth(observer:)
-      equatorial_coordinates = ecliptic_coordinates.to_equatorial(epoch: @epoch)
+      equatorial_coordinates = apparent_ecliptic_coordinates
+        .to_apparent_equatorial(epoch: @epoch)
       Body.new(equatorial_coordinates).setting_azimuth(
         latitude: observer.latitude,
         vertical_shift: vertical_shift
@@ -123,7 +136,9 @@ module Astronoby
 
     # @return [Astronoby::Angle] Apparent Sun's angular size
     def angular_size
-      Angle.as_degrees(ANGULAR_DIAMETER.degrees * distance_angular_size_factor)
+      Angle.from_degrees(
+        ANGULAR_DIAMETER.degrees * distance_angular_size_factor
+      )
     end
 
     # @return [Astronoby::Angle] Sun's true anomaly
@@ -139,27 +154,33 @@ module Astronoby
         (1 + orbital_eccentricity.degrees) / (1 - orbital_eccentricity.degrees)
       ) * Math.tan(eccentric_anomaly.radians / 2)
 
-      Angle.as_degrees((Angle.atan(tan).degrees * 2) % 360)
+      Angle.from_degrees((Angle.atan(tan).degrees * 2) % 360)
     end
 
     # @return [Astronoby::Angle] Sun's longitude at perigee
     def longitude_at_perigee
-      Angle.as_degrees(
+      Angle.from_degrees(
         (281.2208444 + 1.719175 * centuries + 0.000452778 * centuries**2) % 360
       )
     end
 
     # @return [Astronoby::Angle] Sun's orbital eccentricity
     def orbital_eccentricity
-      Angle.as_degrees(
+      Angle.from_degrees(
         (0.01675104 - 0.0000418 * centuries - 0.000000126 * centuries**2) % 360
       )
     end
 
     private
 
+    def true_longitude
+      Angle.from_degrees(
+        (true_anomaly + longitude_at_perigee).degrees % 360
+      )
+    end
+
     def mean_anomaly
-      Angle.as_degrees(
+      Angle.from_degrees(
         (longitude_at_base_epoch - longitude_at_perigee).degrees % 360
       )
     end
@@ -173,7 +194,7 @@ module Astronoby
     end
 
     def longitude_at_base_epoch
-      Angle.as_degrees(
+      Angle.from_degrees(
         (279.6966778 + 36000.76892 * centuries + 0.0003025 * centuries**2) % 360
       )
     end
@@ -191,9 +212,10 @@ module Astronoby
       sun_at_midnight = self.class.new(epoch: epoch)
       shift = Body::DEFAULT_REFRACTION_VERTICAL_SHIFT +
         GeocentricParallax.angle(distance: sun_at_midnight.earth_distance) +
-        Angle.as_degrees(sun_at_midnight.angular_size.degrees / 2)
-      ecliptic_coordinates = sun_at_midnight.ecliptic_coordinates
-      equatorial_coordinates = ecliptic_coordinates.to_equatorial(epoch: epoch)
+        Angle.from_degrees(sun_at_midnight.angular_size.degrees / 2)
+      ecliptic_coordinates = sun_at_midnight.apparent_ecliptic_coordinates
+      equatorial_coordinates = ecliptic_coordinates
+        .to_apparent_equatorial(epoch: epoch)
 
       event_time = if event == :rising
         Body.new(equatorial_coordinates).rising_time(
@@ -220,7 +242,7 @@ module Astronoby
     def vertical_shift
       Astronoby::Body::DEFAULT_REFRACTION_VERTICAL_SHIFT +
         Astronoby::GeocentricParallax.angle(distance: earth_distance) +
-        Astronoby::Angle.as_degrees(angular_size.degrees / 2)
+        Astronoby::Angle.from_degrees(angular_size.degrees / 2)
     end
   end
 end

data/lib/astronoby/body.rb

@@ -2,7 +2,7 @@
 
 module Astronoby
   class Body
-    DEFAULT_REFRACTION_VERTICAL_SHIFT = Angle.as_dms(0, 34, 0)
+    DEFAULT_REFRACTION_VERTICAL_SHIFT = Angle.from_dms(0, 34, 0)
     RISING_SETTING_HOUR_ANGLE_RATIO_RANGE = (-1..1)
 
     def initialize(equatorial_coordinates)
@@ -80,7 +80,7 @@ module Astronoby
       vertical_shift: nil
     )
       time_ratio = time_ratio(latitude, apparent, vertical_shift)
-      return nil unless RISING_SETTING_HOUR_ANGLE_RATIO_RANGE.cover?(time_ratio)
+      return unless RISING_SETTING_HOUR_ANGLE_RATIO_RANGE.cover?(time_ratio)
 
       hour_angle = Angle.acos(time_ratio)
       local_sidereal_time = LocalSiderealTime.new(
@@ -108,7 +108,7 @@ module Astronoby
 
       azimuth_ratio = azimuth_ratio(latitude, apparent, vertical_shift)
 
-      Angle.as_degrees(360 - Angle.acos(azimuth_ratio).degrees)
+      Angle.from_degrees(360 - Angle.acos(azimuth_ratio).degrees)
     end
 
     private

data/lib/astronoby/coordinates/ecliptic.rb

@@ -15,26 +15,37 @@ module Astronoby
       #  Author: J. L. Lawrence
       #  Edition: MIT Press
       #  Chapter: 4 - Orbits and Coordinate Systems
-      def to_equatorial(epoch:)
+
+      def to_true_equatorial(epoch:)
         mean_obliquity = MeanObliquity.for_epoch(epoch)
+        to_equatorial(obliquity: mean_obliquity)
+      end
+
+      def to_apparent_equatorial(epoch:)
+        apparent_obliquity = TrueObliquity.for_epoch(epoch)
+        to_equatorial(obliquity: apparent_obliquity)
+      end
+
+      private
 
-        y = Angle.as_radians(
-          @longitude.sin * mean_obliquity.cos -
-          @latitude.tan * mean_obliquity.sin
+      def to_equatorial(obliquity:)
+        y = Angle.from_radians(
+          @longitude.sin * obliquity.cos -
+            @latitude.tan * obliquity.sin
         )
-        x = Angle.as_radians(@longitude.cos)
+        x = Angle.from_radians(@longitude.cos)
         r = Angle.atan(y.radians / x.radians)
         right_ascension = Util::Trigonometry.adjustement_for_arctangent(y, x, r)
 
         declination = Angle.asin(
-          @latitude.sin * mean_obliquity.cos +
-          @latitude.cos * mean_obliquity.sin * @longitude.sin
+          @latitude.sin * obliquity.cos +
+            @latitude.cos * obliquity.sin * @longitude.sin
         )
 
         Equatorial.new(
           right_ascension: right_ascension,
           declination: declination,
-          epoch: epoch
+          epoch: @epoch
         )
       end
     end

data/lib/astronoby/coordinates/equatorial.rb

@@ -25,7 +25,7 @@ module Astronoby
         ha = (lst.time - @right_ascension.hours)
         ha += 24 if ha.negative?
 
-        Angle.as_hours(ha)
+        Angle.from_hours(ha)
       end
 
       def to_horizontal(time:, latitude:, longitude:)
@@ -39,7 +39,7 @@ module Astronoby
         azimuth = Angle.acos(t2)
 
         if ha.sin.positive?
-          azimuth = Angle.as_degrees(BigDecimal("360") - azimuth.degrees)
+          azimuth = Angle.from_degrees(BigDecimal("360") - azimuth.degrees)
         end
 
         Horizontal.new(
@@ -58,11 +58,11 @@ module Astronoby
       def to_ecliptic(epoch:)
         mean_obliquity = MeanObliquity.for_epoch(epoch)
 
-        y = Angle.as_radians(
+        y = Angle.from_radians(
           @right_ascension.sin * mean_obliquity.cos +
           @declination.tan * mean_obliquity.sin
         )
-        x = Angle.as_radians(@right_ascension.cos)
+        x = Angle.from_radians(@right_ascension.cos)
         r = Angle.atan(y.radians / x.radians)
         longitude = Util::Trigonometry.adjustement_for_arctangent(y, x, r)
 

data/lib/astronoby/coordinates/horizontal.rb

@@ -31,17 +31,17 @@ module Astronoby
 
         if @azimuth.sin.positive?
           hour_angle_degrees = Angle
-            .as_degrees(BigDecimal("360") - hour_angle_degrees)
+            .from_degrees(BigDecimal("360") - hour_angle_degrees)
             .degrees
         end
 
-        hour_angle_hours = Angle.as_degrees(hour_angle_degrees).hours
+        hour_angle_hours = Angle.from_degrees(hour_angle_degrees).hours
         lst = GreenwichSiderealTime
           .from_utc(time.utc)
           .to_lst(longitude: @longitude)
         right_ascension_decimal = lst.time - hour_angle_hours
         right_ascension_decimal += 24 if right_ascension_decimal.negative?
-        right_ascension = Angle.as_hours(right_ascension_decimal)
+        right_ascension = Angle.from_hours(right_ascension_decimal)
 
         Equatorial.new(
           right_ascension: right_ascension,

data/lib/astronoby/equinox_solstice.rb

@@ -102,13 +102,13 @@ module Astronoby
 
     def compute
       t = (julian_day - Epoch::J2000) / Epoch::DAYS_PER_JULIAN_CENTURY
-      w = Angle.as_degrees(35999.373 * t) - Angle.as_degrees(2.47)
+      w = Angle.from_degrees(35999.373 * t) - Angle.from_degrees(2.47)
       delta = 1 +
         0.0334 * w.cos +
-        0.0007 * Angle.as_degrees(w.degrees * 2).cos
+        0.0007 * Angle.from_degrees(w.degrees * 2).cos
 
       s = PERIODIC_TERMS.sum do |a, b, c|
-        a * (Angle.as_degrees(b) + Angle.as_degrees(c * t)).cos
+        a * (Angle.from_degrees(b) + Angle.from_degrees(c * t)).cos
       end
 
       delta_days = 0.00001 * s / delta
@@ -131,23 +131,9 @@ module Astronoby
 
     def correction(epoch)
       sun = Sun.new(epoch: epoch)
+      longitude = sun.apparent_ecliptic_coordinates.longitude
 
-      nutation = Nutation.for_ecliptic_longitude(epoch: epoch)
-
-      earth_radius_vector = 1 / (
-        1 +
-          sun.orbital_eccentricity.degrees *
-            (sun.true_anomaly - sun.longitude_at_perigee).cos
-      )
-      aberration = Angle.as_degrees(
-        Angle.as_dms(0, 0, 20.4898).degrees / -earth_radius_vector
-      )
-
-      corrected_longitude = sun.ecliptic_coordinates.longitude +
-        nutation +
-        aberration
-
-      58 * Angle.as_degrees(@event * 90 - corrected_longitude.degrees).sin
+      58 * Angle.from_degrees(@event * 90 - longitude.degrees).sin
     end
   end
 end

data/lib/astronoby/mean_obliquity.rb

@@ -16,7 +16,7 @@ module Astronoby
 
       t = (epoch - EPOCH_OF_REFERENCE) / Epoch::DAYS_PER_JULIAN_CENTURY
 
-      Angle.as_degrees(
+      Angle.from_degrees(
         obliquity_of_reference.degrees - (
           46.815 * t -
           0.0006 * t * t +
@@ -26,7 +26,7 @@ module Astronoby
     end
 
     def self.obliquity_of_reference
-      Angle.as_dms(23, 26, 21.45)
+      Angle.from_dms(23, 26, 21.45)
     end
   end
 end

data/lib/astronoby/nutation.rb

@@ -21,7 +21,7 @@ module Astronoby
     end
 
     def for_ecliptic_longitude
-      Angle.as_dms(
+      Angle.from_dms(
         0,
         0,
         (
@@ -32,7 +32,7 @@ module Astronoby
     end
 
     def for_obliquity_of_the_ecliptic
-      Angle.as_dms(
+      Angle.from_dms(
         0,
         0,
         (
@@ -49,13 +49,13 @@ module Astronoby
     end
 
     def sun_mean_longitude
-      Angle.as_degrees(
+      Angle.from_degrees(
         (279.6967 + 360.0 * (centuries_a - centuries_a.to_i)) % 360
       )
     end
 
     def moon_ascending_node_longitude
-      Angle.as_degrees(
+      Angle.from_degrees(
         (259.1833 - 360.0 * (centuries_b - centuries_b.to_i)) % 360
       )
     end

data/lib/astronoby/precession.rb

@@ -33,8 +33,8 @@ module Astronoby
 
       Coordinates::Equatorial.new(
         right_ascension: Util::Trigonometry.adjustement_for_arctangent(
-          Angle.as_radians(w[1]),
-          Angle.as_radians(w[0]),
+          Angle.from_radians(w[1]),
+          Angle.from_radians(w[0]),
           Angle.atan(w[1] / w[0])
         ),
         declination: Angle.asin(w[2]),
@@ -47,13 +47,13 @@ module Astronoby
     def matrix_for_epoch(epoch)
       t = (epoch - Epoch::DEFAULT_EPOCH) / Epoch::DAYS_PER_JULIAN_CENTURY
 
-      zeta = Angle.as_degrees(
+      zeta = Angle.from_degrees(
         0.6406161 * t + 0.0000839 * t * t + 0.000005 * t * t * t
       )
-      z = Angle.as_degrees(
+      z = Angle.from_degrees(
         0.6406161 * t + 0.0003041 * t * t + 0.0000051 * t * t * t
       )
-      theta = Angle.as_degrees(
+      theta = Angle.from_degrees(
         0.5567530 * t - 0.0001185 * t * t - 0.0000116 * t * t * t
       )
 

data/lib/astronoby/refraction.rb

@@ -2,8 +2,8 @@
 
 module Astronoby
   class Refraction
-    LOW_ALTITUDE_BODY_ANGLE = Angle.as_degrees(15)
-    ZENITH = Angle.as_degrees(90)
+    LOW_ALTITUDE_BODY_ANGLE = Angle.from_degrees(15)
+    ZENITH = Angle.from_degrees(90)
 
     def self.angle(coordinates:, observer:)
       new(coordinates, observer).refraction_angle
@@ -56,7 +56,7 @@ module Astronoby
 
     def high_altitude_angle
       zenith_angle = ZENITH - @coordinates.altitude
-      Angle.as_degrees(0.00452 * pressure * zenith_angle.tan / temperature)
+      Angle.from_degrees(0.00452 * pressure * zenith_angle.tan / temperature)
     end
 
     def low_altitude_angle
@@ -67,7 +67,7 @@ module Astronoby
         1 + 0.505 * altitude_in_degrees + 0.0845 * altitude_in_degrees**2
       )
 
-      Angle.as_degrees(term1 / term2)
+      Angle.from_degrees(term1 / term2)
     end
   end
 end

data/lib/astronoby/util/astrodynamics.rb

@@ -42,7 +42,7 @@ module Astronoby
                 previous_solution &&
                 (solution - previous_solution).abs <= precision
               )
-            return Angle.as_radians(solution)
+            return Angle.from_radians(solution)
           end
 
           eccentric_anomaly_newton_raphson(
@@ -51,7 +51,7 @@ module Astronoby
             precision,
             maximum_iteration_count,
             current_iteration + 1,
-            Angle.as_radians(solution)
+            Angle.from_radians(solution)
           )
         end
       end

data/lib/astronoby/util/trigonometry.rb

@@ -15,10 +15,10 @@ module Astronoby
           return angle if y.positive? && x.positive?
 
           if y.negative? && x.positive?
-            return Angle.as_degrees(angle.degrees + 360)
+            return Angle.from_degrees(angle.degrees + 360)
           end
 
-          Angle.as_degrees(angle.degrees + 180)
+          Angle.from_degrees(angle.degrees + 180)
         end
       end
     end

data/lib/astronoby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Astronoby
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: astronoby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Rémy Hannequin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-24 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix