atmospheric 0.4.3 → 0.4.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atmospheric
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
-bindir: exe
+autorequire:
+bindir: bin
 cert_chain: []
-date: 2024-11-03 00:00:00.000000000 Z
+date: 2025-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -25,36 +25,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
+        version: 0.7.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: |-
-  Implementation of International Standard Atmosphere (ISA) formulas as
-  defined in ISO 2533:1975 and ICAO 7488/3 1994"
+  Implementation of the ISO Standard Atmosphere (ISA) model as
+  defined in ISO 2533 and ICAO 7488/3 1994.
+  Reference implementation used in ISO 2533:2025."
 email:
 - open.source@ribose.com
 executables: []
@@ -67,26 +68,35 @@ files:
 - README.adoc
 - lib/atmospheric.rb
 - lib/atmospheric/export.rb
-- lib/atmospheric/export/hypsometrical_tables.rb
+- lib/atmospheric/export/altitude_attrs.rb
+- lib/atmospheric/export/altitude_convertable_model.rb
+- lib/atmospheric/export/altitude_table.rb
+- lib/atmospheric/export/hypsometrical_table.rb
 - lib/atmospheric/export/iso_25331975.rb
-- lib/atmospheric/export/iso_25331975/group_base.rb
 - lib/atmospheric/export/iso_25331975/group_one.rb
+- lib/atmospheric/export/iso_25331975/group_one_attrs.rb
 - lib/atmospheric/export/iso_25331975/group_three.rb
+- lib/atmospheric/export/iso_25331975/group_three_attrs.rb
 - lib/atmospheric/export/iso_25331975/group_two.rb
+- lib/atmospheric/export/iso_25331975/group_two_attrs.rb
 - lib/atmospheric/export/iso_25331985.rb
+- lib/atmospheric/export/iso_25331985/pressure_attrs.rb
+- lib/atmospheric/export/iso_25331985/table_five_six_attrs.rb
 - lib/atmospheric/export/iso_25331997.rb
-- lib/atmospheric/export/iso_25332024.rb
-- lib/atmospheric/export/target.rb
+- lib/atmospheric/export/iso_25332025.rb
+- lib/atmospheric/export/iso_25332025/altitude_attrs_group.rb
+- lib/atmospheric/export/iso_25332025/combined_altitude_attrs_group.rb
+- lib/atmospheric/export/pressure_attrs.rb
+- lib/atmospheric/export/utils.rb
 - lib/atmospheric/isa.rb
+- lib/atmospheric/unit_value_float.rb
+- lib/atmospheric/unit_value_integer.rb
 - lib/atmospheric/version.rb
-- spec/fixtures/iso-2533-1975-table5.yaml
-- spec/fixtures/iso-2533-1975-table6.yaml
-- spec/fixtures/iso-2533-1975-table7.yaml
 homepage: https://github.com/metanorma/atmospheric
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -94,15 +104,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
-summary: Implementation of International Standard Atmosphere (ISA) formulas"
+summary: Implementation of the ISO Standard Atmosphere (ISA) model"
 test_files: []

data/lib/atmospheric/export/hypsometrical_tables.rb

@@ -1,34 +0,0 @@
-require_relative "./target"
-
-module Atmospheric
-  module Export
-
-    module HypsometricalTables
-      class TableBase
-        include Target
-
-        def to_h(unit: steps_unit)
-          d = { "rows" => [] }
-          steps.each do |p|
-            d["rows"] << row(p, unit: unit)
-          end
-          d
-        end
-
-        def steps
-          (0..0)
-        end
-
-        def steps_unit
-          :mbar
-        end
-
-        def row(p, unit: steps_unit)
-          {}
-        end
-      end
-
-    end
-
-  end
-end

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

@@ -1,72 +0,0 @@
-require_relative "../target"
-
-module Atmospheric
-  module Export
-    module Iso25331975
-      class GroupBase
-        include Target
-
-        def row_big_h(h, unit: :meters)
-          hgpm, hgpf = values_in_m_ft(h, unit: unit)
-          hgmm = Isa.geometric_altitude_from_geopotential(hgpm)
-          hgmf = m_to_ft(hgmm).round
-          height_hash(hgmm, hgmf, hgpm, hgpf)
-            .merge(self.row_from_geopotential(hgpm))
-        end
-
-        def row_small_h(h, unit: :meters)
-          hgmm, hgmf = values_in_m_ft(h, unit: unit)
-          hgpm = Isa.geopotential_altitude_from_geometric(hgmm)
-          hgpf = m_to_ft(hgpm).round
-          height_hash(hgmm, hgmf, hgpm, hgpf)
-            .merge(self.row_from_geopotential(hgpm))
-        end
-
-        def height_hash(hgmm, hgmf, hgpm, hgpf)
-          {
-            "geometrical-altitude-m"  => hgmm.round,
-            "geometrical-altitude-ft" => hgmf.round,
-            "geopotential-altitude-m"   => hgpm.round,
-            "geopotential-altitude-ft"  => hgpf.round,
-          }
-        end
-
-        def values_in_m_ft(value, unit: :meters)
-          case unit
-          when :meters
-            [value.to_f, m_to_ft(value)]
-          when :feet
-            [ft_to_m(value), value.to_f]
-          end
-        end
-
-        # Step 50 from -2k to 40k, step 100 above 32k, 200 above 51k to 80k
-        def steps
-          (
-            (-2000..31950).step(50) +
-            (32000..50900).step(100) +
-            (51000..80000).step(200)
-          )
-        end
-
-        def steps_unit
-          :meters
-        end
-
-        def to_h(unit: steps_unit)
-          d = {
-            "by-geometrical-altitude" => [],
-            "by-geopotential-altitude" => [],
-          }
-
-          steps.each do |h|
-            d["by-geometrical-altitude"] << row_small_h(h, unit: unit)
-            d["by-geopotential-altitude"] << row_big_h(h, unit: unit)
-          end
-          d
-        end
-      end
-
-    end
-  end
-end

data/lib/atmospheric/export/iso_25332024.rb

@@ -1,205 +0,0 @@
-require_relative "./target"
-require_relative "./hypsometrical_tables"
-require_relative "./iso_25331975"
-
-module Atmospheric
-  module Export
-
-    module Iso25332024
-
-      module GroupBaseMeters
-        def steps
-          (
-            (-5000..31950).step(50) +
-            (32000..50900).step(100) +
-            (51000..80000).step(200)
-          )
-        end
-      end
-
-      class GroupOneMeters < Iso25331975::GroupOne
-        include Iso25332024::GroupBaseMeters
-      end
-
-      class GroupTwoMeters < Iso25331975::GroupTwo
-        include Iso25332024::GroupBaseMeters
-      end
-
-      class GroupThreeMeters < Iso25331975::GroupThree
-        include Iso25332024::GroupBaseMeters
-      end
-
-      module GroupBaseFeet
-        def steps
-          (
-            (-16500..-13750).step(250) +
-            (-14000..104800).step(200) +
-            (105000..262500).step(500)
-          )
-        end
-
-        def steps_unit
-          :feet
-        end
-      end
-
-      class GroupOneFeet < Iso25331975::GroupOne
-        include Iso25332024::GroupBaseFeet
-      end
-
-      class GroupTwoFeet < Iso25331975::GroupTwo
-        include Iso25332024::GroupBaseFeet
-      end
-
-      class GroupThreeFeet < Iso25331975::GroupThree
-        include Iso25332024::GroupBaseFeet
-      end
-
-      class HypsometricalMbar < HypsometricalTables::TableBase
-        # 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
-        #  ...
-        #  1769.4,
-        #  1769.5,
-        #  1769.6000000000001, # <== we need to clean these
-        #  1769.7,
-        #  1769.8000000000002, # <== we need to clean these
-        # The last `map` should be removed if this bug is fixed
-        def steps
-          (
-            (5.0..19.99).step(0.01).to_a.map {|v| v.round(2)} +
-            (20.0..1770.9).step(0.1).to_a.map {|v| v.round(1)}
-          )
-        end
-
-        def steps_unit
-          :mbar
-        end
-
-        def row(p, unit:)
-          method_name = "geopotential_altitude_from_pressure_#{unit}"
-          gp_h_m = Isa.send(method_name, p)
-          gp_h_ft = m_to_ft(gp_h_m)
-          gm_h_m = Isa.geometric_altitude_from_geopotential(gp_h_m)
-          gm_h_ft = m_to_ft(gm_h_m)
-          {
-            "pressure-#{unit}" => p,
-            "geopotential-altitude-m" => gp_h_m.round(1),
-            "geopotential-altitude-ft" => gp_h_ft.round,
-            "geometric-altitude-m" => gm_h_m.round(1),
-            "geometric-altitude-ft" => gm_h_ft.round,
-          }
-        end
-      end
-
-      class HypsometricalGeometric < HypsometricalTables::TableBase
-        def steps
-          (-1000..4599).step(1)
-        end
-
-        def row(hgmm, unit:)
-          hgpm = Isa.geopotential_altitude_from_geometric(hgmm)
-          {
-            "geometric-altitude-m" => hgpm,
-            "pressure-mbar" => round_to_sig_figs(Isa.pressure_from_geopotential_mbar(hgpm.to_f), 6),
-            # "pressure-mmhg" => round_to_sig_figs(Isa.pressure_from_geopotential_mmhg(hgpm.to_f), 6),
-          }
-        end
-      end
-
-      class HypsometricalGeopotential < HypsometricalTables::TableBase
-        def steps
-          (-1000..4599).step(1)
-        end
-
-        def row(hgpm, unit:)
-          {
-            "geopotential-altitude-m" => hgpm,
-            "pressure-mbar" => round_to_sig_figs(Isa.pressure_from_geopotential_mbar(hgpm.to_f), 6),
-            # "pressure-mmhg" => round_to_sig_figs(Isa.pressure_from_geopotential_mmhg(hgpm.to_f), 6),
-          }
-        end
-      end
-
-
-
-      class << self
-        def table_5
-          GroupOneMeters.new.to_h
-        end
-
-        def table_6
-          GroupTwoMeters.new.to_h
-        end
-
-        def table_7
-          GroupThreeMeters.new.to_h
-        end
-
-        def table_8
-          GroupOneFeet.new.to_h
-        end
-
-        def table_9
-          GroupTwoFeet.new.to_h
-        end
-
-        def table_10
-          GroupThreeFeet.new.to_h
-        end
-
-        def table_11
-          HypsometricalMbar.new.to_h
-        end
-
-        def table_12
-          HypsometricalGeometric.new.to_h
-        end
-
-        def table_13
-          HypsometricalGeopotential.new.to_h
-        end
-
-        def table_5_yaml
-          GroupOneMeters.new.to_yaml
-        end
-
-        def table_6_yaml
-          GroupTwoMeters.new.to_yaml
-        end
-
-        def table_7_yaml
-          GroupThreeMeters.new.to_yaml
-        end
-
-        def table_8_yaml
-          GroupOneFeet.new.to_yaml
-        end
-
-        def table_9_yaml
-          GroupTwoFeet.new.to_yaml
-        end
-
-        def table_10_yaml
-          GroupThreeFeet.new.to_yaml
-        end
-
-        def table_11_yaml
-          HypsometricalMbar.new.to_yaml
-        end
-
-        def table_12_yaml
-          HypsometricalGeometric.new.to_yaml
-        end
-
-        def table_13_yaml
-          HypsometricalGeopotential.new.to_yaml
-        end
-
-      end
-
-    end
-
-  end
-end