aixm 0.1.3 → 0.2.0

data/spec/lib/aixm/component/geometry/border_spec.rb

@@ -3,8 +3,8 @@ require_relative '../../../../spec_helper'
 describe AIXM::Component::Geometry::Border do
   describe :to_digest do
     it "must return digest of payload" do
-      subject = AIXM::Component::Geometry::Border.new(
-        xy: AIXM::XY.new(lat: 11.1, long: 22.2),
+      subject = AIXM.border(
+        xy: AIXM.xy(lat: 11.1, long: 22.2),
         name: 'foobar'
       )
       subject.to_digest.must_equal 813052011
@@ -13,8 +13,8 @@ describe AIXM::Component::Geometry::Border do
 
   describe :to_xml do
     it "must build correct XML" do
-      subject = AIXM::Component::Geometry::Border.new(
-        xy: AIXM::XY.new(lat: 11.1, long: 22.2),
+      subject = AIXM.border(
+        xy: AIXM.xy(lat: 11.1, long: 22.2),
         name: 'foobar'
       )
       subject.to_xml.must_equal <<~END

data/spec/lib/aixm/component/geometry/circle_spec.rb

@@ -3,24 +3,24 @@ require_relative '../../../../spec_helper'
 describe AIXM::Component::Geometry::Circle do
   describe :initialize do
     it "won't accept invalid arguments" do
-      -> { AIXM::Component::Geometry::Circle.new(center_xy: 0, radius: 0) }.must_raise ArgumentError
+      -> { AIXM.circle(center_xy: 0, radius: 0) }.must_raise ArgumentError
     end
   end
 
   describe :north_xy do
     it "must calculate approximation of northmost point on the circumference" do
-      subject = AIXM::Component::Geometry::Circle.new(
-        center_xy: AIXM::XY.new(lat: 12.12345678, long: -23.12345678),
+      subject = AIXM.circle(
+        center_xy: AIXM.xy(lat: 12.12345678, long: -23.12345678),
         radius: 15
       )
-      subject.send(:north_xy).must_equal AIXM::XY.new(lat: 12.25835502, long: -23.12345678)
+      subject.send(:north_xy).must_equal AIXM.xy(lat: 12.25835502, long: -23.12345678)
     end
   end
 
   describe :to_digest do
     it "must return digest of payload" do
-      subject = AIXM::Component::Geometry::Circle.new(
-        center_xy: AIXM::XY.new(lat: 12.12345678, long: -23.12345678),
+      subject = AIXM.circle(
+        center_xy: AIXM.xy(lat: 12.12345678, long: -23.12345678),
         radius: 15
       )
       subject.to_digest.must_equal 386055945
@@ -29,8 +29,8 @@ describe AIXM::Component::Geometry::Circle do
 
   describe :to_xml do
     it "must build correct XML for circles not near the equator" do
-      subject = AIXM::Component::Geometry::Circle.new(
-        center_xy: AIXM::XY.new(lat: 11.1, long: 22.2),
+      subject = AIXM.circle(
+        center_xy: AIXM.xy(lat: 11.1, long: 22.2),
         radius: 25
       )
       subject.to_xml.must_equal <<~END
@@ -46,8 +46,8 @@ describe AIXM::Component::Geometry::Circle do
     end
 
     it "must build correct XML for circles near the equator" do
-      subject = AIXM::Component::Geometry::Circle.new(
-        center_xy: AIXM::XY.new(lat: -0.0005, long: -22.2),
+      subject = AIXM.circle(
+        center_xy: AIXM.xy(lat: -0.0005, long: -22.2),
         radius: 50
       )
       subject.to_xml.must_equal <<~END

data/spec/lib/aixm/component/geometry/point_spec.rb

@@ -3,20 +3,20 @@ require_relative '../../../../spec_helper'
 describe AIXM::Component::Geometry::Point do
   describe :initialize do
     it "won't accept invalid arguments" do
-      -> { AIXM::Component::Geometry::Point.new(xy: 0) }.must_raise ArgumentError
+      -> { AIXM.point(xy: 0) }.must_raise ArgumentError
     end
   end
 
   describe :to_digest do
     it "must return digest of payload" do
-      subject = AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: 11.1, long: 22.2))
+      subject = AIXM.point(xy: AIXM.xy(lat: 11.1, long: 22.2))
       subject.to_digest.must_equal 167706171
     end
   end
 
   describe :to_xml do
     it "must build correct XML for N/E points" do
-      subject = AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: 11.1, long: 22.2))
+      subject = AIXM.point(xy: AIXM.xy(lat: 11.1, long: 22.2))
       subject.to_xml.must_equal <<~END
         <Avx>
           <codeType>GRC</codeType>
@@ -28,7 +28,7 @@ describe AIXM::Component::Geometry::Point do
     end
 
     it "must build correct XML for S/W points" do
-      subject = AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: -11.1, long: -22.2))
+      subject = AIXM.point(xy: AIXM.xy(lat: -11.1, long: -22.2))
       subject.to_xml.must_equal <<~END
         <Avx>
           <codeType>GRC</codeType>

data/spec/lib/aixm/component/geometry_spec.rb

@@ -3,7 +3,7 @@ require_relative '../../../spec_helper'
 describe AIXM::Component::Geometry do
   context "singularity" do
     subject do
-      AIXM::Component::Geometry.new
+      AIXM.geometry
     end
 
     it "must fail validation" do
@@ -15,8 +15,8 @@ describe AIXM::Component::Geometry do
 
   context "point" do
     subject do
-      AIXM::Component::Geometry.new.tap do |geometry|
-        geometry << AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: 11, long: 22))
+      AIXM.geometry.tap do |geometry|
+        geometry << AIXM.point(xy: AIXM.xy(lat: 11, long: 22))
       end
     end
 
@@ -29,9 +29,9 @@ describe AIXM::Component::Geometry do
 
   context "line" do
     subject do
-      AIXM::Component::Geometry.new.tap do |geometry|
-        geometry << AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: 11, long: 22))
-        geometry << AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: 22, long: 33))
+      AIXM.geometry.tap do |geometry|
+        geometry << AIXM.point(xy: AIXM.xy(lat: 11, long: 22))
+        geometry << AIXM.point(xy: AIXM.xy(lat: 22, long: 33))
       end
     end
 
@@ -44,9 +44,9 @@ describe AIXM::Component::Geometry do
 
   context "polygon" do
     subject do
-      AIXM::Component::Geometry.new.tap do |geometry|
-        geometry << AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: 11, long: 22))
-        geometry << AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: 22, long: 33))
+      AIXM.geometry.tap do |geometry|
+        geometry << AIXM.point(xy: AIXM.xy(lat: 11, long: 22))
+        geometry << AIXM.point(xy: AIXM.xy(lat: 22, long: 33))
       end
     end
 
@@ -57,7 +57,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must recognize closed" do
-      subject << AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: 11, long: 22))
+      subject << AIXM.point(xy: AIXM.xy(lat: 11, long: 22))
       subject.wont_be :circle?
       subject.must_be :closed_shape?
       subject.must_be :complete?
@@ -91,9 +91,9 @@ describe AIXM::Component::Geometry do
 
   context "arc" do
     subject do
-      AIXM::Component::Geometry.new.tap do |geometry|
-        geometry << AIXM::Component::Geometry::Arc.new(xy: AIXM::XY.new(lat: 11, long: 22), center_xy: AIXM::XY.new(lat: 10, long: 20), clockwise: true)
-        geometry << AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: 22, long: 33))
+      AIXM.geometry.tap do |geometry|
+        geometry << AIXM.arc(xy: AIXM.xy(lat: 11, long: 22), center_xy: AIXM.xy(lat: 10, long: 20), clockwise: true)
+        geometry << AIXM.point(xy: AIXM.xy(lat: 22, long: 33))
       end
     end
 
@@ -104,7 +104,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must recognize closed" do
-      subject << AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: 11, long: 22))
+      subject << AIXM.point(xy: AIXM.xy(lat: 11, long: 22))
       subject.wont_be :circle?
       subject.must_be :closed_shape?
       subject.must_be :complete?
@@ -136,9 +136,9 @@ describe AIXM::Component::Geometry do
 
   context "border" do
     subject do
-      AIXM::Component::Geometry.new.tap do |geometry|
-        geometry << AIXM::Component::Geometry::Border.new(xy: AIXM::XY.new(lat: 11, long: 22), name: 'foobar')
-        geometry << AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: 22, long: 33))
+      AIXM.geometry.tap do |geometry|
+        geometry << AIXM.border(xy: AIXM.xy(lat: 11, long: 22), name: 'foobar')
+        geometry << AIXM.point(xy: AIXM.xy(lat: 22, long: 33))
       end
     end
 
@@ -149,7 +149,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must recognize closed" do
-      subject << AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: 11, long: 22))
+      subject << AIXM.point(xy: AIXM.xy(lat: 11, long: 22))
       subject.wont_be :circle?
       subject.must_be :closed_shape?
       subject.must_be :complete?
@@ -179,8 +179,8 @@ describe AIXM::Component::Geometry do
 
   context "circle" do
     subject do
-      AIXM::Component::Geometry.new.tap do |geometry|
-        geometry << AIXM::Component::Geometry::Circle.new(center_xy: AIXM::XY.new(lat: 11, long: 22), radius: 10)
+      AIXM.geometry.tap do |geometry|
+        geometry << AIXM.circle(center_xy: AIXM.xy(lat: 11, long: 22), radius: 10)
       end
     end
 
@@ -191,7 +191,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must fail validation when additional elements are present" do
-      subject << AIXM::Component::Geometry::Point.new(xy: AIXM::XY.new(lat: 11, long: 22))
+      subject << AIXM.point(xy: AIXM.xy(lat: 11, long: 22))
       subject.wont_be :circle?
       subject.wont_be :closed_shape?
       subject.wont_be :complete?

data/spec/lib/aixm/component/schedule_spec.rb

@@ -3,28 +3,28 @@ require_relative '../../../spec_helper'
 describe AIXM::Component::Schedule do
   describe :initialize do
     it "won't accept invalid arguments" do
-      -> { AIXM::Component::Schedule.new(code: 'foobar') }.must_raise ArgumentError
+      -> { AIXM.schedule(code: 'foobar') }.must_raise ArgumentError
     end
 
     it "must accept explicit codes" do
-      AIXM::Component::Schedule.new(code: :sunrise_to_sunset).code.must_equal :HJ
+      AIXM.schedule(code: :sunrise_to_sunset).code.must_equal :sunrise_to_sunset
     end
 
     it "must accept short codes" do
-      AIXM::Component::Schedule.new(code: :H24).code.must_equal :H24
+      AIXM.schedule(code: :H24).code.must_equal :continuous
     end
   end
 
   describe :to_digest do
     it "must return digest of payload" do
-      subject = AIXM::Component::Schedule.new(code: :H24)
-      subject.to_digest.must_equal 962036587
+      subject = AIXM.schedule(code: :continuous)
+      subject.to_digest.must_equal 349179367
     end
   end
 
   describe :to_xml do
     it "must build correct XML" do
-      subject = AIXM::Component::Schedule.new(code: :H24)
+      subject = AIXM.schedule(code: :continuous)
       subject.to_xml.must_equal <<~END
         <codeWorkHr>H24</codeWorkHr>
       END

data/spec/lib/aixm/component/vertical_limits_spec.rb

@@ -3,28 +3,28 @@ require_relative '../../../spec_helper'
 describe AIXM::Component::VerticalLimits do
   describe :initialize do
     it "won't accept invalid arguments" do
-      z = AIXM::Z.new(alt: 1000, code: :QNH)
-      -> { AIXM::Component::VerticalLimits.new(upper_z: 0, lower_z: z, max_z: z, min_z: z) }.must_raise ArgumentError
-      -> { AIXM::Component::VerticalLimits.new(upper_z: z, lower_z: 0, max_z: z, min_z: z) }.must_raise ArgumentError
-      -> { AIXM::Component::VerticalLimits.new(upper_z: z, lower_z: z, max_z: 0, min_z: z) }.must_raise ArgumentError
-      -> { AIXM::Component::VerticalLimits.new(upper_z: z, lower_z: z, max_z: z, min_z: 0) }.must_raise ArgumentError
+      z = AIXM.z(1000, :qnh)
+      -> { AIXM.vertical_limits(upper_z: 0, lower_z: z, max_z: z, min_z: z) }.must_raise ArgumentError
+      -> { AIXM.vertical_limits(upper_z: z, lower_z: 0, max_z: z, min_z: z) }.must_raise ArgumentError
+      -> { AIXM.vertical_limits(upper_z: z, lower_z: z, max_z: 0, min_z: z) }.must_raise ArgumentError
+      -> { AIXM.vertical_limits(upper_z: z, lower_z: z, max_z: z, min_z: 0) }.must_raise ArgumentError
     end
   end
 
   describe :to_digest do
     it "must return digest of payload" do
-      subject = AIXM::Component::VerticalLimits.new(
-        upper_z: AIXM::Z.new(alt: 2000, code: :QNH),
+      subject = AIXM.vertical_limits(
+        upper_z: AIXM.z(2000, :qnh),
         lower_z: AIXM::GROUND
       )
-      subject.to_digest.must_equal 929399130
+      subject.to_digest.must_equal 867600845
     end
   end
 
   describe :to_xml do
     it "must build correct XML with only upper_z and lower_z" do
-      subject = AIXM::Component::VerticalLimits.new(
-        upper_z: AIXM::Z.new(alt: 2000, code: :QNH),
+      subject = AIXM.vertical_limits(
+        upper_z: AIXM.z(2000, :qnh),
         lower_z: AIXM::GROUND
       )
       subject.to_xml.must_equal <<~END
@@ -38,10 +38,10 @@ describe AIXM::Component::VerticalLimits do
     end
 
     it "must build correct XML with additional max_z" do
-      subject = AIXM::Component::VerticalLimits.new(
-        upper_z: AIXM::Z.new(alt: 65, code: :QNE),
-        lower_z: AIXM::Z.new(alt: 1000, code: :QFE),
-        max_z: AIXM::Z.new(alt: 6000, code: :QNH)
+      subject = AIXM.vertical_limits(
+        upper_z: AIXM.z(65, :qne),
+        lower_z: AIXM.z(1000, :qfe),
+        max_z: AIXM.z(6000, :qnh)
       )
       subject.to_xml.must_equal <<~END
         <codeDistVerUpper>STD</codeDistVerUpper>
@@ -57,10 +57,10 @@ describe AIXM::Component::VerticalLimits do
     end
 
     it "must build correct XML with additional min_z" do
-      subject = AIXM::Component::VerticalLimits.new(
-        upper_z: AIXM::Z.new(alt: 65, code: :QNE),
-        lower_z: AIXM::Z.new(alt: 45, code: :QNE),
-        min_z: AIXM::Z.new(alt: 3000, code: :QNH)
+      subject = AIXM.vertical_limits(
+        upper_z: AIXM.z(65, :qne),
+        lower_z: AIXM.z(45, :qne),
+        min_z: AIXM.z(3000, :qnh)
       )
       subject.to_xml.must_equal <<~END
         <codeDistVerUpper>STD</codeDistVerUpper>

data/spec/lib/aixm/document_spec.rb

@@ -3,39 +3,39 @@ require_relative '../../spec_helper'
 describe AIXM::Document do
   describe :initialize do
     it "won't accept invalid arguments" do
-      -> { AIXM::Document.new(created_at: 0) }.must_raise ArgumentError
-      -> { AIXM::Document.new(created_at: 'foobar') }.must_raise ArgumentError
-      -> { AIXM::Document.new(effective_at: 0) }.must_raise ArgumentError
-      -> { AIXM::Document.new(effective_at: 'foobar') }.must_raise ArgumentError
+      -> { AIXM.document(created_at: 0) }.must_raise ArgumentError
+      -> { AIXM.document(created_at: 'foobar') }.must_raise ArgumentError
+      -> { AIXM.document(effective_at: 0) }.must_raise ArgumentError
+      -> { AIXM.document(effective_at: 'foobar') }.must_raise ArgumentError
     end
 
     it "must accept strings" do
       string = '2018-01-01 12:00:00 +0100'
-      AIXM::Document.new(created_at: string).created_at.must_equal Time.parse(string)
-      AIXM::Document.new(effective_at: string).effective_at.must_equal Time.parse(string)
+      AIXM.document(created_at: string).created_at.must_equal Time.parse(string)
+      AIXM.document(effective_at: string).effective_at.must_equal Time.parse(string)
     end
 
     it "must accept dates" do
       date = Date.parse('2018-01-01')
-      AIXM::Document.new(created_at: date).created_at.must_equal date.to_time
-      AIXM::Document.new(effective_at: date).effective_at.must_equal date.to_time
+      AIXM.document(created_at: date).created_at.must_equal date.to_time
+      AIXM.document(effective_at: date).effective_at.must_equal date.to_time
     end
 
     it "must accept times" do
       time = Time.parse('2018-01-01 12:00:00 +0100')
-      AIXM::Document.new(created_at: time).created_at.must_equal time
-      AIXM::Document.new(effective_at: time).effective_at.must_equal time
+      AIXM.document(created_at: time).created_at.must_equal time
+      AIXM.document(effective_at: time).effective_at.must_equal time
     end
 
     it "must accept nils" do
-      AIXM::Document.new(created_at: nil).created_at.must_be :nil?
-      AIXM::Document.new(effective_at: nil).effective_at.must_be :nil?
+      AIXM.document(created_at: nil).created_at.must_be :nil?
+      AIXM.document(effective_at: nil).effective_at.must_be :nil?
     end
   end
 
   context "incomplete" do
     subject do
-      AIXM::Document.new
+      AIXM.document
     end
 
     it "must fail validation" do
@@ -62,9 +62,9 @@ describe AIXM::Document do
         <AIXM-Snapshot xmlns:xsi="http://www.aixm.aero/schema/4.5/AIXM-Snapshot.xsd" version="4.5" origin="AIXM #{AIXM::VERSION} Ruby gem" created="2018-01-18T12:00:00+01:00" effective="2018-01-18T12:00:00+01:00">
           <!-- Airspace: [D] POLYGON AIRSPACE -->
           <Ase>
-            <AseUid mid="202650074">
+            <AseUid mid="367297292">
               <codeType>D</codeType>
-              <codeId>202650074</codeId>
+              <codeId>367297292</codeId>
             </AseUid>
             <txtLocalType>POLYGON</txtLocalType>
             <txtName>POLYGON AIRSPACE</txtName>
@@ -88,9 +88,9 @@ describe AIXM::Document do
           </Ase>
           <Abd>
             <AbdUid>
-              <AseUid mid="202650074">
+              <AseUid mid="367297292">
                 <codeType>D</codeType>
-                <codeId>202650074</codeId>
+                <codeId>367297292</codeId>
               </AseUid>
             </AbdUid>
             <Avx>
@@ -116,9 +116,9 @@ describe AIXM::Document do
           </Abd>
           <!-- Airspace: [D] CIRCLE AIRSPACE -->
           <Ase>
-            <AseUid mid="646302629">
+            <AseUid mid="332058082">
               <codeType>D</codeType>
-              <codeId>646302629</codeId>
+              <codeId>332058082</codeId>
             </AseUid>
             <txtLocalType>CIRCLE</txtLocalType>
             <txtName>CIRCLE AIRSPACE</txtName>
@@ -142,9 +142,9 @@ describe AIXM::Document do
           </Ase>
           <Abd>
             <AbdUid>
-              <AseUid mid="646302629">
+              <AseUid mid="332058082">
                 <codeType>D</codeType>
-                <codeId>646302629</codeId>
+                <codeId>332058082</codeId>
               </AseUid>
             </AbdUid>
             <Avx>
@@ -156,19 +156,114 @@ describe AIXM::Document do
               <geoLongArc>0045300.00E</geoLongArc>
             </Avx>
           </Abd>
+          <!-- Navigational aid: [ICAO] DESIGNATED POINT NAVAID -->
+          <Dpn>
+            <DpnUid>
+              <codeId>DPN</codeId>
+              <geoLat>475133.00N</geoLat>
+              <geoLong>0073336.00E</geoLong>
+            </DpnUid>
+            <OrgUid/>
+            <txtName>DESIGNATED POINT NAVAID</txtName>
+            <codeDatum>WGE</codeDatum>
+            <codeType>ICAO</codeType>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <txtRmk>designated point navaid</txtRmk>
+          </Dpn>
+          <!-- Navigational aid: [DME] DME NAVAID -->
+          <Dme>
+            <DmeUid>
+              <codeId>DME</codeId>
+              <geoLat>475133.00N</geoLat>
+              <geoLong>0073336.00E</geoLong>
+            </DmeUid>
+            <OrgUid/>
+            <txtName>DME NAVAID</txtName>
+            <codeChannel>95X</codeChannel>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <txtRmk>dme navaid</txtRmk>
+          </Dme>
+          <!-- Navigational aid: [Marker] MARKER NAVAID -->
+          <Mkr>
+            <MkrUid>
+              <codeId>---</codeId>
+              <geoLat>475133.00N</geoLat>
+              <geoLong>0073336.00E</geoLong>
+            </MkrUid>
+            <OrgUid/>
+            <valFreq>75</valFreq>
+            <uomFreq>MHZ</uomFreq>
+            <txtName>MARKER NAVAID</txtName>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <txtRmk>marker navaid</txtRmk>
+          </Mkr>
+          <!-- Navigational aid: [NDB] NDB NAVAID -->
+          <Ndb>
+            <NdbUid>
+              <codeId>NDB</codeId>
+              <geoLat>475133.00N</geoLat>
+              <geoLong>0073336.00E</geoLong>
+            </NdbUid>
+            <OrgUid/>
+            <txtName>NDB NAVAID</txtName>
+            <valFreq>555</valFreq>
+            <uomFreq>KHZ</uomFreq>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <txtRmk>ndb navaid</txtRmk>
+          </Ndb>
+          <!-- Navigational aid: [VOR] VOR NAVAID -->
+          <Vor>
+            <VorUid>
+              <codeId>VOR</codeId>
+              <geoLat>475133.00N</geoLat>
+              <geoLong>0073336.00E</geoLong>
+            </VorUid>
+            <OrgUid/>
+            <txtName>VOR NAVAID</txtName>
+            <codeType>VOR</codeType>
+            <valFreq>111</valFreq>
+            <uomFreq>MHZ</uomFreq>
+            <codeTypeNorth>TRUE</codeTypeNorth>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <txtRmk>vor navaid</txtRmk>
+          </Vor>
+          <!-- Navigational aid: [TACAN] TACAN NAVAID -->
+          <Tcn>
+            <TcnUid>
+              <codeId>TCN</codeId>
+              <geoLat>475133.00N</geoLat>
+              <geoLong>0073336.00E</geoLong>
+            </TcnUid>
+            <OrgUid/>
+            <txtName>TACAN NAVAID</txtName>
+            <codeChannel>29X</codeChannel>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <txtRmk>tacan navaid</txtRmk>
+          </Tcn>
         </AIXM-Snapshot>
       END
     end
 
     it "must build correct XML with OFM extensions" do
-      subject.to_xml(:OFM).must_equal <<~"END"
+      subject.to_xml(:ofm).must_equal <<~"END"
         <?xml version="1.0" encoding="UTF-8"?>
         <AIXM-Snapshot xmlns:xsi="http://www.aixm.aero/schema/4.5/AIXM-Snapshot.xsd" version="4.5 + OFM extensions of version 0.1" origin="AIXM #{AIXM::VERSION} Ruby gem" created="2018-01-18T12:00:00+01:00" effective="2018-01-18T12:00:00+01:00">
           <!-- Airspace: [D] POLYGON AIRSPACE -->
           <Ase xt_classLayersAvail="false">
-            <AseUid mid="202650074" newEntity="true">
+            <AseUid mid="367297292" newEntity="true">
               <codeType>D</codeType>
-              <codeId>202650074</codeId>
+              <codeId>367297292</codeId>
             </AseUid>
             <txtLocalType>POLYGON</txtLocalType>
             <txtName>POLYGON AIRSPACE</txtName>
@@ -193,9 +288,9 @@ describe AIXM::Document do
           </Ase>
           <Abd>
             <AbdUid>
-              <AseUid mid="202650074" newEntity="true">
+              <AseUid mid="367297292" newEntity="true">
                 <codeType>D</codeType>
-                <codeId>202650074</codeId>
+                <codeId>367297292</codeId>
               </AseUid>
             </AbdUid>
             <Avx>
@@ -224,9 +319,9 @@ describe AIXM::Document do
           </Abd>
           <!-- Airspace: [D] CIRCLE AIRSPACE -->
           <Ase xt_classLayersAvail="false">
-            <AseUid mid="646302629" newEntity="true">
+            <AseUid mid="332058082" newEntity="true">
               <codeType>D</codeType>
-              <codeId>646302629</codeId>
+              <codeId>332058082</codeId>
             </AseUid>
             <txtLocalType>CIRCLE</txtLocalType>
             <txtName>CIRCLE AIRSPACE</txtName>
@@ -251,9 +346,9 @@ describe AIXM::Document do
           </Ase>
           <Abd>
             <AbdUid>
-              <AseUid mid="646302629" newEntity="true">
+              <AseUid mid="332058082" newEntity="true">
                 <codeType>D</codeType>
-                <codeId>646302629</codeId>
+                <codeId>332058082</codeId>
               </AseUid>
             </AbdUid>
             <Avx>
@@ -265,6 +360,101 @@ describe AIXM::Document do
               <geoLongArc>4.88333333E</geoLongArc>
             </Avx>
           </Abd>
+          <!-- Navigational aid: [ICAO] DESIGNATED POINT NAVAID -->
+          <Dpn>
+            <DpnUid newEntity="true">
+              <codeId>DPN</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </DpnUid>
+            <OrgUid/>
+            <txtName>DESIGNATED POINT NAVAID</txtName>
+            <codeDatum>WGE</codeDatum>
+            <codeType>ICAO</codeType>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <txtRmk>designated point navaid</txtRmk>
+          </Dpn>
+          <!-- Navigational aid: [DME] DME NAVAID -->
+          <Dme>
+            <DmeUid newEntity="true">
+              <codeId>DME</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </DmeUid>
+            <OrgUid/>
+            <txtName>DME NAVAID</txtName>
+            <codeChannel>95X</codeChannel>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <txtRmk>dme navaid</txtRmk>
+          </Dme>
+          <!-- Navigational aid: [Marker] MARKER NAVAID -->
+          <Mkr>
+            <MkrUid newEntity="true">
+              <codeId>---</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </MkrUid>
+            <OrgUid/>
+            <valFreq>75</valFreq>
+            <uomFreq>MHZ</uomFreq>
+            <txtName>MARKER NAVAID</txtName>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <txtRmk>marker navaid</txtRmk>
+          </Mkr>
+          <!-- Navigational aid: [NDB] NDB NAVAID -->
+          <Ndb>
+            <NdbUid newEntity="true">
+              <codeId>NDB</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </NdbUid>
+            <OrgUid/>
+            <txtName>NDB NAVAID</txtName>
+            <valFreq>555</valFreq>
+            <uomFreq>KHZ</uomFreq>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <txtRmk>ndb navaid</txtRmk>
+          </Ndb>
+          <!-- Navigational aid: [VOR] VOR NAVAID -->
+          <Vor>
+            <VorUid newEntity="true">
+              <codeId>VOR</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </VorUid>
+            <OrgUid/>
+            <txtName>VOR NAVAID</txtName>
+            <codeType>VOR</codeType>
+            <valFreq>111</valFreq>
+            <uomFreq>MHZ</uomFreq>
+            <codeTypeNorth>TRUE</codeTypeNorth>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <txtRmk>vor navaid</txtRmk>
+          </Vor>
+          <!-- Navigational aid: [TACAN] TACAN NAVAID -->
+          <Tcn>
+            <TcnUid newEntity="true">
+              <codeId>TCN</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </TcnUid>
+            <OrgUid/>
+            <txtName>TACAN NAVAID</txtName>
+            <codeChannel>29X</codeChannel>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <txtRmk>tacan navaid</txtRmk>
+          </Tcn>
         </AIXM-Snapshot>
       END
     end