notam 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3f0a2b936b2f99302c03166135f539d6d9aa8c90ded6da55052e72c27937dcf
-  data.tar.gz: de7f1ff14e4c8c5de825f88a3d83cb22b7726a41b6ed5fffa7bf99c19ac856b9
+  metadata.gz: 417d4bc6e661b8d3a79cf54a3f191eea69643e6e40de00152589b12bedf8e768
+  data.tar.gz: 51e949d622b8da7772b8dc1e2247ffe41529e787ec2ee133a7852d728bfdf251
 SHA512:
-  metadata.gz: 53d1288241008d166fde8a71b1e13ae0cc088f62f552503f70282e2de4cca086e22b6cc80437d3dbfd911ec8056e55481a6aaa8f7221c963ab3dc99ff1799eba
-  data.tar.gz: 6c94aa7b09ec15c27d9af9ba4232cf8e5b39086a4444d14bda82c4f5ddd8414ee89c6d9cb53694663b36aa1a0861cb87de2bcbc16b2fe965af3bafbdf36bcc7a
+  metadata.gz: 6717133961de80fed0c49d88af287526e71654ea04ac51baeb69e1fc7b4bfdda8149bddec3949dc1292ad9bec69d1c4aa395224e6db5f17973bf9dd01a915b7e
+  data.tar.gz: 1827871715ad368903c2a91bc8da784a248f7cb44bf926d982efab3243c3ddc3afde83e2fecd1474c8b7725bf8ca4e824fd00ecade6710e9447c1c7e2a98ec18

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-
-xE��(0qk>�\����a�fcUs���K���1���
+��*-bxsk:� ��,�d'��������%3O��7$=B�ы�A�\�w�[�.�
+RCu�==���9=��4-fdqf&��j��x�P��\2�A�F���|�g��լ~ǵ7�ih��T��$nz�g���h��Ù��k�
+w&㛷r��G�۳��6�

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 Nothing so far
 
+## 1.1.1
+
+#### Fixes
+* Carry over base date for multiple D-item elements which partially omit to
+  mention the month in every element
+
+## 1.1.0
+
+#### Additions
+* Extract subject group and condition group on Q item
+
 ## 1.0.0
 
 #### Breaking Changes

data/README.md

@@ -1,5 +1,5 @@
 [![Version](https://img.shields.io/gem/v/notam.svg?style=flat)](https://rubygems.org/gems/notam)
-[![Tests](https://img.shields.io/github/workflow/status/svoop/notam/Test.svg?style=flat&label=tests)](https://github.com/svoop/notam/actions?workflow=Test)
+[![Tests](https://img.shields.io/github/actions/workflow/status/svoop/notam/test.yml?style=flat&label=tests)](https://github.com/svoop/notam/actions?workflow=Test)
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/svoop/notam.svg?style=flat)](https://codeclimate.com/github/svoop/notam/)
 [![Donorbox](https://img.shields.io/badge/donate-on_donorbox-yellow.svg)](https://donorbox.org/bitcetera)
 
@@ -66,7 +66,9 @@ The resulting hash for this example looks as follows:
   id_year: 2022,
   new?: true,
   fir: "LSAS",
+  subject_group: :airspace_restrictions,
   subject: :restricted_area,
+  condition_group: :changes,
   condition: :activated,
   traffic: :vfr,
   purpose: [:operational_significance, :flight_operations],

data/lib/locales/en.yml

@@ -307,6 +307,22 @@ en:
     ZSHA: "Shanghai ACC"
     ZWUQ: "Urumqi ACC"
     ZYSH: "Shenyang ACC"
+  subject_groups:
+    airspace_organization: "airspace organization"
+    communications_and_surveillance_facilities: "communications and surveillance facilities"
+    facilities_and_services: "facilities and services"
+    gnss_services: "GNSS services"
+    instrument_and_microwave_landing_system: "instrument and microwave landing system"
+    checklist: "checklist"
+    lighting_facilities: "lighting facilities"
+    movement_and_landing_area: "movement and landing area"
+    terminal_and_en_route_navigation_facilities: "terminal and en route navigation facilities"
+    other_information: "other information"
+    air_traffic_procedures: "air traffic procedures"
+    airspace_restrictions: "airspace restrictions"
+    air_traffic_and_volmet_services: "air traffic and VOLMET services"
+    warning: "warning"
+    other: "other"
   subjects:
     minimum_altitude: "minimum altitude"
     class_bcde_surface_area: "class B/C/D/E surface area"
@@ -488,6 +504,14 @@ en:
     aerial_survey: "aerial survey"
     model_flying: "model flying"
     other: "other"
+  condition_groups:
+    availability: "availabiity"
+    changes: "changes"
+    hazard_conditions: "hazard conditions"
+    checklist: "checklist"
+    limitations: "limitations"
+    trigger: "trigger"
+    other: "other"
   conditions:
     withdrawn_for_maintenance: "withdrawn for maintenance"
     available_for_daylight_operation: "available for daylight operation"

data/lib/notam/item/d.rb

@@ -15,7 +15,11 @@ module NOTAM
     def parse
       base_date = AIXM.date(data[:effective_at])
       @schedules = text.sub(/\AD\)/, '').split(',').flat_map do |string|
-        Schedule.parse(string, base_date: base_date)
+        Schedule.parse(string, base_date: base_date).tap do |schedule|
+          if (date = schedule.first.actives.first).instance_of? AIXM::Schedule::Date
+            base_date = date   # carry over month
+          end
+        end
       end
       self
     rescue

data/lib/notam/item/q.rb

@@ -26,11 +26,21 @@ module NOTAM
       captures['fir']
     end
 
+    # @return [Symbol]
+    def subject_group
+      NOTAM.subject_group_for(captures['subject'][0,1])
+    end
+
     # @return [Symbol]
     def subject
       NOTAM.subject_for(captures['subject'])
     end
 
+    # @return [Symbol]
+    def condition_group
+      NOTAM.condition_group_for(captures['condition'][0,1])
+    end
+
     # @return [Symbol]
     def condition
       NOTAM.condition_for(captures['condition'])
@@ -82,7 +92,7 @@ module NOTAM
 
     # @see NOTAM::Item#merge
     def merge
-      super(:fir, :subject, :condition, :traffic, :purpose, :scope, :lower_limit, :upper_limit, :center_point, :radius)
+      super(:fir, :subject_group, :subject, :condition_group, :condition, :traffic, :purpose, :scope, :lower_limit, :upper_limit, :center_point, :radius)
     end
 
   end

data/lib/notam/translation.rb

@@ -26,6 +26,14 @@ module NOTAM
       FIRS.fetch(fir)
     end
 
+    # Translates the NOTAM subject group code to human/machine readable symbol
+    #
+    # @param code [String] one letter subject group code
+    # @return [Symbol] value from {NOTAM::SUBJECT_GROUPS}
+    def subject_group_for(code)
+      SUBJECT_GROUPS.fetch(code)
+    end
+
     # Translates the NOTAM subject code to human/machine readable symbol
     #
     # @param code [String] two letter subject code
@@ -34,6 +42,14 @@ module NOTAM
       SUBJECTS.fetch(code)
     end
 
+    # Translates the NOTAM condition group code to human/machine readable symbol
+    #
+    # @param code [String] one letter condition group code
+    # @return [Symbol] value from {NOTAM::CONDITION_GROUPS}
+    def condition_group_for(code)
+      CONDITION_GROUPS.fetch(code)
+    end
+
     # Translates the NOTAM condition code to human/machine readable symbol
     #
     # @param code [String] two letter condition code
@@ -393,6 +409,27 @@ module NOTAM
     'ZYSH' => [:CH]
   }.freeze
 
+  # International NOTAM Q codes for subject groups
+  #
+  # @see https://www.faa.gov/air_traffic/publications/atpubs/notam_html/appendix_b.html
+  SUBJECT_GROUPS = {
+    'A' => :airspace_organization,
+    'C' => :communications_and_surveillance_facilities,
+    'F' => :facilities_and_services,
+    'G' => :gnss_services,
+    'I' => :instrument_and_microwave_landing_system,
+    'K' => :checklist,
+    'L' => :lighting_facilities,
+    'M' => :movement_and_landing_area,
+    'N' => :terminal_and_en_route_navigation_facilities,
+    'O' => :other_information,
+    'P' => :air_traffic_procedures,
+    'R' => :airspace_restrictions,
+    'S' => :air_traffic_and_volmet_services,
+    'W' => :warning,
+    'X' => :other
+  }.freeze
+
   # International NOTAM Q codes for subjects
   #
   # @see https://www.faa.gov/air_traffic/publications/atpubs/notam_html/appendix_b.html
@@ -579,6 +616,19 @@ module NOTAM
     'XX' => :other
   }.freeze
 
+  # International NOTAM Q codes for condition groups
+  #
+  # @see https://www.faa.gov/air_traffic/publications/atpubs/notam_html/appendix_b.html
+  CONDITION_GROUPS = {
+    'A' => :availability,
+    'C' => :changes,
+    'H' => :hazard_conditions,
+    'K' => :checklist,
+    'L' => :limitations,
+    'T' => :trigger,
+    'X' => :other
+  }.freeze
+
   # International NOTAM Q codes for conditions
   #
   # @see https://www.faa.gov/air_traffic/publications/atpubs/notam_html/appendix_b.html

data/lib/notam/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NOTAM
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notam
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sven Schwyn
@@ -29,7 +29,7 @@ cert_chain:
   kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
   fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2022-11-18 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aixm
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Parser for NOTAM (Notice to Airmen) messages