aixm 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3771e796263217c6b52588b5646798dbffe20a7c66f3f71da80d04b18dad32e
-  data.tar.gz: abd545b3cdf9f98f8d707b2358ec4df4c2f6c579dbe7b32003b69b12582b5c7f
+  metadata.gz: 671355726ab63cc24fc7796c42f3001ca40798fb198945bc786e5d138ae13f1b
+  data.tar.gz: 146b0bac038dccf60dac009579b6d9d15730343f26b15208779f26ef71f689a8
 SHA512:
-  metadata.gz: 318d08a571780676fd1e4ab60b4a87a9e9195d79816c15965e7beb40541b7780615fc4ba147f268d076e0ba4520225f01fe5580772a5563a1ed2265fed727a13
-  data.tar.gz: e31f3b267dbf3aaf6db3335fafe483c1e544dd639042b5414afde18cb0e77a8de3372f53d43067f3fc863a7677da431e0a02ee9b1aaab488c0fc76969bbe8d0a
+  metadata.gz: ff1e357cf8ff8eb4f34e0bc26aea1ac88711c0369ef10be08dfe78674db5234310e3b45978df7f379041bd073ce268eecbfbd413b74d9508894394a00460714b
+  data.tar.gz: 6518686433b57562855fb04c43280bdab036a867451baa65669e55ab783b7cd924549198813efefd22447f9968af75fe9002a94806b98d6459766da1f1916018

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 Nothing so far
 
+## 1.5.3
+
+### Additions
+* `Document#sourced_at` to track last update of upstream source data
+
+## 1.5.2
+
+### Changes
+* Adopt update of OFMX which added three new airspace types such as
+  `:radio_mandatory_zone`
+
 ## 1.5.1
 
 ### Changes

data/lib/aixm/document.rb

@@ -8,6 +8,7 @@ module AIXM
   # ===Cheat Sheet in Pseudo Code:
   #   document = AIXM.document(
   #     namespace: String (UUID)
+  #     sourced_at: Time or Date or String or nil
   #     created_at: Time or Date or String
   #     effective_at: Time or Date or String
   #     expiration_at: Time or Date or String or nil
@@ -37,6 +38,14 @@ module AIXM
     #   @param value [String]
     attr_reader :namespace
 
+    # Last upstream source data update date and UTC time
+    #
+    # @overload sourced_at
+    #   @return [Time]
+    # @overload sourced_at=(value)
+    #   @param value [Time, nil]
+    attr_reader :sourced_at
+
     # Creation date and UTC time
     #
     # @overload created_at
@@ -63,9 +72,9 @@ module AIXM
 
     # See the {cheat sheet}[AIXM::Document] for examples on how to create
     # instances of this class.
-    def initialize(namespace: nil, created_at: nil, effective_at: nil, expiration_at: nil)
+    def initialize(namespace: nil, sourced_at: nil, created_at: nil, effective_at: nil, expiration_at: nil)
       self.namespace = namespace
-      self.created_at, self.effective_at, self.expiration_at = created_at, effective_at, expiration_at
+      self.sourced_at, self.created_at, self.effective_at, self.expiration_at = sourced_at, created_at, effective_at, expiration_at
     end
 
     # @return [String]
@@ -78,6 +87,10 @@ module AIXM
       @namespace = value || SecureRandom.uuid
     end
 
+    def sourced_at=(value)
+      @sourced_at = value&.to_time&.round
+    end
+
     def created_at=(value)
       @created_at = if time = value&.to_time
         time.round
@@ -161,6 +174,7 @@ module AIXM
         origin: "rubygem aixm-#{AIXM::VERSION}",
         namespace: (namespace if AIXM.ofmx?),
         regions: (regions.join(' '.freeze) if AIXM.ofmx?),
+        sourced: (@sourced_at&.utc&.xmlschema if AIXM.ofmx?),
         created: @created_at.utc.xmlschema,
         effective: @effective_at.utc.xmlschema,
         expiration: (@expiration_at&.utc&.xmlschema if AIXM.ofmx?)

data/lib/aixm/feature/airspace.rb

@@ -26,11 +26,14 @@ module AIXM
     # character digest from +type+, +local_type+ and +name+.
     #
     # Some regions define additional airspace types. In LF (France) for
-    # intance, the types RMZ (radio mandatory zone) and TMZ (transponder
-    # mandatory zone) exist. Such airspaces are usually specified together
-    # with a generic type such as +:regulated_airspace+:
+    # instance, the types RMZ (radio mandatory zone) and TMZ (transponder
+    # mandatory zone) exist. These have been added as proper types in OFMX as
+    # per {OFMX_TYPES}, however, AIXM encodes them as +:regulated_airspace+ with
+    # a local type of +RMZ+ or +TMZ+ respectively. In other words: For AIXM, the
+    # following two are identical:
     #
-    #   airspace= AIXM.airspace(type: :regulated_airspace, local_type: "RMZ")
+    #   AIXM.airspace(type: :radio_mandatory_zone)
+    #   AIXM.airspace(type: :regulated_airspace, local_type: "RMZ")
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airspace#ase-airspace
     class Airspace < Feature
@@ -38,7 +41,7 @@ module AIXM
 
       public_class_method :new
 
-      TYPES = {
+      COMMON_TYPES = {
         NAS: :national_airspace_system,
         FIR: :flight_information_region,
         'FIR-P': :part_of_flight_information_region,
@@ -81,6 +84,14 @@ module AIXM
         PART: :part_of_airspace
       }.freeze
 
+      OFMX_TYPES = {
+        DRA: :drone_area,
+        RMZ: :radio_mandatory_zone,
+        TMZ: :transponder_mandatory_zone
+      }.freeze
+
+      TYPES = COMMON_TYPES.merge OFMX_TYPES
+
       # @!method geometry
       #   @return [AIXM::Component::Geometry] horizontal geometry shape
       #
@@ -106,18 +117,18 @@ module AIXM
       #   @param value [String]
       attr_reader :id
 
-      # Type of airspace (see {TYPES})
+      # Type of airspace (see {COMMON_TYPES} and {OFMX_TYPES})
       #
       # @overload type
-      #   @return [Symbol] any of {TYPES}
+      #   @return [Symbol] any of {COMMON_TYPES} or {OFMX_TYPES}
       # @overload type=(value)
-      #   @param value [Symbol] any of {TYPES}
+      #   @param value [Symbol] any of {COMMON_TYPES} or {OFMX_TYPES}
       attr_reader :type
 
       # Local type.
       #
-      # Some regions define additional local types such as "RMZ" or "TMZ". They
-      # are often further specifying type +:regulated_airspace+.
+      # Some regions define additional local types. They are usually further
+      # specifying type +:regulated_airspace+.
       #
       # @overload local_type
       #   @return [String, nil]
@@ -184,9 +195,14 @@ module AIXM
       # @!visibility private
       def add_uid_to(builder, as: :AseUid)
         builder.send(as, ({ region: (region if AIXM.ofmx?) }.compact)) do |tag|
-          tag.codeType(TYPES.key(type))
-          tag.codeId(id)
-          tag.txtLocalType(local_type) if AIXM.ofmx? && local_type && local_type != name
+          if AIXM.ofmx?
+            tag.codeType(TYPES.key(type))
+            tag.codeId(id)
+            tag.txtLocalType(local_type) if local_type?
+          else
+            tag.codeType(COMMON_TYPES.key(type) || 'RAS')
+            tag.codeId(id)
+          end
         end
       end
 
@@ -205,7 +221,10 @@ module AIXM
         builder.Ase({ source: (source if AIXM.ofmx?) }.compact) do |ase|
           ase.comment(indented_comment) if comment
           add_uid_to(ase)
-          ase.txtLocalType(local_type) if AIXM.aixm? && local_type && local_type != name
+          if AIXM.aixm?
+            ofmx_type = OFMX_TYPES.key(type)
+            ase.txtLocalType(ofmx_type || local_type) if ofmx_type || local_type?
+          end
           ase.txtName(name) if name
           ase.txtNameAlt(alternative_name) if AIXM.ofmx? && alternative_name
           layers.first.add_to(ase) unless layered?
@@ -249,6 +268,10 @@ module AIXM
 
       private
 
+      def local_type?
+        local_type && local_type != name
+      end
+
       def layered?
         layers.count > 1
       end

data/lib/aixm/version.rb

@@ -1,3 +1,3 @@
 module AIXM
-  VERSION = "1.5.1".freeze
+  VERSION = "1.5.3".freeze
 end

data/schemas/ofmx/0.2/OFMX-DataTypes.xsd

@@ -3033,6 +3033,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <xsd:enumeration value="PROTECT"/>
       <xsd:enumeration value="AMA"/>
       <xsd:enumeration value="ASR"/>
+      <xsd:enumeration value="RMZ"/>
+      <xsd:enumeration value="TMZ"/>
+      <xsd:enumeration value="DRA"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="codeTypeAs">

data/schemas/ofmx/0.2/OFMX-Snapshot.xsd

@@ -172,6 +172,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Regions used throughout this document</xsd:documentation>
         </xsd:annotation>
       </xsd:attribute>
+      <xsd:attribute name="sourced" type="dateTimeZulu">
+        <xsd:annotation>
+          <xsd:documentation>The date and time when the upstream data used for this message was last updated</xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
       <xsd:attribute name="created" type="dateTimeZulu" use="required">
         <xsd:annotation>
           <xsd:documentation>The date and time when the message was created</xsd:documentation>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Sven Schwyn
@@ -27,7 +27,7 @@ cert_chain:
   k/QvZU05f6HMYBrPogJgIzHC/C5N/yeE4BVEuBDn+10Zb1iu3aDk8sd0uMgukCY8
   TUmlP5A6NeGdeDJIoLgromAKs+nvI7TWzhQq9ODs51XhxgUFRCvBqUTpjTQigw==
   -----END CERTIFICATE-----
-date: 2024-04-26 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -330,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Builder for AIXM/OFMX aeronautical information