aixm 0.3.0 → 0.3.1

data/schemas/ofmx/0/OFMX-Snapshot.xsd

@@ -2,7 +2,7 @@
 <!--
 ********************************************************************************
 
-OFMX 0.1.0 - open flightmaps exchange format
+OFMX XML 0.1.0 - open flightmaps exchange format
 
 This is a fork of AIXM 4.5 to accomodate extensions and backports for
 open flightmaps.
@@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <xsd:annotation>
-    <xsd:documentation>Version: 4.5-1</xsd:documentation>
+    <xsd:documentation>Version: 0.1.0</xsd:documentation>
   </xsd:annotation>
   <xsd:include schemaLocation="OFMX-Features.xsd"/>
   <xsd:attributeGroup name="Changes"/>
@@ -192,6 +192,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>The version of the OFMX-Snapshot.xsd schema to which the message conforms</xsd:documentation>
         </xsd:annotation>
       </xsd:attribute>
+      <xsd:attribute name="region" type="codeRegion">
+        <xsd:annotation>
+          <xsd:documentation>Region the data in this document belongs to</xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
       <xsd:attribute name="origin" type="xsd:string" use="required">
         <xsd:annotation>
           <xsd:documentation>The originator (source) of the message</xsd:documentation>

data/spec/factory.rb

@@ -38,8 +38,10 @@ module AIXM
       def layer
         AIXM.layer(
           class: :C,
+          location_indicator: 'XXXX',
           vertical_limits: vertical_limits
         ).tap do |layer|
+          layer.activity = :aerodrome_traffic
           layer.timetable = AIXM::H24
           layer.selective = true
           layer.remarks = 'airspace layer'
@@ -77,11 +79,10 @@ module AIXM
       def polygon_airspace
         AIXM.airspace(
           source: 'LF|GEN|0.0 FACTORY|0|0',
-          region: 'LF',
           id: 'PA',
           type: :danger_area,
-          name: 'POLYGON AIRSPACE',
-          short_name: 'POLYGON'
+          local_type: 'POLYGON',
+          name: 'POLYGON AIRSPACE'
         ).tap do |airspace|
           airspace.layers << layer
           airspace.geometry = polygon_geometry
@@ -91,11 +92,10 @@ module AIXM
       def circle_airspace
         AIXM.airspace(
           source: 'LF|GEN|0.0 FACTORY|0|0',
-          region: 'LF',
           id: 'CA',
           type: :danger_area,
-          name: 'CIRCLE AIRSPACE',
-          short_name: 'CIRCLE'
+          local_type: 'CIRCLE',
+          name: 'CIRCLE AIRSPACE'
         ).tap do |airspace|
           airspace.layers << layer
           airspace.geometry = circle_geometry
@@ -107,7 +107,6 @@ module AIXM
       def designated_point
         AIXM.designated_point(
           source: 'LF|GEN|0.0 FACTORY|0|0',
-          region: 'LF',
           id: 'DDD',
           name: 'DESIGNATED POINT NAVAID',
           xy: AIXM.xy(lat: %q(47°51'33"N), long: %q(007°33'36"E)),
@@ -122,7 +121,6 @@ module AIXM
       def dme
         AIXM.dme(
           source: 'LF|GEN|0.0 FACTORY|0|0',
-          region: 'LF',
           organisation: organisation,
           id: 'MMM',
           name: 'DME NAVAID',
@@ -138,7 +136,6 @@ module AIXM
       def marker
         AIXM.marker(
           source: 'LF|GEN|0.0 FACTORY|0|0',
-          region: 'LF',
           organisation: organisation,
           id: '---',
           name: 'MARKER NAVAID',
@@ -154,7 +151,6 @@ module AIXM
       def ndb
         AIXM.ndb(
           source: 'LF|GEN|0.0 FACTORY|0|0',
-          region: 'LF',
           organisation: organisation,
           id: 'NNN',
           name: 'NDB NAVAID',
@@ -171,7 +167,6 @@ module AIXM
       def tacan
         AIXM.tacan(
           source: 'LF|GEN|0.0 FACTORY|0|0',
-          region: 'LF',
           organisation: organisation,
           id: 'TTT',
           name: 'TACAN NAVAID',
@@ -187,7 +182,6 @@ module AIXM
       def vor
         AIXM.vor(
           source: 'LF|GEN|0.0 FACTORY|0|0',
-          region: 'LF',
           organisation: organisation,
           id: 'VVV',
           name: 'VOR NAVAID',
@@ -205,7 +199,6 @@ module AIXM
       def vordme
         AIXM.vor(
           source: 'LF|GEN|0.0 FACTORY|0|0',
-          region: 'LF',
           organisation: organisation,
           id: 'VDD',
           name: 'VOR/DME NAVAID',
@@ -224,7 +217,6 @@ module AIXM
       def vortac
         AIXM.vor(
           source: 'LF|GEN|0.0 FACTORY|0|0',
-          region: 'LF',
           organisation: organisation,
           id: 'VTT',
           name: 'VORTAC NAVAID',
@@ -245,7 +237,6 @@ module AIXM
       def organisation
         AIXM.organisation(
           source: 'LF|GEN|0.0 FACTORY|0|0',
-          region: 'LF',
           name: 'FRANCE',
           type: 'S'
         ).tap do |organisation|
@@ -259,7 +250,6 @@ module AIXM
       def unit
         AIXM.unit(
           source: 'LF|GEN|0.0 FACTORY|0|0',
-          region: 'LF',
           organisation: organisation,
           name: 'PUJAUT TWR',
           type: :aerodrome_control_tower,
@@ -299,9 +289,8 @@ module AIXM
       def airport
         AIXM.airport(
           source: 'LF|GEN|0.0 FACTORY|0|0',
-          region: 'LF',
           organisation: organisation,
-          code: 'LFNT',
+          id: 'LFNT',
           name: 'Avignon-Pujaut',
           xy: AIXM.xy(lat: %q(43°59'46"N), long: %q(004°45'16"E))
         ).tap do |airport|
@@ -359,6 +348,7 @@ module AIXM
       def document
         time = Time.parse('2018-01-01 12:00:00 +0100')
         AIXM.document(
+          region: 'LF',
           namespace: '00000000-0000-0000-0000-000000000000',
           created_at: time,
           effective_at: time

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

@@ -7,6 +7,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must fail checks" do
+      subject.wont_be :point?
       subject.wont_be :circle?
       subject.wont_be :polygon?
       subject.wont_be :closed?
@@ -24,14 +25,27 @@ describe AIXM::Component::Geometry do
       end
     end
 
-    it "must fail checks" do
+    it "must pass checks" do
+      subject.must_be :point?
       subject.wont_be :circle?
       subject.wont_be :polygon?
-      subject.wont_be :closed?
+      subject.must_be :closed?
     end
 
-    it "must fail to build AIXM" do
-      -> { subject.to_xml }.must_raise AIXM::GeometryError
+    it "must return elements" do
+      subject.segments.count.must_equal 1
+    end
+
+    it "builds valid AIXM" do
+      AIXM.aixm!
+      subject.to_xml.must_equal <<~END
+        <Avx>
+          <codeType>GRC</codeType>
+          <geoLat>110000.00N</geoLat>
+          <geoLong>0220000.00E</geoLong>
+          <codeDatum>WGE</codeDatum>
+        </Avx>
+      END
     end
   end
 
@@ -44,6 +58,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must fail checks" do
+      subject.wont_be :point?
       subject.wont_be :circle?
       subject.wont_be :polygon?
       subject.wont_be :closed?
@@ -65,6 +80,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must pass checks" do
+      subject.wont_be :point?
       subject.wont_be :circle?
       subject.must_be :polygon?
       subject.must_be :closed?
@@ -115,6 +131,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must fail checks" do
+      subject.wont_be :point?
       subject.wont_be :circle?
       subject.wont_be :polygon?
       subject.wont_be :closed?
@@ -135,6 +152,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must pass checks" do
+      subject.wont_be :point?
       subject.wont_be :circle?
       subject.must_be :polygon?
       subject.must_be :closed?
@@ -176,6 +194,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must fail checks" do
+      subject.wont_be :point?
       subject.wont_be :circle?
       subject.wont_be :polygon?
       subject.wont_be :closed?
@@ -196,6 +215,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must pass checks" do
+      subject.wont_be :point?
       subject.wont_be :circle?
       subject.must_be :polygon?
       subject.must_be :closed?
@@ -238,6 +258,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must fail checks" do
+      subject.wont_be :point?
       subject.wont_be :circle?
       subject.wont_be :polygon?
       subject.wont_be :closed?
@@ -256,6 +277,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must pass checks" do
+      subject.wont_be :point?
       subject.must_be :circle?
       subject.wont_be :polygon?
       subject.must_be :closed?
@@ -285,6 +307,7 @@ describe AIXM::Component::Geometry do
     end
 
     it "must fail checks when additional elements are present" do
+      subject.wont_be :point?
       subject.wont_be :circle?
       subject.wont_be :polygon?
       subject.wont_be :closed?

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

@@ -95,7 +95,7 @@ describe AIXM::Component::Helipad do
       subject.to_xml.must_equal <<~END
         <Tla>
           <TlaUid>
-            <AhpUid region="LF">
+            <AhpUid>
               <codeId>LFNT</codeId>
             </AhpUid>
             <txtDesig>H1</txtDesig>
@@ -121,7 +121,7 @@ describe AIXM::Component::Helipad do
       subject.to_xml.must_equal <<~END
         <Tla>
           <TlaUid>
-            <AhpUid region="LF">
+            <AhpUid>
               <codeId>LFNT</codeId>
             </AhpUid>
             <txtDesig>H1</txtDesig>

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

@@ -23,12 +23,37 @@ describe AIXM::Component::Layer do
       end
     end
 
+    describe :location_indicator= do
+      it "fails on invalid values" do
+        [:foobar, 123, 'XXX', 'XXXXX'].wont_be_written_to subject, :location_indicator
+      end
+
+      it "accepts nil value" do
+        [nil].must_be_written_to subject, :location_indicator
+      end
+
+      it "upcases value" do
+        subject.tap { |s| s.location_indicator = 'lfbb' }.location_indicator.must_equal 'LFBB'
+      end
+    end
+
     describe :vertical_limits= do
       it "fails on invalid values" do
         [nil, :foobar, 123].wont_be_written_to subject, :vertical_limits
       end
     end
 
+    describe :activity= do
+      it "fails on invalid values" do
+        [:foobar, 123].wont_be_written_to subject, :activity
+      end
+
+      it "looks up valid values" do
+        subject.tap { |s| s.activity = :aerodrome_traffic }.activity.must_equal :aerodrome_traffic
+        subject.tap { |s| s.activity = :GLIDER }.activity.must_equal :gliding
+      end
+    end
+
     describe :timetable= do
       macro :timetable
     end
@@ -81,6 +106,8 @@ describe AIXM::Component::Layer do
       AIXM.ofmx!
       subject.to_xml.must_equal <<~END
         <codeClass>C</codeClass>
+        <codeLocInd>XXXX</codeLocInd>
+        <codeActivity>TFC-AD</codeActivity>
         <codeDistVerUpper>STD</codeDistVerUpper>
         <valDistVerUpper>65</valDistVerUpper>
         <uomDistVerUpper>FL</uomDistVerUpper>

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

@@ -96,7 +96,7 @@ describe AIXM::Component::Runway do
       subject.to_xml.must_equal <<~END
         <Rwy>
           <RwyUid>
-            <AhpUid region="LF">
+            <AhpUid>
               <codeId>LFNT</codeId>
             </AhpUid>
             <txtDesig>16L/34R</txtDesig>
@@ -111,7 +111,7 @@ describe AIXM::Component::Runway do
         <Rdn>
           <RdnUid>
             <RwyUid>
-              <AhpUid region="LF">
+              <AhpUid>
                 <codeId>LFNT</codeId>
               </AhpUid>
               <txtDesig>16L/34R</txtDesig>
@@ -130,7 +130,7 @@ describe AIXM::Component::Runway do
           <RddUid>
             <RdnUid>
               <RwyUid>
-                <AhpUid region="LF">
+                <AhpUid>
                   <codeId>LFNT</codeId>
                 </AhpUid>
                 <txtDesig>16L/34R</txtDesig>
@@ -147,7 +147,7 @@ describe AIXM::Component::Runway do
         <Rdn>
           <RdnUid>
             <RwyUid>
-              <AhpUid region="LF">
+              <AhpUid>
                 <codeId>LFNT</codeId>
               </AhpUid>
               <txtDesig>16L/34R</txtDesig>
@@ -164,7 +164,7 @@ describe AIXM::Component::Runway do
           <RddUid>
             <RdnUid>
               <RwyUid>
-                <AhpUid region="LF">
+                <AhpUid>
                   <codeId>LFNT</codeId>
                 </AhpUid>
                 <txtDesig>16L/34R</txtDesig>
@@ -187,7 +187,7 @@ describe AIXM::Component::Runway do
       subject.to_xml.must_equal <<~END
         <Rwy>
           <RwyUid>
-            <AhpUid region=\"LF\">
+            <AhpUid>
               <codeId>LFNT</codeId>
             </AhpUid>
             <txtDesig>16L/34R</txtDesig>
@@ -196,7 +196,7 @@ describe AIXM::Component::Runway do
         <Rdn>
           <RdnUid>
             <RwyUid>
-              <AhpUid region=\"LF\">
+              <AhpUid>
                 <codeId>LFNT</codeId>
               </AhpUid>
               <txtDesig>16L/34R</txtDesig>
@@ -215,7 +215,7 @@ describe AIXM::Component::Runway do
           <RddUid>
             <RdnUid>
               <RwyUid>
-                <AhpUid region=\"LF\">
+                <AhpUid>
                   <codeId>LFNT</codeId>
                 </AhpUid>
                 <txtDesig>16L/34R</txtDesig>
@@ -232,7 +232,7 @@ describe AIXM::Component::Runway do
         <Rdn>
           <RdnUid>
             <RwyUid>
-              <AhpUid region=\"LF\">
+              <AhpUid>
                 <codeId>LFNT</codeId>
               </AhpUid>
               <txtDesig>16L/34R</txtDesig>
@@ -249,7 +249,7 @@ describe AIXM::Component::Runway do
           <RddUid>
             <RdnUid>
               <RwyUid>
-                <AhpUid region=\"LF\">
+                <AhpUid>
                   <codeId>LFNT</codeId>
                 </AhpUid>
                 <txtDesig>16L/34R</txtDesig>
@@ -342,7 +342,7 @@ describe AIXM::Component::Runway::Direction do
         <Rdn>
           <RdnUid>
             <RwyUid>
-              <AhpUid region="LF">
+              <AhpUid>
                 <codeId>LFNT</codeId>
               </AhpUid>
               <txtDesig>16L/34R</txtDesig>
@@ -361,7 +361,7 @@ describe AIXM::Component::Runway::Direction do
           <RddUid>
             <RdnUid>
               <RwyUid>
-                <AhpUid region="LF">
+                <AhpUid>
                   <codeId>LFNT</codeId>
                 </AhpUid>
                 <txtDesig>16L/34R</txtDesig>
@@ -385,7 +385,7 @@ describe AIXM::Component::Runway::Direction do
         <Rdn>
           <RdnUid>
             <RwyUid>
-              <AhpUid region="LF">
+              <AhpUid>
                 <codeId>LFNT</codeId>
               </AhpUid>
               <txtDesig>16L/34R</txtDesig>

data/spec/lib/aixm/document_spec.rb

@@ -82,7 +82,7 @@ describe AIXM::Document do
     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="rubygem aixm-0.3.0" created="2018-01-01T12:00:00+01:00" effective="2018-01-01T12:00:00+01:00">
+        <AIXM-Snapshot xmlns:xsi="http://www.aixm.aero/schema/4.5/AIXM-Snapshot.xsd" version="4.5" origin="rubygem aixm-#{AIXM::VERSION}" created="2018-01-01T12:00:00+01:00" effective="2018-01-01T12:00:00+01:00">
           <!-- Organisation: FRANCE -->
           <Org>
             <OrgUid>
@@ -306,6 +306,8 @@ describe AIXM::Document do
             <txtLocalType>POLYGON</txtLocalType>
             <txtName>POLYGON AIRSPACE</txtName>
             <codeClass>C</codeClass>
+            <codeLocInd>XXXX</codeLocInd>
+            <codeActivity>TFC-AD</codeActivity>
             <codeDistVerUpper>STD</codeDistVerUpper>
             <valDistVerUpper>65</valDistVerUpper>
             <uomDistVerUpper>FL</uomDistVerUpper>
@@ -363,6 +365,8 @@ describe AIXM::Document do
             <txtLocalType>CIRCLE</txtLocalType>
             <txtName>CIRCLE AIRSPACE</txtName>
             <codeClass>C</codeClass>
+            <codeLocInd>XXXX</codeLocInd>
+            <codeActivity>TFC-AD</codeActivity>
             <codeDistVerUpper>STD</codeDistVerUpper>
             <valDistVerUpper>65</valDistVerUpper>
             <uomDistVerUpper>FL</uomDistVerUpper>
@@ -420,6 +424,8 @@ describe AIXM::Document do
             </OrgUid>
             <txtName>DME NAVAID</txtName>
             <codeChannel>95X</codeChannel>
+            <valGhostFreq>114.8</valGhostFreq>
+            <uomGhostFreq>MHZ</uomGhostFreq>
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
@@ -629,10 +635,10 @@ describe AIXM::Document do
     it "builds correct OFMX" do
       subject.to_xml.must_equal <<~"END"
         <?xml version="1.0" encoding="UTF-8"?>
-        <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">
+        <OFMX-Snapshot xmlns:xsi="http://openflightmaps.org/schema/0/OFMX-Snapshot.xsd" version="0" origin="rubygem aixm-#{AIXM::VERSION}" region="LF" 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">
+            <OrgUid>
               <txtName>FRANCE</txtName>
             </OrgUid>
             <codeId>LF</codeId>
@@ -641,13 +647,13 @@ describe AIXM::Document do
           </Org>
           <!-- Unit: PUJAUT TWR -->
           <Uni source="LF|GEN|0.0 FACTORY|0|0">
-            <UniUid region="LF">
+            <UniUid>
               <txtName>PUJAUT TWR</txtName>
             </UniUid>
-            <OrgUid region="LF">
+            <OrgUid>
               <txtName>FRANCE</txtName>
             </OrgUid>
-            <AhpUid region="LF">
+            <AhpUid>
               <codeId>LFNT</codeId>
             </AhpUid>
             <codeType>TWR</codeType>
@@ -656,7 +662,7 @@ describe AIXM::Document do
           </Uni>
           <Ser>
             <SerUid>
-              <UniUid region="LF">
+              <UniUid>
                 <txtName>PUJAUT TWR</txtName>
               </UniUid>
               <codeType>APP</codeType>
@@ -670,7 +676,7 @@ describe AIXM::Document do
           <Fqy>
             <FqyUid>
               <SerUid>
-                <UniUid region="LF">
+                <UniUid>
                   <txtName>PUJAUT TWR</txtName>
                 </UniUid>
                 <codeType>APP</codeType>
@@ -695,10 +701,10 @@ describe AIXM::Document do
           </Fqy>
           <!-- Airport: LFNT AVIGNON-PUJAUT -->
           <Ahp source="LF|GEN|0.0 FACTORY|0|0">
-            <AhpUid region="LF">
+            <AhpUid>
               <codeId>LFNT</codeId>
             </AhpUid>
-            <OrgUid region="LF">
+            <OrgUid>
               <txtName>FRANCE</txtName>
             </OrgUid>
             <txtName>AVIGNON-PUJAUT</txtName>
@@ -717,7 +723,7 @@ describe AIXM::Document do
           </Ahp>
           <Rwy>
             <RwyUid>
-              <AhpUid region="LF">
+              <AhpUid>
                 <codeId>LFNT</codeId>
               </AhpUid>
               <txtDesig>16L/34R</txtDesig>
@@ -732,7 +738,7 @@ describe AIXM::Document do
           <Rdn>
             <RdnUid>
               <RwyUid>
-                <AhpUid region="LF">
+                <AhpUid>
                   <codeId>LFNT</codeId>
                 </AhpUid>
                 <txtDesig>16L/34R</txtDesig>
@@ -751,7 +757,7 @@ describe AIXM::Document do
             <RddUid>
               <RdnUid>
                 <RwyUid>
-                  <AhpUid region="LF">
+                  <AhpUid>
                     <codeId>LFNT</codeId>
                   </AhpUid>
                   <txtDesig>16L/34R</txtDesig>
@@ -768,7 +774,7 @@ describe AIXM::Document do
           <Rdn>
             <RdnUid>
               <RwyUid>
-                <AhpUid region="LF">
+                <AhpUid>
                   <codeId>LFNT</codeId>
                 </AhpUid>
                 <txtDesig>16L/34R</txtDesig>
@@ -785,7 +791,7 @@ describe AIXM::Document do
             <RddUid>
               <RdnUid>
                 <RwyUid>
-                  <AhpUid region="LF">
+                  <AhpUid>
                     <codeId>LFNT</codeId>
                   </AhpUid>
                   <txtDesig>16L/34R</txtDesig>
@@ -801,7 +807,7 @@ describe AIXM::Document do
           </Rdd>
           <Tla>
             <TlaUid>
-              <AhpUid region="LF">
+              <AhpUid>
                 <codeId>LFNT</codeId>
               </AhpUid>
               <txtDesig>H1</txtDesig>
@@ -820,7 +826,7 @@ describe AIXM::Document do
           </Tla>
           <Ahu>
             <AhuUid>
-              <AhpUid region="LF">
+              <AhpUid>
                 <codeId>LFNT</codeId>
               </AhpUid>
             </AhuUid>
@@ -847,13 +853,15 @@ describe AIXM::Document do
           </Ahu>
           <!-- Airspace: [D] POLYGON AIRSPACE -->
           <Ase source="LF|GEN|0.0 FACTORY|0|0">
-            <AseUid region="LF">
+            <AseUid>
               <codeType>D</codeType>
               <codeId>PA</codeId>
             </AseUid>
             <txtLocalType>POLYGON</txtLocalType>
             <txtName>POLYGON AIRSPACE</txtName>
             <codeClass>C</codeClass>
+            <codeLocInd>XXXX</codeLocInd>
+            <codeActivity>TFC-AD</codeActivity>
             <codeDistVerUpper>STD</codeDistVerUpper>
             <valDistVerUpper>65</valDistVerUpper>
             <uomDistVerUpper>FL</uomDistVerUpper>
@@ -874,7 +882,7 @@ describe AIXM::Document do
           </Ase>
           <Abd>
             <AbdUid>
-              <AseUid region="LF">
+              <AseUid>
                 <codeType>D</codeType>
                 <codeId>PA</codeId>
               </AseUid>
@@ -905,13 +913,15 @@ describe AIXM::Document do
           </Abd>
           <!-- Airspace: [D] CIRCLE AIRSPACE -->
           <Ase source="LF|GEN|0.0 FACTORY|0|0">
-            <AseUid region="LF">
+            <AseUid>
               <codeType>D</codeType>
               <codeId>CA</codeId>
             </AseUid>
             <txtLocalType>CIRCLE</txtLocalType>
             <txtName>CIRCLE AIRSPACE</txtName>
             <codeClass>C</codeClass>
+            <codeLocInd>XXXX</codeLocInd>
+            <codeActivity>TFC-AD</codeActivity>
             <codeDistVerUpper>STD</codeDistVerUpper>
             <valDistVerUpper>65</valDistVerUpper>
             <uomDistVerUpper>FL</uomDistVerUpper>
@@ -932,7 +942,7 @@ describe AIXM::Document do
           </Ase>
           <Abd>
             <AbdUid>
-              <AseUid region="LF">
+              <AseUid>
                 <codeType>D</codeType>
                 <codeId>CA</codeId>
               </AseUid>
@@ -948,7 +958,7 @@ describe AIXM::Document do
           </Abd>
           <!-- NavigationalAid: [DesignatedPoint:ICAO] DESIGNATED POINT NAVAID -->
           <Dpn source="LF|GEN|0.0 FACTORY|0|0">
-            <DpnUid region="LF">
+            <DpnUid>
               <codeId>DDD</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>007.56000000E</geoLong>
@@ -960,16 +970,18 @@ describe AIXM::Document do
           </Dpn>
           <!-- NavigationalAid: [DME] DME NAVAID -->
           <Dme source="LF|GEN|0.0 FACTORY|0|0">
-            <DmeUid region="LF">
+            <DmeUid>
               <codeId>MMM</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>007.56000000E</geoLong>
             </DmeUid>
-            <OrgUid region="LF">
+            <OrgUid>
               <txtName>FRANCE</txtName>
             </OrgUid>
             <txtName>DME NAVAID</txtName>
             <codeChannel>95X</codeChannel>
+            <valGhostFreq>114.8</valGhostFreq>
+            <uomGhostFreq>MHZ</uomGhostFreq>
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
@@ -980,12 +992,12 @@ describe AIXM::Document do
           </Dme>
           <!-- NavigationalAid: [Marker:O] MARKER NAVAID -->
           <Mkr source="LF|GEN|0.0 FACTORY|0|0">
-            <MkrUid region="LF">
+            <MkrUid>
               <codeId>---</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>007.56000000E</geoLong>
             </MkrUid>
-            <OrgUid region="LF">
+            <OrgUid>
               <txtName>FRANCE</txtName>
             </OrgUid>
             <codePsnIls>O</codePsnIls>
@@ -1002,12 +1014,12 @@ describe AIXM::Document do
           </Mkr>
           <!-- NavigationalAid: [NDB:B] NDB NAVAID -->
           <Ndb source="LF|GEN|0.0 FACTORY|0|0">
-            <NdbUid region="LF">
+            <NdbUid>
               <codeId>NNN</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>007.56000000E</geoLong>
             </NdbUid>
-            <OrgUid region="LF">
+            <OrgUid>
               <txtName>FRANCE</txtName>
             </OrgUid>
             <txtName>NDB NAVAID</txtName>
@@ -1024,16 +1036,18 @@ describe AIXM::Document do
           </Ndb>
           <!-- NavigationalAid: [TACAN] TACAN NAVAID -->
           <Tcn source="LF|GEN|0.0 FACTORY|0|0">
-            <TcnUid region="LF">
+            <TcnUid>
               <codeId>TTT</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>007.56000000E</geoLong>
             </TcnUid>
-            <OrgUid region="LF">
+            <OrgUid>
               <txtName>FRANCE</txtName>
             </OrgUid>
             <txtName>TACAN NAVAID</txtName>
             <codeChannel>29X</codeChannel>
+            <valGhostFreq>109.2</valGhostFreq>
+            <uomGhostFreq>MHZ</uomGhostFreq>
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
@@ -1044,12 +1058,12 @@ describe AIXM::Document do
           </Tcn>
           <!-- NavigationalAid: [VOR:VOR] VOR NAVAID -->
           <Vor source="LF|GEN|0.0 FACTORY|0|0">
-            <VorUid region="LF">
+            <VorUid>
               <codeId>VVV</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>007.56000000E</geoLong>
             </VorUid>
-            <OrgUid region="LF">
+            <OrgUid>
               <txtName>FRANCE</txtName>
             </OrgUid>
             <txtName>VOR NAVAID</txtName>
@@ -1067,12 +1081,12 @@ describe AIXM::Document do
           </Vor>
           <!-- NavigationalAid: [VOR:VOR] VOR/DME NAVAID -->
           <Vor source="LF|GEN|0.0 FACTORY|0|0">
-            <VorUid region="LF">
+            <VorUid>
               <codeId>VDD</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>007.56000000E</geoLong>
             </VorUid>
-            <OrgUid region="LF">
+            <OrgUid>
               <txtName>FRANCE</txtName>
             </OrgUid>
             <txtName>VOR/DME NAVAID</txtName>
@@ -1090,15 +1104,15 @@ describe AIXM::Document do
           </Vor>
           <!-- NavigationalAid: [DME] VOR/DME NAVAID -->
           <Dme>
-            <DmeUid region="LF">
+            <DmeUid>
               <codeId>VDD</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>007.56000000E</geoLong>
             </DmeUid>
-            <OrgUid region="LF">
+            <OrgUid>
               <txtName>FRANCE</txtName>
             </OrgUid>
-            <VorUid region="LF">
+            <VorUid>
               <codeId>VDD</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>007.56000000E</geoLong>
@@ -1115,12 +1129,12 @@ describe AIXM::Document do
           </Dme>
           <!-- NavigationalAid: [VOR:VOR] VORTAC NAVAID -->
           <Vor source="LF|GEN|0.0 FACTORY|0|0">
-            <VorUid region="LF">
+            <VorUid>
               <codeId>VTT</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>007.56000000E</geoLong>
             </VorUid>
-            <OrgUid region="LF">
+            <OrgUid>
               <txtName>FRANCE</txtName>
             </OrgUid>
             <txtName>VORTAC NAVAID</txtName>
@@ -1138,15 +1152,15 @@ describe AIXM::Document do
           </Vor>
           <!-- NavigationalAid: [TACAN] VORTAC NAVAID -->
           <Tcn>
-            <TcnUid region="LF">
+            <TcnUid>
               <codeId>VTT</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>007.56000000E</geoLong>
             </TcnUid>
-            <OrgUid region="LF">
+            <OrgUid>
               <txtName>FRANCE</txtName>
             </OrgUid>
-            <VorUid region="LF">
+            <VorUid>
               <codeId>VTT</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>007.56000000E</geoLong>