atmospheric 0.4.4 → 0.5.0

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

@@ -8,71 +8,87 @@ module Atmospheric
       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
+        attribute :pressure_scale_heights, UnitValueFloat, collection: true
+        attribute :specific_weights, UnitValueFloat, collection: true
+        attribute :air_number_densities, UnitValueFloat, collection: true
+        attribute :mean_speeds, UnitValueFloat, collection: true
+        attribute :frequencies, UnitValueFloat, collection: true
+        attribute :mean_free_paths, UnitValueFloat, collection: true
 
         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
+          map "geometric-altitude", to: :geometric_altitudes
+          map "geopotential-altitude", to: :geopotential_altitudes
+          map "pressure-scale-height", to: :pressure_scale_heights
+          map "specific-weight", to: :specific_weights
+          map "air-number-density", to: :air_number_densities
+          map "mean-speed", to: :mean_speeds
+          map "frequency", to: :frequencies
+          map "mean-free-path", to: :mean_free_paths
         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
+          self.pressure_scale_heights = [
+            calculate(gp_h_m, :pressure_scale_height, precision: precision)
+          ]
+
+          self.specific_weights = [
+            calculate(gp_h_m, :specific_weight, precision: precision)
+          ]
+
+          self.air_number_densities = [
+            calculate(gp_h_m, :air_number_density, precision: precision)
+          ]
+
+          self.mean_speeds = [
+            calculate(gp_h_m, :mean_speed, precision: precision)
+          ]
+
+          self.frequencies = [
+            calculate(gp_h_m, :frequency, precision: precision)
+          ]
+
+          self.mean_free_paths = [
+            calculate(gp_h_m, :mean_free_path, precision: precision)
+          ]
         end
 
         def calculate(gp_h_m, name, precision: :reduced)
+          isa = precision == :high ? Isa::HighPrecision.instance : Isa::NormalPrecision.instance
+
           case name
           when :pressure_scale_height
-            v = Isa::NormalPrecision.instance.pressure_scale_height_from_geopotential(gp_h_m)
+            v = isa.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)
+            v = isa.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)
+            v = isa.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)
+            v = isa.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)
+            v = isa.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)
+            v = isa.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"

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

@@ -8,80 +8,99 @@ module Atmospheric
       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
+        attribute :ppns, UnitValueFloat, collection: true
+        attribute :rhorhons, UnitValueFloat, collection: true
+        attribute :sqrt_rhorhons, UnitValueFloat, collection: true
+        attribute :speeds_of_sound, UnitValueInteger, collection: true
+        attribute :dynamic_viscosities, UnitValueFloat, collection: true
+        attribute :kinematic_viscosities, UnitValueFloat, collection: true
+        attribute :thermal_conductivities, UnitValueFloat, collection: true
 
         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
+          map "geometric-altitude", to: :geometric_altitudes
+          map "geopotential-altitude", to: :geopotential_altitudes
+          map "ppn", to: :ppns
+          map "rhorhon", to: :rhorhons
+          map "sqrt-rhorhon", to: :sqrt_rhorhons
+          map "speed-of-sound", to: :speeds_of_sound
+          map "dynamic-viscosity", to: :dynamic_viscosities
+          map "kinematic-viscosity", to: :kinematic_viscosities
+          map "thermal-conductivity", to: :thermal_conductivities
         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
+          self.ppns = [
+            calculate(gp_h_m, :ppn, precision: precision)
+          ]
+
+          self.rhorhons = [
+            calculate(gp_h_m, :rhorhon, precision: precision)
+          ]
+
+          self.sqrt_rhorhons = [
+            calculate(gp_h_m, :sqrt_rhorhon, precision: precision)
+          ]
+
+          self.speeds_of_sound = [
+            calculate(gp_h_m, :speed_of_sound, precision: precision)
+          ]
+
+          self.dynamic_viscosities = [
+            calculate(gp_h_m, :dynamic_viscosity, precision: precision)
+          ]
+
+          self.kinematic_viscosities = [
+            calculate(gp_h_m, :kinematic_viscosity, precision: precision)
+          ]
+
+          self.thermal_conductivities = [
+            calculate(gp_h_m, :thermal_conductivity, precision: precision)
+          ]
         end
 
         def calculate(gp_h_m, name, precision: :reduced)
-          case name
+          isa = precision == :high ? Isa::HighPrecision.instance : Isa::NormalPrecision.instance
 
+          case name
           when :ppn
-            v = Isa::NormalPrecision.instance.p_p_n_from_geopotential(gp_h_m)
+            v = isa.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)
+            v = isa.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)
+            v = isa.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)
+            v = isa.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)
+            v = isa.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)
+            v = isa.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)
+            v = isa.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"

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

@@ -9,9 +9,8 @@ module Atmospheric
     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
+          map "pressure", to: :pressures
+          map "geopotential-altitude", to: :geopotential_altitudes
         end
       end
     end

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

@@ -9,9 +9,8 @@ module Atmospheric
         # 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
+          map "geopotential-altitude", to: :geopotential_altitudes
+          map "pressure", to: :pressures
         end
       end
     end

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

@@ -18,7 +18,7 @@ module Atmospheric
         attribute :rows, AltitudeAttrs, collection: true
 
         xml do
-          root "attributes-group"
+          element "attributes-group"
           map_element "atmospheric-attributes", to: :rows
         end
       end

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

@@ -17,7 +17,7 @@ module Atmospheric
         end
 
         xml do
-          root "atmospheric"
+          element "atmospheric"
           map_element "by-geometric-altitude", to: :by_geometric_altitude
           map_element "by-geopotential-altitude", to: :by_geopotential_altitude
         end

data/lib/atmospheric/export/iso_25332025.rb

@@ -60,20 +60,20 @@ module Atmospheric
       end
 
       class << self
-        def table_atmosphere_meters
-          AltitudesInMeters.new.set_attrs
+        def table_atmosphere_meters(precision: :reduced)
+          AltitudesInMeters.new.set_attrs(precision: precision)
         end
 
-        def table_atmosphere_feet
-          AltitudesInFeet.new.set_attrs
+        def table_atmosphere_feet(precision: :reduced)
+          AltitudesInFeet.new.set_attrs(precision: precision)
         end
 
-        def table_hypsometrical_altitude
-          AltitudesForPressure.new.set_attrs
+        def table_hypsometrical_altitude(precision: :reduced)
+          AltitudesForPressure.new.set_attrs(precision: precision)
         end
 
-        def table_hypsometrical_mbar
-          HypsometricalMbar.new.set_attrs
+        def table_hypsometrical_mbar(precision: :reduced)
+          HypsometricalMbar.new.set_attrs(precision: precision)
         end
       end
     end

data/lib/atmospheric/export/pressure_attrs.rb

@@ -9,30 +9,21 @@ module Atmospheric
   module Export
     class PressureAttrs < Lutaml::Model::Serializable
       include Utils
-      attribute :pressure_mbar, UnitValueFloat
-      attribute :pressure_mmhg, UnitValueFloat
-      attribute :geometric_altitude_m, UnitValueFloat
-      attribute :geometric_altitude_ft, UnitValueInteger
-      attribute :geopotential_altitude_m, UnitValueFloat
-      attribute :geopotential_altitude_ft, UnitValueInteger
+      attribute :pressures, UnitValueFloat, collection: true
+      attribute :geometric_altitudes, UnitValueFloat, collection: true
+      attribute :geopotential_altitudes, UnitValueFloat, collection: true
 
       key_value do
-        map "pressure-mbar", to: :pressure_mbar
-        map "pressure-mmhg", to: :pressure_mmhg
-        map "geopotential-altitude-m", to: :geopotential_altitude_m
-        map "geopotential-altitude-ft", to: :geopotential_altitude_ft
-        map "geometric-altitude-m", to: :geometric_altitude_m
-        map "geometric-altitude-ft", to: :geometric_altitude_ft
+        map "pressure", to: :pressures
+        map "geopotential-altitude", to: :geopotential_altitudes
+        map "geometric-altitude", to: :geometric_altitudes
       end
 
       xml do
-        root "hypsometrical-attributes"
-        map_element "pressure-mbar", to: :pressure_mbar
-        map_element "pressure-mmhg", to: :pressure_mmhg
-        map_element "geometric-altitude-m", to: :geometric_altitude_m
-        map_element "geometric-altitude-ft", to: :geometric_altitude_ft
-        map_element "geopotential-altitude-m", to: :geopotential_altitude_m
-        map_element "geopotential-altitude-ft", to: :geopotential_altitude_ft
+        element "hypsometrical-attributes"
+        map_element "pressure", to: :pressures
+        map_element "geometric-altitude", to: :geometric_altitudes
+        map_element "geopotential-altitude", to: :geopotential_altitudes
       end
 
       def set_pressure(value:, unit: :mbar, precision: :reduced)
@@ -48,45 +39,52 @@ module Atmospheric
         self
       end
 
-      # TODO: Not sure why we need round(1) for meter values
       def realize_altitudes(hgmm, hgmf, hgpm, hgpf, precision: :reduced)
-        self.geometric_altitude_m = UnitValueFloat.new(
-          value: precision == :reduced ? hgmm.round(1) : hgmm,
-          unitsml: "m"
-        )
+        self.geometric_altitudes = [
+          UnitValueFloat.new(
+            value: precision == :reduced ? hgmm.round(1) : hgmm,
+            unitsml: "m"
+          ),
+          UnitValueFloat.new(
+            value: precision == :reduced ? hgmf.round : hgmf,
+            unitsml: "ft"
+          )
+        ]
 
-        self.geometric_altitude_ft = UnitValueInteger.new(
-          value: precision == :reduced ? hgmf.round : hgmf,
-          unitsml: "ft"
-        )
-
-        self.geopotential_altitude_m = UnitValueFloat.new(
-          value: precision == :reduced ? hgpm.round(1) : hgpm,
-          unitsml: "m"
-        )
-
-        self.geopotential_altitude_ft = UnitValueInteger.new(
-          value: precision == :reduced ? hgpf.round : hgpf,
-          unitsml: "ft"
-        )
+        self.geopotential_altitudes = [
+          UnitValueFloat.new(
+            value: precision == :reduced ? hgpm.round(1) : hgpm,
+            unitsml: "m"
+          ),
+          UnitValueFloat.new(
+            value: precision == :reduced ? hgpf.round : hgpf,
+            unitsml: "ft"
+          )
+        ]
       end
 
       def realize_pressures(input, unit:)
-        # pattern: [value in mbar, value in mmhg]
-        mbar, mmhg = case unit
-                     when :mbar
-                       [input,
-                        Isa::NormalPrecision.instance.mbar_to_mmhg(input)]
-                     when :mmhg
-                       [Isa::NormalPrecision.instance.mmhg_to_mbar(input),
-                        input]
-                     else
-                       raise ArgumentError,
-                             "Invalid unit: #{unit}. Use :mbar or :mmhg."
-                     end
-
-        self.pressure_mbar = UnitValueFloat.new(value: mbar, unitsml: "mbar")
-        self.pressure_mmhg = UnitValueFloat.new(value: mmhg, unitsml: "mmhg")
+        self.pressures = case unit
+                         when :mbar
+                           [
+                             UnitValueFloat.new(value: input, unitsml: "mbar"),
+                             UnitValueFloat.new(
+                               value: Isa::NormalPrecision.instance.mbar_to_mmhg(input),
+                               unitsml: "mm_Hg"
+                             )
+                           ]
+                         when :mmhg
+                           [
+                             UnitValueFloat.new(
+                               value: Isa::NormalPrecision.instance.mmhg_to_mbar(input),
+                               unitsml: "mbar"
+                             ),
+                             UnitValueFloat.new(value: input, unitsml: "mm_Hg")
+                           ]
+                         else
+                           raise ArgumentError,
+                                 "Invalid unit: #{unit}. Use :mbar or :mmhg."
+                         end
       end
     end
   end

data/lib/atmospheric/export/utils.rb

@@ -13,7 +13,9 @@ module Atmospheric
       end
 
       def round_to_sig_figs(num, num_sig_figs)
-        num.round(num_sig_figs - Math.log10(num).ceil).to_f
+        return 0.0 if num.nil? || num.zero?
+
+        num.round(num_sig_figs - Math.log10(num.abs).ceil).to_f
       end
 
       def m_to_ft(meters)

data/lib/atmospheric/unit_value_float.rb

@@ -15,7 +15,7 @@ module Atmospheric
     end
 
     xml do
-      root "unitl-value-float"
+      element "unitl-value-float"
       map_content to: :value
       map_attribute :unitsml, to: :unitsml
       map_attribute :type, to: :type, render_default: true

data/lib/atmospheric/unit_value_integer.rb

@@ -15,7 +15,7 @@ module Atmospheric
     end
 
     xml do
-      root "unit-value-integer"
+      element "unit-value-integer"
       map_content to: :value
       map_attribute :unitsml, to: :unitsml
       map_attribute :type, to: :type, render_default: true

data/lib/atmospheric/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Atmospheric
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atmospheric
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 2026-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement