aipp 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26ef796dce1fa17d820789dde8827d9eb9e2a65a08c8f3188f7f77817831705e
-  data.tar.gz: 42d29d718c93d348e1a316f68030ee668f385ea7e0777b4237686c343fe14da0
+  metadata.gz: fb12aa39a6f3fdec1fd5aad06f710f6e87a0898c7b438306e08dc5a7b663a96e
+  data.tar.gz: af5e924c030036416ed373ae2196975ef1ddcf564ded3eca39f60d2c5d99cd23
 SHA512:
-  metadata.gz: 2485bf5b7e124649f3286e8fdacb3086b559d8178ff1d7b6b5610973be1c6c64ac78998c786e59b847fc3224478bdb51363dcc917b8ddf9b449f8059142b2b68
-  data.tar.gz: 2af199441c341c7984e500ff517438877bdf3364243e85df99f0d3f7be6476179f023604cb0af466a16f09cd1becdd067b7e87688a6a366a03215480edd48435
+  metadata.gz: ab37e2bfcdb4a6419450c8a75c2bd1d3a6dbcdf2b4f2e9f86d5859a4d41e5bc6fc30bcaf629c82e61e98613641477d922743d3d3776b205ab2b255eaae081c1a
+  data.tar.gz: 6fdf209fed20da43f36b9f62cbae84be1c939bd839c87db1ff432ac751085d06f281a4607fd6531abd84c8ba46beebe0271d9527461d761c16508e92ddc9fbea

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Nothing so far
 
+## 2.2.1
+
+#### Changes
+* Adopt latest update of OFMX to accommodate new airspace types RMZ, TMZ and DRA
+
 ## 2.2.0
 
 #### Changes

data/lib/aipp/regions/LF/aip/serviced_airspaces.rb

@@ -3,6 +3,8 @@ module AIPP::LF::AIP
 
     include AIPP::LF::Helpers::Base
 
+    depends_on :Aerodromes
+
     # Map source types to type and optional local type and skip regexp
     SOURCE_TYPES = {
       'FIR' => { type: 'FIR' },
@@ -13,9 +15,7 @@ module AIPP::LF::AIP
       'TMA' => { type: 'TMA', skip: /geneve/i },   # Geneva listed FYI only
       'SIV' => { type: 'SECTOR', local_type: 'FIZ/SIV' },   # providing FIS
       'CTR' => { type: 'CTR' },
-      'RMZ' => { type: 'RAS', local_type: 'RMZ' },
-      'TMZ' => { type: 'RAS', local_type: 'TMZ' },
-      'RMZ-TMZ' => { type: 'RAS', local_type: 'RMZ-TMZ' }
+      'RMZ-TMZ' => { type: ['RMZ', 'TMZ'] }   # two separate airspaces
     }.freeze
 
     # Map airspace "<type> <name>" to location indicator
@@ -36,34 +36,57 @@ module AIPP::LF::AIP
           next if espace_node.(:Nom).match? DELEGATED_RE
           next if (re = target[:skip]) && espace_node.(:Nom).match?(re)
           # Build airspaces and layers
-          AIPP.cache.partie.css(%Q(Partie:has(Espace[pk="#{espace_node['pk']}"]))).each do |partie_node|
+          partie_nodes = AIPP.cache.partie.css(%Q(Partie:has(Espace[pk="#{espace_node['pk']}"])))
+          partie_nodes.each_with_index do |partie_node, index|
             next if partie_node.(:NomPartie).match? DELEGATED_RE
-            add(
-              AIXM.airspace(
-                source: source(part: 'ENR', position: espace_node.line),
-                name: [
-                  espace_node.(:Nom),
-                  partie_node.(:NomPartie).remove(/^\.$/).blank_to_nil
-                ].compact.join(' '),
-                type: target[:type],
-                local_type: target[:local_type]
-              ).tap do |airspace|
-                airspace.meta = espace_node.attr('pk')
-                airspace.geometry = geometry_from(partie_node.(:Contour))
-                fail("geometry is not closed") unless airspace.geometry.closed?
-                AIPP.cache.volume.css(%Q(Volume:has(Partie[pk="#{partie_node['pk']}"]))).each do |volume_node|
-                  airspace.add_layer(
-                    layer_from(volume_node).tap do |layer|
-                      layer.location_indicator = FIR_LOCATION_INDICATORS.fetch(airspace.name) if airspace.type == :flight_information_region
-                    end
-                  )
-                end
+            partie_nom = partie_node.(:NomPartie).remove(/^\.$/).blank_to_nil
+            partie_index = if partie_nodes.count > 1
+              if partie_nom.match?(/^\d+$/)
+                partie_nom.to_i   # use declared index if numerical...
+              else
+                index   # ...or positional index otherwise
               end
-            )
+            end
+            [target[:type]].flatten.each do |type|
+              add(
+                AIXM.airspace(
+                  source: source(part: 'ENR', position: espace_node.line),
+                  id: id_from(espace_node, partie_index),
+                  name: name_from(espace_node, partie_nom),
+                  type: type,
+                  local_type: target[:local_type]
+                ).tap do |airspace|
+                  airspace.meta = espace_node.attr('pk')
+                  airspace.geometry = geometry_from(partie_node.(:Contour))
+                  fail("geometry is not closed") unless airspace.geometry.closed?
+                  AIPP.cache.volume.css(%Q(Volume:has(Partie[pk="#{partie_node['pk']}"]))).each do |volume_node|
+                    airspace.add_layer(
+                      layer_from(volume_node).tap do |layer|
+                        layer.location_indicator = FIR_LOCATION_INDICATORS.fetch(airspace.name) if airspace.type == :flight_information_region
+                      end
+                    )
+                  end
+                end
+              )
+            end
           end
         end
       end
     end
 
+    private
+
+    def id_from(espace_node, partie_index)
+      if espace_node.(:TypeEspace) == 'CTR' &&
+        (ad_pk = espace_node.at_css(:AdAssocie)&.attr('pk')) &&
+        (airport = find_by(:airport, meta: ad_pk).first)
+      then
+        [airport.id, partie_index].join
+      end
+    end
+
+    def name_from(espace_node, partie_nom)
+      [espace_node.(:Nom), partie_nom].compact.join(' ')
+    end
   end
 end

data/lib/aipp/regions/LF/aip/services.rb

@@ -40,10 +40,16 @@ module AIPP::LF::AIP
       AIPP.cache.service.css(%Q(Service[lk^="[LF]"][pk])).each do |service_node|
         # Ignore private services/frequencies
         next if service_node.(:IndicLieu) == 'XX'
-        # Load referenced airport
+        # Load directly referenced airport
         airport = given(service_node.at_css('Ad')&.attr('pk')) do
           find_by(:airport, meta: _1).first
         end
+        # Load indirectly referenced airport
+        airport ||= given(service_node.at_css('Espace')&.attr('pk')) do
+          if airspace = find_by(:airspace, meta: _1)&.first
+            find_by(:airport, id: airspace.id[0, 4])&.first
+          end
+        end
         # Build addresses and services
         case SOURCE_TYPES.fetch(type_for(service_node))
         when :address
@@ -53,7 +59,9 @@ module AIPP::LF::AIP
           given service_from(service_node) do |service|
             AIPP.cache.frequence.css(%Q(Frequence:has(Service[pk="#{service_node['pk']}"]))).each do |frequence_node|
               if frequency = frequency_from(frequence_node, service_node)
-                service.add_frequency frequency
+                unless frequency.type == :emergency
+                  service.add_frequency frequency
+                end
               end
             end
             if airport
@@ -70,7 +78,10 @@ module AIPP::LF::AIP
       end
       # Assign A/A address to all yet radioless airports
       find_by(:airport).each do |airport|
-        unless airport.services.find_by(:service, type: :aerodrome_control_tower_service).any? || airport.addresses.any?
+        unless airport.addresses.any? ||
+          airport.services.find_by(:service, type: :aerodrome_control_tower_service).any? ||
+          airport.services.find_by(:service, type: :flight_information_service).any?
+        then
           airport.add_address(
             address_from_vac_for(airport) || fallback_address_for(airport)
           )

data/lib/aipp/runner.rb

@@ -115,7 +115,11 @@ module AIPP
       info("detecting duplicates")
       if (duplicates = aixm.features.duplicates).any?
         message = "duplicates found"
-        details = duplicates.map { "#{_1.inspect} from #{_1.source}" }.join("\n")
+        details = duplicates.map do |group|
+          group.map.with_index do |member, index|
+            "#{member.inspect} from #{member.source} #{'has duplicate(s)...' if index.zero?}"
+          end
+        end.join("\n")
         AIPP.options.force ? warn(message) : fail([message, details].join(":\n"))
       end
       info("validating #{AIPP.options.schema.upcase}")

data/lib/aipp/version.rb

@@ -1,3 +1,3 @@
 module AIPP
-  VERSION = "2.2.0".freeze
+  VERSION = "2.2.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aipp
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Sven Schwyn
@@ -27,7 +27,7 @@ cert_chain:
   k/QvZU05f6HMYBrPogJgIzHC/C5N/yeE4BVEuBDn+10Zb1iu3aDk8sd0uMgukCY8
   TUmlP5A6NeGdeDJIoLgromAKs+nvI7TWzhQq9ODs51XhxgUFRCvBqUTpjTQigw==
   -----END CERTIFICATE-----
-date: 2024-04-04 00:00:00.000000000 Z
+date: 2024-05-29 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.0
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -68,7 +68,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: notam
   requirement: !ruby/object:Gem::Requirement
@@ -474,7 +474,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Parser for aeronautical information publications