notam 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 417d4bc6e661b8d3a79cf54a3f191eea69643e6e40de00152589b12bedf8e768
-  data.tar.gz: 51e949d622b8da7772b8dc1e2247ffe41529e787ec2ee133a7852d728bfdf251
+  metadata.gz: 9ac9f9d9c891d07fa204936e712b43f3b872d0d79b07298e426e845916d8b20d
+  data.tar.gz: 33a5fdaadf77d20c37690e06147942c30167e296cb1e2c41f90d432c44a5f39d
 SHA512:
-  metadata.gz: 6717133961de80fed0c49d88af287526e71654ea04ac51baeb69e1fc7b4bfdda8149bddec3949dc1292ad9bec69d1c4aa395224e6db5f17973bf9dd01a915b7e
-  data.tar.gz: 1827871715ad368903c2a91bc8da784a248f7cb44bf926d982efab3243c3ddc3afde83e2fecd1474c8b7725bf8ca4e824fd00ecade6710e9447c1c7e2a98ec18
+  metadata.gz: a1d8eb8f529b8cfd2b0da1426093450451dffd85aa28e9ddee6e69e25ec993dc56f5035954c17e10e801dc9ecf90583a5e36306dab8ac4722c1c26305a557107
+  data.tar.gz: 17c930b744c09c3059592d8e859c8e3cb8a8e7dc805d847e8ef9eac4f43991f6125af70e5ae4e66f8d56217a922300ea69e7a5c7bc0a52e20dd8863411f350fe

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Nothing so far
 
+## 1.1.2
+
+#### Fixes
+* Carry over last base date instead of first base date
+
 ## 1.1.1
 
 #### Fixes

data/README.md

@@ -212,6 +212,7 @@ Parsed | `00:00`          | `24:00`    | the Ruby way
 ### References
 
 * [ICAO Doc 8126: Aeronautical Information Services Manual](https://www.icao.int/NACC/Documents/eDOCS/AIM/8126_unedited_en%20Jul2021.pdf)
+* [ICAO Doc 10066: Aeronautical Information Management](https://ffac.ch/wp-content/uploads/2020/11/ICAO-Doc-10066-Aeronautical-Information-Management.pdf)
 * [EUROCONTROL Guidelines Operating Procedures AIS Dynamic Data (OPADD)](https://www.eurocontrol.int/sites/default/files/2021-07/eurocontrol-guidelines-opadd-ed4-1.pdf)
 * [NOTAM Q Codes](https://www.faa.gov/air_traffic/publications/atpubs/notam_html/appendix_b.html)
 * [NOTAM Contractions](https://www.notams.faa.gov/downloads/contractions.pdf)

data/lib/notam/item/d.rb

@@ -16,9 +16,7 @@ module NOTAM
       base_date = AIXM.date(data[:effective_at])
       @schedules = text.sub(/\AD\)/, '').split(',').flat_map do |string|
         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
+          base_date = schedule.last.last_date || base_date   # carry over month
         end
       end
       self

data/lib/notam/schedule.rb

@@ -28,7 +28,7 @@ module NOTAM
 
     # Active dates or days
     #
-    # @note If {#active} lists dates, then {#inactive} must list days and
+    # @note If {#actives} lists dates, then {#inactives} must list days and
     #   vice versa.
     #
     # @return [Array<NOTAM::Schedule::Dates>, Array<NOTAM::Schedule::Days>]
@@ -41,7 +41,7 @@ module NOTAM
 
     # Inactive dates or days
     #
-    # @note If {#inactive} lists dates, then {#active} must list days and
+    # @note If {#inactives} lists dates, then {#actives} must list days and
     #   vice versa.
     #
     # @return [Array<NOTAM::Schedule::Dates>, Array<NOTAM::Schedule::Days>]
@@ -274,6 +274,16 @@ module NOTAM
       resolve(on: date, xy: xy).slice(date).times.cover? AIXM.time(at)
     end
 
+    # Last +actives+ date of the schedule (+inatives+ are ignored).
+    #
+    # @return [AIXM::Date, nil] last date or +nil+ if schedule actives are days
+    def last_date
+      actives.last.then do |active|
+        active = active.last if active.respond_to? :last
+        active if active.instance_of? AIXM::Schedule::Date
+      end
+    end
+
     # @abstract
     class ScheduleArray < Array
       # @return [String]

data/lib/notam/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notam
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Sven Schwyn
@@ -29,7 +29,7 @@ cert_chain:
   kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
   fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-06-17 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.4.13
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: Parser for NOTAM (Notice to Airmen) messages