aixm 1.0.0 → 1.1.0

data/lib/aixm/component/runway.rb

@@ -1,7 +1,7 @@
 using AIXM::Refinements
 
 module AIXM
-  module Component
+  class Component
 
     # Runways are landing and takeoff strips for forward propelled aircraft.
     #
@@ -16,16 +16,19 @@ module AIXM
     #   runway = AIXM.runway(
     #     name: String
     #   )
-    #   runway.length = AIXM.d or nil   # must use same unit as width
-    #   runway.width = AIXM.d or nil    # must use same unit as length
+    #   runway.dimensions = AIXM.r or nil
     #   runway.surface = AIXM.surface
+    #   runway.marking = String or nil
     #   runway.status = STATUSES or nil
     #   runway.remarks = String or nil
-    #   runway.forth.name = AIXM.a[precision=2]   # preset based on the runway name
-    #   runway.forth.geographic_orientation = AIXM.a[precision=3] or nil
+    #   runway.forth.name = AIXM.a   # preset based on the runway name
+    #   runway.forth.geographic_bearing = AIXM.a or nil
     #   runway.forth.xy = AIXM.xy
-    #   runway.forth.z = AIXM.z or nil
+    #   runway.forth.z = AIXM.z or nil   # highest point of the TDZ
     #   runway.forth.displaced_threshold = AIXM.xy or AIXM.d or nil
+    #   runway.forth.vasis = AIXM.vasis or nil (default: unspecified VASIS)
+    #   runway.forth.add_lighting = AIXM.lighting
+    #   runway.forth.add_approach_lighting = AIXM.approach_lighting
     #   runway.forth.vfr_pattern = VFR_PATTERNS or nil
     #   runway.forth.remarks = String or nil
     #
@@ -33,19 +36,19 @@ module AIXM
     #   runway = AIXM.runway(name: '16L/34R')
     #   runway.name   # => '16L/34R'
     #   runway.forth.name.to_s = '16L'
-    #   runway.forth.geographic_orientation = 165
+    #   runway.forth.geographic_bearing = 165
     #   runway.back.name.to_s = '34R'
-    #   runway.back.geographic_orientation = 345
+    #   runway.back.geographic_bearing = 345
     #
     # @example Unidirectional runway:
     #   runway = AIXM.runway(name: '16L')
     #   runway.name   # => '16L'
     #   runway.forth.name.to_s = '16L'
-    #   runway.forth.geographic_orientation = 165
+    #   runway.forth.geographic_bearing = 165
     #   runway.back = nil
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#rwy-runway
-    class Runway
+    class Runway < Component
       include AIXM::Association
       include AIXM::Memoize
 
@@ -56,20 +59,29 @@ module AIXM
         FAILAID: :visual_aids_failure,   # failure or irregular operation of visual aids
         SPOWER: :secondary_power,        # secondary power supply in operation
         OTHER: :other                    # specify in remarks
-      }
+      }.freeze
 
       # @!method forth
       #   @return [AIXM::Component::Runway::Direction] main direction
+      #
       # @!method forth=(forth)
       #   @param forth [AIXM::Component::Runway::Direction]
       has_one :forth, accept: 'AIXM::Component::Runway::Direction'
 
       # @!method back
       #   @return [AIXM::Component::Runway::Direction, nil] reverse direction
+      #
       # @!method back=(back)
       #   @param back [AIXM::Component::Runway::Direction, nil]
       has_one :back, accept: 'AIXM::Component::Runway::Direction', allow_nil: true
 
+      # @!method surface
+      #   @return [AIXM::Component::Surface] surface of the runway
+      #
+      # @!method surface=(surface)
+      #   @param surface [AIXM::Component::Surface]
+      has_one :surface, accept: 'AIXM::Component::Surface'
+
       # @!method airport
       #   @return [AIXM::Feature::Airport] airport the runway belongs to
       belongs_to :airport
@@ -77,14 +89,11 @@ module AIXM
       # @return [String] full name of runway (e.g. "12/30" or "16L/34R")
       attr_reader :name
 
-      # @return [AIXM::D, nil] length
-      attr_reader :length
+      # @return [AIXM::R, nil] dimensions
+      attr_reader :dimensions
 
-      # @return [AIXM::D, nil] width
-      attr_reader :width
-
-      # @return [AIXM::Component::Surface] surface of the runway
-      attr_reader :surface
+      # @return [String, nil] markings
+      attr_reader :marking
 
       # @return [Symbol, nil] status of the runway (see {STATUSES}) or +nil+ for normal operation
       attr_reader :status
@@ -99,7 +108,7 @@ module AIXM
           self.back = Direction.new(name: AIXM.a(back_name)) if back_name
           fail(ArgumentError, "invalid name") unless !back || back.name.inverse_of?(@forth.name)
         end
-        @surface = AIXM.surface
+        self.surface = AIXM.surface
       end
 
       # @return [String]
@@ -112,20 +121,13 @@ module AIXM
         @name = value.uptrans
       end
 
-      def length=(value)
-        @length = if value
-          fail(ArgumentError, "invalid length") unless value.is_a?(AIXM::D) && value.dist > 0
-          fail(ArgumentError, "invalid length unit") if width && width.unit != value.unit
-          value
-        end
+      def dimensions=(value)
+        fail(ArgumentError, "invalid dimensions") unless value.nil? || value.is_a?(AIXM::R)
+        @dimensions = value
       end
 
-      def width=(value)
-        @width = if value
-          fail(ArgumentError, "invalid width") unless value.is_a?(AIXM::D)  && value.dist > 0
-          fail(ArgumentError, "invalid width unit") if length && length.unit != value.unit
-          value
-        end
+      def marking=(value)
+        @marking = value&.to_s
       end
 
       def status=(value)
@@ -151,14 +153,16 @@ module AIXM
         builder = Builder::XmlMarkup.new(indent: 2)
         builder.Rwy do |rwy|
           rwy << to_uid.indent(2)
-          rwy.valLen(length.dist.trim) if length
-          rwy.valWid(width.dist.trim) if width
-          rwy.uomDimRwy(length.unit.to_s.upcase) if length
-          rwy.uomDimRwy(width.unit.to_s.upcase) if width && !length
+          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
+          rwy.txtMarking(marking) if marking
           rwy.txtRmk(remarks) if remarks
         end
         %i(@forth @back).each do |direction|
@@ -181,15 +185,24 @@ module AIXM
           L: :left,
           R: :right,
           E: :left_or_right
-        }
+        }.freeze
 
         # @!method lightings
         #   @return [Array<AIXM::Component::Lighting>] installed lighting systems
+        #
         # @!method add_lighting(lighting)
         #   @param lighting [AIXM::Component::Lighting]
         #   @return [self]
         has_many :lightings, as: :lightable
 
+        # @!method approach_lightings
+        #   @return [Array<AIXM::Component::ApproachLighting>] installed approach lighting systems
+        #
+        # @!method add_approach_lighting(approach_lighting)
+        #   @param approach_lighting [AIXM::Component::ApproachLighting]
+        #   @return [self]
+        has_many :approach_lightings, as: :approach_lightable
+
         # @!method runway
         #   @return [AIXM::Component::Runway] runway the runway direction is further describing
         belongs_to :runway, readonly: true
@@ -197,8 +210,8 @@ module AIXM
         # @return [AIXM::A] partial name of runway (e.g. "12" or "16L")
         attr_reader :name
 
-        # @return [AIXM::A, nil] geographic orientation (true bearing) in degrees
-        attr_reader :geographic_orientation
+        # @return [AIXM::A, nil] (true) geographic bearing in degrees
+        attr_reader :geographic_bearing
 
         # @return [AIXM::XY] beginning point (middle of the runway width)
         attr_reader :xy
@@ -211,6 +224,10 @@ module AIXM
         #   point
         attr_reader :displaced_threshold
 
+        # @return [AIXM::Component::VASIS, nil] visual approach slope indicator
+        #   system
+        attr_reader :vasis
+
         # @return [Symbol, nil] direction of the VFR flight pattern (see {VFR_PATTERNS})
         attr_reader :vfr_pattern
 
@@ -219,11 +236,12 @@ module AIXM
 
         def initialize(name:)
           self.name = name
+          self.vasis = AIXM.vasis
         end
 
         # @return [String]
         def inspect
-          %Q(#<#{self.class} airport=#{runway&.airport&.id.inspect} name=#{name.inspect}>)
+          %Q(#<#{self.class} airport=#{runway&.airport&.id.inspect} name=#{name.to_s(:runway).inspect}>)
         end
 
         def name=(value)
@@ -231,10 +249,10 @@ module AIXM
           @name = value
         end
 
-        def geographic_orientation=(value)
-          return @geographic_orientation = nil if value.nil?
-          fail(ArgumentError, "invalid geographic orientation") unless value.is_a? AIXM::A
-          @geographic_orientation = value
+        def geographic_bearing=(value)
+          return @geographic_bearing = nil if value.nil?
+          fail(ArgumentError, "invalid geographic bearing") unless value.is_a? AIXM::A
+          @geographic_bearing = value
         end
 
         def xy=(value)
@@ -252,7 +270,7 @@ module AIXM
           when AIXM::XY
             @displaced_threshold = @xy.distance(value)
           when AIXM::D
-            fail(ArgumentError, "invalid displaced threshold") unless value.dist > 0
+            fail(ArgumentError, "invalid displaced threshold") unless value.dim > 0
             @displaced_threshold = value
           when NilClass
             @displaced_threshold = nil
@@ -261,6 +279,11 @@ module AIXM
           end
         end
 
+        def vasis=(value)
+          fail(ArgumentError, "invalid vasis") unless value.nil? || value.is_a?(AIXM::Component::VASIS)
+          @vasis = value
+        end
+
         def vfr_pattern=(value)
           @vfr_pattern = value.nil? ? nil : (VFR_PATTERNS.lookup(value.to_s.to_sym, nil) || fail(ArgumentError, "invalid VFR pattern"))
         end
@@ -269,10 +292,10 @@ module AIXM
           @remarks = value&.to_s
         end
 
-        # @return [AIXM::A] magnetic orientation (magnetic bearing) in degrees
-        def magnetic_orientation
-          if geographic_orientation && runway.airport.declination
-            geographic_orientation - runway.airport.declination
+        # @return [AIXM::A] magnetic bearing in degrees
+        def magnetic_bearing
+          if geographic_bearing && runway.airport.declination
+            geographic_bearing - runway.airport.declination
           end
         end
 
@@ -281,7 +304,7 @@ module AIXM
           builder = Builder::XmlMarkup.new(indent: 2)
           builder.RdnUid do |rdn_uid|
             rdn_uid << runway.to_uid.indent(2)
-            rdn_uid.txtDesig(name)
+            rdn_uid.txtDesig(name.to_s(:runway))
           end
         end
         memoize :to_uid
@@ -293,12 +316,15 @@ module AIXM
             rdn << to_uid.indent(2)
             rdn.geoLat(xy.lat(AIXM.schema))
             rdn.geoLong(xy.long(AIXM.schema))
-            rdn.valTrueBrg(geographic_orientation) if geographic_orientation
-            rdn.valMagBrg(magnetic_orientation) if magnetic_orientation
+            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)
+            end
             rdn.codeVfrPattern(VFR_PATTERNS.key(vfr_pattern).to_s) if vfr_pattern
             rdn.txtRmk(remarks) if remarks
           end
@@ -309,7 +335,7 @@ module AIXM
                 rdd_uid.codeType('DPLM')
                 rdd_uid.codeDayPeriod('A')
               end
-              rdd.valDist(displaced_threshold.dist.trim)
+              rdd.valDist(displaced_threshold.dim.trim)
               rdd.uomDist(displaced_threshold.unit.to_s.upcase)
               rdd.txtRmk(remarks) if remarks
             end
@@ -317,6 +343,9 @@ module AIXM
           lightings.each do |lighting|
             builder << lighting.to_xml(as: :Rls)
           end
+          approach_lightings.each do |approach_lighting|
+            builder << approach_lighting.to_xml(as: :Rda)
+          end
           builder.target!
         end
       end

data/lib/aixm/component/service.rb

@@ -1,7 +1,7 @@
 using AIXM::Refinements
 
 module AIXM
-  module Component
+  class Component
 
     # Service provided by a unit.
     #
@@ -14,7 +14,7 @@ module AIXM
     #   service.add_frequency(AIXM.frequency)
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Organisation#ser-service
-    class Service
+    class Service < Component
       include AIXM::Association
       include AIXM::Memoize
 
@@ -73,7 +73,7 @@ module AIXM
         TWR: :aerodrome_control_tower_service,
         UAC: :upper_area_control_service,
         UDF: :uhf_direction_finding_service,
-        VDF: :vhf_direction_finding_service,
+        VDF: :vdf_direction_finding_service,
         VOLMET: :volmet_service,
         VOT: :vor_test_facility,
         OTHER: :other   # specify in remarks
@@ -129,6 +129,7 @@ module AIXM
 
       # @!method frequencies
       #   @return [Array<AIXM::Component::Frequency>] frequencies used by this service
+      #
       # @!method add_frequency(frequency)
       #   @param frequency [AIXM::Component::Frequency]
       has_many :frequencies
@@ -137,6 +138,14 @@ module AIXM
       #   @return [AIXM::Feature::Unit] unit providing this service
       belongs_to :unit
 
+      # @!method airport
+      #   @return [AIXM::Feature::Airport] airport this service is provided at
+      belongs_to :airport
+
+      # @!method airspace
+      #   @return [AIXM::Feature::Airspace] airspace this service is provided in
+      belongs_to :airspace
+
       # @!method layer
       #   @return [AIXM::Component::Layer] airspace layer this service is provided within
       belongs_to :layer

data/lib/aixm/component/surface.rb

@@ -1,16 +1,15 @@
 using AIXM::Refinements
 
 module AIXM
-  module Component
+  class Component
 
     # Surface of a runway, helipad etc
     #
     # ===Cheat Sheet in Pseudo Code:
-    #   surface = AIXM.surface(
-    #     composition: COMPOSITIONS or nil
-    #     preparation: PREPARATIONS or nil
-    #     condition: CONDITIONS or nil
-    #   )
+    #   surface = AIXM.surface
+    #   surface.composition: COMPOSITIONS or nil
+    #   surface.preparation: PREPARATIONS or nil
+    #   surface.condition: CONDITIONS or nil
     #   surface.pcn = String or nil
     #   surface.siwl_weight = AIXM.w
     #   surface.siwl_tire_pressure = AIXM.p
@@ -20,9 +19,10 @@ module AIXM
     # ===Constants:
     # * +AIXM::PCN_RE+ - regular expression to match PCN notations
     #
-    #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#rwy-runway
-    class Surface
+    # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#tla-helipad-tlof
+    # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#fto-fato
+    class Surface < Component
       COMPOSITIONS = {
         ASPH: :asphalt,
         BITUM: :bitumen,        # dug up, bound and rolled ground
@@ -38,7 +38,7 @@ module AIXM
         SNOW: :snow,
         WATER: :water,
         OTHER: :other           # specify in remarks
-      }
+      }.freeze
 
       PREPARATIONS = {
         AFSC: :aggregate_friction_seal_coat,
@@ -50,14 +50,14 @@ module AIXM
         RFSC: :rubberized_friction_seal_coat,
         ROLLED: :rolled,
         OTHER: :other
-      }
+      }.freeze
 
       CONDITIONS = {
         GOOD: :good,
         FAIR: :fair,
         POOR: :poor,
         OTHER: :other
-      }
+      }.freeze
 
       # @return [Symbol, nil] composition of the surface (see {COMPOSITIONS})
       attr_reader :composition
@@ -103,7 +103,7 @@ module AIXM
 
       # @return [String, nil] pavement classification number (e.g. "59/F/A/W/T")
       def pcn
-        @pcn.none? ? nil : @pcn.values.join("/")
+        @pcn.none? ? nil : @pcn.values.join("/".freeze)
       end
 
       def pcn=(value)

data/lib/aixm/component/timetable.rb

@@ -1,7 +1,7 @@
 using AIXM::Refinements
 
 module AIXM
-  module Component
+  class Component
 
     # Timetables define activity time windows.
     #
@@ -18,7 +18,7 @@ module AIXM
     # * +AIXM::H_RE+ - pattern matching working hour codes
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Timetable#predefined-timetable
-    class Timetable
+    class Timetable < Component
       CODES = {
         H24: :continuous,           # all day and all night
         HJ: :sunrise_to_sunset,     # all day

data/lib/aixm/component/vasis.rb

@@ -0,0 +1,105 @@
+using AIXM::Refinements
+
+module AIXM
+  class Component
+
+    # Visual approach slope indicator system
+    #
+    # ===Cheat Sheet in Pseudo Code:
+    #   vasis = AIXM.vasis
+    #   vasis.type = TYPES or nil
+    #   vasis.position = POSITIONS or nil
+    #   vasis.boxes = Integer or nil
+    #   vasis.portable = true or false or nil (means: unknown, default)
+    #   vasis.slope_angle = AIXM.a or nil
+    #   vasis.meht = AIXM.d or nil
+    #
+    # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#rdn-runway-direction
+    # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airport#fdn-fato-direction
+    class VASIS < Component
+      TYPES = {
+        PAPI: :precision_api,
+        APAPI: :abbreviated_precision_api,
+        HAPI: :helicopter_api,
+        VASIS: :vasis,
+        AVASIS: :abbreviated_vasis,
+        TVASIS: :t_shaped_vasis,
+        ATVASIS: :abbreviated_t_shaped_vasis,
+        OTHER: :other   # specify in remarks
+      }.freeze
+
+      POSITIONS = {
+        LEFT: :left,
+        RIGHT: :right,
+        BOTH: :left_and_right,
+        OTHER: :other   # specify in remarks
+      }.freeze
+
+      # @return [Symbol, nil] type of VASIS (see {TYPES})
+      attr_reader :type
+
+      # @return [Symbol, nil] position relative to the runway (see {POSITIONS})
+      attr_reader :position
+
+      # @return [Integer, nil] number of boxes
+      attr_reader :boxes
+
+      # @return [Boolean, nil] whether the VASIS is portable
+      attr_reader :portable
+
+      # @return [AIXM::A, nil] appropriate approach slope angle
+      attr_reader :slope_angle
+
+      # @return [AIXM::Z, nil] minimum eye height over threshold (MEHT)
+      attr_reader :meht
+
+      # @return [String]
+      def inspect
+        %Q(#<#{self.class} type=#{type.inspect}>)
+      end
+
+      def type=(value)
+        @type = value.nil? ? nil : TYPES.lookup(value.to_s.to_sym, nil) || fail(ArgumentError, "invalid type")
+      end
+
+      def position=(value)
+        @position = value.nil? ? nil : POSITIONS.lookup(value.to_s.to_sym, nil) || fail(ArgumentError, "invalid position")
+      end
+
+      def boxes=(value)
+        fail(ArgumentError, "invalid boxes count") unless value.nil? || (value.is_a?(Integer) && value > 0)
+        @boxes = value
+      end
+
+      def portable=(value)
+        fail(ArgumentError, "invalid portable") unless [true, false, nil].include? value
+        @portable = value
+      end
+
+      def slope_angle=(value)
+        fail(ArgumentError, "invalid slope angle") unless value.nil? || (value.is_a?(AIXM::A) && value.deg <= 90)
+        @slope_angle = value
+      end
+
+      def meht=(value)
+        fail(ArgumentError, "invalid MEHT") unless value.nil? || (value.is_a?(AIXM::Z) && value.qfe?)
+        @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
+        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.uomMeht('FT')
+        end
+        builder.target!
+      end
+    end
+  end
+end

data/lib/aixm/component/vertical_limit.rb

@@ -1,7 +1,7 @@
 using AIXM::Refinements
 
 module AIXM
-  module Component
+  class Component
 
     # Vertical limit defines a 3D airspace vertically. It is often noted in
     # AIP as follows:
@@ -25,7 +25,7 @@ module AIXM
     # * +AIXM::UNLIMITED+ - no upper limit expressed as "FL 999"
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airspace#ase-airspace
-    class VerticalLimit
+    class VerticalLimit < Component
       include AIXM::Association
 
       # @api private
@@ -57,7 +57,7 @@ module AIXM
       # @return [String]
       def inspect
         payload = %i(upper_z max_z lower_z min_z).map { %Q(#{_1}="#{send(_1)}") if send(_1) }.compact
-        %Q(#<#{self.class} #{payload.join(' ')}>)
+        %Q(#<#{self.class} #{payload.join(' '.freeze)}>)
       end
 
       def upper_z=(value)

data/lib/aixm/component.rb

@@ -0,0 +1,10 @@
+module AIXM
+
+  # @abstract
+  class Component
+
+    # @return [Object] freely usable e.g. to find_by foreign keys
+    attr_accessor :meta
+
+  end
+end

data/lib/aixm/config.rb

@@ -48,6 +48,7 @@ module AIXM
     #
     # @!method aixm!
     # @!method ofmx!
+    #
     # @return [Symbol] schema key
     SCHEMAS.each_key do |schema|
       define_method("#{schema}!") { @@config.schema = schema }
@@ -63,6 +64,7 @@ module AIXM
     #
     # @!method aixm?
     # @!method ofmx?
+    #
     # @return [Boolean]
     SCHEMAS.each_key do |schema|
       define_method("#{schema}?") { @@config.schema == schema }

data/lib/aixm/d.rb

@@ -2,7 +2,7 @@ using AIXM::Refinements
 
 module AIXM
 
-  # Distance or length
+  # Dimension, distance or length
   #
   # @example
   #   AIXM.d(123, :m)
@@ -18,17 +18,17 @@ module AIXM
     }.freeze
 
     # @!method zero?
-    #   @return [Boolean] whether distance is zero
-    def_delegator :@dist, :zero?
+    #   @return [Boolean] whether dimension is zero
+    def_delegator :@dim, :zero?
 
-    # @return [Float] distance
-    attr_reader :dist
+    # @return [Float] dimension
+    attr_reader :dim
 
     # @return [Symbol] unit (see {UNITS})
     attr_reader :unit
 
-    def initialize(dist, unit)
-      self.dist, self.unit = dist, unit
+    def initialize(dim, unit)
+      self.dim, self.unit = dim, unit
     end
 
     # @return [String]
@@ -36,14 +36,14 @@ module AIXM
       %Q(#<#{self.class} #{to_s}>)
     end
 
-    # @return [String] human readable representation (e.g. "123 m")
+    # @return [String] human readable representation (e.g. "123.0 m")
     def to_s
-      [dist, unit].join(' ')
+      [dim, unit].join(' '.freeze)
     end
 
-    def dist=(value)
-      fail(ArgumentError, "invalid dist") unless value.is_a?(Numeric) && value >= 0
-      @dist = value.to_f
+    def dim=(value)
+      fail(ArgumentError, "invalid dim") unless value.is_a?(Numeric) && value >= 0
+      @dim = value.to_f
     end
 
     def unit=(value)
@@ -56,18 +56,19 @@ module AIXM
     # @!method to_km
     # @!method to_m
     # @!method to_nm
-    # @return [AIXM::D] convert distance
+    #
+    # @return [AIXM::D] convert dimension
     UNITS.each_key do |target_unit|
       define_method "to_#{target_unit}" do
         return self if unit == target_unit
-        self.class.new((dist * UNITS[unit][target_unit]).round(8), target_unit)
+        self.class.new((dim * UNITS[unit][target_unit]).round(8), target_unit)
       end
     end
 
     # @see Object#<=>
     # @return [Integer]
     def <=>(other)
-      dist <=> other.send(:"to_#{unit}").dist
+      dim <=> other.send(:"to_#{unit}").dim
     end
 
     # @see Object#==