aixm 0.2.3 → 0.3.0

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

@@ -0,0 +1,61 @@
+require_relative '../../../spec_helper'
+
+describe AIXM::Component::Service do
+  subject do
+    AIXM::Factory.service
+  end
+
+  describe :initialize do
+    it "sets defaults" do
+      subject = AIXM::Component::Service.new(
+        name: "PUJAUT TOWER",
+        type: :approach_control_service
+      )
+      subject.frequencies.must_equal []
+    end
+  end
+
+  describe :name= do
+    it "fails on invalid values" do
+      -> { subject.name = :foobar }.must_raise ArgumentError
+      -> { subject.name = nil }.must_raise ArgumentError
+    end
+
+    it "upcases and transcodes valid values" do
+      subject.tap { |s| s.name = 'Nîmes-Alès' }.name.must_equal 'NIMES-ALES'
+    end
+  end
+
+  describe :type= do
+    it "fails on invalid values" do
+      -> { subject.type = :foobar }.must_raise ArgumentError
+      -> { subject.type = nil }.must_raise ArgumentError
+    end
+
+    it "looks up valid values" do
+      subject.tap { |s| s.type = :area_control_service }.type.must_equal :area_control_service
+      subject.tap { |s| s.type = :ATIS }.type.must_equal :automated_terminal_information_service
+    end
+  end
+
+  describe :timetable= do
+    macro :timetable
+  end
+
+  describe :remarks= do
+    macro :remarks
+  end
+
+  describe :add_frequency do
+    it "fails on invalid arguments" do
+      -> { subject.add_frequency nil }.must_raise ArgumentError
+    end
+
+    it "adds frequency to the array" do
+      count = subject.frequencies.count
+      subject.add_frequency(AIXM::Factory.frequency)
+      subject.frequencies.count.must_equal count + 1
+    end
+  end
+
+end

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

@@ -0,0 +1,49 @@
+require_relative '../../../spec_helper'
+
+describe AIXM::Component::Timetable do
+  subject do
+    AIXM::Factory.timetable
+  end
+
+  describe :code= do
+    it "fails on invalid values" do
+      [nil, :foobar, 123].wont_be_written_to subject, :code
+    end
+
+    it "looks up valid values" do
+      subject.tap { |s| s.code = :notam }.code.must_equal :notam
+      subject.tap { |s| s.code = :H24 }.code.must_equal :continuous
+    end
+  end
+
+  describe :remarks= do
+    macro :remarks
+  end
+
+  describe :to_xml do
+    it "builds correct complete AIXM" do
+      AIXM.aixm!
+      subject.to_xml.must_equal <<~END
+        <Timetable>
+          <codeWorkHr>HJ</codeWorkHr>
+          <txtRmkWorkHr>timetable remarks</txtRmkWorkHr>
+        </Timetable>
+      END
+    end
+
+    it "builds correct minimal AIXM" do
+      AIXM.aixm!
+      subject.remarks = nil
+      subject.to_xml.must_equal <<~END
+        <Timetable>
+          <codeWorkHr>HJ</codeWorkHr>
+        </Timetable>
+      END
+    end
+
+    it "builds with arbitrary tag" do
+      subject.to_xml.must_match(/<Timetable>/)
+      subject.to_xml(as: :FooBar).must_match(/<FooBar>/)
+    end
+  end
+end

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

@@ -1,33 +1,50 @@
 require_relative '../../../spec_helper'
 
 describe AIXM::Component::VerticalLimits do
-  describe :initialize do
-    it "won't accept invalid arguments" do
-      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
+  subject do
+    AIXM::Factory.vertical_limits
+  end
+
+  describe :upper_z= do
+    it "fails on invalid values" do
+      [nil, :foobar, 123].wont_be_written_to subject, :upper_z
     end
   end
 
-  describe :to_digest do
-    it "must return digest of payload" do
-      subject = AIXM.vertical_limits(
-        upper_z: AIXM.z(2000, :qnh),
-        lower_z: AIXM::GROUND
-      )
-      subject.to_digest.must_equal 867600845
+  describe :lower_z= do
+    it "fails on invalid values" do
+      [nil, :foobar, 123].wont_be_written_to subject, :lower_z
+    end
+  end
+
+  describe :max_z= do
+    it "fails on invalid values" do
+      [:foobar, 123].wont_be_written_to subject, :max_z
+    end
+
+    it "accepts nil value" do
+      [nil].must_be_written_to subject, :max_z
+    end
+  end
+
+  describe :min_z= do
+    it "fails on invalid values" do
+      [:foobar, 123].wont_be_written_to subject, :min_z
+    end
+
+    it "accepts nil value" do
+      [nil].must_be_written_to subject, :max_z
     end
   end
 
   describe :to_aixm do
-    it "must build correct XML with only upper_z and lower_z" do
+    it "builds correct AIXM with only upper_z and lower_z" do
       subject = AIXM.vertical_limits(
         upper_z: AIXM.z(2000, :qnh),
         lower_z: AIXM::GROUND
       )
-      subject.to_aixm.must_equal <<~END
+      AIXM.aixm!
+      subject.to_xml.must_equal <<~END
         <codeDistVerUpper>ALT</codeDistVerUpper>
         <valDistVerUpper>2000</valDistVerUpper>
         <uomDistVerUpper>FT</uomDistVerUpper>
@@ -37,13 +54,14 @@ describe AIXM::Component::VerticalLimits do
       END
     end
 
-    it "must build correct XML with additional max_z" do
+    it "builds correct AIXM with additional max_z" do
       subject = AIXM.vertical_limits(
         upper_z: AIXM.z(65, :qne),
         lower_z: AIXM.z(1000, :qfe),
         max_z: AIXM.z(6000, :qnh)
       )
-      subject.to_aixm.must_equal <<~END
+      AIXM.aixm!
+      subject.to_xml.must_equal <<~END
         <codeDistVerUpper>STD</codeDistVerUpper>
         <valDistVerUpper>65</valDistVerUpper>
         <uomDistVerUpper>FL</uomDistVerUpper>
@@ -56,13 +74,14 @@ describe AIXM::Component::VerticalLimits do
       END
     end
 
-    it "must build correct XML with additional min_z" do
+    it "builds correct AIXM with additional min_z" do
       subject = AIXM.vertical_limits(
         upper_z: AIXM.z(65, :qne),
         lower_z: AIXM.z(45, :qne),
         min_z: AIXM.z(3000, :qnh)
       )
-      subject.to_aixm.must_equal <<~END
+      AIXM.aixm!
+      subject.to_xml.must_equal <<~END
         <codeDistVerUpper>STD</codeDistVerUpper>
         <valDistVerUpper>65</valDistVerUpper>
         <uomDistVerUpper>FL</uomDistVerUpper>

data/spec/lib/aixm/config_spec.rb

@@ -0,0 +1,41 @@
+require_relative '../../spec_helper'
+
+describe AIXM do
+  describe :initialize_config do
+    it "must use AIXM" do
+      AIXM.send :initialize_config
+      AIXM.schema.must_equal :aixm
+    end
+  end
+
+  describe :config do
+    it "must set and get arbitrary config options" do
+      AIXM.config.foo = :bar
+      AIXM.config.foo.must_equal :bar
+    end
+  end
+
+  describe :schema do
+    it "must return schema identifier" do
+      AIXM.aixm!
+      AIXM.schema.must_equal :aixm
+    end
+
+    it "must return schema details" do
+      AIXM.aixm!
+      AIXM.schema(:root).must_equal 'AIXM-Snapshot'
+    end
+  end
+
+  describe "<schema>! and <schema>?" do
+    it "must set and query schemas" do
+      AIXM.aixm!
+      AIXM.must_be :aixm?
+      AIXM.wont_be :ofmx?
+      AIXM.ofmx!
+      AIXM.wont_be :aixm?
+      AIXM.must_be :ofmx?
+    end
+  end
+
+end

data/spec/lib/aixm/document_spec.rb

@@ -1,50 +1,77 @@
 require_relative '../../spec_helper'
 
 describe AIXM::Document do
+  subject do
+    AIXM.document
+  end
+
   describe :initialize do
-    it "won't accept invalid arguments" do
-      -> { 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
+    it "sets defaults" do
+      subject.features.must_equal []
     end
+  end
 
-    it "must accept strings" do
-      string = '2018-01-01 12:00:00 +0100'
-      AIXM.document(created_at: string).created_at.must_equal Time.parse(string)
-      AIXM.document(effective_at: string).effective_at.must_equal Time.parse(string)
+  describe :namespace= do
+    it "fails on invalid values" do
+      ['foobar', :foobar].wont_be_written_to subject, :namespace
+    end
+
+    it "sets random UUID for nil value" do
+      subject.tap { |s| s.namespace = nil }.namespace.must_match AIXM::Document::NAMESPACE_PATTERN
     end
 
-    it "must accept dates" do
-      date = Date.parse('2018-01-01')
-      AIXM.document(created_at: date).created_at.must_equal date.to_time
-      AIXM.document(effective_at: date).effective_at.must_equal date.to_time
+    it "accepts UUID value" do
+      [SecureRandom.uuid].must_be_written_to subject, :namespace
     end
+  end
 
-    it "must accept times" do
-      time = Time.parse('2018-01-01 12:00:00 +0100')
-      AIXM.document(created_at: time).created_at.must_equal time
-      AIXM.document(effective_at: time).effective_at.must_equal time
+  describe :created_at= do
+    it "fails on invalid values" do
+      [:foobar, 123].wont_be_written_to subject, :created_at
+    end
+
+    it "parses dates and times" do
+      string = '2018-01-01 12:00:00 +0100'
+      subject.tap { |s| s.created_at = string }.created_at.must_equal Time.parse(string)
     end
 
-    it "must accept nils" do
-      AIXM.document(created_at: nil).created_at.must_be :nil?
-      AIXM.document(effective_at: nil).effective_at.must_be :nil?
+    it "falls back to effective_at first" do
+      subject.effective_at = Time.now
+      subject.created_at = nil
+      subject.created_at.must_equal subject.effective_at
+    end
+
+    it "falls back to now second" do
+      subject.created_at = nil
+      subject.created_at.must_be_close_to Time.now
     end
   end
 
-  context "incomplete" do
-    subject do
-      AIXM.document
+  describe :effective_at= do
+    it "fails on invalid values" do
+      [:foobar, 123].wont_be_written_to subject, :effective_at
     end
 
-    it "must fail validation" do
-      subject.wont_be :complete?
+    it "parses dates and times" do
+      string = '2018-01-01 12:00:00 +0100'
+      subject.tap { |s| s.effective_at = string }.effective_at.must_equal Time.parse(string)
+    end
+
+    it "falls back to created_at first" do
+      subject.effective_at = Time.now
+      subject.effective_at = nil
+      subject.effective_at.must_equal subject.created_at
+    end
+
+    it "falls back to now second" do
+      subject.effective_at = nil
+      subject.effective_at.must_be_close_to Time.now
     end
   end
 
-  context "complete" do
+  context "AIXM" do
     subject do
+      AIXM.aixm!
       AIXM::Factory.document
     end
 
@@ -52,19 +79,229 @@ describe AIXM::Document do
       subject.errors.must_equal []
     end
 
-    it "must pass validation" do
-      subject.must_be :complete?
-    end
-
-    it "must build correct XML without extensions" do
-      subject.to_aixm.must_equal <<~"END"
+    it "builds correct AIXM" do
+      subject.to_xml.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" origin="AIXM #{AIXM::VERSION} Ruby gem" created="2018-01-18T12:00:00+01:00" effective="2018-01-18T12:00:00+01:00">
+        <AIXM-Snapshot xmlns:xsi="http://www.aixm.aero/schema/4.5/AIXM-Snapshot.xsd" version="4.5" origin="rubygem aixm-0.3.0" created="2018-01-01T12:00:00+01:00" effective="2018-01-01T12:00:00+01:00">
+          <!-- Organisation: FRANCE -->
+          <Org>
+            <OrgUid>
+              <txtName>FRANCE</txtName>
+            </OrgUid>
+            <codeId>LF</codeId>
+            <codeType>S</codeType>
+            <txtRmk>Oversea departments not included</txtRmk>
+          </Org>
+          <!-- Unit: PUJAUT TWR -->
+          <Uni>
+            <UniUid>
+              <txtName>PUJAUT TWR</txtName>
+            </UniUid>
+            <OrgUid>
+              <txtName>FRANCE</txtName>
+            </OrgUid>
+            <AhpUid>
+              <codeId>LFNT</codeId>
+            </AhpUid>
+            <codeType>TWR</codeType>
+            <codeClass>ICAO</codeClass>
+            <txtRmk>A/A FR only</txtRmk>
+          </Uni>
+          <Ser>
+            <SerUid>
+              <UniUid>
+                <txtName>PUJAUT TWR</txtName>
+              </UniUid>
+              <codeType>APP</codeType>
+              <noSeq>1</noSeq>
+            </SerUid>
+            <Stt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Stt>
+            <txtRmk>service remarks</txtRmk>
+          </Ser>
+          <Fqy>
+            <FqyUid>
+              <SerUid>
+                <UniUid>
+                  <txtName>PUJAUT TWR</txtName>
+                </UniUid>
+                <codeType>APP</codeType>
+                <noSeq>1</noSeq>
+              </SerUid>
+              <valFreqTrans>123.35</valFreqTrans>
+            </FqyUid>
+            <valFreqRec>124.1</valFreqRec>
+            <uomFreq>MHZ</uomFreq>
+            <Ftt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Ftt>
+            <txtRmk>frequency remarks</txtRmk>
+            <Cdl>
+              <txtCallSign>PUJAUT CONTROL</txtCallSign>
+              <codeLang>EN</codeLang>
+            </Cdl>
+            <Cdl>
+              <txtCallSign>PUJAUT CONTROLE</txtCallSign>
+              <codeLang>FR</codeLang>
+            </Cdl>
+          </Fqy>
+          <!-- Airport: LFNT AVIGNON-PUJAUT -->
+          <Ahp>
+            <AhpUid>
+              <codeId>LFNT</codeId>
+            </AhpUid>
+            <OrgUid>
+              <txtName>FRANCE</txtName>
+            </OrgUid>
+            <txtName>AVIGNON-PUJAUT</txtName>
+            <codeIcao>LFNT</codeIcao>
+            <codeType>AH</codeType>
+            <geoLat>435946.00N</geoLat>
+            <geoLong>0044516.00E</geoLong>
+            <codeDatum>WGE</codeDatum>
+            <valElev>146</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <valMagVar>1.08</valMagVar>
+            <valTransitionAlt>10000</valTransitionAlt>
+            <uomTransitionAlt>FT</uomTransitionAlt>
+            <txtRmk>Restricted access</txtRmk>
+          </Ahp>
+          <Rwy>
+            <RwyUid>
+              <AhpUid>
+                <codeId>LFNT</codeId>
+              </AhpUid>
+              <txtDesig>16L/34R</txtDesig>
+            </RwyUid>
+            <valLen>650</valLen>
+            <valWid>80</valWid>
+            <uomDimRwy>M</uomDimRwy>
+            <codeComposition>GRADE</codeComposition>
+            <codeSts>CLSD</codeSts>
+            <txtRmk>Markings eroded</txtRmk>
+          </Rwy>
+          <Rdn>
+            <RdnUid>
+              <RwyUid>
+                <AhpUid>
+                  <codeId>LFNT</codeId>
+                </AhpUid>
+                <txtDesig>16L/34R</txtDesig>
+              </RwyUid>
+              <txtDesig>16L</txtDesig>
+            </RdnUid>
+            <geoLat>440007.63N</geoLat>
+            <geoLong>0044507.81E</geoLong>
+            <valTrueBrg>165</valTrueBrg>
+            <valMagBrg>166</valMagBrg>
+            <valElevTdz>147</valElevTdz>
+            <uomElevTdz>FT</uomElevTdz>
+            <txtRmk>forth remarks</txtRmk>
+          </Rdn>
+          <Rdd>
+            <RddUid>
+              <RdnUid>
+                <RwyUid>
+                  <AhpUid>
+                    <codeId>LFNT</codeId>
+                  </AhpUid>
+                  <txtDesig>16L/34R</txtDesig>
+                </RwyUid>
+                <txtDesig>16L</txtDesig>
+              </RdnUid>
+              <codeType>DPLM</codeType>
+              <codeDayPeriod>A</codeDayPeriod>
+            </RddUid>
+            <valDist>131</valDist>
+            <uomDist>M</uomDist>
+            <txtRmk>forth remarks</txtRmk>
+          </Rdd>
+          <Rdn>
+            <RdnUid>
+              <RwyUid>
+                <AhpUid>
+                  <codeId>LFNT</codeId>
+                </AhpUid>
+                <txtDesig>16L/34R</txtDesig>
+              </RwyUid>
+              <txtDesig>34R</txtDesig>
+            </RdnUid>
+            <geoLat>435925.31N</geoLat>
+            <geoLong>0044523.24E</geoLong>
+            <valTrueBrg>345</valTrueBrg>
+            <valMagBrg>346</valMagBrg>
+            <txtRmk>back remarks</txtRmk>
+          </Rdn>
+          <Rdd>
+            <RddUid>
+              <RdnUid>
+                <RwyUid>
+                  <AhpUid>
+                    <codeId>LFNT</codeId>
+                  </AhpUid>
+                  <txtDesig>16L/34R</txtDesig>
+                </RwyUid>
+                <txtDesig>34R</txtDesig>
+              </RdnUid>
+              <codeType>DPLM</codeType>
+              <codeDayPeriod>A</codeDayPeriod>
+            </RddUid>
+            <valDist>209</valDist>
+            <uomDist>M</uomDist>
+            <txtRmk>back remarks</txtRmk>
+          </Rdd>
+          <Tla>
+            <TlaUid>
+              <AhpUid>
+                <codeId>LFNT</codeId>
+              </AhpUid>
+              <txtDesig>H1</txtDesig>
+            </TlaUid>
+            <geoLat>435956.94N</geoLat>
+            <geoLong>0044505.56E</geoLong>
+            <codeDatum>WGE</codeDatum>
+            <valElev>141</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <valLen>20</valLen>
+            <valWid>20</valWid>
+            <uomDim>M</uomDim>
+            <codeComposition>GRASS</codeComposition>
+            <codeSts>OTHER</codeSts>
+            <txtRmk>Authorizaton by AD operator required</txtRmk>
+          </Tla>
+          <Ahu>
+            <AhuUid>
+              <AhpUid>
+                <codeId>LFNT</codeId>
+              </AhpUid>
+            </AhuUid>
+            <UsageLimitation>
+              <codeUsageLimitation>PERMIT</codeUsageLimitation>
+            </UsageLimitation>
+            <UsageLimitation>
+              <codeUsageLimitation>RESERV</codeUsageLimitation>
+              <UsageCondition>
+                <AircraftClass>
+                  <codeType>E</codeType>
+                </AircraftClass>
+              </UsageCondition>
+              <UsageCondition>
+                <FlightClass>
+                  <codeOrigin>INTL</codeOrigin>
+                </FlightClass>
+              </UsageCondition>
+              <Timetable>
+                <codeWorkHr>H24</codeWorkHr>
+              </Timetable>
+              <txtRmk>reservation remarks</txtRmk>
+            </UsageLimitation>
+          </Ahu>
           <!-- Airspace: [D] POLYGON AIRSPACE -->
           <Ase>
-            <AseUid mid="367297292">
+            <AseUid>
               <codeType>D</codeType>
-              <codeId>367297292</codeId>
+              <codeId>PA</codeId>
             </AseUid>
             <txtLocalType>POLYGON</txtLocalType>
             <txtName>POLYGON AIRSPACE</txtName>
@@ -84,13 +321,13 @@ describe AIXM::Document do
             <Att>
               <codeWorkHr>H24</codeWorkHr>
             </Att>
-            <txtRmk>polygon airspace</txtRmk>
+            <txtRmk>airspace layer</txtRmk>
           </Ase>
           <Abd>
             <AbdUid>
-              <AseUid mid="367297292">
+              <AseUid>
                 <codeType>D</codeType>
-                <codeId>367297292</codeId>
+                <codeId>PA</codeId>
               </AseUid>
             </AbdUid>
             <Avx>
@@ -102,6 +339,9 @@ describe AIXM::Document do
               <geoLongArc>0073348.00E</geoLongArc>
             </Avx>
             <Avx>
+              <GbrUid>
+                <txtName>FRANCE_GERMANY</txtName>
+              </GbrUid>
               <codeType>FNT</codeType>
               <geoLat>475637.00N</geoLat>
               <geoLong>0073545.00E</geoLong>
@@ -116,9 +356,9 @@ describe AIXM::Document do
           </Abd>
           <!-- Airspace: [D] CIRCLE AIRSPACE -->
           <Ase>
-            <AseUid mid="332058082">
+            <AseUid>
               <codeType>D</codeType>
-              <codeId>332058082</codeId>
+              <codeId>CA</codeId>
             </AseUid>
             <txtLocalType>CIRCLE</txtLocalType>
             <txtName>CIRCLE AIRSPACE</txtName>
@@ -138,13 +378,13 @@ describe AIXM::Document do
             <Att>
               <codeWorkHr>H24</codeWorkHr>
             </Att>
-            <txtRmk>circle airspace</txtRmk>
+            <txtRmk>airspace layer</txtRmk>
           </Ase>
           <Abd>
             <AbdUid>
-              <AseUid mid="332058082">
+              <AseUid>
                 <codeType>D</codeType>
-                <codeId>332058082</codeId>
+                <codeId>CA</codeId>
               </AseUid>
             </AbdUid>
             <Avx>
@@ -158,30 +398,26 @@ describe AIXM::Document do
           </Abd>
           <!-- NavigationalAid: [DesignatedPoint:ICAO] DESIGNATED POINT NAVAID -->
           <Dpn>
-            <DpnUid mid="5317882">
+            <DpnUid>
               <codeId>DDD</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>
-            <Dtt>
-              <codeWorkHr>H24</codeWorkHr>
-            </Dtt>
+            <txtName>DESIGNATED POINT NAVAID</txtName>
             <txtRmk>designated point navaid</txtRmk>
           </Dpn>
           <!-- NavigationalAid: [DME] DME NAVAID -->
           <Dme>
-            <DmeUid mid="537506748">
+            <DmeUid>
               <codeId>MMM</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </DmeUid>
-            <OrgUid/>
+            <OrgUid>
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <txtName>DME NAVAID</txtName>
             <codeChannel>95X</codeChannel>
             <codeDatum>WGE</codeDatum>
@@ -194,12 +430,14 @@ describe AIXM::Document do
           </Dme>
           <!-- NavigationalAid: [Marker:O] MARKER NAVAID -->
           <Mkr>
-            <MkrUid mid="300437209">
+            <MkrUid>
               <codeId>---</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </MkrUid>
-            <OrgUid/>
+            <OrgUid>
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <codePsnIls>O</codePsnIls>
             <valFreq>75</valFreq>
             <uomFreq>MHZ</uomFreq>
@@ -214,12 +452,14 @@ describe AIXM::Document do
           </Mkr>
           <!-- NavigationalAid: [NDB:B] NDB NAVAID -->
           <Ndb>
-            <NdbUid mid="782114926">
+            <NdbUid>
               <codeId>NNN</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </NdbUid>
-            <OrgUid/>
+            <OrgUid>
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <txtName>NDB NAVAID</txtName>
             <valFreq>555</valFreq>
             <uomFreq>KHZ</uomFreq>
@@ -234,12 +474,14 @@ describe AIXM::Document do
           </Ndb>
           <!-- NavigationalAid: [TACAN] TACAN NAVAID -->
           <Tcn>
-            <TcnUid mid="648449590">
+            <TcnUid>
               <codeId>TTT</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </TcnUid>
-            <OrgUid/>
+            <OrgUid>
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <txtName>TACAN NAVAID</txtName>
             <codeChannel>29X</codeChannel>
             <codeDatum>WGE</codeDatum>
@@ -252,12 +494,14 @@ describe AIXM::Document do
           </Tcn>
           <!-- NavigationalAid: [VOR:VOR] VOR NAVAID -->
           <Vor>
-            <VorUid mid="904391566">
+            <VorUid>
               <codeId>VVV</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </VorUid>
-            <OrgUid/>
+            <OrgUid>
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <txtName>VOR NAVAID</txtName>
             <codeType>VOR</codeType>
             <valFreq>111</valFreq>
@@ -273,12 +517,14 @@ describe AIXM::Document do
           </Vor>
           <!-- NavigationalAid: [VOR:VOR] VOR/DME NAVAID -->
           <Vor>
-            <VorUid mid="428844269">
+            <VorUid>
               <codeId>VDD</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </VorUid>
-            <OrgUid/>
+            <OrgUid>
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <txtName>VOR/DME NAVAID</txtName>
             <codeType>VOR</codeType>
             <valFreq>111</valFreq>
@@ -294,13 +540,15 @@ describe AIXM::Document do
           </Vor>
           <!-- NavigationalAid: [DME] VOR/DME NAVAID -->
           <Dme>
-            <DmeUid mid="284278140">
+            <DmeUid>
               <codeId>VDD</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </DmeUid>
-            <OrgUid/>
-            <VorUid mid="428844269">
+            <OrgUid>
+              <txtName>FRANCE</txtName>
+            </OrgUid>
+            <VorUid>
               <codeId>VDD</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
@@ -317,12 +565,14 @@ describe AIXM::Document do
           </Dme>
           <!-- NavigationalAid: [VOR:VOR] VORTAC NAVAID -->
           <Vor>
-            <VorUid mid="305713874">
+            <VorUid>
               <codeId>VTT</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </VorUid>
-            <OrgUid/>
+            <OrgUid>
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <txtName>VORTAC NAVAID</txtName>
             <codeType>VOR</codeType>
             <valFreq>111</valFreq>
@@ -338,13 +588,15 @@ describe AIXM::Document do
           </Vor>
           <!-- NavigationalAid: [TACAN] VORTAC NAVAID -->
           <Tcn>
-            <TcnUid mid="595472802">
+            <TcnUid>
               <codeId>VTT</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </TcnUid>
-            <OrgUid/>
-            <VorUid mid="305713874">
+            <OrgUid>
+              <txtName>FRANCE</txtName>
+            </OrgUid>
+            <VorUid>
               <codeId>VTT</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
@@ -362,16 +614,242 @@ describe AIXM::Document do
         </AIXM-Snapshot>
       END
     end
+  end
 
-    it "must build correct XML with OFM extensions" do
-      subject.to_aixm(:ofm).must_equal <<~"END"
+  context "OFMX" do
+    subject do
+      AIXM.ofmx!
+      AIXM::Factory.document
+    end
+
+    it "won't have errors" do
+      subject.errors.must_equal []
+    end
+
+    it "builds correct OFMX" do
+      subject.to_xml.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">
+        <OFMX-Snapshot xmlns:xsi="http://openflightmaps.org/schema/0/OFMX-Snapshot.xsd" version="0" origin="rubygem aixm-0.3.0" namespace="00000000-0000-0000-0000-000000000000" created="2018-01-01T12:00:00+01:00" effective="2018-01-01T12:00:00+01:00">
+          <!-- Organisation: FRANCE -->
+          <Org source="LF|GEN|0.0 FACTORY|0|0">
+            <OrgUid region="LF">
+              <txtName>FRANCE</txtName>
+            </OrgUid>
+            <codeId>LF</codeId>
+            <codeType>S</codeType>
+            <txtRmk>Oversea departments not included</txtRmk>
+          </Org>
+          <!-- Unit: PUJAUT TWR -->
+          <Uni source="LF|GEN|0.0 FACTORY|0|0">
+            <UniUid region="LF">
+              <txtName>PUJAUT TWR</txtName>
+            </UniUid>
+            <OrgUid region="LF">
+              <txtName>FRANCE</txtName>
+            </OrgUid>
+            <AhpUid region="LF">
+              <codeId>LFNT</codeId>
+            </AhpUid>
+            <codeType>TWR</codeType>
+            <codeClass>ICAO</codeClass>
+            <txtRmk>A/A FR only</txtRmk>
+          </Uni>
+          <Ser>
+            <SerUid>
+              <UniUid region="LF">
+                <txtName>PUJAUT TWR</txtName>
+              </UniUid>
+              <codeType>APP</codeType>
+              <noSeq>1</noSeq>
+            </SerUid>
+            <Stt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Stt>
+            <txtRmk>service remarks</txtRmk>
+          </Ser>
+          <Fqy>
+            <FqyUid>
+              <SerUid>
+                <UniUid region="LF">
+                  <txtName>PUJAUT TWR</txtName>
+                </UniUid>
+                <codeType>APP</codeType>
+                <noSeq>1</noSeq>
+              </SerUid>
+              <valFreqTrans>123.35</valFreqTrans>
+            </FqyUid>
+            <valFreqRec>124.1</valFreqRec>
+            <uomFreq>MHZ</uomFreq>
+            <Ftt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Ftt>
+            <txtRmk>frequency remarks</txtRmk>
+            <Cdl>
+              <txtCallSign>PUJAUT CONTROL</txtCallSign>
+              <codeLang>EN</codeLang>
+            </Cdl>
+            <Cdl>
+              <txtCallSign>PUJAUT CONTROLE</txtCallSign>
+              <codeLang>FR</codeLang>
+            </Cdl>
+          </Fqy>
+          <!-- Airport: LFNT AVIGNON-PUJAUT -->
+          <Ahp source="LF|GEN|0.0 FACTORY|0|0">
+            <AhpUid region="LF">
+              <codeId>LFNT</codeId>
+            </AhpUid>
+            <OrgUid region="LF">
+              <txtName>FRANCE</txtName>
+            </OrgUid>
+            <txtName>AVIGNON-PUJAUT</txtName>
+            <codeIcao>LFNT</codeIcao>
+            <codeGps>LFPUJAUT</codeGps>
+            <codeType>AH</codeType>
+            <geoLat>43.99611111N</geoLat>
+            <geoLong>004.75444444E</geoLong>
+            <codeDatum>WGE</codeDatum>
+            <valElev>146</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <valMagVar>1.08</valMagVar>
+            <valTransitionAlt>10000</valTransitionAlt>
+            <uomTransitionAlt>FT</uomTransitionAlt>
+            <txtRmk>Restricted access</txtRmk>
+          </Ahp>
+          <Rwy>
+            <RwyUid>
+              <AhpUid region="LF">
+                <codeId>LFNT</codeId>
+              </AhpUid>
+              <txtDesig>16L/34R</txtDesig>
+            </RwyUid>
+            <valLen>650</valLen>
+            <valWid>80</valWid>
+            <uomDimRwy>M</uomDimRwy>
+            <codeComposition>GRADE</codeComposition>
+            <codeSts>CLSD</codeSts>
+            <txtRmk>Markings eroded</txtRmk>
+          </Rwy>
+          <Rdn>
+            <RdnUid>
+              <RwyUid>
+                <AhpUid region="LF">
+                  <codeId>LFNT</codeId>
+                </AhpUid>
+                <txtDesig>16L/34R</txtDesig>
+              </RwyUid>
+              <txtDesig>16L</txtDesig>
+            </RdnUid>
+            <geoLat>44.00211944N</geoLat>
+            <geoLong>004.75216944E</geoLong>
+            <valTrueBrg>165</valTrueBrg>
+            <valMagBrg>166</valMagBrg>
+            <valElevTdz>147</valElevTdz>
+            <uomElevTdz>FT</uomElevTdz>
+            <txtRmk>forth remarks</txtRmk>
+          </Rdn>
+          <Rdd>
+            <RddUid>
+              <RdnUid>
+                <RwyUid>
+                  <AhpUid region="LF">
+                    <codeId>LFNT</codeId>
+                  </AhpUid>
+                  <txtDesig>16L/34R</txtDesig>
+                </RwyUid>
+                <txtDesig>16L</txtDesig>
+              </RdnUid>
+              <codeType>DPLM</codeType>
+              <codeDayPeriod>A</codeDayPeriod>
+            </RddUid>
+            <valDist>131</valDist>
+            <uomDist>M</uomDist>
+            <txtRmk>forth remarks</txtRmk>
+          </Rdd>
+          <Rdn>
+            <RdnUid>
+              <RwyUid>
+                <AhpUid region="LF">
+                  <codeId>LFNT</codeId>
+                </AhpUid>
+                <txtDesig>16L/34R</txtDesig>
+              </RwyUid>
+              <txtDesig>34R</txtDesig>
+            </RdnUid>
+            <geoLat>43.99036389N</geoLat>
+            <geoLong>004.75645556E</geoLong>
+            <valTrueBrg>345</valTrueBrg>
+            <valMagBrg>346</valMagBrg>
+            <txtRmk>back remarks</txtRmk>
+          </Rdn>
+          <Rdd>
+            <RddUid>
+              <RdnUid>
+                <RwyUid>
+                  <AhpUid region="LF">
+                    <codeId>LFNT</codeId>
+                  </AhpUid>
+                  <txtDesig>16L/34R</txtDesig>
+                </RwyUid>
+                <txtDesig>34R</txtDesig>
+              </RdnUid>
+              <codeType>DPLM</codeType>
+              <codeDayPeriod>A</codeDayPeriod>
+            </RddUid>
+            <valDist>209</valDist>
+            <uomDist>M</uomDist>
+            <txtRmk>back remarks</txtRmk>
+          </Rdd>
+          <Tla>
+            <TlaUid>
+              <AhpUid region="LF">
+                <codeId>LFNT</codeId>
+              </AhpUid>
+              <txtDesig>H1</txtDesig>
+            </TlaUid>
+            <geoLat>43.99915000N</geoLat>
+            <geoLong>004.75154444E</geoLong>
+            <codeDatum>WGE</codeDatum>
+            <valElev>141</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <valLen>20</valLen>
+            <valWid>20</valWid>
+            <uomDim>M</uomDim>
+            <codeComposition>GRASS</codeComposition>
+            <codeSts>OTHER</codeSts>
+            <txtRmk>Authorizaton by AD operator required</txtRmk>
+          </Tla>
+          <Ahu>
+            <AhuUid>
+              <AhpUid region="LF">
+                <codeId>LFNT</codeId>
+              </AhpUid>
+            </AhuUid>
+            <UsageLimitation>
+              <codeUsageLimitation>PERMIT</codeUsageLimitation>
+            </UsageLimitation>
+            <UsageLimitation>
+              <codeUsageLimitation>RESERV</codeUsageLimitation>
+              <UsageCondition>
+                <AircraftClass>
+                  <codeType>E</codeType>
+                </AircraftClass>
+              </UsageCondition>
+              <UsageCondition>
+                <FlightClass>
+                  <codeOrigin>INTL</codeOrigin>
+                </FlightClass>
+              </UsageCondition>
+              <Timetable>
+                <codeWorkHr>H24</codeWorkHr>
+              </Timetable>
+              <txtRmk>reservation remarks</txtRmk>
+            </UsageLimitation>
+          </Ahu>
           <!-- Airspace: [D] POLYGON AIRSPACE -->
-          <Ase xt_classLayersAvail="false">
-            <AseUid mid="367297292" newEntity="true">
+          <Ase source="LF|GEN|0.0 FACTORY|0|0">
+            <AseUid region="LF">
               <codeType>D</codeType>
-              <codeId>367297292</codeId>
+              <codeId>PA</codeId>
             </AseUid>
             <txtLocalType>POLYGON</txtLocalType>
             <txtName>POLYGON AIRSPACE</txtName>
@@ -391,45 +869,45 @@ describe AIXM::Document do
             <Att>
               <codeWorkHr>H24</codeWorkHr>
             </Att>
-            <txtRmk>polygon airspace</txtRmk>
-            <xt_selAvail>false</xt_selAvail>
+            <codeSelAvbl>Y</codeSelAvbl>
+            <txtRmk>airspace layer</txtRmk>
           </Ase>
           <Abd>
             <AbdUid>
-              <AseUid mid="367297292" newEntity="true">
+              <AseUid region="LF">
                 <codeType>D</codeType>
-                <codeId>367297292</codeId>
+                <codeId>PA</codeId>
               </AseUid>
             </AbdUid>
             <Avx>
               <codeType>CWA</codeType>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
               <codeDatum>WGE</codeDatum>
               <geoLatArc>47.90416667N</geoLatArc>
-              <geoLongArc>7.56333333E</geoLongArc>
+              <geoLongArc>007.56333333E</geoLongArc>
             </Avx>
             <Avx>
-              <codeType>FNT</codeType>
-              <geoLat>47.94361111N</geoLat>
-              <geoLong>7.59583333E</geoLong>
-              <codeDatum>WGE</codeDatum>
               <GbrUid>
                 <txtName>FRANCE_GERMANY</txtName>
               </GbrUid>
+              <codeType>FNT</codeType>
+              <geoLat>47.94361111N</geoLat>
+              <geoLong>007.59583333E</geoLong>
+              <codeDatum>WGE</codeDatum>
             </Avx>
             <Avx>
               <codeType>GRC</codeType>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
               <codeDatum>WGE</codeDatum>
             </Avx>
           </Abd>
           <!-- Airspace: [D] CIRCLE AIRSPACE -->
-          <Ase xt_classLayersAvail="false">
-            <AseUid mid="332058082" newEntity="true">
+          <Ase source="LF|GEN|0.0 FACTORY|0|0">
+            <AseUid region="LF">
               <codeType>D</codeType>
-              <codeId>332058082</codeId>
+              <codeId>CA</codeId>
             </AseUid>
             <txtLocalType>CIRCLE</txtLocalType>
             <txtName>CIRCLE AIRSPACE</txtName>
@@ -449,51 +927,47 @@ describe AIXM::Document do
             <Att>
               <codeWorkHr>H24</codeWorkHr>
             </Att>
-            <txtRmk>circle airspace</txtRmk>
-            <xt_selAvail>false</xt_selAvail>
+            <codeSelAvbl>Y</codeSelAvbl>
+            <txtRmk>airspace layer</txtRmk>
           </Ase>
           <Abd>
             <AbdUid>
-              <AseUid mid="332058082" newEntity="true">
+              <AseUid region="LF">
                 <codeType>D</codeType>
-                <codeId>332058082</codeId>
+                <codeId>CA</codeId>
               </AseUid>
             </AbdUid>
             <Avx>
               <codeType>CWA</codeType>
-              <geoLat>47.67326549N</geoLat>
-              <geoLong>4.88333333E</geoLong>
+              <geoLat>47.67326537N</geoLat>
+              <geoLong>004.88333333E</geoLong>
               <codeDatum>WGE</codeDatum>
               <geoLatArc>47.58333333N</geoLatArc>
-              <geoLongArc>4.88333333E</geoLongArc>
+              <geoLongArc>004.88333333E</geoLongArc>
             </Avx>
           </Abd>
           <!-- NavigationalAid: [DesignatedPoint:ICAO] DESIGNATED POINT NAVAID -->
-          <Dpn>
-            <DpnUid mid="5317882" newEntity="true">
+          <Dpn source="LF|GEN|0.0 FACTORY|0|0">
+            <DpnUid region="LF">
               <codeId>DDD</codeId>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
             </DpnUid>
-            <OrgUid/>
-            <txtName>DESIGNATED POINT NAVAID</txtName>
             <codeDatum>WGE</codeDatum>
             <codeType>ICAO</codeType>
-            <valElev>500</valElev>
-            <uomDistVer>FT</uomDistVer>
-            <Dtt>
-              <codeWorkHr>H24</codeWorkHr>
-            </Dtt>
+            <txtName>DESIGNATED POINT NAVAID</txtName>
             <txtRmk>designated point navaid</txtRmk>
           </Dpn>
           <!-- NavigationalAid: [DME] DME NAVAID -->
-          <Dme>
-            <DmeUid mid="537506748" newEntity="true">
+          <Dme source="LF|GEN|0.0 FACTORY|0|0">
+            <DmeUid region="LF">
               <codeId>MMM</codeId>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
             </DmeUid>
-            <OrgUid/>
+            <OrgUid region="LF">
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <txtName>DME NAVAID</txtName>
             <codeChannel>95X</codeChannel>
             <codeDatum>WGE</codeDatum>
@@ -505,13 +979,15 @@ describe AIXM::Document do
             <txtRmk>dme navaid</txtRmk>
           </Dme>
           <!-- NavigationalAid: [Marker:O] MARKER NAVAID -->
-          <Mkr>
-            <MkrUid mid="300437209" newEntity="true">
+          <Mkr source="LF|GEN|0.0 FACTORY|0|0">
+            <MkrUid region="LF">
               <codeId>---</codeId>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
             </MkrUid>
-            <OrgUid/>
+            <OrgUid region="LF">
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <codePsnIls>O</codePsnIls>
             <valFreq>75</valFreq>
             <uomFreq>MHZ</uomFreq>
@@ -525,13 +1001,15 @@ describe AIXM::Document do
             <txtRmk>marker navaid</txtRmk>
           </Mkr>
           <!-- NavigationalAid: [NDB:B] NDB NAVAID -->
-          <Ndb>
-            <NdbUid mid="782114926" newEntity="true">
+          <Ndb source="LF|GEN|0.0 FACTORY|0|0">
+            <NdbUid region="LF">
               <codeId>NNN</codeId>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
             </NdbUid>
-            <OrgUid/>
+            <OrgUid region="LF">
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <txtName>NDB NAVAID</txtName>
             <valFreq>555</valFreq>
             <uomFreq>KHZ</uomFreq>
@@ -545,13 +1023,15 @@ describe AIXM::Document do
             <txtRmk>ndb navaid</txtRmk>
           </Ndb>
           <!-- NavigationalAid: [TACAN] TACAN NAVAID -->
-          <Tcn>
-            <TcnUid mid="648449590" newEntity="true">
+          <Tcn source="LF|GEN|0.0 FACTORY|0|0">
+            <TcnUid region="LF">
               <codeId>TTT</codeId>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
             </TcnUid>
-            <OrgUid/>
+            <OrgUid region="LF">
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <txtName>TACAN NAVAID</txtName>
             <codeChannel>29X</codeChannel>
             <codeDatum>WGE</codeDatum>
@@ -563,13 +1043,15 @@ describe AIXM::Document do
             <txtRmk>tacan navaid</txtRmk>
           </Tcn>
           <!-- NavigationalAid: [VOR:VOR] VOR NAVAID -->
-          <Vor>
-            <VorUid mid="904391566" newEntity="true">
+          <Vor source="LF|GEN|0.0 FACTORY|0|0">
+            <VorUid region="LF">
               <codeId>VVV</codeId>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
             </VorUid>
-            <OrgUid/>
+            <OrgUid region="LF">
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <txtName>VOR NAVAID</txtName>
             <codeType>VOR</codeType>
             <valFreq>111</valFreq>
@@ -584,13 +1066,15 @@ describe AIXM::Document do
             <txtRmk>vor navaid</txtRmk>
           </Vor>
           <!-- NavigationalAid: [VOR:VOR] VOR/DME NAVAID -->
-          <Vor>
-            <VorUid mid="428844269" newEntity="true">
+          <Vor source="LF|GEN|0.0 FACTORY|0|0">
+            <VorUid region="LF">
               <codeId>VDD</codeId>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
             </VorUid>
-            <OrgUid/>
+            <OrgUid region="LF">
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <txtName>VOR/DME NAVAID</txtName>
             <codeType>VOR</codeType>
             <valFreq>111</valFreq>
@@ -606,16 +1090,18 @@ describe AIXM::Document do
           </Vor>
           <!-- NavigationalAid: [DME] VOR/DME NAVAID -->
           <Dme>
-            <DmeUid mid="284278140" newEntity="true">
+            <DmeUid region="LF">
               <codeId>VDD</codeId>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
             </DmeUid>
-            <OrgUid/>
-            <VorUid mid="428844269" newEntity="true">
+            <OrgUid region="LF">
+              <txtName>FRANCE</txtName>
+            </OrgUid>
+            <VorUid region="LF">
               <codeId>VDD</codeId>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
             </VorUid>
             <txtName>VOR/DME NAVAID</txtName>
             <codeChannel>95X</codeChannel>
@@ -628,13 +1114,15 @@ describe AIXM::Document do
             <txtRmk>vor/dme navaid</txtRmk>
           </Dme>
           <!-- NavigationalAid: [VOR:VOR] VORTAC NAVAID -->
-          <Vor>
-            <VorUid mid="305713874" newEntity="true">
+          <Vor source="LF|GEN|0.0 FACTORY|0|0">
+            <VorUid region="LF">
               <codeId>VTT</codeId>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
             </VorUid>
-            <OrgUid/>
+            <OrgUid region="LF">
+              <txtName>FRANCE</txtName>
+            </OrgUid>
             <txtName>VORTAC NAVAID</txtName>
             <codeType>VOR</codeType>
             <valFreq>111</valFreq>
@@ -650,16 +1138,18 @@ describe AIXM::Document do
           </Vor>
           <!-- NavigationalAid: [TACAN] VORTAC NAVAID -->
           <Tcn>
-            <TcnUid mid="595472802" newEntity="true">
+            <TcnUid region="LF">
               <codeId>VTT</codeId>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
             </TcnUid>
-            <OrgUid/>
-            <VorUid mid="305713874" newEntity="true">
+            <OrgUid region="LF">
+              <txtName>FRANCE</txtName>
+            </OrgUid>
+            <VorUid region="LF">
               <codeId>VTT</codeId>
               <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
+              <geoLong>007.56000000E</geoLong>
             </VorUid>
             <txtName>VORTAC NAVAID</txtName>
             <codeChannel>29X</codeChannel>
@@ -671,7 +1161,7 @@ describe AIXM::Document do
             </Ttt>
             <txtRmk>vortac navaid</txtRmk>
           </Tcn>
-        </AIXM-Snapshot>
+        </OFMX-Snapshot>
       END
     end
   end