atmospheric 0.4.3 → 0.4.4

data/lib/atmospheric/export/iso_25331975/group_three_attrs.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Atmospheric
+  module Export
+    module Iso25331975
+      class GroupThreeAttrs < Lutaml::Model::Serializable
+        include AltitudeConvertableModel
+
+        attribute :pressure_scale_height, UnitValueFloat
+        attribute :specific_weight, UnitValueFloat
+        attribute :air_number_density, UnitValueFloat
+        attribute :mean_speed, UnitValueFloat
+        attribute :frequency, UnitValueFloat
+        attribute :mean_free_path, UnitValueFloat
+
+        key_value do
+          map "geometric-altitude-m", to: :geometric_altitude_m
+          map "geometric-altitude-ft", to: :geometric_altitude_ft
+          map "geopotential-altitude-m", to: :geopotential_altitude_m
+          map "geopotential-altitude-ft", to: :geopotential_altitude_ft
+          map "pressure-scale-height", to: :pressure_scale_height
+          map "specific-weight", to: :specific_weight
+          map "air-number-density", to: :air_number_density
+          map "mean-speed", to: :mean_speed
+          map "frequency", to: :frequency
+          map "mean-free-path", to: :mean_free_path
+        end
+
+        # In meters only
+        def realize_values_from_geopotential(gp_h_m, precision: :reduced)
+          %i[
+            pressure_scale_height specific_weight air_number_density mean_speed
+            frequency mean_free_path
+          ].each do |attr|
+            v = calculate(gp_h_m, attr, precision: precision)
+            send("#{attr}=", v) if respond_to?("#{attr}=")
+          end
+        end
+
+        def calculate(gp_h_m, name, precision: :reduced)
+          case name
+          when :pressure_scale_height
+            v = Isa::NormalPrecision.instance.pressure_scale_height_from_geopotential(gp_h_m)
+            UnitValueFloat.new(
+              value: precision == :reduced ? v.round(1) : v,
+              unitsml: "m"
+            )
+          when :specific_weight
+            v = Isa::NormalPrecision.instance.specific_weight_from_geopotential(gp_h_m)
+            UnitValueFloat.new(
+              value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
+              unitsml: "N*m^-3"
+            )
+          when :air_number_density
+            v = Isa::NormalPrecision.instance.air_number_density_from_geopotential(gp_h_m)
+            UnitValueFloat.new(
+              value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
+              unitsml: "m^-3"
+            )
+          when :mean_speed
+            v = Isa::NormalPrecision.instance.mean_air_particle_speed_from_geopotential(gp_h_m)
+            UnitValueFloat.new(
+              value: precision == :reduced ? v.round(2) : v,
+              unitsml: "m*s^-1"
+            )
+          when :frequency
+            v = Isa::NormalPrecision.instance.air_particle_collision_frequency_from_geopotential(gp_h_m)
+            UnitValueFloat.new(
+              value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
+              unitsml: "s^-1"
+            )
+          when :mean_free_path
+            v = Isa::NormalPrecision.instance.mean_free_path_of_air_particles_from_geopotential(gp_h_m)
+            UnitValueFloat.new(
+              value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
+              unitsml: "m"
+            )
+          else
+            raise ArgumentError, "Unknown attribute: #{name}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/atmospheric/export/iso_25331975/group_two.rb

@@ -1,38 +1,24 @@
-require_relative "./group_base"
-# rubocop:disable Metrics/AbcSize
-# rubocop:disable Metrics/BlockLength
-# rubocop:disable Metrics/CyclomaticComplexity
-# rubocop:disable Metrics/MethodLength
-# rubocop:disable Metrics/PerceivedComplexity
-# rubocop:disable Layout/LineLength
-# rubocop:disable Layout/HashAlignment
+# frozen_string_literal: true
+
+require_relative "../altitude_table"
+require_relative "group_two_attrs"
+
 module Atmospheric
   module Export
     module Iso25331975
+      class GroupTwo < AltitudeTable
+        attribute :by_geometric_altitude, GroupTwoAttrs, collection: true
+        attribute :by_geopotential_altitude, GroupTwoAttrs, collection: true
 
-      class GroupTwo < GroupBase
-        # In meters only
-        def row_from_geopotential(gp_h_f)
-          {
-            "ppn"                  => round_to_sig_figs(Isa.p_p_n_from_geopotential(gp_h_f), 6),
-            "rhorhon"              => round_to_sig_figs(Isa.rho_rho_n_from_geopotential(gp_h_f), 6),
-            "sqrt-rhorhon"         => round_to_sig_figs(Isa.root_rho_rho_n_from_geopotential(gp_h_f), 6),
-            "speed-of-sound"       => (Isa.speed_of_sound_from_geopotential(gp_h_f) * 1000.0).round,
-            "dynamic-viscosity"    => round_to_sig_figs(Isa.dynamic_viscosity_from_geopotential(gp_h_f), 5),
-            "kinematic-viscosity"  => round_to_sig_figs(Isa.kinematic_viscosity_from_geopotential(gp_h_f), 5),
-            "thermal-conductivity" => round_to_sig_figs(Isa.thermal_conductivity_from_geopotential(gp_h_f), 5),
-          }
+        key_value do
+          map "by-geometric-altitude", to: :by_geometric_altitude
+          map "by-geopotential-altitude", to: :by_geopotential_altitude
         end
 
+        def set_attrs(klass: GroupTwoAttrs, unit: steps_unit, precision: :reduced)
+          super
+        end
       end
     end
-
   end
 end
-# rubocop:enable Metrics/AbcSize
-# rubocop:enable Metrics/BlockLength
-# rubocop:enable Metrics/CyclomaticComplexity
-# rubocop:enable Metrics/MethodLength
-# rubocop:enable Metrics/PerceivedComplexity
-# rubocop:enable Layout/LineLength
-# rubocop:enable Layout/HashAlignment

data/lib/atmospheric/export/iso_25331975/group_two_attrs.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Atmospheric
+  module Export
+    module Iso25331975
+      class GroupTwoAttrs < Lutaml::Model::Serializable
+        include AltitudeConvertableModel
+
+        attribute :ppn, UnitValueFloat
+        attribute :rhorhon, UnitValueFloat
+        attribute :sqrt_rhorhon, UnitValueFloat
+        attribute :speed_of_sound, UnitValueInteger
+        attribute :dynamic_viscosity, UnitValueFloat
+        attribute :kinematic_viscosity, UnitValueFloat
+        attribute :thermal_conductivity, UnitValueFloat
+
+        key_value do
+          map "geometric-altitude-m", to: :geometric_altitude_m
+          map "geometric-altitude-ft", to: :geometric_altitude_ft
+          map "geopotential-altitude-m", to: :geopotential_altitude_m
+          map "geopotential-altitude-ft", to: :geopotential_altitude_ft
+          map "ppn", to: :ppn
+          map "rhorhon", to: :rhorhon
+          map "sqrt-rhorhon", to: :sqrt_rhorhon
+          map "speed-of-sound", to: :speed_of_sound
+          map "dynamic-viscosity", to: :dynamic_viscosity
+          map "kinematic-viscosity", to: :kinematic_viscosity
+          map "thermal-conductivity", to: :thermal_conductivity
+        end
+
+        # In meters only
+        def realize_values_from_geopotential(gp_h_m, precision: :reduced)
+          %i[
+            ppn rhorhon sqrt_rhorhon speed_of_sound
+            dynamic_viscosity kinematic_viscosity thermal_conductivity
+          ].each do |attr|
+            v = calculate(gp_h_m, attr, precision: precision)
+            send("#{attr}=", v) if respond_to?("#{attr}=")
+          end
+        end
+
+        def calculate(gp_h_m, name, precision: :reduced)
+          case name
+
+          when :ppn
+            v = Isa::NormalPrecision.instance.p_p_n_from_geopotential(gp_h_m)
+            UnitValueFloat.new(
+              value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
+              unitsml: nil
+            )
+          when :rhorhon
+            v = Isa::NormalPrecision.instance.rho_rho_n_from_geopotential(gp_h_m)
+            UnitValueFloat.new(
+              value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
+              unitsml: nil
+            )
+          when :sqrt_rhorhon
+            v = Isa::NormalPrecision.instance.root_rho_rho_n_from_geopotential(gp_h_m)
+            UnitValueFloat.new(
+              value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
+              unitsml: nil
+            )
+          when :speed_of_sound
+            v = Isa::NormalPrecision.instance.speed_of_sound_from_geopotential(gp_h_m)
+            UnitValueInteger.new(
+              value: precision == :reduced ? (v * 1000.0).round : v,
+              unitsml: "m*s^-1"
+            )
+          when :dynamic_viscosity
+            v = Isa::NormalPrecision.instance.dynamic_viscosity_from_geopotential(gp_h_m)
+            UnitValueFloat.new(
+              value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
+              unitsml: "Pa*s"
+            )
+          when :kinematic_viscosity
+            v = Isa::NormalPrecision.instance.kinematic_viscosity_from_geopotential(gp_h_m)
+            UnitValueFloat.new(
+              value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
+              unitsml: "m^2*s^-1"
+            )
+          when :thermal_conductivity
+            v = Isa::NormalPrecision.instance.thermal_conductivity_from_geopotential(gp_h_m)
+            UnitValueFloat.new(
+              value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
+              unitsml: "W*m^-1*K^-1"
+            )
+          else
+            raise ArgumentError, "Unknown attribute: #{name}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/atmospheric/export/iso_25331975.rb

@@ -1,37 +1,25 @@
+# frozen_string_literal: true
+
 module Atmospheric
   module Export
     module Iso25331975
       class << self
         def table_5
-          GroupOne.new.to_h
+          GroupOne.new.set_attrs
         end
 
         def table_6
-          GroupTwo.new.to_h
+          GroupTwo.new.set_attrs
         end
 
         def table_7
-          GroupThree.new.to_h
-        end
-
-        def table_5_yaml
-          GroupOne.new.to_yaml
-        end
-
-        def table_6_yaml
-          GroupTwo.new.to_yaml
-        end
-
-        def table_7_yaml
-          GroupThree.new.to_yaml
+          GroupThree.new.set_attrs
         end
       end
-
     end
   end
 end
 
-require_relative "iso_25331975/group_base"
 require_relative "iso_25331975/group_one"
 require_relative "iso_25331975/group_two"
 require_relative "iso_25331975/group_three"

data/lib/atmospheric/export/iso_25331985/pressure_attrs.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative "../pressure_attrs"
+
+# The purpose of this class is to trim the attributes used in the ISO 2533:1985
+# standard.
+module Atmospheric
+  module Export
+    module Iso25331985
+      class PressureAttrs < ::Atmospheric::Export::PressureAttrs
+        key_value do
+          map "pressure-mbar", to: :pressure_mbar
+          map "pressure-mmhg", to: :pressure_mmhg
+          map "geopotential-altitude-m", to: :geopotential_altitude_m
+        end
+      end
+    end
+  end
+end

data/lib/atmospheric/export/iso_25331985/table_five_six_attrs.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative "../iso_25331975/group_one_attrs"
+
+module Atmospheric
+  module Export
+    module Iso25331985
+      class TableFiveSixAttrs < ::Atmospheric::Export::Iso25331975::GroupOneAttrs
+        # TODO: Completely override other attributes / key value mappings so
+        # they don't show in YAML
+        key_value do
+          map "geopotential-altitude-m", to: :geopotential_altitude_m
+          map "pressure-mbar", to: :pressure_mbar
+          map "pressure-mmhg", to: :pressure_mmhg
+        end
+      end
+    end
+  end
+end

data/lib/atmospheric/export/iso_25331985.rb

@@ -1,12 +1,14 @@
-require_relative "./target"
-require_relative "./hypsometrical_tables"
+# frozen_string_literal: true
+
+require_relative "hypsometrical_table"
+require_relative "iso_25331985/pressure_attrs"
+require_relative "iso_25331985/table_five_six_attrs"
+require_relative "iso_25331975/group_one"
 
 module Atmospheric
   module Export
-
     module Iso25331985
-
-      class TableOne < HypsometricalTables::TableBase
+      class TableOne < HypsometricalTable
         # TODO: when Ruby's step does not create inaccurate floating point numbers
         # This is a hack to solve a Ruby bug with floating point calcuations
         # > (20.0..1770.9).step(0.1).to_a
@@ -17,120 +19,97 @@ module Atmospheric
         #  1769.7,
         #  1769.8000000000002, # <== we need to clean these
         # The last `map` should be removed if this bug is fixed
+
+        attribute :rows, PressureAttrs, collection: true
+
         def steps
-          (5.0..19.99).step(0.01).to_a.map {|v| v.round(2)}
+          (5.0..19.99).step(0.01).to_a.map { |v| v.round(2) }
         end
 
         def steps_unit
           :mbar
         end
 
-        def row(p, unit: steps_unit)
-          method_name = "geopotential_altitude_from_pressure_#{unit}"
-          value = Isa.send(method_name, p).round
-          {
-            "pressure-#{unit}" => p,
-            "geopotential-altitude" => value,
-          }
+        def set_attrs(klass: PressureAttrs, unit: steps_unit, precision: :reduced)
+          super
         end
       end
 
-      class TableTwo < HypsometricalTables::TableBase
+      class TableTwo < HypsometricalTable
+        attribute :rows, PressureAttrs, collection: true
+
         def steps
-          (20.0..1199.9).step(0.1).to_a.map {|v| v.round(1)}
+          (20.0..1199.9).step(0.1).to_a.map { |v| v.round(1) }
         end
 
-        def row(p, unit:)
-          method_name = "geopotential_altitude_from_pressure_#{unit}"
-          value = Isa.send(method_name, p).round
-          {
-            "pressure-#{unit}" => p,
-            "geopotential-altitude" => value,
-          }
+        def set_attrs(klass: PressureAttrs, unit: steps_unit, precision: :reduced)
+          super
         end
       end
 
-      # Same as Table 1 with mmHg
       class TableThree < TableOne
+        attribute :rows, PressureAttrs, collection: true
+
         def steps
-          (4.0..9.99).step(0.01).to_a.map {|v| v.round(2)}
+          (4.0..9.99).step(0.01).to_a.map { |v| v.round(2) }
         end
 
         def steps_unit
           :mmhg
         end
+
+        def set_attrs(klass: PressureAttrs, unit: steps_unit, precision: :reduced)
+          super
+        end
       end
 
-      # Same as Table 3 with mmHg
       class TableFour < TableTwo
+        attribute :rows, PressureAttrs, collection: true
+
         def steps
-          (10.0..899.9).step(0.1).to_a.map {|v| v.round(1)}
+          (10.0..899.9).step(0.1).to_a.map { |v| v.round(1) }
         end
 
         def steps_unit
           :mmhg
         end
+
+        def set_attrs(klass: PressureAttrs, unit: steps_unit, precision: :reduced)
+          super
+        end
       end
 
-      class TableFiveSix < HypsometricalTables::TableBase
+      class TableFiveSix < Iso25331975::GroupOne
         def steps
           (-1000..4599).step(1)
         end
 
-        def row(h, unit:)
-          {
-            "geopotential-altitude" => h,
-            "pressure-mbar" => round_to_sig_figs(Isa.pressure_from_geopotential_mbar(h.to_f), 6),
-            "pressure-mmhg" => round_to_sig_figs(Isa.pressure_from_geopotential_mmhg(h.to_f), 6),
-          }
+        def set_attrs(klass: TableFiveSixAttrs, unit: steps_unit, precision: :reduced)
+          super
         end
       end
 
       class << self
-
         def table_1
-          TableOne.new.to_h
-        end
-
-        def table_1_yaml
-          TableOne.new.to_yaml
+          TableOne.new.set_attrs
         end
 
         def table_2
-          TableTwo.new.to_h
-        end
-
-        def table_2_yaml
-          TableTwo.new.to_yaml
+          TableTwo.new.set_attrs
         end
 
         def table_3
-          TableThree.new.to_h
-        end
-
-        def table_3_yaml
-          TableThree.new.to_yaml
+          TableThree.new.set_attrs
         end
 
         def table_4
-          TableFour.new.to_h
-        end
-
-        def table_4_yaml
-          TableFour.new.to_yaml
+          TableFour.new.set_attrs
         end
 
         def table_56
-          TableFiveSix.new.to_h
-        end
-
-        def table_56_yaml
-          TableFiveSix.new.to_yaml
+          TableFiveSix.new.set_attrs
         end
-
       end
-
     end
-
   end
-end
+end

data/lib/atmospheric/export/iso_25331997.rb

@@ -1,11 +1,10 @@
-require_relative "./target"
+# frozen_string_literal: true
+
 require_relative "./iso_25331975"
 
 module Atmospheric
   module Export
-
     module Iso25331997
-
       module GroupBaseMeters
         def steps
           (-5000..2000).step(50)
@@ -27,9 +26,9 @@ module Atmospheric
       module GroupBaseFeet
         def steps
           (
-            (-16500..-13750).step(250) +
-            (-14000..104800).step(200) +
-            (105000..262500).step(500)
+            (-16_500..-13_750).step(250) +
+            (-14_000..104_800).step(200) +
+            (105_000..262_500).step(500)
           )
         end
 
@@ -40,67 +39,50 @@ module Atmospheric
 
       class GroupFour < Iso25331975::GroupOne
         include Iso25331997::GroupBaseFeet
+        def set_attrs(klass: Iso25331975::GroupOneAttrs, unit: steps_unit, precision: :reduced)
+          super
+        end
       end
 
       class GroupFive < Iso25331975::GroupTwo
         include Iso25331997::GroupBaseFeet
+        def set_attrs(klass: Iso25331975::GroupTwoAttrs, unit: steps_unit, precision: :reduced)
+          super
+        end
       end
 
       class GroupSix < Iso25331975::GroupThree
         include Iso25331997::GroupBaseFeet
+        def set_attrs(klass: Iso25331975::GroupThreeAttrs, unit: steps_unit, precision: :reduced)
+          super
+        end
       end
 
       class << self
         def table_1
-          GroupOne.new.to_h
+          GroupOne.new.set_attrs
         end
 
         def table_2
-          GroupTwo.new.to_h
+          GroupTwo.new.set_attrs
         end
 
         def table_3
-          GroupThree.new.to_h
+          GroupThree.new.set_attrs
         end
 
         def table_4
-          GroupFour.new.to_h
+          GroupFour.new.set_attrs
         end
 
         def table_5
-          GroupFive.new.to_h
+          GroupFive.new.set_attrs
         end
 
         def table_6
-          GroupSix.new.to_h
-        end
-
-        def table_1_yaml
-          GroupOne.new.to_yaml
-        end
-
-        def table_2_yaml
-          GroupTwo.new.to_yaml
-        end
-
-        def table_3_yaml
-          GroupThree.new.to_yaml
-        end
-
-        def table_4_yaml
-          GroupFour.new.to_yaml
-        end
-
-        def table_5_yaml
-          GroupFive.new.to_yaml
-        end
-
-        def table_6_yaml
-          GroupSix.new.to_yaml
+          GroupSix.new.set_attrs
         end
       end
-
     end
-
   end
-end
+end

data/lib/atmospheric/export/iso_25332025/altitude_attrs_group.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+require_relative "../altitude_attrs"
+
+# The purpose of this class is really for XML grouping.
+# It is not a table in the same sense as the other tables.
+# It is a collection of attributes grouped by altitude type.
+# This class is used to group the attributes by altitude type
+# and to serialize them to XML.
+
+# The class is used in the CombinedAltitudeAttrsGroup class
+# and is not intended to be used directly.
+module Atmospheric
+  module Export
+    module Iso25332025
+      class AltitudeAttrsGroup < Lutaml::Model::Serializable
+        attribute :rows, AltitudeAttrs, collection: true
+
+        xml do
+          root "attributes-group"
+          map_element "atmospheric-attributes", to: :rows
+        end
+      end
+    end
+  end
+end

data/lib/atmospheric/export/iso_25332025/combined_altitude_attrs_group.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative "../altitude_table"
+require_relative "../altitude_attrs"
+require_relative "altitude_attrs_group"
+
+module Atmospheric
+  module Export
+    module Iso25332025
+      class CombinedAltitudeAttrsGroup < AltitudeTable
+        attribute :by_geometric_altitude, AltitudeAttrsGroup
+        attribute :by_geopotential_altitude, AltitudeAttrsGroup
+
+        key_value do
+          map "by-geometric-altitude", to: :by_geometric_altitude
+          map "by-geopotential-altitude", to: :by_geopotential_altitude
+        end
+
+        xml do
+          root "atmospheric"
+          map_element "by-geometric-altitude", to: :by_geometric_altitude
+          map_element "by-geopotential-altitude", to: :by_geopotential_altitude
+        end
+
+        def add_to_geometric(item)
+          by_geometric_altitude.rows << item
+        end
+
+        def add_to_geopotential(item)
+          by_geopotential_altitude.rows << item
+        end
+
+        def initialize_attrs
+          self.by_geometric_altitude = AltitudeAttrsGroup.new(rows: [])
+          self.by_geopotential_altitude = AltitudeAttrsGroup.new(rows: [])
+        end
+
+        def set_attrs(klass: AltitudeAttrs, unit: steps_unit, precision: :normal)
+          super
+        end
+      end
+    end
+  end
+end