aipp 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aae45b128912df9df9109e73ba42eaa08491b28811f2aa4cd0d9ce0a703407a3
-  data.tar.gz: ff736ac780721e9829bfdcbaa4dd55fb303adef8832a8a0a48aeba14f6ee94af
+  metadata.gz: 4d5b1987ad76642974e3525037cd251b9d191e6ddf3bb355452c06fc31c47734
+  data.tar.gz: b282045f0717e48248e8c876bc0b117fee79c394f751bf3c20cf4c1e96597a3a
 SHA512:
-  metadata.gz: c9dfd3da655aa728bd3794b2c66ae9bfda2a62ebf13a03c2e88e82c329245532e00e3204ff3fa8f16a800f6531b0717a0eb026318e96a92537594c349ecf0e23
-  data.tar.gz: d51724f671e855b6ff396fe3e2dcc84440db2685092c28a8d8d9e08e2cf3ee5f4faf61a2720abccf45d5e8b5944cbaed9d1aa41944b7777d6cee9dacdbd6aece
+  metadata.gz: 80481622154b8a77f614758d41bddc1190d38bed8530f55dc08a6736e9852dac5cbf0bd6d767025dfdf1d73b8e727bb567c193a390546b4f8080d5686ce5163a
+  data.tar.gz: dc7991927db97747f7e643ec7484420c741e8d64e33e57187e8c63a361ab45b0ea21666b7ff6e72c464283eee6670bea7f49e9e9ccbe1aeece75aedfdcad4396

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-׼��O�i��Ib�f��x�����~�;�c&(��W�@4��
�W1O"��<v�����T�GM�V2��vo����ު�~1�����Q�	Rc2��O�*h	���j�,�M�kz^��SX�F��A�*��y@Y�[<S�[i��g�Ԥ�u���j�������ᙛK����f�:q��H��/)��Y[Mx��U~��3~l%Dף��X!��3�aq�Ҵ�U6Y�U��Z��h
+"N�F��������"LT����6��bЪ_��9�d�����8q����.�@�K���w���4Q�Y���x����-je$O}r��h_՞ˁ�  �Mֈ�pU����.
+�b/!�H�CBJ�Y�Ȩ�~�Lt�*�	�Lx��qA�V��t�

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Nothing so far
 
+## 2.0.3
+
+#### Breaking Changes
+* THR/DTHR fixes from AIXM gem
+* Improve filters of delegated airspaces (region LF)
+
 ## 2.0.2
 
 #### Additions

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

@@ -109,7 +109,7 @@ module AIPP::LF::AIP
         runway.surface = surface_from(rwy_node)
         runway.forth.geographic_bearing = given(rwy_node.(:OrientationGeo)) { AIXM.a(_1.to_f) }
         runway.forth.xy = given(rwy_node.(:LatThr1), rwy_node.(:LongThr1)) { AIXM.xy(lat: _1.to_f, long: _2.to_f) }
-        runway.forth.displaced_threshold = given(rwy_node.(:LatDThr1), rwy_node.(:LongDThr1)) { AIXM.xy(lat: _1.to_f, long: _2.to_f) }
+        runway.forth.displaced_threshold_xy = given(rwy_node.(:LatDThr1), rwy_node.(:LongDThr1)) { AIXM.xy(lat: _1.to_f, long: _2.to_f) }
         runway.forth.z = given(rwy_node.(:AltFtDThr1)) { AIXM.z(_1.to_i, :qnh) }
         runway.forth.z ||= given(rwy_node.(:AltFtThr1)) { AIXM.z(_1.to_i, :qnh) }
         if rwylgt_node = rwylgt_nodes[0]
@@ -121,7 +121,7 @@ module AIPP::LF::AIP
         end
         if rwy_node.(:Rwy).match? '/'
           runway.back.xy = given(rwy_node.(:LatThr2), rwy_node.(:LongThr2)) { AIXM.xy(lat: _1.to_f, long: _2.to_f) }
-          runway.back.displaced_threshold = given(rwy_node.(:LatDThr2), rwy_node.(:LongDThr2)) { AIXM.xy(lat: _1.to_f, long: _2.to_f) }
+          runway.back.displaced_threshold_xy = given(rwy_node.(:LatDThr2), rwy_node.(:LongDThr2)) { AIXM.xy(lat: _1.to_f, long: _2.to_f) }
           runway.back.z = given(rwy_node.(:AltFtDThr2)) { AIXM.z(_1.to_i, :qnh) }
           runway.back.z ||= given(rwy_node.(:AltFtThr2)) { AIXM.z(_1.to_i, :qnh) }
           if rwylgt_node = rwylgt_nodes[1]

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

@@ -27,15 +27,17 @@ module AIPP::LF::AIP
       'REIMS' => 'LFRR'
     }.freeze
 
+    DELEGATED_RE = /(?:deleg\.|delegated|delegation)/i.freeze
+
     def parse
       SOURCE_TYPES.each do |source_type, target|
         verbose_info("processing #{source_type}")
         AIPP.cache.espace.css(%Q(Espace[lk^="[LF][#{source_type} "])).each do |espace_node|
-          # Skip all delegated airspaces
-          next if espace_node.(:Nom).match? /deleg/i
+          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|
+            next if partie_node.(:NomPartie).match? DELEGATED_RE
             add(
               AIXM.airspace(
                 source: source(part: 'ENR', position: espace_node.line),

data/lib/aipp/version.rb

@@ -1,3 +1,3 @@
 module AIPP
-  VERSION = "2.0.2".freeze
+  VERSION = "2.0.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aipp
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Sven Schwyn
@@ -29,7 +29,7 @@ cert_chain:
   kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
   fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2023-01-02 00:00:00.000000000 Z
+date: 2023-01-22 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.3.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: notam
   requirement: !ruby/object:Gem::Requirement
@@ -441,7 +441,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Parser for aeronautical information publications