astronoby 0.5.0 → 0.7.0

data/lib/astronoby.rb

@@ -5,31 +5,52 @@ require "astronoby/angle"
 require "astronoby/angles/dms"
 require "astronoby/angles/hms"
 require "astronoby/distance"
+require "astronoby/ephem"
 require "astronoby/epoch"
-require "astronoby/astronomical_models/ephemeride_lunaire_parisienne"
+require "astronoby/instant"
+require "astronoby/vector"
+require "astronoby/velocity"
 require "astronoby/astronomical_models/moon_phases_periodic_terms"
+require "astronoby/bodies/solar_system_body"
 require "astronoby/bodies/moon"
 require "astronoby/bodies/sun"
+require "astronoby/bodies/mercury"
+require "astronoby/bodies/venus"
+require "astronoby/bodies/earth"
+require "astronoby/bodies/mars"
+require "astronoby/bodies/jupiter"
+require "astronoby/bodies/saturn"
+require "astronoby/bodies/uranus"
+require "astronoby/bodies/neptune"
 require "astronoby/coordinates/ecliptic"
 require "astronoby/coordinates/equatorial"
 require "astronoby/coordinates/horizontal"
+require "astronoby/corrections/light_time_delay"
 require "astronoby/aberration"
+require "astronoby/deflection"
 require "astronoby/equinox_solstice"
 require "astronoby/errors"
 require "astronoby/events/moon_phases"
-require "astronoby/events/observation_events"
-require "astronoby/events/rise_transit_set_iteration"
-require "astronoby/events/twilight_events"
+require "astronoby/events/rise_transit_set_event"
+require "astronoby/events/rise_transit_set_events"
+require "astronoby/events/rise_transit_set_calculator"
+require "astronoby/events/twilight_event"
+require "astronoby/events/twilight_calculator"
 require "astronoby/geocentric_parallax"
 require "astronoby/mean_obliquity"
 require "astronoby/moon_phase"
 require "astronoby/nutation"
 require "astronoby/observer"
 require "astronoby/precession"
+require "astronoby/reference_frame"
+require "astronoby/reference_frames/geometric"
+require "astronoby/reference_frames/astrometric"
+require "astronoby/reference_frames/mean_of_date"
+require "astronoby/reference_frames/apparent"
+require "astronoby/reference_frames/topocentric"
 require "astronoby/refraction"
 require "astronoby/time/greenwich_sidereal_time"
 require "astronoby/time/local_sidereal_time"
-require "astronoby/util/astrodynamics"
 require "astronoby/util/maths"
 require "astronoby/util/time"
 require "astronoby/util/trigonometry"

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: astronoby
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Rémy Hannequin
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ephem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: matrix
   requirement: !ruby/object:Gem::Requirement
@@ -31,7 +44,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -45,13 +58,41 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
@@ -66,17 +107,16 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description: Ruby version of the calculations from various books like Celestial Calculations
-  by J. L. Lawrence, Practical Astronomy with your Calculator or Spreadsheet by Peter
-  Duffett-Smith and Jonathan Zwart, or Astronomical Algorithms by Jean Meeus
+description: Astronomy and astrometry Ruby library for astronomical data and events.
 email:
-- hello@rhannequ.in
+- remy.hannequin@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
-- ".tool-versions"
+- ".ruby-version"
+- ".standard.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -86,41 +126,66 @@ files:
 - README.md
 - Rakefile
 - UPGRADING.md
+- benchmark/README.md
+- benchmark/benchmark.rb
+- benchmark/data/imcce.csv.zip
+- benchmark/data/sun_calc.csv.zip
 - lib/astronoby.rb
 - lib/astronoby/aberration.rb
 - lib/astronoby/angle.rb
 - lib/astronoby/angles/dms.rb
 - lib/astronoby/angles/hms.rb
-- lib/astronoby/astronomical_models/ephemeride_lunaire_parisienne.rb
 - lib/astronoby/astronomical_models/moon_phases_periodic_terms.rb
+- lib/astronoby/bodies/earth.rb
+- lib/astronoby/bodies/jupiter.rb
+- lib/astronoby/bodies/mars.rb
+- lib/astronoby/bodies/mercury.rb
 - lib/astronoby/bodies/moon.rb
+- lib/astronoby/bodies/neptune.rb
+- lib/astronoby/bodies/saturn.rb
+- lib/astronoby/bodies/solar_system_body.rb
 - lib/astronoby/bodies/sun.rb
+- lib/astronoby/bodies/uranus.rb
+- lib/astronoby/bodies/venus.rb
 - lib/astronoby/constants.rb
 - lib/astronoby/coordinates/ecliptic.rb
 - lib/astronoby/coordinates/equatorial.rb
 - lib/astronoby/coordinates/horizontal.rb
+- lib/astronoby/corrections/light_time_delay.rb
+- lib/astronoby/deflection.rb
 - lib/astronoby/distance.rb
+- lib/astronoby/ephem.rb
 - lib/astronoby/epoch.rb
 - lib/astronoby/equinox_solstice.rb
 - lib/astronoby/errors.rb
 - lib/astronoby/events/moon_phases.rb
-- lib/astronoby/events/observation_events.rb
-- lib/astronoby/events/rise_transit_set_iteration.rb
-- lib/astronoby/events/twilight_events.rb
+- lib/astronoby/events/rise_transit_set_calculator.rb
+- lib/astronoby/events/rise_transit_set_event.rb
+- lib/astronoby/events/rise_transit_set_events.rb
+- lib/astronoby/events/twilight_calculator.rb
+- lib/astronoby/events/twilight_event.rb
 - lib/astronoby/geocentric_parallax.rb
+- lib/astronoby/instant.rb
 - lib/astronoby/mean_obliquity.rb
 - lib/astronoby/moon_phase.rb
 - lib/astronoby/nutation.rb
 - lib/astronoby/observer.rb
 - lib/astronoby/precession.rb
+- lib/astronoby/reference_frame.rb
+- lib/astronoby/reference_frames/apparent.rb
+- lib/astronoby/reference_frames/astrometric.rb
+- lib/astronoby/reference_frames/geometric.rb
+- lib/astronoby/reference_frames/mean_of_date.rb
+- lib/astronoby/reference_frames/topocentric.rb
 - lib/astronoby/refraction.rb
 - lib/astronoby/time/greenwich_sidereal_time.rb
 - lib/astronoby/time/local_sidereal_time.rb
 - lib/astronoby/true_obliquity.rb
-- lib/astronoby/util/astrodynamics.rb
 - lib/astronoby/util/maths.rb
 - lib/astronoby/util/time.rb
 - lib/astronoby/util/trigonometry.rb
+- lib/astronoby/vector.rb
+- lib/astronoby/velocity.rb
 - lib/astronoby/version.rb
 homepage: https://github.com/rhannequin/astronoby
 licenses:
@@ -129,7 +194,6 @@ metadata:
   homepage_uri: https://github.com/rhannequin/astronoby
   source_code_uri: https://github.com/rhannequin/astronoby
   changelog_uri: https://github.com/rhannequin/astronoby/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,8 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Astronomical calculations
 test_files: []

data/.tool-versions

@@ -1 +0,0 @@
-ruby 3.2.2

data/lib/astronoby/astronomical_models/ephemeride_lunaire_parisienne.rb

@@ -1,143 +0,0 @@
-# frozen_string_literal: true
-
-module Astronoby
-  class EphemerideLunaireParisienne
-    # Lunar theory: Éphéméride Lunaire Parisienne
-    # By Jean Chapront, Michelle Chapront-Touzé
-    # https://en.wikipedia.org/wiki/Ephemeride_Lunaire_Parisienne
-
-    DEGREES_UNIT = 10**-6
-
-    # @return [Array] Periodic terms for the Moon's longitude and distance
-    def self.periodic_terms_for_moon_longitude_and_distance
-      [
-        [0, 0, 1, 0, 6288774, -20905355],
-        [2, 0, -1, 0, 1274027, -3699111],
-        [2, 0, 0, 0, 658314, -2955968],
-        [0, 0, 2, 0, 213618, -569925],
-        [0, 1, 0, 0, -185116, 48888],
-        [0, 0, 0, 2, -114332, -3149],
-        [2, 0, -2, 0, 58793, 246158],
-        [2, -1, -1, 0, 57066, -152138],
-        [2, 0, 1, 0, 53322, -170733],
-        [2, -1, 0, 0, 45758, -204586],
-        [0, 1, -1, 0, -40923, -129620],
-        [1, 0, 0, 0, -34720, 108743],
-        [0, 1, 1, 0, -30383, 104755],
-        [2, 0, 0, -2, 15327, 10321],
-        [0, 0, 1, 2, -12528, 0],
-        [0, 0, 1, -2, 10980, 79661],
-        [4, 0, -1, 0, 10675, -34782],
-        [0, 0, 3, 0, 10034, -23210],
-        [4, 0, -2, 0, 8548, -21636],
-        [2, 1, -1, 0, -7888, 24208],
-        [2, 1, 0, 0, -6766, 30824],
-        [1, 0, -1, 0, -5163, -8379],
-        [1, 1, 0, 0, 4987, -16675],
-        [2, -1, 1, 0, 4036, -12831],
-        [2, 0, 2, 0, 3994, -10445],
-        [4, 0, 0, 0, 3861, -11650],
-        [2, 0, -3, 0, 3665, 14403],
-        [0, 1, -2, 0, -2689, -7003],
-        [2, 0, -1, 2, -2602, 0],
-        [2, -1, -2, 0, 2390, 10056],
-        [1, 0, 1, 0, -2348, 6322],
-        [2, -2, 0, 0, 2236, -9884],
-        [0, 1, 2, 0, -2120, 5751],
-        [0, 2, 0, 0, -2069, 0],
-        [2, -2, -1, 0, 2048, -4950],
-        [2, 0, 1, -2, -1773, 4130],
-        [2, 0, 0, 2, -1595, 0],
-        [4, -1, -1, 0, 1215, -3958],
-        [0, 0, 2, 2, -1110, 0],
-        [3, 0, -1, 0, -892, 3258],
-        [2, 1, 1, 0, -810, 2616],
-        [4, -1, -2, 0, 759, -1897],
-        [0, 2, -1, 0, -713, -2117],
-        [2, 2, -1, 0, -700, 2354],
-        [2, 1, -2, 0, 691, 0],
-        [2, -1, 0, -2, 596, 0],
-        [4, 0, 1, 0, 549, -1423],
-        [0, 0, 4, 0, 537, -1117],
-        [4, -1, 0, 0, 520, -1571],
-        [1, 0, -2, 0, -487, -1739],
-        [2, 1, 0, -2, -399, 0],
-        [0, 0, 2, -2, -381, -4421],
-        [1, 1, 1, 0, 351, 0],
-        [3, 0, -2, 0, -340, 0],
-        [4, 0, -3, 0, 330, 0],
-        [2, -1, 2, 0, 327, 0],
-        [0, 2, 1, 0, -323, 1165],
-        [1, 1, -1, 0, 299, 0],
-        [2, 0, 3, 0, 294, 0],
-        [2, 0, -1, -2, 0, 8752]
-      ]
-    end
-
-    # @return [Array] Periodic terms for the Moon's latitude
-    def self.periodic_terms_for_moon_latitude
-      [
-        [0, 0, 0, 1, 5128122],
-        [0, 0, 1, 1, 280602],
-        [0, 0, 1, -1, 277693],
-        [2, 0, 0, -1, 173237],
-        [2, 0, -1, 1, 55413],
-        [2, 0, -1, -1, 46271],
-        [2, 0, 0, 1, 32573],
-        [0, 0, 2, 1, 17198],
-        [2, 0, 1, -1, 9266],
-        [0, 0, 2, -1, 8822],
-        [2, -1, 0, -1, 8216],
-        [2, 0, -2, -1, 4324],
-        [2, 0, 1, 1, 4200],
-        [2, 1, 0, -1, -3359],
-        [2, -1, -1, 1, 2463],
-        [2, -1, 0, 1, 2211],
-        [2, -1, -1, -1, 2065],
-        [0, 1, -1, -1, -1870],
-        [4, 0, -1, -1, 1828],
-        [0, 1, 0, 1, -1794],
-        [0, 0, 0, 3, -1749],
-        [0, 1, -1, 1, -1565],
-        [1, 0, 0, 1, -1491],
-        [0, 1, 1, 1, -1475],
-        [0, 1, 1, -1, -1410],
-        [0, 1, 0, -1, -1344],
-        [1, 0, 0, -1, -1335],
-        [0, 0, 3, 1, 1107],
-        [4, 0, 0, -1, 1021],
-        [4, 0, -1, 1, 833],
-        [0, 0, 1, -3, 777],
-        [4, 0, -2, 1, 671],
-        [2, 0, 0, -3, 607],
-        [2, 0, 2, -1, 596],
-        [2, -1, 1, -1, 491],
-        [2, 0, -2, 1, -451],
-        [0, 0, 3, -1, 439],
-        [2, 0, 2, 1, 422],
-        [2, 0, -3, -1, 421],
-        [2, 1, -1, 1, -366],
-        [2, 1, 0, 1, -351],
-        [4, 0, 0, 1, 331],
-        [2, -1, 1, 1, 315],
-        [2, -2, 0, -1, 302],
-        [0, 0, 1, 3, -283],
-        [2, 1, 1, -1, -229],
-        [1, 1, 0, -1, 223],
-        [1, 1, 0, 1, 223],
-        [0, 1, -2, -1, -220],
-        [2, 1, -1, -1, -220],
-        [1, 0, 1, 1, -185],
-        [2, -1, -2, -1, 181],
-        [0, 1, 2, 1, -177],
-        [4, 0, -2, -1, 176],
-        [4, -1, -1, -1, 166],
-        [1, 0, 1, -1, -164],
-        [4, 0, 1, -1, 132],
-        [1, 0, -1, -1, -119],
-        [4, -1, 0, -1, 115],
-        [2, -2, 0, 1, 107]
-      ]
-    end
-  end
-end

data/lib/astronoby/events/observation_events.rb

@@ -1,259 +0,0 @@
-# frozen_string_literal: true
-
-module Astronoby
-  module Events
-    class ObservationEvents
-      STANDARD_ALTITUDE = Angle.from_dms(0, -34, 0)
-      RISING_SETTING_HOUR_ANGLE_RATIO_RANGE = (-1..1)
-      EARTH_SIDEREAL_ROTATION_RATE = 360.98564736629
-      ITERATION_PRECISION = 0.0001
-
-      attr_reader :rising_time,
-        :rising_azimuth,
-        :transit_time,
-        :transit_altitude,
-        :setting_time,
-        :setting_azimuth
-
-      # Source:
-      #  Title: Astronomical Algorithms
-      #  Author: Jean Meeus
-      #  Edition: 2nd edition
-      #  Chapter: 15 - Rising, Transit, and Setting
-
-      # @param observer [Astronoby::Observer] Observer
-      # @param date [Date] Date of the event
-      # @param coordinates_of_the_previous_day [Astronoby::Coordinates::Equatorial]
-      #   Coordinates of the body of the previous day
-      # @param coordinates_of_the_day [Astronoby::Coordinates::Equatorial]
-      #   Coordinates of the body of the day
-      # @param coordinates_of_the_next_day [Astronoby::Coordinates::Equatorial]
-      #   Coordinates of the body of the next day
-      # @param additional_altitude [Astronoby::Angle] Additional altitude to the
-      #   standard altitude adjustment
-      def initialize(
-        observer:,
-        date:,
-        coordinates_of_the_previous_day:,
-        coordinates_of_the_day:,
-        coordinates_of_the_next_day:,
-        additional_altitude: Angle.zero
-      )
-        @observer = observer
-        @date = date
-        @coordinates_of_the_previous_day = coordinates_of_the_previous_day
-        @coordinates_of_the_day = coordinates_of_the_day
-        @coordinates_of_the_next_day = coordinates_of_the_next_day
-        @standard_altitude = STANDARD_ALTITUDE
-        @additional_altitude = additional_altitude
-        compute
-      end
-
-      private
-
-      def compute
-        @initial_transit = initial_transit
-        @transit_time = Util::Time.decimal_hour_to_time(@date, @initial_transit)
-        @transit_altitude = local_horizontal_altitude_transit
-
-        return if h0.nil?
-
-        initial_rising = rationalize_decimal_time(
-          @initial_transit - h0.degrees / Constants::DEGREES_PER_CIRCLE
-        )
-
-        initial_setting = rationalize_decimal_time(
-          @initial_transit + h0.degrees / Constants::DEGREES_PER_CIRCLE
-        )
-
-        @final_rising, @final_transit, @final_setting =
-          iterate(initial_rising, @initial_transit, initial_setting)
-
-        rationalized_corrected_rising = rationalize_decimal_hours(
-          Constants::HOURS_PER_DAY * @final_rising
-        )
-        rationalized_corrected_transit = rationalize_decimal_hours(
-          Constants::HOURS_PER_DAY * @final_transit
-        )
-        rationalized_corrected_setting = rationalize_decimal_hours(
-          Constants::HOURS_PER_DAY * @final_setting
-        )
-
-        @rising_time = Util::Time.decimal_hour_to_time(@date, rationalized_corrected_rising)
-        @rising_azimuth = local_horizontal_azimuth_rising
-        @transit_time = Util::Time.decimal_hour_to_time(@date, rationalized_corrected_transit)
-        @transit_altitude = local_horizontal_altitude_transit
-        @setting_time = Util::Time.decimal_hour_to_time(@date, rationalized_corrected_setting)
-        @setting_azimuth = local_horizontal_azimuth_setting
-      end
-
-      def iterate(initial_rising, initial_transit, initial_setting)
-        delta = 1
-        corrected_rising = initial_rising
-        corrected_transit = initial_transit
-        corrected_setting = initial_setting
-        until delta < ITERATION_PRECISION
-          iterate = RiseTransitSetIteration.new(
-            observer: @observer,
-            date: @date,
-            coordinates_of_the_next_day: @coordinates_of_the_next_day,
-            coordinates_of_the_day: @coordinates_of_the_day,
-            coordinates_of_the_previous_day: @coordinates_of_the_previous_day,
-            shift: shift,
-            initial_rising: corrected_rising,
-            initial_transit: corrected_transit,
-            initial_setting: corrected_setting
-          ).iterate
-          delta = iterate.sum
-          corrected_rising = rationalize_decimal_time corrected_rising + iterate[0]
-          corrected_transit = rationalize_decimal_time corrected_transit + iterate[1]
-          corrected_setting = rationalize_decimal_time corrected_setting + iterate[2]
-        end
-        [corrected_rising, corrected_transit, corrected_setting]
-      end
-
-      def observer_longitude
-        # Longitude must be treated positively westwards from the meridian of
-        # Greenwich, and negatively to the east
-        -@observer.longitude
-      end
-
-      def initial_transit
-        rationalize_decimal_time(
-          (
-            @coordinates_of_the_day.right_ascension.degrees +
-              observer_longitude.degrees -
-              apparent_gst_at_midnight.degrees
-          ) / Constants::DEGREES_PER_CIRCLE
-        )
-      end
-
-      def h0
-        @h0 ||= begin
-          term1 = shift.sin -
-            @observer.latitude.sin * @coordinates_of_the_day.declination.sin
-          term2 = @observer.latitude.cos * @coordinates_of_the_day.declination.cos
-          ratio = term1 / term2
-          return nil unless RISING_SETTING_HOUR_ANGLE_RATIO_RANGE.cover?(ratio)
-
-          Angle.acos(ratio)
-        end
-      end
-
-      def apparent_gst_at_midnight
-        Angle.from_hours(
-          GreenwichSiderealTime.from_utc(
-            Time.utc(@date.year, @date.month, @date.day)
-          ).time
-        )
-      end
-
-      def gst_transit
-        Angle.from_degrees(
-          apparent_gst_at_midnight.degrees +
-            EARTH_SIDEREAL_ROTATION_RATE * (@final_transit || @initial_transit)
-        )
-      end
-
-      def leap_day_portion
-        leap_seconds = Util::Time.terrestrial_universal_time_delta(@date)
-        leap_seconds / Constants::SECONDS_PER_DAY
-      end
-
-      def local_hour_angle_transit
-        gst_transit - observer_longitude - right_ascension_transit
-      end
-
-      def local_horizontal_azimuth_rising
-        term1 = declination_rising.sin + (-shift).sin * @observer.latitude.cos
-        term2 = (-shift).cos * @observer.latitude.cos
-        angle = term1 / term2
-        Angle.acos(angle)
-      end
-
-      def local_horizontal_altitude_transit
-        Angle.asin(
-          @observer.latitude.sin * declination_transit.sin +
-            @observer.latitude.cos * declination_transit.cos * local_hour_angle_transit.cos
-        )
-      end
-
-      def local_horizontal_azimuth_setting
-        term1 = declination_setting.sin + (-shift).sin * @observer.latitude.cos
-        term2 = (-shift).cos * @observer.latitude.cos
-        angle = term1 / term2
-        Angle.from_degrees(
-          Constants::DEGREES_PER_CIRCLE - Angle.acos(angle).degrees
-        )
-      end
-
-      def rationalize_decimal_time(decimal_time)
-        decimal_time += 1 if decimal_time.negative?
-        decimal_time -= 1 if decimal_time > 1
-        decimal_time
-      end
-
-      def rationalize_decimal_hours(decimal_hours)
-        decimal_hours += Constants::HOURS_PER_DAY if decimal_hours.negative?
-        decimal_hours -= Constants::HOURS_PER_DAY if decimal_hours > Constants::HOURS_PER_DAY
-        decimal_hours
-      end
-
-      def right_ascension_transit
-        Angle.from_degrees(
-          Util::Maths.interpolate(
-            [
-              @coordinates_of_the_previous_day.right_ascension.degrees,
-              @coordinates_of_the_day.right_ascension.degrees,
-              @coordinates_of_the_next_day.right_ascension.degrees
-            ],
-            (@final_transit || @initial_transit) + leap_day_portion
-          )
-        )
-      end
-
-      def declination_rising
-        Angle.from_degrees(
-          Util::Maths.interpolate(
-            [
-              @coordinates_of_the_previous_day.declination.degrees,
-              @coordinates_of_the_day.declination.degrees,
-              @coordinates_of_the_next_day.declination.degrees
-            ],
-            @final_rising + leap_day_portion
-          )
-        )
-      end
-
-      def declination_transit
-        Angle.from_degrees(
-          Util::Maths.interpolate(
-            [
-              @coordinates_of_the_previous_day.declination.degrees,
-              @coordinates_of_the_day.declination.degrees,
-              @coordinates_of_the_next_day.declination.degrees
-            ],
-            (@final_transit || @initial_transit) + leap_day_portion
-          )
-        )
-      end
-
-      def declination_setting
-        Angle.from_degrees(
-          Util::Maths.interpolate(
-            [
-              @coordinates_of_the_previous_day.declination.degrees,
-              @coordinates_of_the_day.declination.degrees,
-              @coordinates_of_the_next_day.declination.degrees
-            ],
-            @final_setting + leap_day_portion
-          )
-        )
-      end
-
-      def shift
-        @standard_altitude - @additional_altitude
-      end
-    end
-  end
-end