aipp 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3071c8fa3c85350a820cf89edc762dd69f926810c5a7cc21dfcb9f050e08d04b
-  data.tar.gz: 6c09089a9c6375b8e7840969b09d644867a41cd3a8d9a5665407c278e2ff1d64
+  metadata.gz: '0385e3ecea39a5901ed655b46dd7809097f5893ee48ac42a7258caefd6b143d7'
+  data.tar.gz: 29448f03945cea80986b719c21817dce6121b01c2eb351484ccc8185d49a5d5f
 SHA512:
-  metadata.gz: 8bd8790d84f2170b2d9505d0b664216134fdaf471acbb2c2e55872f1b54976261b6ac8de83c4bad1cc1ba4f0e0ed92f977fb818f073fd45fbb2ab05107e61a36
-  data.tar.gz: ca05e4eec29621ec019774d559ab81ed35d41b2c1d70aecc93e653f7a188bcc237dfa6864ada0f6f470d9b3836ed6d96f7033649afbaa32c8107ada6671a1135
+  metadata.gz: cc9552790fc6a1e810e12d866437bf868e64d1cec05986ac063113cf4d1170afc7827cc70e96d6001e1021efa21f86634c131eadfdd2db6c882e4b4dda1cdfcf
+  data.tar.gz: d86c19825cfdea27a77e9e7add2a5c5239982f9c1b38e54d3557155b44019ef12dcda6dca2076a536c44914d002348ed8f52afc314098c1c464aeb5f21aab1da

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Nothing so far
 
+## 2.3.0
+
+#### Additions
+* Include the date and time of the last upstream update for LS NOTAM and SHOOT
+
 ## 2.2.2
 
 #### Fix

data/lib/aipp/downloader.rb

@@ -28,7 +28,7 @@ module AIPP
   # [.json] Deserialized JSON e.g. as response to a GraphQL query
   # [.xlsx] Parsed by Roo returning an instance of {Roo::Excelx}[https://www.rubydoc.info/gems/roo/Roo/Excelx]
   # [.ods] Parsed by Roo returning an instance of {Roo::OpenOffice}[https://www.rubydoc.info/gems/roo/Roo/OpenOffice]
-  # [.csv] Parsed by Roo returning an instance of {Roo::CSV}[https://www.rubydoc.info/gems/roo/Roo/CSV]
+  # [.csv] Parsed by Roo returning an instance of {Roo::CSV}[https://www.rubydoc.info/gems/roo/Roo/CSV] including the first header line
   # [.txt] Instance of +String+
   #
   # @example
@@ -162,19 +162,13 @@ module AIPP
     end
 
     def convert(file)
-# TODO: temporary workaround for broken CSV - see https://github.com/svoop/aipp/issues/28
-if file.basename.to_s == 'schiessanzeigen.csv'
-  contents = file.read
-  contents.gsub!(';Blindgänger Sprengung, Aufräumaktion "SÄNTIS 23";', ';"Blindgänger Sprengung, Aufräumaktion SÄNTIS 23";')
-  file.write(contents)
-end
       case file.extname
         when '.xml', '.ofmx' then Nokogiri.XML(::File.open(file), &:noblanks)
         when '.html' then Nokogiri.HTML5(::File.open(file))
         when '.json' then JSON.load_file(file, symbolize_names: true)
         when '.pdf' then AIPP::PDF.new(file)
         when '.xlsx', '.ods' then Roo::Spreadsheet.open(file.to_s)
-        when '.csv' then Roo::Spreadsheet.open(file.to_s, csv_options: { col_sep: separator(file) })
+        when '.csv' then Roo::Spreadsheet.open(file.to_s, csv_options: { encoding: 'bom|utf-8', headers: false, col_sep: separator(file) })
         when '.txt' then ::File.read(file)
         else fail(ArgumentError, "unrecognized file type")
       end

data/lib/aipp/regions/LS/helpers/base.rb

@@ -11,6 +11,7 @@ module AIPP
     class Notam
       Query = Client.parse <<~END
         query ($region: String!, $series: [String!], $start: Int!, $end: Int!) {
+          latestUpdate,
           queryNOTAMs(
             filter: {region: $region, series: $series, start: $start, end: $end}
           ) {

data/lib/aipp/regions/LS/notam/ENR.rb

@@ -11,6 +11,7 @@ module AIPP::LS::NOTAM
       json = read
       fail "malformed JSON received from API" unless json.has_key?(:queryNOTAMs)
       added_notam_ids = []
+      aixm.sourced_at = Time.at(json[:latestUpdate])
       json[:queryNOTAMs].each do |row|
         next unless row[:notamRaw].match? /^Q\) LS/   # only parse national NOTAM
 

data/lib/aipp/regions/LS/shoot/shooting_grounds.rb

@@ -12,28 +12,40 @@ module AIPP::LS::SHOOT
       effective_date = AIPP.options.local_effective_at.strftime('%Y%m%d')
       airac_date = AIRAC::Cycle.new(aixm.effective_at).to_s('%Y-%m-%d')
       shooting_grounds = {}
+      spl_rows = 0
       read.each_with_index do |row, line|
-        type, id, date, no_shooting = row[0], row[1], row[2], (row[17] == "1")
-        next unless type == 'BSZ'
-        next if no_shooting || date != effective_date
-        next if AIPP.options.id && AIPP.options.id != id
-        # TODO: Several BSZ lines may exist for the same shooting area with
-        #   different location codes (aka: partial activations). The geometries
-        #   of those location codes are not currently available, we therefore
-        #   have to merge the data into one record. The geometries should become
-        #   available by the end of 2023 which will make it possible to map
-        #   each line to one geometry and remove the merging logic.
-        upper_z = row[15] ? AIXM.z(AIXM.d(row[15].to_i + SAFETY, :m).to_ft.dim.round, :qfe) : DEFAULT_Z
-        (shooting_grounds[id] ||= { schedules: [], upper_z: AIXM::GROUND }).then do |s|
-          s[:feature] ||= read("shooting_grounds-#{id}").fetch(:feature)
-          s[:csv_line] ||= line
-          s[:url] ||= row[10].blank_to_nil
-          s[:details] = [s[:details], row[6].blank_to_nil].compact.join("\n")
-          s[:dabs] ||= (row[16] == '1')
-          s[:upper_z] = upper_z if upper_z.alt > s[:upper_z].alt
-          s[:schedules] += schedules_for(row)
+        case row[0].strip
+        when 'TOT'
+          date, spl_count = row[1], row[2].to_i
+          fail "malformed CSV: #{spl_count} SPL records announced but #{spl_rows} SPL records found" unless spl_count == spl_rows
+          aixm.sourced_at = [date, TZInfo::Timezone.get('Europe/Zurich').abbr].join(' ')
+          next
+        when 'SPL'
+          spl_rows += 1
+          next
+        when 'BSZ'
+          id, date, no_shooting = row[1], row[2], (row[17] == "1")
+          next if no_shooting || date != effective_date
+          next if AIPP.options.id && AIPP.options.id != id
+          # TODO: Several BSZ lines may exist for the same shooting area with
+          #   different location codes (aka: partial activations). The geometries
+          #   of those location codes are not currently available, we therefore
+          #   have to merge the data into one record. The geometries should become
+          #   available by the end of 2023 which will make it possible to map
+          #   each line to one geometry and remove the merging logic.
+          upper_z = row[15] ? AIXM.z(AIXM.d(row[15].to_i + SAFETY, :m).to_ft.dim.round, :qfe) : DEFAULT_Z
+          (shooting_grounds[id] ||= { schedules: [], upper_z: AIXM::GROUND }).then do |s|
+            s[:feature] ||= read("shooting_grounds-#{id}").fetch(:feature)
+            s[:csv_line] ||= line
+            s[:url] ||= row[10].blank_to_nil
+            s[:details] = [s[:details], row[6].blank_to_nil].compact.join("\n")
+            s[:dabs] ||= (row[16] == '1')
+            s[:upper_z] = upper_z if upper_z.alt > s[:upper_z].alt
+            s[:schedules] += schedules_for(row)
+          end
         end
       end
+      fail "malformed CSV: TOT record missing" unless aixm.sourced_at
       shooting_grounds.each do |id, data|
         data in csv_line:, details:, url:, upper_z:, schedules:, dabs:, feature: { geometry: polygons, properties: { bezeichnung: name, infobezeichnung: contact, infotelefonnr: phone, infoemail: email } }
         schedules = consolidate(schedules)

data/lib/aipp/version.rb

@@ -1,3 +1,3 @@
 module AIPP
-  VERSION = "2.2.2".freeze
+  VERSION = "2.3.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aipp
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Sven Schwyn
@@ -27,7 +27,7 @@ cert_chain:
   k/QvZU05f6HMYBrPogJgIzHC/C5N/yeE4BVEuBDn+10Zb1iu3aDk8sd0uMgukCY8
   TUmlP5A6NeGdeDJIoLgromAKs+nvI7TWzhQq9ODs51XhxgUFRCvBqUTpjTQigw==
   -----END CERTIFICATE-----
-date: 2024-05-30 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airac
@@ -58,7 +58,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -68,7 +68,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: notam
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +89,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.5
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -474,7 +488,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Parser for aeronautical information publications