aixm 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce948465612571ae319c68d7f0eff0664d41c696440fb190298ac475b0e3105d
-  data.tar.gz: 402358be48d240b24baef522ace4c501b1c685073ef28be35ce70985a5eaa9e8
+  metadata.gz: af33154acb182006b0c9f4e048c305b2489cba22d15ee1bc9aa724ddec70ceab
+  data.tar.gz: 44c42b5e93537e33cb2623a19a043216853664358d5c616f59aa884ee4c3e80c
 SHA512:
-  metadata.gz: ee675af09c87b12e15bd50e2b2a2c8f00b457cb6ec53c8ee3d16d1b1b5965e410687c2f24f51c49a9673cef00d882f2ef6101e6af780161d33f6f898ff903f9f
-  data.tar.gz: da8135812e7dd27baeb8068b8eefd6004467370763170737c18258b09cdc520bf09aad70fd6eb4c567dd39d5920c46ac1fd87a0ca5e30895c33b684fdf52ab73
+  metadata.gz: e960a18401dd58557db667b01cb3f15683728798f3aee736fda794a18519d7b3fb99e0725154a01b564a4e35658cdde5310402fd1c2b6f2e4550880cf47db98b
+  data.tar.gz: 2855fb8f01ca9dd515e8c05b60e79d80f4d4af77b48f1b03cc4baaadd1451810b877c92cd9364cb5d84b80f6d99ebda3b8c21d2445143f9d078a9e4e7ef2cc76

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 Nothing so far
 
+## 1.3.0
+
+#### Breaking Changes
+* `Document#created_at` no longer falls back to `Document#effective_at`
+
+#### Additions
+* Refinement to pretty print Nokogiri XML documents
+* XML comments on features (e.g. to include raw NOTAM)
+* `Document#expiration_at` for OFMX
+* Generic features as raw XML (e.g. extracted from another AIXM/OFMX file)
+
 ## 1.2.1
 
 #### Additions
@@ -20,7 +31,7 @@ Nothing so far
 ## 1.1.0
 
 #### Breaking Changes
-* `AIXM::Association:Array#duplicates` now returns an array of arrays which
+* `AIXM::Concerns::Association:Array#duplicates` now returns an array of arrays which
   group all duplicates together.
 * `VOR#associate_dme` and `VOR#associate_tacan` no longer take the channel
   as argument but calculate it from the (ghost) frequency of the VOR.
@@ -74,10 +85,10 @@ Nothing so far
 
 #### Additions
 * Proper `has_many` and `has_one` associations
-* `AIXM::Association:Array#find_by|find|duplicates` on `has_many` associations
+* `AIXM::Concerns::Association:Array#find_by|find|duplicates` on `has_many` associations
 * `AIXM.config.mid` now defines whether `mid` attributes are inserted or not
   provided the selected schema is OFMX
-* `AIXM::Memoize` module
+* `AIXM::Concerns::Memoize` module
 * `AIXM::PayloadHash` class
 * `mkmid` executable to insert `mid` attributes into valid OFMX file
 * `ckmid` executable to check `mid` attributes in an OFMX file

data/README.md

@@ -28,7 +28,7 @@ gem cert --add <(curl -Ls https://raw.github.com/svoop/aixm/main/certs/svoop.pem
 Add the following to the <tt>Gemfile</tt> or <tt>gems.rb</tt> of your [Bundler](https://bundler.io) powered Ruby project:
 
 ```ruby
-gem aixm
+gem 'aixm'
 ```
 
 And then install the bundle:
@@ -163,6 +163,7 @@ AIXM.config.ignored_errors = /invalid date/i
 * [Organisation](https://www.rubydoc.info/gems/aixm/AIXM/Feature/Organisation.html)
 * [Service](https://www.rubydoc.info/gems/aixm/AIXM/Component/Service.html)
 * [Unit](https://www.rubydoc.info/gems/aixm/AIXM/Feature/Unit.html)
+* [Generic](https://www.rubydoc.info/gems/aixm/AIXM/Feature/Generic.html)
 
 ### Components
 
@@ -190,7 +191,7 @@ AIXM.config.ignored_errors = /invalid date/i
 
 The different models are interwoven with [`has_many` and `has_one` associations](https://www.rubydoc.info/gems/aixm/AIXM/Association).
 
-Please note that `has_many` associations are instances `AIXM::Association::Array` which mostly behave like normal arrays. However, you must not add or remove elements on the array directly but use the corresponding method on the associating model instead:
+Please note that `has_many` associations are instances `AIXM::Concerns::Association::Array` which mostly behave like normal arrays. However, you must not add or remove elements on the array directly but use the corresponding method on the associating model instead:
 
 ```ruby
 document.features << airport   # => NoMethodError
@@ -230,6 +231,33 @@ Equally on `has_many` associations, use `duplicates` to find identical or equal
 document.features.duplicates   # => [#<AIXM::Feature::Unit>, #<AIXM::Component::Service>, ...]
 ```
 
+## XML Comments
+
+All features implement the `comment` attribute which accepts any object and converts it `#to_s`. When set, an XML comment is inserted right after the opening tag of the feature. This comes in handy e.g. in case you want to include source data facsimile such as NOTAM. Oneline and multiline comments are inserted differently:
+
+```xml
+<Ase>
+  <!--
+    B0330/22 NOTAMR B1756/21
+    Q) LSAS/QAFLT/V/NBO/E/000/050/4734N00841E005
+    A) LSAS B) 2203170746 C) 2206242359 EST
+  -->
+  <AseUid>
+    <codeType>RAS</codeType>
+    <codeId>B0330/22</codeId>
+  </AseUid>
+  (...)
+</Ase>
+
+<Org>
+  <!-- Generic organisation -->
+  <OrgUid>
+    <txtName>FRANCE</txtName>
+  </OrgUid>
+  (...)
+</Org>
+```
+
 ## Payload Hash
 
 OFMX defines a [payload hash function](https://gitlab.com/openflightmaps/ofmx/wikis/Functions) used to facilitate association and modification tracking. It is used internally, but you can also use it in your own code:

data/exe/ckmid

@@ -1,11 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'bundler/inline'
-
-gemfile do
-  source 'https://rubygems.org'
-  ruby '>= 3.0'
-  gem 'aixm', '~> 0'
-end
+require 'aixm'
 
 AIXM::Executables::Ckmid.new.run

data/exe/mkmid

@@ -1,11 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'bundler/inline'
-
-gemfile do
-  source 'https://rubygems.org'
-  ruby '>= 3.0'
-  gem 'aixm', '~> 0'
-end
+require 'aixm'
 
 AIXM::Executables::Mkmid.new.run

data/lib/aixm/classes.rb

@@ -45,7 +45,8 @@ module AIXM
     obstacle_group: 'AIXM::Feature::ObstacleGroup',
     timetable: 'AIXM::Component::Timetable',
     timesheet: 'AIXM::Component::Timesheet',
-    vasis: 'AIXM::Component::VASIS'
+    vasis: 'AIXM::Component::VASIS',
+    generic: 'AIXM::Feature::Generic'
   }.freeze
 
 end

data/lib/aixm/component/address.rb

@@ -14,8 +14,7 @@ module AIXM
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#aha-airport-address
     class Address < Component
-      include AIXM::Association
-      include AIXM::Memoize
+      include AIXM::Concerns::Association
       include AIXM::Concerns::Remarks
 
       public_class_method :new
@@ -82,26 +81,24 @@ module AIXM
         end
       end
 
-      # @return [String] UID markup
-      def to_uid(as:, sequence:)
-        builder = Builder::XmlMarkup.new(indent: 2)
-        builder.tag!(as) do |tag|
-          tag << addressable.to_uid.indent(2) if addressable
+      # @!visibility private
+      def add_uid_to(builder, as:, sequence:)
+        builder.send(as) do |tag|
+          addressable.add_uid_to(tag) if addressable
           tag.codeType(TYPES.key(type).to_s.then_if(AIXM.aixm?) { _1.sub(/-\w+$/, '') })
           tag.noSeq(sequence)
         end
       end
-      memoize :to_uid
 
-      # @return [String] AIXM or OFMX markup
-      def to_xml(as:, sequence:)
-        builder = Builder::XmlMarkup.new(indent: 2)
-        builder.comment! ["Address: #{TYPES.key(type)}", addressable&.id].compact.join(' for ')
-        builder.tag!(as) do |tag|
-          tag << to_uid(as: :"#{as}Uid", sequence: sequence).indent(2)
+      # @!visibility private
+      def add_to(builder, as:, sequence:)
+        builder.comment ["Address: #{TYPES.key(type)}", addressable&.id].compact.join(' for ').dress
+        builder.text "\n"
+        builder.send(as) do |tag|
+          add_uid_to(tag, as: :"#{as}Uid", sequence: sequence)
           case type
           when :radio_frequency
-            tag.txtAddress(address.freq.to_s)
+            tag.txtAddress(address.freq)
           else
             tag.txtAddress(address)
           end

data/lib/aixm/component/approach_lighting.rb

@@ -17,8 +17,7 @@ module AIXM
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#rda-runway-direction-approach-lighting
     class ApproachLighting < Component
-      include AIXM::Association
-      include AIXM::Memoize
+      include AIXM::Concerns::Association
       include AIXM::Concerns::Intensity
       include AIXM::Concerns::Remarks
 
@@ -108,31 +107,27 @@ module AIXM
         @flash_description = value&.to_s
       end
 
-      # @return [String] UID markup
-      def to_uid(as:)
-        builder = Builder::XmlMarkup.new(indent: 2)
-        builder.tag!(as) do |tag|
-          tag << approach_lightable.to_uid.indent(2)
-          tag.codeType(TYPES.key(type).to_s)
+      # @!visibility private
+      def add_uid_to(builder, as:)
+        builder.send(as) do |tag|
+          approach_lightable.add_uid_to(tag)
+          tag.codeType(TYPES.key(type))
         end
       end
-      memoize :to_uid
 
-      # @return [String] AIXM or OFMX markup
-      def to_xml(as:)
-        builder = Builder::XmlMarkup.new(indent: 2)
-        builder.tag!(as) do |tag|
-          tag << to_uid(as: "#{as}Uid").indent(2)
+      # @!visibility private
+      def add_to(builder, as:)
+        builder.send(as) do |tag|
+          add_uid_to(tag, as: "#{as}Uid")
           if length
             tag.valLen(length.dim.round)
             tag.uomLen(length.unit.to_s.upcase)
           end
-          tag.codeIntst(INTENSITIES.key(intensity).to_s) if intensity
+          tag.codeIntst(INTENSITIES.key(intensity)) if intensity
           tag.codeSequencedFlash(sequenced_flash ? 'Y' : 'N') unless sequenced_flash.nil?
           tag.txtDescrFlash(flash_description) if flash_description
           tag.txtRmk(remarks) if remarks
         end
-        builder.target!
       end
     end
   end

data/lib/aixm/component/fato.rb

@@ -28,8 +28,7 @@ module AIXM
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#fto-fato
     class FATO < Component
-      include AIXM::Association
-      include AIXM::Memoize
+      include AIXM::Concerns::Association
       include AIXM::Concerns::Marking
       include AIXM::Concerns::Remarks
 
@@ -128,46 +127,41 @@ module AIXM
         @status = value.nil? ? nil : (STATUSES.lookup(value.to_s.to_sym, nil) || fail(ArgumentError, "invalid status"))
       end
 
-      # @return [String] UID markup
-      def to_uid
-        builder = Builder::XmlMarkup.new(indent: 2)
+      # @!visibility private
+      def add_uid_to(builder)
         builder.FtoUid do |fto_uid|
-          fto_uid << airport.to_uid.indent(2)
+          airport.add_uid_to(fto_uid)
           fto_uid.txtDesig(name)
         end
       end
-      memoize :to_uid
 
-      # @return [String] AIXM or OFMX markup
-      def to_xml
-        builder = Builder::XmlMarkup.new(indent: 2)
+      # @!visibility private
+      def add_to(builder)
         builder.Fto do |fto|
-          fto << to_uid.indent(2)
+          add_uid_to(fto)
           if dimensions
             fto.valLen(dimensions.length.to_m.dim.trim)
             fto.valWid(dimensions.width.to_m.dim.trim)
             fto.uomDim('M')
           end
-          unless  (xml = surface.to_xml).empty?
-            fto << xml.indent(2)
-          end
+          surface.add_to(fto) if surface
           fto.txtProfile(profile) if profile
           fto.txtMarking(marking) if marking
-          fto.codeSts(STATUSES.key(status).to_s) if status
+          fto.codeSts(STATUSES.key(status)) if status
           fto.txtRmk(remarks) if remarks
         end
         directions.each do |direction|
-          builder << direction.to_xml
+          direction.add_to(builder)
         end
-        builder.target!
       end
 
       # FATO directions further describe each direction to and from the FATO.
       #
       # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#fdn-fato-direction
       class Direction
-        include AIXM::Association
-        include AIXM::Memoize
+        include AIXM::Concerns::Association
+        include AIXM::Concerns::Memoize
+        include AIXM::Concerns::XMLBuilder
         include AIXM::Concerns::Remarks
 
         # @!method lightings
@@ -239,35 +233,29 @@ module AIXM
           @vasis = value
         end
 
-        # @return [String] UID markup
-        def to_uid
-          builder = Builder::XmlMarkup.new(indent: 2)
+        # @!visibility private
+        def add_uid_to(builder)
           builder.FdnUid do |fdn_uid|
-            fdn_uid << fato.to_uid.indent(2)
+            fato.add_uid_to(fdn_uid)
             fdn_uid.txtDesig(name.to_s(:runway))
           end
         end
-        memoize :to_uid
 
-        # @return [String] AIXM or OFMX markup
-        def to_xml
-          builder = Builder::XmlMarkup.new(indent: 2)
+        # @!visibility private
+        def add_to(builder)
           builder.Fdn do |fdn|
-            fdn << to_uid.indent(2)
+            add_uid_to(fdn)
             fdn.valTrueBrg(geographic_bearing.to_s(:bearing)) if geographic_bearing
             fdn.valMagBrg(magnetic_bearing.to_s(:bearing)) if magnetic_bearing
-            if vasis
-              fdn << vasis.to_xml.indent(2)
-            end
+            vasis.add_to(fdn) if vasis
             fdn.txtRmk(remarks) if remarks
           end
           lightings.each do |lighting|
-            builder << lighting.to_xml(as: :Fls)
+            lighting.add_to(builder, as: :Fls)
           end
           approach_lightings.each do |approach_lighting|
-            builder << approach_lighting.to_xml(as: :Fda)
+            approach_lighting.add_to(builder, as: :Fda)
           end
-          builder.target!
         end
       end
     end

data/lib/aixm/component/frequency.rb

@@ -22,8 +22,7 @@ module AIXM
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Organisation#fqy-frequency
     class Frequency < Component
-      include AIXM::Association
-      include AIXM::Memoize
+      include AIXM::Concerns::Association
       include AIXM::Concerns::Timetable
       include AIXM::Concerns::Remarks
 
@@ -112,32 +111,28 @@ module AIXM
         @type = value.nil? ? nil : TYPES.lookup(value.to_s.to_sym, nil) || fail(ArgumentError, "invalid type")
       end
 
-      # @return [String] UID markup
-      def to_uid
-        builder = Builder::XmlMarkup.new(indent: 2)
+      # @!visibility private
+      def add_uid_to(builder)
         builder.FqyUid do |fqy_uid|
-          fqy_uid << service.to_uid.indent(2)
+          service.add_uid_to(fqy_uid)
           fqy_uid.valFreqTrans(transmission_f.freq)
         end
       end
-      memoize :to_uid
 
-      # @return [String] AIXM or OFMX markup
-      def to_xml
-        builder = Builder::XmlMarkup.new(indent: 2)
+      # @!visibility private
+      def add_to(builder)
         builder.Fqy do |fqy|
-          fqy << to_uid.indent(2)
+          add_uid_to(fqy)
           fqy.valFreqRec(reception_f.freq) if reception_f
-          fqy.uomFreq(transmission_f.unit.upcase.to_s)
-          fqy << timetable.to_xml(as: :Ftt).indent(2) if timetable
+          fqy.uomFreq(transmission_f.unit.upcase)
+          timetable.add_to(fqy, as: :Ftt) if timetable
           fqy.txtRmk(remarks) if remarks
           callsigns.each do |language, callsign|
             fqy.Cdl do |cdl|
               cdl.txtCallSign(callsign)
-              cdl.codeLang(language.upcase.to_s)
+              cdl.codeLang(language.upcase)
             end
           end
-          fqy.target!
         end
       end
     end

data/lib/aixm/component/geometry/arc.rb

@@ -58,9 +58,8 @@ module AIXM
           @clockwise = value
         end
 
-        # @return [String] AIXM or OFMX markup
-        def to_xml
-          builder = Builder::XmlMarkup.new(indent: 2)
+        # @!visibility private
+        def add_to(builder)
           builder.Avx do |avx|
             avx.codeType(clockwise? ? 'CWA' : 'CCA')
             avx.geoLat(xy.lat(AIXM.schema))

data/lib/aixm/component/geometry/border.rb

@@ -15,7 +15,6 @@ module AIXM
       #
       # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airspace#frontier
       class Border < Point
-        include AIXM::Memoize
 
         # Name of the border
         #
@@ -42,20 +41,17 @@ module AIXM
           @name = value
         end
 
-        # @return [String] UID markup
-        def to_uid(as: :GbrUid)
-          builder = Builder::XmlMarkup.new(indent: 2)
-          builder.tag!(as) do |tag|
+        # @!visibility private
+        def add_uid_to(builder, as: :GbrUid)
+          builder.send(as) do |tag|
             tag.txtName(name.to_s)
           end
         end
-        memoize :to_uid
 
-        # @return [String] AIXM or OFMX markup
-        def to_xml
-          builder = Builder::XmlMarkup.new(indent: 2)
+        # @!visibility private
+        def add_to(builder)
           builder.Avx do |avx|
-            avx << to_uid.indent(2)
+            add_uid_to(avx)
             avx.codeType('FNT')
             avx.geoLat(xy.lat(AIXM.schema))
             avx.geoLong(xy.long(AIXM.schema))

data/lib/aixm/component/geometry/circle.rb

@@ -14,7 +14,8 @@ module AIXM
       #
       # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airspace#circle
       class Circle
-        include AIXM::Association
+        include AIXM::Concerns::Association
+        include AIXM::Concerns::XMLBuilder
 
         # @!method geometry
         #   @return [AIXM::Component::Geometry] geometry this segment belongs to
@@ -57,9 +58,8 @@ module AIXM
           @radius = value
         end
 
-        # @return [String] AIXM or OFMX markup
-        def to_xml
-          builder = Builder::XmlMarkup.new(indent: 2)
+        # @!visibility private
+        def add_to(builder)
           builder.Avx do |avx|
             avx.codeType('CWA')
             avx.geoLat(north_xy.lat(AIXM.schema))

data/lib/aixm/component/geometry/point.rb

@@ -14,7 +14,8 @@ module AIXM
       #
       # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airspace#point
       class Point
-        include AIXM::Association
+        include AIXM::Concerns::Association
+        include AIXM::Concerns::XMLBuilder
 
         # @!method geometry
         #   @return [AIXM::Component::Geometry] geometry this segment belongs to
@@ -44,9 +45,8 @@ module AIXM
           @xy = value
         end
 
-        # @return [String] AIXM or OFMX markup
-        def to_xml
-          builder = Builder::XmlMarkup.new(indent: 2)
+        # @!visibility private
+        def add_to(builder)
           builder.Avx do |avx|
             avx.codeType('GRC')
             avx.geoLat(xy.lat(AIXM.schema))

data/lib/aixm/component/geometry/rhumb_line.rb

@@ -14,7 +14,8 @@ module AIXM
       #
       # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airspace#rhumb-line
       class RhumbLine
-        include AIXM::Association
+        include AIXM::Concerns::Association
+        include AIXM::Concerns::XMLBuilder
 
         # @!method geometry
         #   @return [AIXM::Component::Geometry] geometry this segment belongs to
@@ -44,9 +45,8 @@ module AIXM
           @xy = value
         end
 
-        # @return [String] AIXM or OFMX markup
-        def to_xml
-          builder = Builder::XmlMarkup.new(indent: 2)
+        # @!visibility private
+        def add_to(builder)
           builder.Avx do |avx|
             avx.codeType('RHL')
             avx.geoLat(xy.lat(AIXM.schema))

data/lib/aixm/component/geometry.rb

@@ -27,7 +27,7 @@ module AIXM
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airspace#avx-border-vertex
     class Geometry < Component
-      include AIXM::Association
+      include AIXM::Concerns::Association
 
       # @!method segments
       #   @return [Array<AIXM::Component::Geometry::Point,
@@ -93,10 +93,10 @@ module AIXM
           segments.first.xy == segments.last.xy
       end
 
-      # @return [String] AIXM or OFMX markup
-      def to_xml
+      # @!visibility private
+      def add_to(builder)
         fail(GeometryError.new("geometry is not closed", self)) unless closed?
-        segments.map { _1.to_xml }.join
+        segments.each { _1.add_to(builder) }
       end
     end
 

data/lib/aixm/component/helipad.rb

@@ -23,8 +23,7 @@ module AIXM
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#tla-helipad-tlof
     class Helipad < Component
-      include AIXM::Association
-      include AIXM::Memoize
+      include AIXM::Concerns::Association
       include AIXM::Concerns::Marking
       include AIXM::Concerns::Remarks
 
@@ -159,46 +158,40 @@ module AIXM
         @status = value.nil? ? nil : (STATUSES.lookup(value.to_s.to_sym, nil) || fail(ArgumentError, "invalid status"))
       end
 
-      # @return [String] UID markup
-      def to_uid
-        builder = Builder::XmlMarkup.new(indent: 2)
+      # @!visibility private
+      def add_uid_to(builder)
         builder.TlaUid do |tla_uid|
-          tla_uid << airport.to_uid.indent(2)
+          airport.add_uid_to(tla_uid)
           tla_uid.txtDesig(name)
         end
       end
-      memoize :to_uid
 
-      # @return [String] AIXM or OFMX markup
-      def to_xml
-        builder = Builder::XmlMarkup.new(indent: 2)
+      # @!visibility private
+      def add_to(builder)
         builder.Tla do |tla|
-          tla << to_uid.indent(2)
-          tla << fato.to_uid.indent(2) if fato
+          add_uid_to(tla)
+          fato.add_uid_to(tla) if fato
           tla.geoLat(xy.lat(AIXM.schema))
           tla.geoLong(xy.long(AIXM.schema))
           tla.codeDatum('WGE')
           if z
             tla.valElev(z.alt)
-            tla.uomDistVer(z.unit.upcase.to_s)
+            tla.uomDistVer(z.unit.upcase)
           end
           if dimensions
             tla.valLen(dimensions.length.to_m.dim.trim)
             tla.valWid(dimensions.width.to_m.dim.trim)
             tla.uomDim('M')
           end
-          unless  (xml = surface.to_xml).empty?
-            tla << xml.indent(2)
-          end
-          tla.codeClassHel(PERFORMANCE_CLASSES.key(performance_class).to_s) if performance_class
+          surface.add_to(tla) if surface
+          tla.codeClassHel(PERFORMANCE_CLASSES.key(performance_class)) if performance_class
           tla.txtMarking(marking) if marking
-          tla.codeSts(STATUSES.key(status).to_s) if status
+          tla.codeSts(STATUSES.key(status)) if status
           tla.txtRmk(remarks) if remarks
         end
         lightings.each do |lighting|
-          builder << lighting.to_xml(as: :Tls)
+          lighting.add_to(builder, as: :Tls)
         end
-        builder.target!
       end
     end
   end

data/lib/aixm/component/layer.rb

@@ -20,7 +20,7 @@ module AIXM
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airspace
     class Layer < Component
-      include AIXM::Association
+      include AIXM::Concerns::Association
       include AIXM::Concerns::Timetable
       include AIXM::Concerns::Remarks
 
@@ -180,19 +180,17 @@ module AIXM
         @selective = value
       end
 
-      # @return [String] AIXM or OFMX markup
-      def to_xml
-        builder = Builder::XmlMarkup.new(indent: 2)
-        builder.codeClass(self.class.to_s) if self.class
+      # @!visibility private
+      def add_to(builder)
+        builder.codeClass(self.class) if self.class
         builder.codeLocInd(location_indicator) if location_indicator
         if activity
           builder.codeActivity(ACTIVITIES.key(activity).to_s.then_if(AIXM.aixm?) { { 'AIRMODEL' => 'UAV', 'WINCH' => 'GLIDER' }[_1] || _1 })
         end
-        builder << vertical_limit.to_xml
-        builder << timetable.to_xml(as: :Att) if timetable
+        vertical_limit.add_to(builder)
+        timetable.add_to(builder, as: :Att) if timetable
         builder.codeSelAvbl(selective? ? 'Y' : 'N') if AIXM.ofmx?
         builder.txtRmk(remarks) if remarks
-        builder.target!
       end
     end