metar-parser 1.5.0 → 1.6.0

data/lib/metar/data/remark.rb

@@ -1,136 +1,152 @@
+# frozen_string_literal: true
+
 require "i18n"
 require "m9t"
 
-class Metar::Data::Remark
-  PRESSURE_CHANGE_CHARACTER = [
-    :increasing_then_decreasing, # 0
-    :increasing_then_steady,     # 1
-    :increasing,                 # 2
-    :decreasing_or_steady_then_increasing, # 3
-    :steady,                     # 4
-    :decreasing_then_increasing, # 5
-    :decreasing_then_steady,     # 6
-    :decreasing,                 # 7
-    :steady_then_decreasing,     # 8
-  ]
-
-  INDICATOR_TYPE = {
-    'TS'  => :thunderstorm_information,
-    'PWI' => :precipitation_identifier,
-    'P'   => :precipitation_amount,
-  }
-
-  COLOR_CODE = ['RED', 'AMB', 'YLO', 'GRN', 'WHT', 'BLU']
-
-  def self.parse(raw)
-    if !raw
-      return nil
-    end
-
-    m1 = raw.match(/^([12])([01])(\d{3})$/)
-    if m1
-      extreme = {'1' => :maximum, '2' => :minimum}[m1[1]]
-      value   = sign(m1[2]) * tenths(m1[3])
-      return Metar::Data::TemperatureExtreme.new(raw, extreme, value)
-    end
-
-    m2 = raw.match(/^4([01])(\d{3})([01])(\d{3})$/)
-    if m2
-      return [
-        Metar::Data::TemperatureExtreme.new(raw, :maximum, sign(m2[1]) * tenths(m2[2])),
-        Metar::Data::TemperatureExtreme.new(raw, :minimum, sign(m2[3]) * tenths(m2[4])),
-      ]
-    end
-
-    m3 = raw.match(/^5([0-8])(\d{3})$/)
-    if m3
-      character = PRESSURE_CHANGE_CHARACTER[m3[1].to_i]
-      return Metar::Data::PressureTendency.new(raw, character, tenths(m3[2]))
-    end
-
-    m4 = raw.match(/^6(\d{4})$/)
-    if m4
-      return Metar::Data::Precipitation.new(raw, 3, Metar::Data::Distance.new(inches_to_meters(m4[1]))) # actually 3 or 6 depending on reporting time
-    end
-
-    m5 = raw.match(/^7(\d{4})$/)
-    if m5
-      return Metar::Data::Precipitation.new(raw, 24, Metar::Data::Distance.new(inches_to_meters(m5[1])))
-    end
-
-    m6 = raw.match(/^A[0O]([12])$/)
-    if m6
-      type = [:with_precipitation_discriminator, :without_precipitation_discriminator][m6[1].to_i - 1]
-      return Metar::Data::AutomatedStationType.new(raw, type)
-    end
-
-    m7 = raw.match(/^P(\d{4})$/)
-    if m7
-      return Metar::Data::Precipitation.new(raw, 1, Metar::Data::Distance.new(inches_to_meters(m7[1])))
-    end
-
-    m8 = raw.match(/^T([01])(\d{3})([01])(\d{3})$/)
-    if m8
-      temperature = Metar::Data::Temperature.new(sign(m8[1]) * tenths(m8[2]))
-      dew_point   = Metar::Data::Temperature.new(sign(m8[3]) * tenths(m8[4]))
-      return Metar::Data::HourlyTemperatureAndDewPoint.new(raw, temperature, dew_point)
-    end
-
-    m9 = raw.match(/^SLP(\d{3})$/)
-    if m9
-      return Metar::Data::SeaLevelPressure.new(raw, M9t::Pressure.hectopascals(tenths(m9[1])))
+module Metar
+  module Data
+    TemperatureExtreme = Struct.new(:raw, :extreme, :value)
+    PressureTendency = Struct.new(:raw, :character, :value)
+    Precipitation = Struct.new(:raw, :period, :amount)
+    AutomatedStationType = Struct.new(:raw, :type)
+    HourlyTemperatureAndDewPoint = Struct.new(:raw, :temperature, :dew_point)
+    SeaLevelPressure = Struct.new(:raw, :pressure)
+    SensorStatusIndicator = Struct.new(:raw, :type, :state)
+    ColorCode = Struct.new(:raw, :code)
+    MaintenanceNeeded = Struct.new(:raw)
+
+    class Remark
+      PRESSURE_CHANGE_CHARACTER = [
+        :increasing_then_decreasing, # 0
+        :increasing_then_steady,     # 1
+        :increasing,                 # 2
+        :decreasing_or_steady_then_increasing, # 3
+        :steady,                     # 4
+        :decreasing_then_increasing, # 5
+        :decreasing_then_steady,     # 6
+        :decreasing,                 # 7
+        :steady_then_decreasing # 8
+      ].freeze
+
+      INDICATOR_TYPE = {
+        'TS' => :thunderstorm_information,
+        'PWI' => :precipitation_identifier,
+        'P' => :precipitation_amount
+      }.freeze
+
+      COLOR_CODE = %w(RED AMB YLO GRN WHT BLU).freeze
+
+      def self.parse(raw)
+        return nil if !raw
+
+        m1 = raw.match(/^([12])([01])(\d{3})$/)
+        if m1
+          extreme = {'1' => :maximum, '2' => :minimum}[m1[1]]
+          value   = sign(m1[2]) * tenths(m1[3])
+          return Metar::Data::TemperatureExtreme.new(raw, extreme, value)
+        end
+
+        m2 = raw.match(/^4([01])(\d{3})([01])(\d{3})$/)
+        if m2
+          v1 = sign(m2[1]) * tenths(m2[2])
+          v2 = sign(m2[3]) * tenths(m2[4])
+          return [
+            Metar::Data::TemperatureExtreme.new(raw, :maximum, v1),
+            Metar::Data::TemperatureExtreme.new(raw, :minimum, v2)
+          ]
+        end
+
+        m3 = raw.match(/^5([0-8])(\d{3})$/)
+        if m3
+          character = PRESSURE_CHANGE_CHARACTER[m3[1].to_i]
+          return Metar::Data::PressureTendency.new(
+            raw, character, tenths(m3[2])
+          )
+        end
+
+        m4 = raw.match(/^6(\d{4})$/)
+        if m4
+          d = Metar::Data::Distance.new(inches_to_meters(m4[1]))
+          period = 3 # actually 3 or 6 depending on reporting time
+          return Metar::Data::Precipitation.new(raw, period, d)
+        end
+
+        m5 = raw.match(/^7(\d{4})$/)
+        if m5
+          d = Metar::Data::Distance.new(inches_to_meters(m5[1]))
+          return Metar::Data::Precipitation.new(raw, 24, d)
+        end
+
+        m6 = raw.match(/^A[0O]([12])$/)
+        if m6
+          index = m6[1].to_i - 1
+          type = %i(
+            with_precipitation_discriminator without_precipitation_discriminator
+          )[index]
+          return Metar::Data::AutomatedStationType.new(raw, type)
+        end
+
+        m7 = raw.match(/^P(\d{4})$/)
+        if m7
+          d = Metar::Data::Distance.new(inches_to_meters(m7[1]))
+          return Metar::Data::Precipitation.new(raw, 1, d)
+        end
+
+        m8 = raw.match(/^T([01])(\d{3})([01])(\d{3})$/)
+        if m8
+          temperature = Metar::Data::Temperature.new(
+            sign(m8[1]) * tenths(m8[2])
+          )
+          dew_point = Metar::Data::Temperature.new(
+            sign(m8[3]) * tenths(m8[4])
+          )
+          return Metar::Data::HourlyTemperatureAndDewPoint.new(
+            raw, temperature, dew_point
+          )
+        end
+
+        m9 = raw.match(/^SLP(\d{3})$/)
+        if m9
+          pressure = M9t::Pressure.hectopascals(tenths(m9[1]))
+          return Metar::Data::SeaLevelPressure.new(raw, pressure)
+        end
+
+        m10 = raw.match(/^(#{INDICATOR_TYPE.keys.join('|')})NO$/)
+        if m10
+          type = INDICATOR_TYPE[m10[1]]
+          return Metar::Data::SensorStatusIndicator.new(
+            raw, type, :not_available
+          )
+        end
+
+        m11 = raw.match(/^(#{COLOR_CODE.join('|')})$/)
+        return Metar::Data::ColorCode.new(raw, m11[1]) if m11
+
+        return Metar::Data::SkyCondition.new(raw) if raw == 'SKC'
+
+        return Metar::Data::MaintenanceNeeded.new(raw) if raw == '$'
+
+        nil
+      end
+
+      def self.sign(digit)
+        case digit
+        when '0'
+          1.0
+        when '1'
+          -1.0
+        else
+          raise "Unexpected sign: #{digit}"
+        end
+      end
+
+      def self.tenths(digits)
+        digits.to_f / 10.0
+      end
+
+      def self.inches_to_meters(digits)
+        digits.to_f * 0.000254
+      end
     end
-
-    m10 = raw.match(/^(#{INDICATOR_TYPE.keys.join('|')})NO$/)
-    if m10
-      type = INDICATOR_TYPE[m10[1]]
-      return Metar::Data::SensorStatusIndicator.new(raw, type, :not_available)
-    end
-
-    m11 = raw.match(/^(#{COLOR_CODE.join('|')})$/)
-    if m11
-      return Metar::Data::ColorCode.new(raw, m11[1])
-    end
-
-    if raw == 'SKC'
-      return Metar::Data::SkyCondition.new(raw)
-    end
-
-    if raw == '$'
-      Metar::Data::MaintenanceNeeded.new(raw)
-    end
-
-    nil
   end
-
-  def self.sign(digit)
-    case digit
-    when '0'
-      1.0
-    when '1'
-      -1.0
-    else
-      raise "Unexpected sign: #{digit}"
-    end
-  end
-
-  def self.tenths(digits)
-    digits.to_f / 10.0
-  end
-
-  def self.inches_to_meters(digits)
-    digits.to_f * 0.000254
-  end
-end
-
-module Metar::Data
-  TemperatureExtreme = Struct.new(:raw, :extreme, :value)
-  PressureTendency = Struct.new(:raw, :character, :value)
-  Precipitation = Struct.new(:raw, :period, :amount)
-  AutomatedStationType = Struct.new(:raw, :type)
-  HourlyTemperatureAndDewPoint = Struct.new(:raw, :temperature, :dew_point)
-  SeaLevelPressure = Struct.new(:raw, :pressure)
-  SensorStatusIndicator = Struct.new(:raw, :type, :state)
-  ColorCode = Struct.new(:raw, :code)
-  MaintenanceNeeded = Struct.new(:raw)
 end

data/lib/metar/data/runway_visible_range.rb

@@ -1,90 +1,110 @@
-class Metar::Data::RunwayVisibleRange < Metar::Data::Base
-  TENDENCY   = {'' => nil, 'N' => :no_change, 'U' => :improving, 'D' => :worsening}
-  COMPARATOR = {'' => nil, 'P' => :more_than, 'M' => :less_than}
-  UNITS      = {'' => :meters, 'FT' => :feet}
+# frozen_string_literal: true
 
-  def self.parse(raw)
-    return nil if raw.nil?
+module Metar
+  module Data
+    class RunwayVisibleRange < Metar::Data::Base
+      TENDENCY = {
+        '' => nil,
+        'N' => :no_change,
+        'U' => :improving,
+        'D' => :worsening
+      }.freeze
 
-    m1 = raw.match(/^R(\d+[RLC]?)\/(P|M|)(\d{4})(FT|)\/?(N|U|D|)$/)
-    if m1
-      designator = m1[1]
-      comparator = COMPARATOR[m1[2]]
-      count      = m1[3].to_f
-      units      = UNITS[m1[4]]
-      tendency   = TENDENCY[m1[5]]
-      distance   = Metar::Data::Distance.send(units, count)
-      visibility = Metar::Data::Visibility.new(
-        nil, distance: distance, comparator: comparator
-      )
-      return new(
-        raw,
-        designator: designator, visibility1: visibility, tendency: tendency
-      )
-    end
+      COMPARATOR = {'' => nil, 'P' => :more_than, 'M' => :less_than}.freeze
+      UNITS      = {'' => :meters, 'FT' => :feet}.freeze
 
-    m2 = raw.match(/^R(\d+[RLC]?)\/(P|M|)(\d{4})V(P|M|)(\d{4})(FT|)\/?(N|U|D)?$/)
-    if m2
-      designator  = m2[1]
-      comparator1 = COMPARATOR[m2[2]]
-      count1      = m2[3].to_f
-      comparator2 = COMPARATOR[m2[4]]
-      count2      = m2[5].to_f
-      units       = UNITS[m2[6]]
-      tendency    = TENDENCY[m2[7]]
-      distance1   = Metar::Data::Distance.send(units, count1)
-      distance2   = Metar::Data::Distance.send(units, count2)
-      visibility1 = Metar::Data::Visibility.new(
-        nil, distance: distance1, comparator: comparator1
-      )
-      visibility2 = Metar::Data::Visibility.new(
-        nil, distance: distance2, comparator: comparator2
-      )
-      return new(
-        raw,
-        designator: designator,
-        visibility1: visibility1, visibility2: visibility2,
-        tendency: tendency, units: units
-      )
-    end
+      def self.parse(raw)
+        return nil if raw.nil?
 
-    nil
-  end
+        m1 = raw.match(%r{^R(\d+[RLC]?)/(P|M|)(\d{4})(FT|)/?(N|U|D|)$})
+        if m1
+          designator = m1[1]
+          comparator = COMPARATOR[m1[2]]
+          count      = m1[3].to_f
+          units      = UNITS[m1[4]]
+          tendency   = TENDENCY[m1[5]]
+          distance   = Metar::Data::Distance.send(units, count)
+          visibility = Metar::Data::Visibility.new(
+            nil, distance: distance, comparator: comparator
+          )
+          return new(
+            raw,
+            designator: designator, visibility1: visibility, tendency: tendency
+          )
+        end
 
-  attr_reader :designator, :visibility1, :visibility2, :tendency
+        m2 = raw.match(
+          %r{^R(\d+[RLC]?)/(P|M|)(\d{4})V(P|M|)(\d{4})(FT|)/?(N|U|D)?$}
+        )
+        if m2
+          designator  = m2[1]
+          comparator1 = COMPARATOR[m2[2]]
+          count1      = m2[3].to_f
+          comparator2 = COMPARATOR[m2[4]]
+          count2      = m2[5].to_f
+          units       = UNITS[m2[6]]
+          tendency    = TENDENCY[m2[7]]
+          distance1   = Metar::Data::Distance.send(units, count1)
+          distance2   = Metar::Data::Distance.send(units, count2)
+          visibility1 = Metar::Data::Visibility.new(
+            nil, distance: distance1, comparator: comparator1
+          )
+          visibility2 = Metar::Data::Visibility.new(
+            nil, distance: distance2, comparator: comparator2
+          )
+          return new(
+            raw,
+            designator: designator,
+            visibility1: visibility1, visibility2: visibility2,
+            tendency: tendency, units: units
+          )
+        end
 
-  def initialize(
-    raw,
-    designator:, visibility1:, visibility2: nil, tendency: nil, units: :meters
-  )
-    @raw = raw
-    @designator, @visibility1, @visibility2, @tendency, @units = designator, visibility1, visibility2, tendency, units
-  end
+        nil
+      end
+
+      attr_reader :designator, :visibility1, :visibility2, :tendency
 
-  def to_s
-    distance_options = {
-      abbreviated: true,
-      precision:   0,
-      units:       @units,
-    }
-    s =
-      if @visibility2.nil?
-        I18n.t('metar.runway_visible_range.runway') +
-          ' '  + @designator +
-          ': ' + @visibility1.to_s(distance_options)
-      else
-        I18n.t('metar.runway_visible_range.runway') +
-          ' '  + @designator +
-          ': ' + I18n.t('metar.runway_visible_range.from') +
-          ' '  + @visibility1.to_s(distance_options) +
-          ' '  + I18n.t('metar.runway_visible_range.to') +
-          ' '  + @visibility2.to_s(distance_options)
+      def initialize(
+        raw,
+        designator:,
+        visibility1:,
+        visibility2: nil,
+        tendency: nil,
+        units: :meters
+      )
+        @raw = raw
+        @designator = designator
+        @visibility1 = visibility1
+        @visibility2 = visibility2
+        @tendency = tendency
+        @units = units
       end
 
-    if ! tendency.nil?
-      s += ' ' + I18n.t("tendency.#{tendency}")
-    end
+      def to_s
+        distance_options = {
+          abbreviated: true,
+          precision: 0,
+          units: @units
+        }
+        s =
+          if @visibility2.nil?
+            I18n.t('metar.runway_visible_range.runway') +
+              ' '  + @designator +
+              ': ' + @visibility1.to_s(distance_options)
+          else
+            I18n.t('metar.runway_visible_range.runway') +
+              ' '  + @designator +
+              ': ' + I18n.t('metar.runway_visible_range.from') +
+              ' '  + @visibility1.to_s(distance_options) +
+              ' '  + I18n.t('metar.runway_visible_range.to') +
+              ' '  + @visibility2.to_s(distance_options)
+          end
+
+        s += ' ' + I18n.t("tendency.#{tendency}") if !tendency.nil?
 
-    s
+        s
+      end
+    end
   end
 end

data/lib/metar/data/sky_condition.rb

@@ -1,70 +1,81 @@
-class Metar::Data::SkyCondition < Metar::Data::Base
-  QUANTITY = {'BKN' => 'broken', 'FEW' => 'few', 'OVC' => 'overcast', 'SCT' => 'scattered'}
-  CONDITION = {
-    'CB'  => 'cumulonimbus',
-    'TCU' => 'towering cumulus',
-    '///' => nil, # cloud type unknown as observed by automatic system (15.9.1.7)
-    ''    => nil,
-  }
-  CLEAR_SKIES = [
-    'NSC', # WMO
-    'NCD', # WMO
-    'CLR',
-    'SKC',
-  ]
+# frozen_string_literal: true
 
-  def self.parse(raw)
-    if !raw
-      return nil
-    end
+module Metar
+  module Data
+    class SkyCondition < Metar::Data::Base
+      QUANTITY = {
+        'BKN' => 'broken',
+        'FEW' => 'few',
+        'OVC' => 'overcast',
+        'SCT' => 'scattered'
+      }.freeze
 
-    if CLEAR_SKIES.include?(raw)
-      return new(raw)
-    end
+      CONDITION = {
+        'CB' => 'cumulonimbus',
+        'TCU' => 'towering cumulus',
+        # /// - cloud type unknown as observed by automatic system (15.9.1.7)
+        '///' => nil,
+        '' => nil
+      }.freeze
+      CLEAR_SKIES = [
+        'NSC', # WMO
+        'NCD', # WMO
+        'CLR',
+        'SKC'
+      ].freeze
 
-    m1 = raw.match(/^(BKN|FEW|OVC|SCT)(\d+|\/{3})(CB|TCU|\/{3}|)?$/)
-    if m1
-      quantity = QUANTITY[m1[1]]
-      height   =
-        if m1[2] == '///'
-          nil
-        else
-          Metar::Data::Distance.new(m1[2].to_i * 30.48)
+      def self.parse(raw)
+        return nil if !raw
+
+        return new(raw) if CLEAR_SKIES.include?(raw)
+
+        m1 = raw.match(%r{^(BKN|FEW|OVC|SCT)(\d+|/{3})(CB|TCU|/{3}|)?$})
+        if m1
+          quantity = QUANTITY[m1[1]]
+          height   =
+            if m1[2] == '///'
+              nil
+            else
+              Metar::Data::Distance.new(m1[2].to_i * 30.48)
+            end
+          type = CONDITION[m1[3]]
+          return new(raw, quantity: quantity, height: height, type: type)
         end
-      type = CONDITION[m1[3]]
-      return new(raw, quantity: quantity, height: height, type: type)
-    end
 
-    m2 = raw.match(/^(CB|TCU)$/)
-    if m2
-      type = CONDITION[m2[1]]
-      return new(raw, type: type)
-    end
+        m2 = raw.match(/^(CB|TCU)$/)
+        if m2
+          type = CONDITION[m2[1]]
+          return new(raw, type: type)
+        end
 
-    nil
-  end
+        nil
+      end
 
-  attr_reader :quantity, :height, :type
+      attr_reader :quantity, :height, :type
 
-  def initialize(raw, quantity: nil, height: nil, type: nil)
-    @raw = raw
-    @quantity, @height, @type = quantity, height, type
-  end
+      def initialize(raw, quantity: nil, height: nil, type: nil)
+        @raw = raw
+        @quantity = quantity
+        @height = height
+        @type = type
+      end
 
-  def to_s
-    if @height.nil?
-      to_summary
-    else
-      to_summary + ' ' + I18n.t('metar.altitude.at') + ' ' + height.to_s
-    end
-  end
+      def to_s
+        if @height.nil?
+          to_summary
+        else
+          to_summary + ' ' + I18n.t('metar.altitude.at') + ' ' + height.to_s
+        end
+      end
 
-  def to_summary
-    if @quantity == nil and @height == nil and @type == nil
-      I18n.t('metar.sky_conditions.clear skies')
-    else
-      type = @type ? ' ' + @type : ''
-      I18n.t("metar.sky_conditions.#{@quantity}#{type}")
+      def to_summary
+        if @quantity.nil? && @height.nil? && @type.nil?
+          I18n.t('metar.sky_conditions.clear skies')
+        else
+          type = @type ? ' ' + @type : ''
+          I18n.t("metar.sky_conditions.#{@quantity}#{type}")
+        end
+      end
     end
   end
 end

data/lib/metar/data/speed.rb

@@ -1,20 +1,27 @@
+# frozen_string_literal: true
+
 require "i18n"
 require "m9t"
 
-# Adds a parse method to the M9t base class
-class Metar::Data::Speed < M9t::Speed
-  METAR_UNITS = {
-    ""    => :kilometers_per_hour,
-    "KMH" => :kilometers_per_hour,
-    "MPS" => :meters_per_second,
-    "KT"  => :knots,
-  }
+module Metar
+  module Data
+    class Speed < M9t::Speed
+      METAR_UNITS = {
+        "" => :kilometers_per_hour,
+        "KMH" => :kilometers_per_hour,
+        "MPS" => :meters_per_second,
+        "KT" => :knots
+      }.freeze
+
+      def self.parse(raw)
+        return nil if raw.nil?
+
+        m = raw.match(/^(\d+)(|KT|MPS|KMH)$/)
+        return nil if m.nil?
 
-  def self.parse(raw)
-    return nil if raw.nil?
-    m = raw.match(/^(\d+)(|KT|MPS|KMH)$/)
-    return nil if m.nil?
-    # Call the appropriate factory method for the supplied units
-    return send(METAR_UNITS[m[2]], m[1].to_i)
+        # Call the appropriate factory method for the supplied units
+        send(METAR_UNITS[m[2]], m[1].to_i)
+      end
+    end
   end
 end

data/lib/metar/data/station_code.rb

@@ -1,7 +1,11 @@
-class Metar::Data::StationCode < Metar::Data::Base
-  def self.parse(raw)
-    if raw =~ /^[A-Z][A-Z0-9]{3}$/
-      new(raw)
+# frozen_string_literal: true
+
+module Metar
+  module Data
+    class StationCode < Metar::Data::Base
+      def self.parse(raw)
+        new(raw) if raw =~ /^[A-Z][A-Z0-9]{3}$/
+      end
     end
   end
 end