notam 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82e0d9749642d667ef8b547cb0fea44184dd695889258798302ca5875b019947
-  data.tar.gz: 7a7b5ebd3fe9fcd0b8368e66911b24228672283048d3e83cfc87ab2c923e1805
+  metadata.gz: b793dbd67af43de50525171950c176860cb7095b865e2362d1aaf31c4a4e737c
+  data.tar.gz: e3915a6680b06eb3a43270012dfb552b84443605a21dafd44f7c72597973a3de
 SHA512:
-  metadata.gz: a98c7ae52e81387a1699c3d668e1fae0536112ef6cbc5ae071f5a98d4c096c33f0a71a25174c9c4c6bec6a183f75a7ebc03aa23ff44de87033895b7746ff4a28
-  data.tar.gz: 72811552016bbd955f52cab2fac066ffbafae6683eefb4f19f738c9186d736db6b4948b30dab04440d9b08f4e863d00e74af517bb0f20f45e9b438da277b8d76
+  metadata.gz: cccba536bce34a893bdc717ba2b4983bf09e66d499acc33cec4ec949a52bb4685319c36fe99c30ee73ba82e91d33a8c5446a96f7ba18abf468c5fd6dc147daa1
+  data.tar.gz: 1acee0ea83919ed99d2825d81ea34d1e0fba3464a31c68706e870baa8e72c8e2e05c5ac282410bf09cde59be5a01b809c8fe780771c12197bee7331b13d9318b

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 Nothing so far
 
+## 0.1.3
+
+#### Fixes
+* Reverse accidentally flipped F and G item.
+
+## 0.1.2
+
+#### Changes
+* The five day schedules are calculated starting today if `effective_at` is
+  in the past.
+
+## 0.1.1
+
+#### Changes
+* Update dependency on AIXM gem
+
 ## 0.1.0
 
 #### Initial Implementation

data/README.md

@@ -1,6 +1,6 @@
 [![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)
-[![Code Climate](https://img.shields.io/codeclimate/maintainability/notam/notam.svg?style=flat)](https://codeclimate.com/github/svoop/notam/)
+[![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)
 
 # NOTAM
@@ -26,7 +26,7 @@ gem cert --add <(curl -Ls https://raw.github.com/svoop/notam/main/certs/svoop.pe
 Add the following to the `Gemfile` or `gems.rb` of your [Bundler](https://bundler.io) powered Ruby project:
 
 ```ruby
-gem notam
+gem 'notam'
 ```
 
 And then install the bundle:
@@ -112,6 +112,19 @@ See the [API documentation](https://www.rubydoc.info/gems/notam) for more.
 
 ⚠️ Only NOTAM compatible with the ICAO annex 15 are supported for now. Most notably in the USA other NOTAM formats exist which cannot be parsed using this gem.
 
+### Anatomy of a NOTAM message
+
+A NOTAM message consists of a header followed by the following items:
+
+* [Q item](https://www.rubydoc.info/gems/notam/NOTAM/Q): Essential information such as purpose or center point and radius
+* [A item](https://www.rubydoc.info/gems/notam/NOTAM/A): Affected locations
+* [B item](https://www.rubydoc.info/gems/notam/NOTAM/B): When the NOTAM becomes effective
+* [C item](https://www.rubydoc.info/gems/notam/NOTAM/C): When the NOTAM expires
+* [D item](https://www.rubydoc.info/gems/notam/NOTAM/D): Activity schedules (optional)
+* [E item](https://www.rubydoc.info/gems/notam/NOTAM/E): Free text description
+* [F item](https://www.rubydoc.info/gems/notam/NOTAM/F): Upper limit (optional)
+* [G item](https://www.rubydoc.info/gems/notam/NOTAM/G): Lower limit (optional)
+
 ### FIR
 
 Four letter FIR codes assigned by the ICAO follow some logic, albeit there exist exceptions and inconsistencies e.g. for historical reasons. Let's take an easy example:
@@ -119,14 +132,14 @@ Four letter FIR codes assigned by the ICAO follow some logic, albeit there exist
 ```
 L F M M
 ┬ ┬ ─┬─
-│ │  └─ global area: L => lower Europe
+│ │  └─ subsection: MM => Marseille
 │ └──── geopolitical unit: F => France
-└────── subsection: MM => Marseille
+└────── global area: L => lower Europe
 ```
 
 The informal use of only the first two letters often stands for a combination of all subsections contained therein. Example: `LF` is a combination of `LFBB`, `LFEE`, `LFFF`, `LFMM` and `LFRR`.
 
-FIR codes ending with `XX` specify more than one subsection. Example: `LFXX` is a combination of two subsections with in `LF`. In NOTAM, this notation may be used on the Q item if (and only if) the affected subsections are listed on the A item.
+FIR codes ending with `XX` specify more than one subsection. Example: `LFXX` can be any combination of at least two subsections within `LF`. In NOTAM, this notation may be used on the Q item if (and only if) the affected subsections are listed on the A item.
 
 ### Series
 
@@ -151,18 +164,20 @@ AIS are free to define series as they please, however, a few conventions have em
 
 #### Checklist
 
-Checklist NOTAM are periodically issued lists of all currently effective NOTAM. They are used for cross checking and can usually be ignored for flight planning. Their Q item contain `Q..KK` which is decoded as "condition: :checklist", here's an example:
+Checklist NOTAM are periodically issued lists of all currently effective NOTAM. They are used for cross checking and can usually be ignored for flight planning. Their Q item contain `QKKKK` which is decoded as `condition: :checklist`, here's an example:
 
 ```
 Q) EDXX/QKKKK/K /K  /K /000/999/5123N01018E999
+        ^^^^^
 ```
 
 #### Trigger
 
-Trigger NOTAM are referring to another source of information such as AIP SUP (AIP supplement). Their Q item contain `Q..TT` which is decoded as "condition: :trigger", here's an example:
+Trigger NOTAM are referring to another source of information such as AIP SUP (AIP supplement). Their Q item contain `Q..TT` which is decoded as `condition: :trigger`, here's an example:
 
 ```
 Q) LFXX/QRTTT/IV/BO /W /000/035/4708N00029E010
+        ^  ^^
 ```
 
 Note: Trigger NOTAM are never published as series `T`.

data/lib/notam/item/d.rb

@@ -28,11 +28,17 @@ module NOTAM
       schedules.any? { _1.active?(at: at, xy: data[:center_point]) }
     end
 
+    # Calculate the relevant, consolidated schedules for five days.
+    #
+    # The beginning of the five day window is either today (if +effective_at+
+    # is in the past) or +effective_at+ (otherwise).
+    #
+    # @return [Array<NOTAM::Schedule>]
     def five_day_schedules
       schedules.map do |schedule|
         schedule
-          .slice(AIXM.date(data[:effective_at]), AIXM.date(data[:effective_at] + 4 * 86_400))
-          .resolve(on: data[:effective_at], xy: data[:center_point])
+          .slice(AIXM.date(five_day_base), AIXM.date(five_day_base + 4 * 86_400))
+          .resolve(on: AIXM.date(five_day_base), xy: data[:center_point])
       end.map { _1 unless _1.empty? }.compact
     end
 
@@ -43,6 +49,12 @@ module NOTAM
 
     private
 
+    # @return [Time]
+    def five_day_base
+      @five_day_base ||= [data[:effective_at], Time.now.utc.round].max
+    end
+
+    # @params string [String] string to clean up
     # @return [String]
     def cleanup(string)
       string

data/lib/notam/item/f.rb

@@ -2,7 +2,7 @@
 
 module NOTAM
 
-  # The F item defines the upper limit for this NOTAM.
+  # The F item defines the lower limit for this NOTAM.
   class F < Item
 
     RE = %r(
@@ -17,7 +17,7 @@ module NOTAM
     )x.freeze
 
     # @return [AIXM::Z]
-    def upper_limit
+    def lower_limit
       case captures['all']
         when 'UNL' then AIXM::UNLIMITED
         when 'SFC', 'GND' then AIXM::GROUND
@@ -27,7 +27,7 @@ module NOTAM
 
     # @see NOTAM::Item#merge
     def merge
-      super(:upper_limit)
+      super(:lower_limit)
     end
 
   end

data/lib/notam/item/g.rb

@@ -2,7 +2,7 @@
 
 module NOTAM
 
-  # The G item defines the lower limit for this NOTAM.
+  # The G item defines the upper limit for this NOTAM.
   class G < Item
 
     RE = %r(
@@ -17,7 +17,7 @@ module NOTAM
     )x.freeze
 
     # @return [AIXM::Z]
-    def lower_limit
+    def upper_limit
       case captures['all']
         when 'UNL' then AIXM::UNLIMITED
         when 'SFC', 'GND' then AIXM::GROUND
@@ -27,7 +27,7 @@ module NOTAM
 
     # @see NOTAM::Item#merge
     def merge
-      super(:lower_limit)
+      super(:upper_limit)
     end
 
   end

data/lib/notam/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notam
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Sven Schwyn
@@ -30,7 +30,7 @@ cert_chain:
   1+2Y1+i+4jd1B7qxIgOLxQTNIJiwE0sqU1itFfuesfgUACS7M0IV9u9Bp4hBGNEw
   5JcY2h7owdMxXIvgk1oakgldFJc=
   -----END CERTIFICATE-----
-date: 2022-04-23 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aixm
@@ -38,14 +38,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -252,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.3.14
 signing_key:
 specification_version: 4
 summary: Parser for NOTAM (Notice to Airmen) messages