aixm 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4e0b32c04cba8526128ce56c60abf4343b7ac8f2e8a3e8252e1046ce3ccbfe3
-  data.tar.gz: c88875a5a1921f90a1d4055302469c1608ae610bce5b513c9a3e2d50ed32f842
+  metadata.gz: cbcadda83460463ad9ab68569e04738a5811b10e3534f3f91fde0ed1f4104874
+  data.tar.gz: aa14c72ecf04553fde4243ff74b68e5cfe2b1d3f19efbb4ef1f473a6dce79a38
 SHA512:
-  metadata.gz: e0f11994c12259bee9a013b92162ed14f763206855adfb5f0d25fc45807a885da5b330010c1c7768590cd3cca19c260976c68674b0354091b2ef64288a70914e
-  data.tar.gz: 800ef3ea1d7e298281454957f3471e06452d9a23a4333c0f978c24590cd9fc140b21948d7588a07a896995731897810bffc317ae610e39822b6e27e51554cb10
+  metadata.gz: 18f3c67e93a4d6527d8240f819c942d82e81cef33332902749ebcde5e62c3aa4aaf2e12ea2ddce4b642b4ba63b2913e557207161dd4400b01685ec673c436885
+  data.tar.gz: f35b079b357d0b00e5c7bc11a71f0e610cc787863eb678f49aa6697ab11eccc32804c33e73e9f2d4851209d9604b16a271c9f85759b2c41b7e8094a928ff5034

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.3
+ruby-2.6.3

data/.travis.yml

@@ -1,5 +1,4 @@
 ---
 language: ruby
 rvm:
-  - 2.5.3
-before_install: gem install bundler -v 1.17.1
+  - 2.6.0

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.3.4
+
+#### Additions
+* Address feature
+* `Runway#preparation`, `Runway#condition` and `Runway#vfr_pattern`
+* `Service#guessed_unit_type`
+* Surface for `Runway|Helipad#surface`
+* Extracted `AIXM::MIN`, `AIXM::SEC` and `AIXM::DMS_RE` to scan for coordinates in texts
+* Refinement `String#payload_hash`
+
+#### Breaking Changes
+* Require Ruby 2.6
+* Renamed `AIXM::H` to `AIXM::A` (angle) and add simple arithmetics to make it more versatile
+* `Runway|Helipad#composition` moved to `Runway|Helipad#surface`
+* DMS notation `{-}{DD}DMMSS{.SS}[NESW]` now requires compulsory cardinal direction (N, E, S or W) at the end
+
+#### Changes
+* Service is a feature now
+
 ## 0.3.3
 
 #### Additions
@@ -132,6 +151,7 @@
 ## 0.1.0
 
 #### Initial Implementation
+* Require Ruby 2.5
 * `AIXM::XY` (coordinates)
 * `AIXM::Z` (altitude or elevation)
 * AIXM-Snapshot 4.5 Document

data/README.md

@@ -37,13 +37,15 @@ document.aixm!   # not really necessary since AIXM is the default schema
 document.to_xml
 ```
 
-You can initialize all elements either traditionally or by use of shorter AIXM class methods. The following two statements are identical:
+You can initialize all elements either traditionally or by use of the corresponding shorthand AIXM class method. The following two statements are identical:
 
 ```ruby
 AIXM::Feature::NavigationalAid::DesignatedPoint.new(...)
 AIXM.designated_point(...)
 ```
 
+See `AIXM::CLASSES` for the complete list of shorthand names.
+
 ## Configuration
 
 The following configuration options are available for setting and getting:
@@ -76,10 +78,13 @@ AIXM.schema(:version)   # => 0
 * [Z (height, elevation or altitude)](http://www.rubydoc.info/gems/aixm/AIXM/Z.html)
 * [D (distance or length)](http://www.rubydoc.info/gems/aixm/AIXM/D.html)
 * [F (frequency)](http://www.rubydoc.info/gems/aixm/AIXM/F.html)
+* [A (angle)](http://www.rubydoc.info/gems/aixm/AIXM/A.html)
 
 ### Features
+* [Address](http://www.rubydoc.info/gems/aixm/AIXM/Feature/Address.html)
 * [Organisation](http://www.rubydoc.info/gems/aixm/AIXM/Feature/Organisation.html)
 * [Unit](http://www.rubydoc.info/gems/aixm/AIXM/Feature/Unit.html)
+* [Service](http://www.rubydoc.info/gems/aixm/AIXM/Component/Service.html)
 * [Airport](http://www.rubydoc.info/gems/aixm/AIXM/Feature/Airport.html)
 * [Airspace](http://www.rubydoc.info/gems/aixm/AIXM/Feature/Airspace.html)
 * [Navigational aid](http://www.rubydoc.info/gems/aixm/AIXM/NavigationalAid.html)
@@ -92,7 +97,6 @@ AIXM.schema(:version)   # => 0
 * [Obstacle and obstacle group](http://www.rubydoc.info/gems/aixm/AIXM/Feature/Obstacle.html)
 
 ### Components
-* [Service](http://www.rubydoc.info/gems/aixm/AIXM/Component/Service.html)
 * [Frequency](http://www.rubydoc.info/gems/aixm/AIXM/Component/Frequency.html)
 * [Geometry](http://www.rubydoc.info/gems/aixm/AIXM/Component/Geometry.html)
   * [Point](http://www.rubydoc.info/gems/aixm/AIXM/Component/Point.html)
@@ -101,6 +105,7 @@ AIXM.schema(:version)   # => 0
   * [Circle](http://www.rubydoc.info/gems/aixm/AIXM/Component/Circle.html)
 * [Runway](http://www.rubydoc.info/gems/aixm/AIXM/Component/Runway.html)
 * [Helipad](http://www.rubydoc.info/gems/aixm/AIXM/Component/Helipad.html)
+* [Surface](http://www.rubydoc.info/gems/aixm/AIXM/Component/Surface.html)
 * [Layer](http://www.rubydoc.info/gems/aixm/AIXM/Component/Layer.html)
 * [Vertical limits](http://www.rubydoc.info/gems/aixm/AIXM/Component/VerticalLimits.html)
 * [Timetable](http://www.rubydoc.info/gems/aixm/AIXM/Component/Timetable.html)

data/aixm.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5'
-  
-  spec.add_development_dependency 'bundler'
+  spec.required_ruby_version = '>= 2.6'
+
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-reporters'

data/lib/aixm.rb

@@ -5,8 +5,10 @@ require 'nokogiri'
 require 'forwardable'
 require 'digest'
 require 'time'
+require 'pathname'
 
 require_relative 'aixm/version'
+require_relative 'aixm/constants'
 require_relative 'aixm/refinements'
 require_relative 'aixm/config'
 require_relative 'aixm/errors'
@@ -16,10 +18,9 @@ require_relative 'aixm/xy'
 require_relative 'aixm/z'
 require_relative 'aixm/d'
 require_relative 'aixm/f'
-require_relative 'aixm/h'
+require_relative 'aixm/a'
 
 require_relative 'aixm/component'
-require_relative 'aixm/component/service'
 require_relative 'aixm/component/frequency'
 require_relative 'aixm/component/geometry'
 require_relative 'aixm/component/geometry/point'
@@ -31,10 +32,13 @@ require_relative 'aixm/component/vertical_limits'
 require_relative 'aixm/component/timetable'
 require_relative 'aixm/component/runway'
 require_relative 'aixm/component/helipad'
+require_relative 'aixm/component/surface'
 
 require_relative 'aixm/feature'
+require_relative 'aixm/feature/address'
 require_relative 'aixm/feature/organisation'
 require_relative 'aixm/feature/unit'
+require_relative 'aixm/feature/service'
 require_relative 'aixm/feature/airspace'
 require_relative 'aixm/feature/airport'
 require_relative 'aixm/feature/navigational_aid'

data/lib/aixm/a.rb

@@ -0,0 +1,151 @@
+using AIXM::Refinements
+
+module AIXM
+
+  # Angle from 0 to 359 degrees with an optional suffix used for azimuths,
+  # bearings, headings, courses etc.
+  #
+  # @example Initialized with Numeric
+  #   a = AIXM.a(12)   # 12 degrees, 1 degree precision, no suffix
+  #   a.precision      # => 3 (three digits = steps of 1 degree)
+  #   a.to_s           # => "012"
+  #   a.suffix         # => nil
+  #   a.deg            # => 12
+  #   a.deg += 7       # => 19
+  #   a.deg += 341     # => 0     - deg is always within (0..359)
+  #   a.to_s           # => "000" - to_s is always within ("000".."359")
+  #
+  # @example Initialized with String
+  #   a = AIXM.a('06L')   # 60 degrees, 10 degree precision, suffix :L
+  #   a.precision         # => 2 (two digits = steps of 10 degrees)
+  #   a.to_s              # => "06L"
+  #   a.suffix            # => :L
+  #   a.deg               # => 60
+  #   a.deg += 7          # => 70
+  #   a.deg += 190        # => 0     - deg is always within (0..359)
+  #   a.to_s              # => "36L" - to_s converts to ("01".."36")
+  class A
+    SUFFIX_INVERSIONS = {
+      R: :L,
+      L: :R
+    }.freeze
+
+    # @return [Integer] angle
+    attr_reader :deg
+
+    # @return [Integer] precision: +2+ (10 degree steps) or +3+ (1 degree steps)
+    attr_reader :precision
+
+    # @return [Symbol, nil] suffix
+    attr_reader :suffix
+
+    def initialize(deg_and_suffix)
+      case deg_and_suffix
+      when Numeric
+        self.deg, @precision = deg_and_suffix, 3
+      when String
+        fail(ArgumentError, "invalid angle") unless deg_and_suffix.to_s =~ /\A(\d+)([A-Z]+)?\z/
+        self.deg, @precision, self.suffix = $1.to_i * 10, 2, $2
+      when Symbol   # used only by private build method
+        fail(ArgumentError, "invalid precision") unless %i(2 3).include? deg_and_suffix
+        @deg, @precision = 0, deg_and_suffix.to_s.to_i
+      else
+        fail(ArgumentError, "invalid angle")
+      end
+    end
+
+    # @return [String]
+    def inspect
+      %Q(#<#{self.class}[precision=#{precision}] #{to_s}>)
+    end
+
+    # @return [String] human readable representation according to precision
+    def to_s
+      if precision == 2
+        [('%02d' % ((deg / 10 + 35) % 36 + 1)), suffix].map(&:to_s).join
+      else
+        ('%03d' % deg)
+      end
+    end
+
+    def deg=(value)
+      fail(ArgumentError, "invalid deg `#{value}'") unless value.is_a?(Numeric) && value.round.between?(0, 360)
+      @deg = (precision == 2 ? (value.to_f / 10).round * 10 : value.round) % 360
+    end
+
+    def suffix=(value)
+      fail(RuntimeError, "suffix only allowed when precision is 2") unless value.nil? || precision == 2
+      fail(ArgumentError, "invalid suffix") unless value.nil? || value.to_s =~ /\A[A-Z]+\z/
+      @suffix = value&.to_s&.to_sym
+    end
+
+    # Invert an angle by 180 degrees
+    #
+    # @example
+    #   AIXM.a(120).invert     # => AIXM.a(300)
+    #   AIXM.a("34L").invert   # => AIXM.a("16R")
+    #   AIXM.a("33X").invert   # => AIXM.a("33X")
+    #
+    # @return [AIXM::A] inverted angle
+    def invert
+      build(precision: precision, deg: (deg + 180) % 360, suffix: SUFFIX_INVERSIONS.fetch(suffix, suffix))
+    end
+
+    # Check whether +other+ angle is the inverse
+    #
+    # @example
+    #   AIXM.a(120).inverse_of? AIXM.a(300)       # => true
+    #   AIXM.a("34L").inverse_of? AIXM.a("16R")   # => true
+    #   AIXM.a("33X").inverse_of? AIXM.a("33X")   # => true
+    #   AIXM.a("16R").inverse_of? AIXM.a("16L")   # => false
+    #
+    # @return [Boolean] whether the inverted angle or not
+    def inverse_of?(other)
+      invert == other
+    end
+
+    # Add degrees
+    #
+    # @return [AIXM::A]
+    def +(numeric_or_angle)
+      fail ArgumentError unless numeric_or_angle.respond_to? :round
+      build(precision: precision, deg: (deg + numeric_or_angle.round) % 360, suffix: suffix)
+    end
+
+    # Subtract degrees
+    #
+    # @return [AIXM::A]
+    def -(numeric_or_angle)
+      fail ArgumentError unless numeric_or_angle.respond_to? :round
+      build(precision: precision, deg: (deg - numeric_or_angle.round + 360) % 360, suffix: suffix)
+    end
+
+    # @private
+    def round
+      deg
+    end
+
+    # @see Object#==
+    # @return [Boolean]
+    def ==(other)
+      self.class === other  && deg == other.deg && precision == other.precision && suffix == other.suffix
+    end
+    alias_method :eql?, :==
+
+    # @see Object#hash
+    # @return [Integer]
+    def hash
+      to_s.hash
+    end
+
+    private
+
+    def build(precision:, deg:, suffix: nil)
+      self.class.new(precision.to_s.to_sym).tap do |a|
+        a.deg = deg
+        a.suffix = suffix
+      end
+    end
+  end
+
+end

data/lib/aixm/component/frequency.rb

@@ -32,7 +32,7 @@ module AIXM
         OTHER: :other   # specify in remarks
       }.freeze
 
-      # @return [AIXM::Component::Service] service the frequency belongs to
+      # @return [AIXM::Feature::Service] service the frequency belongs to
       attr_reader :service
 
       # @return [AIXM::F] frequency for transmission (outgoing)
@@ -69,7 +69,7 @@ module AIXM
       end
 
       def service=(value)
-        fail(ArgumentError, "invalid service") unless value.is_a? AIXM::Component::Service
+        fail(ArgumentError, "invalid service") unless value.is_a? AIXM::Feature::Service
         @service = value
       end
       private :service=

data/lib/aixm/component/geometry.rb

@@ -33,6 +33,10 @@ module AIXM
       include Enumerable
       extend Forwardable
 
+      # @!method each
+      #   @return [Enumerator] see Array#each
+      # @!method <<
+      #   @return [Array] see Array#<<
       def_delegators :@result_array, :each, :<<
 
       def initialize(*segments)

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

@@ -13,10 +13,6 @@ module AIXM
       #
       # @see https://github.com/openflightmaps/ofmx/wiki/Airspace#point
       class Point
-        extend Forwardable
-
-        def_delegators :xy
-
         # @return [AIXM::XY] (starting) point
         attr_reader :xy
 

data/lib/aixm/component/helipad.rb

@@ -13,25 +13,12 @@ module AIXM
     #   helipad.z = AIXM.z or nil
     #   helipad.length = AIXM.d or nil   # must use same unit as width
     #   helipad.width = AIXM.d or nil    # must use same unit as length
-    #   helipad.composition = COMPOSITIONS or nil
+    #   helipad.surface = AIXM.surface
     #   helipad.status = STATUSES or nil
     #   helipad.remarks = String or nil
     #
     # @see https://github.com/openflightmaps/ofmx/wiki/Airport#tla-helipad-tlof
     class Helipad
-      COMPOSITIONS = {
-        ASPH: :asphalt,
-        BITUM: :bitumen,        # dug up, bound and rolled ground
-        CONC: :concrete,
-        GRAVE: :gravel,         # small and midsize rounded stones
-        MACADAM: :macadam,      # small rounded stones
-        SAND: :sand,
-        GRADE: :graded_earth,   # graded or rolled earth possibly with some grass
-        GRASS: :grass,          # lawn
-        WATER: :water,
-        OTHER: :other           # specify in remarks
-      }.freeze
-
       STATUSES = {
         CLSD: :closed,
         WIP: :work_in_progress,          # e.g. construction work
@@ -59,8 +46,8 @@ module AIXM
       # @return [AIXM::D, nil] width
       attr_reader :width
 
-      # @return [Symbol, nil] composition of the surface (see {COMPOSITIONS})
-      attr_reader :composition
+      # @return [AIXM::Component::Surface] surface of the helipad
+      attr_reader :surface
 
       # @return [Symbol, nil] status of the helipad (see {STATUSES}) or +nil+ for normal operation
       attr_reader :status
@@ -70,11 +57,12 @@ module AIXM
 
       def initialize(name:)
         self.name = name
+        @surface = AIXM.surface
       end
 
       # @return [String]
       def inspect
-        %Q(#<#{self.class} name=#{name.inspect}>)
+        %Q(#<#{self.class} airport=#{airport&.id.inspect} name=#{name.inspect}>)
       end
 
       def airport=(value)
@@ -114,10 +102,6 @@ module AIXM
         end
       end
 
-      def composition=(value)
-        @composition = value.nil? ? nil : COMPOSITIONS.lookup(value.to_s.to_sym, nil) || fail(ArgumentError, "invalid composition")
-      end
-
       def status=(value)
         @status = value.nil? ? nil : (STATUSES.lookup(value.to_s.to_sym, nil) || fail(ArgumentError, "invalid status"))
       end
@@ -151,7 +135,9 @@ module AIXM
           tla.valWid(width.dist.trim) if width
           tla.uomDim(length.unit.to_s.upcase) if length
           tla.uomDim(width.unit.to_s.upcase) if width && !length
-          tla.codeComposition(COMPOSITIONS.key(composition).to_s) if composition
+          unless  (xml = surface.to_xml).empty?
+            tla << xml.indent(2)
+          end
           tla.codeSts(STATUSES.key(status).to_s) if status
           tla.txtRmk(remarks) if remarks
         end

data/lib/aixm/component/runway.rb

@@ -18,14 +18,15 @@ module AIXM
     #   )
     #   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.composition = COMPOSITIONS or nil
+    #   runway.surface = AIXM.surface
     #   runway.status = STATUSES or nil
     #   runway.remarks = String or nil
-    #   runway.forth.name = AIXM.h   # preset based on the runway name
-    #   runway.forth.geographic_orientation = Integer or nil   # degrees
+    #   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.xy = AIXM.xy
     #   runway.forth.z = AIXM.z or nil
     #   runway.forth.displaced_threshold = AIXM.xy or AIXM.d or nil
+    #   runway.forth.vfr_pattern = VFR_PATTERNS or nil
     #   runway.forth.remarks = String or nil
     #
     # @example Bidirectional runway
@@ -45,19 +46,6 @@ module AIXM
     #
     # @see https://github.com/openflightmaps/ofmx/wiki/Airport#rwy-runway
     class Runway
-      COMPOSITIONS = {
-        ASPH: :asphalt,
-        BITUM: :bitumen,        # dug up, bound and rolled ground
-        CONC: :concrete,
-        GRAVE: :gravel,         # small and midsize rounded stones
-        MACADAM: :macadam,      # small rounded stones
-        SAND: :sand,
-        GRADE: :graded_earth,   # graded or rolled earth possibly with some grass
-        GRASS: :grass,          # lawn
-        WATER: :water,
-        OTHER: :other           # specify in remarks
-      }
-
       STATUSES = {
         CLSD: :closed,
         WIP: :work_in_progress,          # e.g. construction work
@@ -79,8 +67,8 @@ module AIXM
       # @return [AIXM::D, nil] width
       attr_reader :width
 
-      # @return [Symbol, nil] composition of the surface (see {COMPOSITIONS})
-      attr_reader :composition
+      # @return [AIXM::Component::Surface] surface of the runway
+      attr_reader :surface
 
       # @return [Symbol, nil] status of the runway (see {STATUSES}) or +nil+ for normal operation
       attr_reader :status
@@ -96,16 +84,17 @@ module AIXM
 
       def initialize(name:)
         self.name = name
-        @name.split('/').tap do |forth, back|
-          @forth = Direction.new(runway: self, name: AIXM.h(forth))
-          @back = Direction.new(runway: self, name: AIXM.h(back)) if back
+        @name.split("/").tap do |forth, back|
+          @forth = Direction.new(runway: self, name: AIXM.a(forth))
+          @back = Direction.new(runway: self, name: AIXM.a(back)) if back
           fail(ArgumentError, "invalid name") unless !@back || @back.name.inverse_of?(@forth.name)
         end
+        @surface = AIXM.surface
       end
 
       # @return [String]
       def inspect
-        %Q(#<#{self.class} name=#{name.inspect}>)
+        %Q(#<#{self.class} airport=#{airport&.id.inspect} name=#{name.inspect}>)
       end
 
       def airport=(value)
@@ -135,10 +124,6 @@ module AIXM
         end
       end
 
-      def composition=(value)
-        @composition = value.nil? ? nil : COMPOSITIONS.lookup(value.to_s.to_sym, nil) || fail(ArgumentError, "invalid composition")
-      end
-
       def status=(value)
         @status = value.nil? ? nil : (STATUSES.lookup(value.to_s.to_sym, nil) || fail(ArgumentError, "invalid status"))
       end
@@ -165,7 +150,9 @@ module AIXM
           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
-          rwy.codeComposition(COMPOSITIONS.key(composition).to_s) if composition
+          unless  (xml = surface.to_xml).empty?
+            rwy << xml.indent(2)
+          end
           rwy.codeSts(STATUSES.key(status).to_s) if status
           rwy.txtRmk(remarks) if remarks
         end
@@ -181,13 +168,19 @@ module AIXM
       #
       # @see https://github.com/openflightmaps/ofmx/wiki/Airport#rdn-runway-direction
       class Direction
+        VFR_PATTERNS = {
+          L: :left,
+          R: :right,
+          E: :left_or_right
+        }
+
         # @return [AIXM::Component::Runway] runway the runway direction is further describing
         attr_reader :runway
 
-        # @return [AIXM::H] partial name of runway (e.g. "12" or "16L")
+        # @return [AIXM::A] partial name of runway (e.g. "12" or "16L")
         attr_reader :name
 
-        # @return [Integer, nil] geographic orientation (true bearing) in degrees
+        # @return [AIXM::A, nil] geographic orientation (true bearing) in degrees
         attr_reader :geographic_orientation
 
         # @return [AIXM::XY] beginning point (middle of the runway width)
@@ -201,6 +194,9 @@ module AIXM
         #   point
         attr_reader :displaced_threshold
 
+        # @return [Symbol, nil] direction of the VFR flight pattern (see {VFR_PATTERNS})
+        attr_reader :vfr_pattern
+
         # @return [String, nil] free text remarks
         attr_reader :remarks
 
@@ -210,7 +206,7 @@ module AIXM
 
         # @return [String]
         def inspect
-          %Q(#<#{self.class} name=#{name.inspect}>)
+          %Q(#<#{self.class} airport=#{runway&.airport&.id.inspect} name=#{name.inspect}>)
         end
 
         def runway=(value)
@@ -220,15 +216,14 @@ module AIXM
         private :runway
 
         def name=(value)
-          fail(ArgumentError, "invalid name") unless value.is_a? AIXM::H
+          fail(ArgumentError, "invalid name") unless value.is_a? AIXM::A
           @name = value
         end
 
         def geographic_orientation=(value)
           return @geographic_orientation = nil if value.nil?
-          fail(ArgumentError, "invalid geographic orientation") unless value.is_a? Numeric
-          @geographic_orientation = value.to_i
-          fail(ArgumentError, "invalid geographic orientation") unless (1..360).include? @geographic_orientation
+          fail(ArgumentError, "invalid geographic orientation") unless value.is_a? AIXM::A
+          @geographic_orientation = value
         end
 
         def xy=(value)
@@ -255,14 +250,18 @@ module AIXM
           end
         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
+
         def remarks=(value)
           @remarks = value&.to_s
         end
 
-        # @return [Integer] magnetic orientation (magnetic bearing) in degrees
+        # @return [AIXM::A] magnetic orientation (magnetic bearing) in degrees
         def magnetic_orientation
           if geographic_orientation && runway.airport.declination
-            (geographic_orientation + runway.airport.declination).round
+            geographic_orientation + runway.airport.declination
           end
         end
 
@@ -282,6 +281,7 @@ module AIXM
               rdn.valElevTdz(z.alt)
               rdn.uomElevTdz(z.unit.upcase.to_s)
             end
+            rdn.codeVfrPattern(VFR_PATTERNS.key(vfr_pattern).to_s) if vfr_pattern
             rdn.txtRmk(remarks) if remarks
           end
           if displaced_threshold