aixm 1.2.1 → 1.3.1

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
 

data/lib/aixm/component/lighting.rb

@@ -18,8 +18,7 @@ module AIXM
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#fls-fato-direction-lighting
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#tls-helipad-tlof-lighting
     class Lighting < Component
-      include AIXM::Association
-      include AIXM::Memoize
+      include AIXM::Concerns::Association
       include AIXM::Concerns::Intensity
       include AIXM::Concerns::Remarks
 
@@ -103,27 +102,23 @@ module AIXM
         @color = value.nil? ? nil : COLORS.lookup(value.to_s.to_sym, nil) || fail(ArgumentError, "invalid color")
       end
 
-      # @return [String] UID markup
-      def to_uid(as:)
-        builder = Builder::XmlMarkup.new(indent: 2)
-        builder.tag!(as) do |tag|
-          tag << lightable.to_uid.indent(2)
-          tag.codePsn(POSITIONS.key(position).to_s)
+      # @!visibility private
+      def add_uid_to(builder, as:)
+        builder.send(as) do |tag|
+          lightable.add_uid_to(tag)
+          tag.codePsn(POSITIONS.key(position))
         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")
           tag.txtDescr(description) if description
-          tag.codeIntst(INTENSITIES.key(intensity).to_s) if intensity
-          tag.codeColour(COLORS.key(color).to_s) if color
+          tag.codeIntst(INTENSITIES.key(intensity)) if intensity
+          tag.codeColour(COLORS.key(color)) if color
           tag.txtRmk(remarks) if remarks
         end
-        builder.target!
       end
     end
   end

data/lib/aixm/component/runway.rb

@@ -49,8 +49,7 @@ module AIXM
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#rwy-runway
     class Runway < Component
-      include AIXM::Association
-      include AIXM::Memoize
+      include AIXM::Concerns::Association
       include AIXM::Concerns::Marking
       include AIXM::Concerns::Remarks
 
@@ -144,39 +143,33 @@ 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.RwyUid do |rwy_uid|
-          rwy_uid << airport.to_uid.indent(2)
+          airport.add_uid_to(rwy_uid)
           rwy_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.Rwy do |rwy|
-          rwy << to_uid.indent(2)
+          add_uid_to(rwy)
           if dimensions
             rwy.valLen(dimensions.length.to_m.dim.trim)
             rwy.valWid(dimensions.width.to_m.dim.trim)
             rwy.uomDimRwy('M')
           end
-          unless  (xml = surface.to_xml).empty?
-            rwy << xml.indent(2)
-          end
-          rwy.codeSts(STATUSES.key(status).to_s) if status
+          surface.add_to(rwy) if surface
+          rwy.codeSts(STATUSES.key(status)) if status
           rwy.txtMarking(marking) if marking
           rwy.txtRmk(remarks) if remarks
         end
         %i(@forth @back).each do |direction|
           if direction = instance_variable_get(direction)
-            builder << direction.to_xml
+            direction.add_to(builder)
           end
         end
-        builder.target!
       end
 
       # Runway directions further describe each direction {#forth} and {#back}
@@ -184,8 +177,9 @@ module AIXM
       #
       # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#rdn-runway-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
 
         VFR_PATTERNS = {
@@ -306,54 +300,48 @@ module AIXM
           end
         end
 
-        # @return [String] UID markup
-        def to_uid
-          builder = Builder::XmlMarkup.new(indent: 2)
+        # @!visibility private
+        def add_uid_to(builder)
           builder.RdnUid do |rdn_uid|
-            rdn_uid << runway.to_uid.indent(2)
+            runway.add_uid_to(rdn_uid)
             rdn_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.Rdn do |rdn|
-            rdn << to_uid.indent(2)
+            add_uid_to(rdn)
             rdn.geoLat(xy.lat(AIXM.schema))
             rdn.geoLong(xy.long(AIXM.schema))
             rdn.valTrueBrg(geographic_bearing.to_s(:bearing)) if geographic_bearing
             rdn.valMagBrg(magnetic_bearing.to_s(:bearing)) if magnetic_bearing
             if z
               rdn.valElevTdz(z.alt)
-              rdn.uomElevTdz(z.unit.upcase.to_s)
-            end
-            if vasis
-              rdn << vasis.to_xml.indent(2)
+              rdn.uomElevTdz(z.unit.upcase)
             end
-            rdn.codeVfrPattern(VFR_PATTERNS.key(vfr_pattern).to_s) if vfr_pattern
+            vasis.add_to(rdn) if vasis
+            rdn.codeVfrPattern(VFR_PATTERNS.key(vfr_pattern)) if vfr_pattern
             rdn.txtRmk(remarks) if remarks
           end
           if displaced_threshold
             builder.Rdd do |rdd|
               rdd.RddUid do |rdd_uid|
-                rdd_uid << to_uid.indent(4)
+                add_uid_to(rdd_uid)
                 rdd_uid.codeType('DPLM')
                 rdd_uid.codeDayPeriod('A')
               end
               rdd.valDist(displaced_threshold.dim.trim)
-              rdd.uomDist(displaced_threshold.unit.to_s.upcase)
+              rdd.uomDist(displaced_threshold.unit.upcase)
               rdd.txtRmk(remarks) if remarks
             end
           end
           lightings.each do |lighting|
-            builder << lighting.to_xml(as: :Rls)
+            lighting.add_to(builder, as: :Rls)
           end
           approach_lightings.each do |approach_lighting|
-            builder << approach_lighting.to_xml(as: :Rda)
+            approach_lighting.add_to(builder, as: :Rda)
           end
-          builder.target!
         end
       end
     end

data/lib/aixm/component/service.rb

@@ -15,8 +15,7 @@ module AIXM
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Organisation#ser-service
     class Service < Component
-      include AIXM::Association
-      include AIXM::Memoize
+      include AIXM::Concerns::Association
       include AIXM::Concerns::Timetable
       include AIXM::Concerns::Remarks
 
@@ -183,31 +182,28 @@ module AIXM
         GUESSED_UNIT_TYPES_MAP[type]
       end
 
-      # @return [String] UID markup
-      def to_uid
+      # @!visibility private
+      def add_uid_to(builder)
         resequence!
-        builder = Builder::XmlMarkup.new(indent: 2)
         builder.SerUid do |ser_uid|
-          ser_uid << unit.to_uid.indent(2)
-          ser_uid.codeType(TYPES.key(type).to_s)
+          unit.add_uid_to(ser_uid)
+          ser_uid.codeType(TYPES.key(type))
           ser_uid.noSeq(@sequence)
         end
       end
-      memoize :to_uid
 
-      # @return [String] AIXM or OFMX markup
-      def to_xml
-        builder = Builder::XmlMarkup.new(indent: 2)
-        builder.comment! ["Service: #{TYPES.key(type)}", unit&.send(:name_with_type)].compact.join(' by ')
+      # @!visibility private
+      def add_to(builder)
+        builder.comment ["Service: #{TYPES.key(type)}", unit&.send(:name_with_type)].compact.join(' by ').dress
+        builder.text "\n"
         builder.Ser do |ser|
-          ser << to_uid.indent(2)
-          ser << timetable.to_xml(as: :Stt).indent(2) if timetable
+          add_uid_to(ser)
+          timetable.add_to(ser, as: :Stt) if timetable
           ser.txtRmk(remarks) if remarks
         end
         frequencies.each do |frequency|
-          builder << frequency.to_xml
+          frequency.add_to(builder)
         end
-        builder.target!
       end
 
       private

data/lib/aixm/component/surface.rb

@@ -164,12 +164,11 @@ module AIXM
         @auw_weight = value
       end
 
-      # @return [String] AIXM or OFMX markup
-      def to_xml
-        builder = Builder::XmlMarkup.new(indent: true)
-        builder.codeComposition(COMPOSITIONS.key(composition).to_s) if composition
-        builder.codePreparation(PREPARATIONS.key(preparation).to_s) if preparation
-        builder.codeCondSfc(CONDITIONS.key(condition).to_s) if condition
+      # @!visibility private
+      def add_to(builder)
+        builder.codeComposition(COMPOSITIONS.key(composition)) if composition
+        builder.codePreparation(PREPARATIONS.key(preparation)) if preparation
+        builder.codeCondSfc(CONDITIONS.key(condition)) if condition
         if pcn
           builder.valPcnClass(@pcn['capacity'])
           builder.codePcnPavementType(@pcn['type'])
@@ -180,17 +179,16 @@ module AIXM
         builder.txtPcnNote(@remarks) if remarks
         if siwl_weight
           builder.valSiwlWeight(siwl_weight.wgt.trim)
-          builder.uomSiwlWeight(siwl_weight.unit.to_s.upcase)
+          builder.uomSiwlWeight(siwl_weight.unit.upcase)
         end
         if siwl_tire_pressure
           builder.valSiwlTirePressure(siwl_tire_pressure.pres.trim)
-          builder.uomSiwlTirePressure(siwl_tire_pressure.unit.to_s.upcase)
+          builder.uomSiwlTirePressure(siwl_tire_pressure.unit.upcase)
         end
         if auw_weight
           builder.valAuwWeight(auw_weight.wgt.trim)
-          builder.uomAuwWeight(auw_weight.unit.to_s.upcase)
+          builder.uomAuwWeight(auw_weight.unit.upcase)
         end
-        builder.target!
       end
     end
   end

data/lib/aixm/component/timesheet.rb

@@ -141,9 +141,8 @@ module AIXM
         @days = value
       end
 
-      # @return [String] AIXM or OFMX markup
-      def to_xml
-        builder = Builder::XmlMarkup.new(indent: 2)
+      # @!visibility private
+      def add_to(builder)
         builder.Timsh do |timsh|
           timsh.codeTimeRef(adjust_to_dst? ? 'UTCW' : 'UTC')
           timsh.dateValidWef(dates.begin.to_s('%d-%m'))
@@ -151,23 +150,23 @@ module AIXM
           timsh.dateValidTil(dates.end.to_s('%d-%m'))
           timsh.dateYearValidTil(dates.end.year) if AIXM.ofmx? && !dates.end.yearless?
           if days.instance_of? Range
-            timsh.codeDay(DAYS.key(days.begin.day).to_s)
-            timsh.codeDayTil(DAYS.key(days.end.day).to_s)
+            timsh.codeDay(DAYS.key(days.begin.day))
+            timsh.codeDayTil(DAYS.key(days.end.day))
           else
-            timsh.codeDay(DAYS.key(days.day).to_s)
+            timsh.codeDay(DAYS.key(days.day))
           end
           if times
             if times.begin
               timsh.timeWef(times.begin.to_s('%R'))
-              timsh.codeEventWef(EVENTS.key(times.begin.event).to_s) if times.begin.event
+              timsh.codeEventWef(EVENTS.key(times.begin.event)) if times.begin.event
               timsh.timeRelEventWef(times.begin.delta) unless times.begin.delta.zero?
-              timsh.codeCombWef(PRECEDENCES.key(times.begin.precedence).to_s) if times.begin.precedence
+              timsh.codeCombWef(PRECEDENCES.key(times.begin.precedence)) if times.begin.precedence
             end
             if times.end
               timsh.timeTil(times.end.to_s('%R'))
-              timsh.codeEventTil(EVENTS.key(times.end.event).to_s) if times.end.event
+              timsh.codeEventTil(EVENTS.key(times.end.event)) if times.end.event
               timsh.timeRelEventTil(times.end.delta) unless times.end.delta.zero?
-              timsh.codeCombTil(PRECEDENCES.key(times.end.precedence).to_s) if times.end.precedence
+              timsh.codeCombTil(PRECEDENCES.key(times.end.precedence)) if times.end.precedence
             end
           end
         end

data/lib/aixm/component/timetable.rb

@@ -18,7 +18,7 @@ module AIXM
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Timetable#predefined-timetable
     class Timetable < Component
-      include AIXM::Association
+      include AIXM::Concerns::Association
       include AIXM::Concerns::Remarks
 
       CODES = {
@@ -70,13 +70,12 @@ module AIXM
         end
       end
 
-      # @return [String] AIXM or OFMX markup
-      def to_xml(as: :Timetable)
-        builder = Builder::XmlMarkup.new(indent: 2)
-        builder.tag!(as) do |tag|
-          tag.codeWorkHr(CODES.key(code).to_s)
+      # @!visibility private
+      def add_to(builder, as: :Timetable)
+        builder.send(as) do |tag|
+          tag.codeWorkHr(CODES.key(code))
           timesheets.each do |timesheet|
-           tag << timesheet.to_xml.indent(2)
+            timesheet.add_to(tag)
           end
           tag.txtRmkWorkHr(remarks) if remarks
         end

data/lib/aixm/component/vasis.rb

@@ -116,19 +116,17 @@ module AIXM
         @meht = value
       end
 
-      # @return [String] AIXM or OFMX markup
-      def to_xml
-        builder = Builder::XmlMarkup.new(indent: true)
-        builder.codeTypeVasis(TYPES.key(type).to_s) if type
-        builder.codePsnVasis(POSITIONS.key(position).to_s) if position
-        builder.noBoxVasis(boxes.to_s) if boxes
+      # @!visibility private
+      def add_to(builder)
+        builder.codeTypeVasis(TYPES.key(type)) if type
+        builder.codePsnVasis(POSITIONS.key(position)) if position
+        builder.noBoxVasis(boxes) if boxes
         builder.codePortableVasis(portable ? 'Y' : 'N') unless portable.nil?
         builder.valSlopeAngleGpVasis(slope_angle.to_f) if slope_angle
         if meht
-          builder.valMeht(meht.alt.to_s)
+          builder.valMeht(meht.alt)
           builder.uomMeht('FT')
         end
-        builder.target!
       end
     end
   end

data/lib/aixm/component/vertical_limit.rb

@@ -26,7 +26,7 @@ module AIXM
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airspace#ase-airspace
     class VerticalLimit < Component
-      include AIXM::Association
+      include AIXM::Concerns::Association
 
       # @api private
       TAGS = { upper_z: :Upper, lower_z: :Lower, max_z: :Max, min_z: :Mnm }.freeze
@@ -102,15 +102,15 @@ module AIXM
         @min_z = value
       end
 
-      # @return [String] AIXM or OFMX markup
-      def to_xml
-        TAGS.keys.each_with_object(Builder::XmlMarkup.new(indent: 2)) do |limit, builder|
+      # @!visibility private
+      def add_to(builder)
+        TAGS.each_key do |limit|
           if z = send(limit)
-            builder.tag!(:"codeDistVer#{TAGS[limit]}", CODES[z.code].to_s)
-            builder.tag!(:"valDistVer#{TAGS[limit]}", z.alt.to_s)
-            builder.tag!(:"uomDistVer#{TAGS[limit]}", z.unit.upcase.to_s)
+            builder.send(:"codeDistVer#{TAGS[limit]}", CODES[z.code])
+            builder.send(:"valDistVer#{TAGS[limit]}", z.alt)
+            builder.send(:"uomDistVer#{TAGS[limit]}", z.unit.upcase)
           end
-        end.target!
+        end
       end
     end
 

data/lib/aixm/component.rb

@@ -2,12 +2,13 @@ module AIXM
 
   # @abstract
   class Component
+    include AIXM::Concerns::XMLBuilder
     include AIXM::Concerns::HashEquality
 
-    # Freely usable e.g. to +find_by+ foreign keys
+    # Freely usable e.g. to find_by foreign keys.
     #
     # @return [Object]
     attr_accessor :meta
-
   end
+
 end