aipp 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a3f910ee20e31b9a2d0ee0644714c43898917cd9fda36bb5f721c17fcb758be
-  data.tar.gz: a996dd39757199cdadd5ceab2c7014b871785c857dc2054c4d9e5c264b16b5a9
+  metadata.gz: cb4a7ae75e5b180c62d60b63a28ef1e28de3d23e0fe008defc4cc7bc0cf61f14
+  data.tar.gz: 6705dbfab25adfb9c71b1781c8ded9106ab1adc6906ec67f3c1330beb73de3e7
 SHA512:
-  metadata.gz: d8cea4595823cf29656e25e252e205007de55a74240c1bca96f47ccd4e69194a112cb4665da0c784c24289f2d117d9b04e1a43625f86820763553a04bde03ab0
-  data.tar.gz: 7b3ae6c428f88231456a94a882c51ec8c5436bd2ff1398e61a0465b48939ccc3a443ff20ab98039a9ee9fc1ac2a5b70cbbc54ebdf29f9712a84a35460250b312
+  metadata.gz: f394783a21b6aaac134155d06c1e3f5c082dcfdd835d0cb3abf708bc1a417fcc2a4bebf382fa1cc70b82c8fe8fa440cacb6a2f73eb73a1efbd0d3b72c437d5e4
+  data.tar.gz: 6c9d845076a9c2f894c2d4e586f66a32616d1a1903beb54423844b26d12e930bf85089b72494abe51a47c2701450044ef35508b0221c994d9ed512e3a821b6be

checksums.yaml.gz.sig

@@ -1,3 +1,2 @@
-�(��F���S�> *���
-ͻ��\���	k��1�<��>%���#cu�Q�L��Y+<��`%e��#�{k	2�'���M�����&a����*�ɝ7W��T��L��fX�Oki<i�����{��i�+�ޔ
-r�}��Q==J����ÑeF��0*L2��!���?���r�L�������
+M{��T��8(��3;p=[PR��oS�WoE���ʦ�q�3���U~���
+\�ܚ)��o�>�g���

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Nothing so far
 
+## 2.1.2
+
+#### Changes
+* Improve timesheet calculation for shooting grounds in LS
+* Improve safety margins for shooting grounds in LS
+* Switch to unzipped OFMX for now due to issues upstream
+
 ## 2.1.1
 
 #### Additions

data/lib/aipp/regions/LS/README.md

@@ -92,6 +92,14 @@ TOT | 0   | Row        | text(3)                   | yes  | "TOT" (aka: Total)
 TOT | 1   | Created at | datetime(yyyymmddhhmmss)  | yes  | Date and time of CSV creation
 TOT | 2   | SPL count  | number                    | yes  | Number of SPL records
 
+### Safety Margins
+
+The max height (BSZ col 15) has to be treated as an advisory value, not a guarantee:
+
+If no value is given, the ammunition *should* not exceed 250m above ground. However, regulations for certain ammunition types allow for higher peaks. As of March 2023, 6cm mortars *may* reach up to 500m and future weapon systems *may* even go beyond that.
+
+To account for this, the two constants `DEFAULT_Z` and `SAFETY` should be revisited from time to time.
+
 ## Asynchronous Use
 
 ### Command Line Arguments

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

@@ -48,9 +48,12 @@ module AIPP
             fail "not yet implemented"
           when 'AIP'
             AIPP::Downloader::HTTP.new(
-              archive: "https://snapshots.openflightmaps.org/live/#{AIRAC::Cycle.new.id}/ofmx/lsas/latest/ofmx_ls.zip",
-              file: "ofmx_ls/isolated/ofmx_ls.ofmx"
+              file: "https://storage.googleapis.com/snapshots.openflightmaps.org/live/#{AIRAC::Cycle.new.id}/ofmx/lsas/latest/isolated/ofmx_ls.xml"
             )
+            # AIPP::Downloader::HTTP.new(
+            #   archive: "https://snapshots.openflightmaps.org/live/#{AIRAC::Cycle.new.id}/ofmx/lsas/latest/ofmx_ls.zip",
+            #   file: "ofmx_ls/isolated/ofmx_ls.ofmx"
+            # )
           when 'DABS'
             if aixm.effective_at.to_date == Date.today   # DABS cross check works reliably for today only
               AIPP::Downloader::HTTP.new(

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

@@ -5,33 +5,40 @@ module AIPP::LS::SHOOT
 
     include AIPP::LS::Helpers::Base
 
-    DEFAULT_Z = AIXM.z(1000, :qfe)   # height 300m unless present in publication
+    DEFAULT_Z = AIXM.z(2000, :qfe)   # fallback if no max height is defined
+    SAFETY = 100                     # safety margin in meters added to max height
 
     def parse
-      effective_date = aixm.effective_at.strftime('%Y%m%d')
+      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 = {}
       read.each_with_index do |row, line|
         type, id, date, no_shooting = row[0], row[1], row[2], (row[17] == "1")
-        if type == 'BSZ' && !no_shooting && date == effective_date
-          shooting_grounds[id] ||= read("shooting_grounds-#{id}")
-            .fetch(:feature)
-            .merge(
-              csv_line: line,
-              location_codes: row[5].split(/ *, */),   # TODO: currently ignored - not available as separate geometries
-              details: row[6].blank_to_nil,
-              url: row[10].blank_to_nil,
-              upper_z: (AIXM.z(AIXM.d(row[15].to_i, :m).to_ft.dim.round, :qfe) if row[15]),
-              dabs: (row[16] == '1'),
-              schedules: []
-            )
-          shooting_grounds[id][:schedules] << schedule_for(row)
+        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)
         end
       end
       shooting_grounds.each do |id, data|
-        data in csv_line:, location_codes:, details:, url:, upper_z:, schedules:, properties: { bezeichnung: name, infotelefonnr: phone, infoemail: email }
-        if schedules.compact.any?
-          geometries = geometries_for data[:geometry]
+        data in csv_line:, details:, url:, upper_z:, schedules:, dabs:, feature: { geometry: polygons, properties: { bezeichnung: name, infotelefonnr: phone, infoemail: email } }
+        schedules = consolidate(schedules)
+        if schedules.any?
+          geometries = geometries_for polygons
           indexed = geometries.count > 1
           geometries.each_with_index do |geometry, index|
             remarks = {
@@ -49,7 +56,7 @@ module AIPP::LS::SHOOT
               ).tap do |airspace|
                 airspace.add_layer layer_for(upper_z, schedules, remarks)
                 airspace.geometry = geometry
-                airspace.comment = "DABS: marked for publication"
+                airspace.comment = "DABS: marked for publication" if dabs
               end
             )
           end
@@ -59,18 +66,34 @@ module AIPP::LS::SHOOT
 
     private
 
-    # Returns +nil+ if neither beginning nor ending time is declared which
-    # has to be treated as "no shooting".
-    def schedule_for(row)
-      from = AIXM.time("#{row[3]} #{AIPP.options.time_zone}") if row[3]
-      to = AIXM.time("#{row[4]} #{AIPP.options.time_zone}") if row[4]
-      case
-        when from && to then (from..to)
-        when from then (from..AIXM::END_OF_DAY)
-        when to then (AIXM::BEGINNING_OF_DAY..to)
+    def schedules_for(row)
+      from, to = time_for(row[3]), time_for(row[4], ending: true)
+      if from.to_date == to.to_date
+        [
+          [AIXM.date(from), (AIXM.time(from)..AIXM.time(to))]
+        ]
+      else
+        [
+          [AIXM.date(from), (AIXM.time(from)..AIXM::END_OF_DAY)],
+          [AIXM.date(to), (AIXM::BEGINNING_OF_DAY..AIXM.time(to))]
+        ]
       end
     end
 
+    def time_for(string, ending: false)
+      hour, min = case string.strip
+      when /(\d{2})(\d{2})/
+        [$1.to_i, $2.to_i]
+      when '', '0'
+        [0, 0]
+      else
+        warn("ignoring malformed time `#{string}'")
+        [0, 0]
+      end
+      hour = 24 if hour.zero? && min.zero? && ending
+      AIPP.options.local_effective_at.change(hour: hour, min: min).utc
+    end
+
     def geometries_for(polygons)
       fail "only type MultiPolygon supported" unless polygons[:type] == 'MultiPolygon'
       fail "polygon coordinates missing" unless polygons[:coordinates]
@@ -97,20 +120,30 @@ module AIPP::LS::SHOOT
 
     def timetable_for(schedules)
       AIXM.timetable.tap do |timetable|
-        schedules.each do |schedule|
-          timetable.add_timesheet(
-            AIXM.timesheet(
-              adjust_to_dst: true,
-              dates: (AIXM.date(aixm.effective_at)..AIXM.date(aixm.effective_at))
-              # TODO: transform to...
-              # dates: AIXM.date(aixm.effective_at)
-            ).tap do |timesheet|
-              timesheet.times = schedule
-            end
-          )
+        schedules.each do |date, times_array|
+          times_array.each do |times|
+            timetable.add_timesheet(
+              AIXM.timesheet(
+                adjust_to_dst: true,
+                dates: (date..date)
+                # TODO: transform to...
+                # dates: AIXM.date(date)
+              ).tap do |timesheet|
+                timesheet.times = times
+              end
+            )
+          end
         end
       end
     end
 
+    # TODO: Consolidate will become obsolete once location code geometries
+    #   are available.
+    def consolidate(schedules)
+      schedules
+        .group_by(&:first)
+        .transform_values { _1.map(&:last).consolidate_ranges(:time) }
+    end
+
   end
 end

data/lib/aipp/scopes/shoot/executable.rb

@@ -6,7 +6,8 @@ module AIPP
       def options
         AIPP.options.merge(
           module: 'Shoot',
-          effective_at: Time.now.at_midnight
+          local_effective_at: Time.now.at_midnight,
+          id: nil
         )
       end
 
@@ -15,12 +16,13 @@ module AIPP
           Download online shooting activities and convert them to #{AIPP.options.schema.upcase}.
           Usage: #{File.basename($0)} shoot [options]
         END
-        o.on('-t', '--effective (DATE)', String, %Q[effective on this date (default: "#{AIPP.options.effective_at.to_date}")]) { AIPP.options.effective_at = Time.parse("#{_1} CET") }
+        o.on('-t', '--effective (DATE)', String, %Q[effective on this date (default: "#{AIPP.options.local_effective_at.to_date}")]) { AIPP.options.local_effective_at = Time.parse("#{_1} CET") }
+        o.on('-i', '--id ID', String, %Q[process shooting ground with this ID only]) { AIPP.options.id = _1 }
       end
 
       def guard
-        AIPP.options.time_zone = AIPP.options.effective_at.at_noon.strftime('%z')
-        AIPP.options.effective_at = AIPP.options.effective_at.at_midnight.utc
+        AIPP.options.time_zone = AIPP.options.local_effective_at.at_noon.strftime('%z')
+        AIPP.options.effective_at = AIPP.options.local_effective_at.at_midnight.utc
       end
 
     end

data/lib/aipp/scopes/shoot/runner.rb

@@ -8,7 +8,7 @@ module AIPP
       end
 
       def expiration_at
-        effective_at.end_of_day.round - 1
+        effective_at + 86399
       end
 
       def run

data/lib/aipp/version.rb

@@ -1,3 +1,3 @@
 module AIPP
-  VERSION = "2.1.1".freeze
+  VERSION = "2.1.2".freeze
 end

data/lib/core_ext/array.rb

@@ -10,4 +10,27 @@ class Array
     map(&:to_s).join('::').constantize
   end
 
+  # Consolidate array of possibly overlapping ranges.
+  #
+  # @example
+  #   [15..17, 7..11, 12..13, 8..12, 12..13].consolidate_ranges
+  #   # => [7..13, 15..17]
+  #
+  # @param [Symbol, nil] method to call on range members for comparison
+  # @return [Array] consolidated array
+  def consolidate_ranges(method=:itself)
+    uniq.sort_by { [_1.begin, _1.end] }.then do |ranges|
+      consolidated, a = [], ranges.first
+      Array(ranges[1..]).each do |b|
+        if a.end.send(method) >= b.begin.send(method)   # overlapping
+          a = (a.begin..(a.end.send(method) > b.end.send(method) ? a.end : b.end))
+        else   # not overlapping
+          consolidated << a
+          a = b
+        end
+      end
+      consolidated << a
+    end.compact
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aipp
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Sven Schwyn
@@ -29,7 +29,7 @@ cert_chain:
   kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
   fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airac
@@ -60,7 +60,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: notam
   requirement: !ruby/object:Gem::Requirement
@@ -442,7 +442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.4.9
 signing_key:
 specification_version: 4
 summary: Parser for aeronautical information publications