RubyGems - aixm - Versions diffs - 0.2.0 → 0.2.1 - Mend

aixm 0.2.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (39) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +10 -0
data/README.md +149 -116
data/lib/aixm/component/class_layer.rb +3 -3
data/lib/aixm/component/geometry.rb +3 -3
data/lib/aixm/component/geometry/arc.rb +2 -2
data/lib/aixm/component/geometry/border.rb +2 -2
data/lib/aixm/component/geometry/circle.rb +2 -2
data/lib/aixm/component/geometry/point.rb +2 -2
data/lib/aixm/component/schedule.rb +2 -2
data/lib/aixm/component/vertical_limits.rb +2 -2
data/lib/aixm/document.rb +4 -4
data/lib/aixm/feature/airspace.rb +42 -17
data/lib/aixm/feature/navigational_aid/base.rb +41 -8
data/lib/aixm/feature/navigational_aid/designated_point.rb +29 -15
data/lib/aixm/feature/navigational_aid/dme.rb +32 -9
data/lib/aixm/feature/navigational_aid/marker.rb +25 -7
data/lib/aixm/feature/navigational_aid/ndb.rb +25 -9
data/lib/aixm/feature/navigational_aid/tacan.rb +21 -20
data/lib/aixm/feature/navigational_aid/vor.rb +66 -26
data/lib/aixm/version.rb +1 -1
data/spec/factory.rb +69 -13
data/spec/lib/aixm/component/class_layer_spec.rb +4 -4
data/spec/lib/aixm/component/geometry/arc_spec.rb +3 -3
data/spec/lib/aixm/component/geometry/border_spec.rb +2 -2
data/spec/lib/aixm/component/geometry/circle_spec.rb +3 -3
data/spec/lib/aixm/component/geometry/point_spec.rb +3 -3
data/spec/lib/aixm/component/geometry_spec.rb +4 -4
data/spec/lib/aixm/component/schedule_spec.rb +2 -2
data/spec/lib/aixm/component/vertical_limits_spec.rb +4 -4
data/spec/lib/aixm/document_spec.rb +282 -28
data/spec/lib/aixm/feature/airspace_spec.rb +14 -10
data/spec/lib/aixm/feature/navigational_aid/designated_point_spec.rb +9 -6
data/spec/lib/aixm/feature/navigational_aid/dme_spec.rb +9 -6
data/spec/lib/aixm/feature/navigational_aid/marker_spec.rb +7 -4
data/spec/lib/aixm/feature/navigational_aid/ndb_spec.rb +9 -6
data/spec/lib/aixm/feature/navigational_aid/tacan_spec.rb +9 -6
data/spec/lib/aixm/feature/navigational_aid/vor_spec.rb +156 -7
metadata +2 -2

data/spec/lib/aixm/component/class_layer_spec.rb CHANGED Viewed

@@ -19,9 +19,9 @@ describe AIXM::Component::ClassLayer do
       end
     end
-    describe :to_xml do
+    describe :to_aixm do
       it "must build correct XML" do
-        subject.to_xml.must_equal <<~END
+        subject.to_aixm.must_equal <<~END
           <codeClass>C</codeClass>
           <codeDistVerUpper>STD</codeDistVerUpper>
           <valDistVerUpper>65</valDistVerUpper>
@@ -51,9 +51,9 @@ describe AIXM::Component::ClassLayer do
       end
     end
-    describe :to_xml do
+    describe :to_aixm do
       it "must build correct XML" do
-        subject.to_xml.must_equal <<~END
+        subject.to_aixm.must_equal <<~END
           <codeDistVerUpper>STD</codeDistVerUpper>
           <valDistVerUpper>65</valDistVerUpper>
           <uomDistVerUpper>FL</uomDistVerUpper>

data/spec/lib/aixm/component/geometry/arc_spec.rb CHANGED Viewed

@@ -29,14 +29,14 @@ describe AIXM::Component::Geometry::Arc do
     end
   end
-  describe :to_xml do
+  describe :to_aixm do
     it "must build correct XML for clockwise arcs" do
       subject = AIXM.arc(
         xy: AIXM.xy(lat: 11.1, long: 33.3),
         center_xy: AIXM.xy(lat: 22.2, long: 33.3),
         clockwise: true
       )
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <Avx>
           <codeType>CWA</codeType>
           <geoLat>110600.00N</geoLat>
@@ -54,7 +54,7 @@ describe AIXM::Component::Geometry::Arc do
         center_xy: AIXM.xy(lat: 22.2, long: 33.3),
         clockwise: false
       )
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <Avx>
           <codeType>CCA</codeType>
           <geoLat>110600.00N</geoLat>

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

@@ -11,13 +11,13 @@ describe AIXM::Component::Geometry::Border do
     end
   end
-  describe :to_xml do
+  describe :to_aixm do
     it "must build correct XML" do
       subject = AIXM.border(
         xy: AIXM.xy(lat: 11.1, long: 22.2),
         name: 'foobar'
       )
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
       <Avx>
         <codeType>FNT</codeType>
         <geoLat>110600.00N</geoLat>

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

@@ -27,13 +27,13 @@ describe AIXM::Component::Geometry::Circle do
     end
   end
-  describe :to_xml do
+  describe :to_aixm do
     it "must build correct XML for circles not near the equator" do
       subject = AIXM.circle(
         center_xy: AIXM.xy(lat: 11.1, long: 22.2),
         radius: 25
       )
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <Avx>
           <codeType>CWA</codeType>
           <geoLat>111929.39N</geoLat>
@@ -50,7 +50,7 @@ describe AIXM::Component::Geometry::Circle do
         center_xy: AIXM.xy(lat: -0.0005, long: -22.2),
         radius: 50
       )
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <Avx>
           <codeType>CWA</codeType>
           <geoLat>002656.98N</geoLat>

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

@@ -14,10 +14,10 @@ describe AIXM::Component::Geometry::Point do
     end
   end
-  describe :to_xml do
+  describe :to_aixm do
     it "must build correct XML for N/E points" do
       subject = AIXM.point(xy: AIXM.xy(lat: 11.1, long: 22.2))
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <Avx>
           <codeType>GRC</codeType>
           <geoLat>110600.00N</geoLat>
@@ -29,7 +29,7 @@ describe AIXM::Component::Geometry::Point do
     it "must build correct XML for S/W points" do
       subject = AIXM.point(xy: AIXM.xy(lat: -11.1, long: -22.2))
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <Avx>
           <codeType>GRC</codeType>
           <geoLat>110600.00S</geoLat>

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

@@ -72,7 +72,7 @@ describe AIXM::Component::Geometry do
     end
     it "must build valid XML" do
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <Avx>
           <codeType>GRC</codeType>
           <geoLat>110000.00N</geoLat>
@@ -111,7 +111,7 @@ describe AIXM::Component::Geometry do
     end
     it "must build valid XML" do
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <Avx>
           <codeType>CWA</codeType>
           <geoLat>110000.00N</geoLat>
@@ -156,7 +156,7 @@ describe AIXM::Component::Geometry do
     end
     it "must build valid XML" do
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <Avx>
           <codeType>FNT</codeType>
           <geoLat>110000.00N</geoLat>
@@ -198,7 +198,7 @@ describe AIXM::Component::Geometry do
     end
     it "must build valid XML" do
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <Avx>
           <codeType>CWA</codeType>
           <geoLat>110523.76N</geoLat>

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

@@ -22,10 +22,10 @@ describe AIXM::Component::Schedule do
     end
   end
-  describe :to_xml do
+  describe :to_aixm do
     it "must build correct XML" do
       subject = AIXM.schedule(code: :continuous)
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <codeWorkHr>H24</codeWorkHr>
       END
     end

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

@@ -21,13 +21,13 @@ describe AIXM::Component::VerticalLimits do
     end
   end
-  describe :to_xml do
+  describe :to_aixm do
     it "must build correct XML with only upper_z and lower_z" do
       subject = AIXM.vertical_limits(
         upper_z: AIXM.z(2000, :qnh),
         lower_z: AIXM::GROUND
       )
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <codeDistVerUpper>ALT</codeDistVerUpper>
         <valDistVerUpper>2000</valDistVerUpper>
         <uomDistVerUpper>FT</uomDistVerUpper>
@@ -43,7 +43,7 @@ describe AIXM::Component::VerticalLimits do
         lower_z: AIXM.z(1000, :qfe),
         max_z: AIXM.z(6000, :qnh)
       )
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <codeDistVerUpper>STD</codeDistVerUpper>
         <valDistVerUpper>65</valDistVerUpper>
         <uomDistVerUpper>FL</uomDistVerUpper>
@@ -62,7 +62,7 @@ describe AIXM::Component::VerticalLimits do
         lower_z: AIXM.z(45, :qne),
         min_z: AIXM.z(3000, :qnh)
       )
-      subject.to_xml.must_equal <<~END
+      subject.to_aixm.must_equal <<~END
         <codeDistVerUpper>STD</codeDistVerUpper>
         <valDistVerUpper>65</valDistVerUpper>
         <uomDistVerUpper>FL</uomDistVerUpper>

data/spec/lib/aixm/document_spec.rb CHANGED Viewed

@@ -57,7 +57,7 @@ describe AIXM::Document do
     end
     it "must build correct XML without extensions" do
-      subject.to_xml.must_equal <<~"END"
+      subject.to_aixm.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">
           <!-- Airspace: [D] POLYGON AIRSPACE -->
@@ -156,10 +156,10 @@ describe AIXM::Document do
               <geoLongArc>0045300.00E</geoLongArc>
             </Avx>
           </Abd>
-          <!-- Navigational aid: [ICAO] DESIGNATED POINT NAVAID -->
+          <!-- NavigationalAid: [DesignatedPoint:ICAO] DESIGNATED POINT NAVAID -->
           <Dpn>
             <DpnUid>
-              <codeId>DPN</codeId>
+              <codeId>DDD</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </DpnUid>
@@ -169,12 +169,15 @@ describe AIXM::Document do
             <codeType>ICAO</codeType>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Dtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Dtt>
             <txtRmk>designated point navaid</txtRmk>
           </Dpn>
-          <!-- Navigational aid: [DME] DME NAVAID -->
+          <!-- NavigationalAid: [DME] DME NAVAID -->
           <Dme>
             <DmeUid>
-              <codeId>DME</codeId>
+              <codeId>MMM</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </DmeUid>
@@ -184,9 +187,12 @@ describe AIXM::Document do
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Dtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Dtt>
             <txtRmk>dme navaid</txtRmk>
           </Dme>
-          <!-- Navigational aid: [Marker] MARKER NAVAID -->
+          <!-- NavigationalAid: [Marker] MARKER NAVAID -->
           <Mkr>
             <MkrUid>
               <codeId>---</codeId>
@@ -200,12 +206,15 @@ describe AIXM::Document do
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Mtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Mtt>
             <txtRmk>marker navaid</txtRmk>
           </Mkr>
-          <!-- Navigational aid: [NDB] NDB NAVAID -->
+          <!-- NavigationalAid: [NDB] NDB NAVAID -->
           <Ndb>
             <NdbUid>
-              <codeId>NDB</codeId>
+              <codeId>NNN</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </NdbUid>
@@ -216,12 +225,33 @@ describe AIXM::Document do
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Ntt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Ntt>
             <txtRmk>ndb navaid</txtRmk>
           </Ndb>
-          <!-- Navigational aid: [VOR] VOR NAVAID -->
+          <!-- NavigationalAid: [TACAN] TACAN NAVAID -->
+          <Tcn>
+            <TcnUid>
+              <codeId>TTT</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>
+            <Ttt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Ttt>
+            <txtRmk>tacan navaid</txtRmk>
+          </Tcn>
+          <!-- NavigationalAid: [VOR:VOR] VOR NAVAID -->
           <Vor>
             <VorUid>
-              <codeId>VOR</codeId>
+              <codeId>VVV</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </VorUid>
@@ -234,29 +264,126 @@ describe AIXM::Document do
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Vtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Vtt>
             <txtRmk>vor navaid</txtRmk>
           </Vor>
-          <!-- Navigational aid: [TACAN] TACAN NAVAID -->
+          <!-- NavigationalAid: [VOR:DVOR] DOPPLER-VOR NAVAID -->
+          <Vor>
+            <VorUid>
+              <codeId>DVV</codeId>
+              <geoLat>475133.00N</geoLat>
+              <geoLong>0073336.00E</geoLong>
+            </VorUid>
+            <OrgUid/>
+            <txtName>DOPPLER-VOR NAVAID</txtName>
+            <codeType>DVOR</codeType>
+            <valFreq>111</valFreq>
+            <uomFreq>MHZ</uomFreq>
+            <codeTypeNorth>TRUE</codeTypeNorth>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <Vtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Vtt>
+            <txtRmk>doppler-vor navaid</txtRmk>
+          </Vor>
+          <!-- NavigationalAid: [VOR:VOR] VOR/DME NAVAID -->
+          <Vor>
+            <VorUid>
+              <codeId>VDD</codeId>
+              <geoLat>475133.00N</geoLat>
+              <geoLong>0073336.00E</geoLong>
+            </VorUid>
+            <OrgUid/>
+            <txtName>VOR/DME NAVAID</txtName>
+            <codeType>VOR</codeType>
+            <valFreq>111</valFreq>
+            <uomFreq>MHZ</uomFreq>
+            <codeTypeNorth>TRUE</codeTypeNorth>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <Vtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Vtt>
+            <txtRmk>vor/dme navaid</txtRmk>
+          </Vor>
+          <!-- NavigationalAid: [DME] VOR/DME NAVAID -->
+          <Dme>
+            <DmeUid>
+              <codeId>VDD</codeId>
+              <geoLat>475133.00N</geoLat>
+              <geoLong>0073336.00E</geoLong>
+            </DmeUid>
+            <OrgUid/>
+            <VorUid>
+              <codeId>VDD</codeId>
+              <geoLat>475133.00N</geoLat>
+              <geoLong>0073336.00E</geoLong>
+            </VorUid>
+            <txtName>VOR/DME NAVAID</txtName>
+            <codeChannel>95X</codeChannel>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <Dtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Dtt>
+            <txtRmk>vor/dme navaid</txtRmk>
+          </Dme>
+          <!-- NavigationalAid: [VOR:VOR] VORTAC NAVAID -->
+          <Vor>
+            <VorUid>
+              <codeId>VTT</codeId>
+              <geoLat>475133.00N</geoLat>
+              <geoLong>0073336.00E</geoLong>
+            </VorUid>
+            <OrgUid/>
+            <txtName>VORTAC NAVAID</txtName>
+            <codeType>VOR</codeType>
+            <valFreq>111</valFreq>
+            <uomFreq>MHZ</uomFreq>
+            <codeTypeNorth>TRUE</codeTypeNorth>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <Vtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Vtt>
+            <txtRmk>vortac navaid</txtRmk>
+          </Vor>
+          <!-- NavigationalAid: [TACAN] VORTAC NAVAID -->
           <Tcn>
             <TcnUid>
-              <codeId>TCN</codeId>
+              <codeId>VTT</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </TcnUid>
             <OrgUid/>
-            <txtName>TACAN NAVAID</txtName>
+            <VorUid>
+              <codeId>VTT</codeId>
+              <geoLat>475133.00N</geoLat>
+              <geoLong>0073336.00E</geoLong>
+            </VorUid>
+            <txtName>VORTAC NAVAID</txtName>
             <codeChannel>29X</codeChannel>
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
-            <txtRmk>tacan navaid</txtRmk>
+            <Ttt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Ttt>
+            <txtRmk>vortac 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_aixm(: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 -->
@@ -360,10 +487,10 @@ describe AIXM::Document do
               <geoLongArc>4.88333333E</geoLongArc>
             </Avx>
           </Abd>
-          <!-- Navigational aid: [ICAO] DESIGNATED POINT NAVAID -->
+          <!-- NavigationalAid: [DesignatedPoint:ICAO] DESIGNATED POINT NAVAID -->
           <Dpn>
             <DpnUid newEntity="true">
-              <codeId>DPN</codeId>
+              <codeId>DDD</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </DpnUid>
@@ -373,12 +500,15 @@ describe AIXM::Document do
             <codeType>ICAO</codeType>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Dtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Dtt>
             <txtRmk>designated point navaid</txtRmk>
           </Dpn>
-          <!-- Navigational aid: [DME] DME NAVAID -->
+          <!-- NavigationalAid: [DME] DME NAVAID -->
           <Dme>
             <DmeUid newEntity="true">
-              <codeId>DME</codeId>
+              <codeId>MMM</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </DmeUid>
@@ -388,9 +518,12 @@ describe AIXM::Document do
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Dtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Dtt>
             <txtRmk>dme navaid</txtRmk>
           </Dme>
-          <!-- Navigational aid: [Marker] MARKER NAVAID -->
+          <!-- NavigationalAid: [Marker] MARKER NAVAID -->
           <Mkr>
             <MkrUid newEntity="true">
               <codeId>---</codeId>
@@ -404,12 +537,15 @@ describe AIXM::Document do
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Mtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Mtt>
             <txtRmk>marker navaid</txtRmk>
           </Mkr>
-          <!-- Navigational aid: [NDB] NDB NAVAID -->
+          <!-- NavigationalAid: [NDB] NDB NAVAID -->
           <Ndb>
             <NdbUid newEntity="true">
-              <codeId>NDB</codeId>
+              <codeId>NNN</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </NdbUid>
@@ -420,12 +556,33 @@ describe AIXM::Document do
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Ntt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Ntt>
             <txtRmk>ndb navaid</txtRmk>
           </Ndb>
-          <!-- Navigational aid: [VOR] VOR NAVAID -->
+          <!-- NavigationalAid: [TACAN] TACAN NAVAID -->
+          <Tcn>
+            <TcnUid newEntity="true">
+              <codeId>TTT</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>
+            <Ttt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Ttt>
+            <txtRmk>tacan navaid</txtRmk>
+          </Tcn>
+          <!-- NavigationalAid: [VOR:VOR] VOR NAVAID -->
           <Vor>
             <VorUid newEntity="true">
-              <codeId>VOR</codeId>
+              <codeId>VVV</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </VorUid>
@@ -438,22 +595,119 @@ describe AIXM::Document do
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Vtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Vtt>
             <txtRmk>vor navaid</txtRmk>
           </Vor>
-          <!-- Navigational aid: [TACAN] TACAN NAVAID -->
+          <!-- NavigationalAid: [VOR:DVOR] DOPPLER-VOR NAVAID -->
+          <Vor>
+            <VorUid newEntity="true">
+              <codeId>DVV</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </VorUid>
+            <OrgUid/>
+            <txtName>DOPPLER-VOR NAVAID</txtName>
+            <codeType>DVOR</codeType>
+            <valFreq>111</valFreq>
+            <uomFreq>MHZ</uomFreq>
+            <codeTypeNorth>TRUE</codeTypeNorth>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <Vtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Vtt>
+            <txtRmk>doppler-vor navaid</txtRmk>
+          </Vor>
+          <!-- NavigationalAid: [VOR:VOR] VOR/DME NAVAID -->
+          <Vor>
+            <VorUid newEntity="true">
+              <codeId>VDD</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </VorUid>
+            <OrgUid/>
+            <txtName>VOR/DME NAVAID</txtName>
+            <codeType>VOR</codeType>
+            <valFreq>111</valFreq>
+            <uomFreq>MHZ</uomFreq>
+            <codeTypeNorth>TRUE</codeTypeNorth>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <Vtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Vtt>
+            <txtRmk>vor/dme navaid</txtRmk>
+          </Vor>
+          <!-- NavigationalAid: [DME] VOR/DME NAVAID -->
+          <Dme>
+            <DmeUid newEntity="true">
+              <codeId>VDD</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </DmeUid>
+            <OrgUid/>
+            <VorUid newEntity="true">
+              <codeId>VDD</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </VorUid>
+            <txtName>VOR/DME NAVAID</txtName>
+            <codeChannel>95X</codeChannel>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <Dtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Dtt>
+            <txtRmk>vor/dme navaid</txtRmk>
+          </Dme>
+          <!-- NavigationalAid: [VOR:VOR] VORTAC NAVAID -->
+          <Vor>
+            <VorUid newEntity="true">
+              <codeId>VTT</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </VorUid>
+            <OrgUid/>
+            <txtName>VORTAC NAVAID</txtName>
+            <codeType>VOR</codeType>
+            <valFreq>111</valFreq>
+            <uomFreq>MHZ</uomFreq>
+            <codeTypeNorth>TRUE</codeTypeNorth>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <Vtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Vtt>
+            <txtRmk>vortac navaid</txtRmk>
+          </Vor>
+          <!-- NavigationalAid: [TACAN] VORTAC NAVAID -->
           <Tcn>
             <TcnUid newEntity="true">
-              <codeId>TCN</codeId>
+              <codeId>VTT</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </TcnUid>
             <OrgUid/>
-            <txtName>TACAN NAVAID</txtName>
+            <VorUid newEntity="true">
+              <codeId>VTT</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </VorUid>
+            <txtName>VORTAC NAVAID</txtName>
             <codeChannel>29X</codeChannel>
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
-            <txtRmk>tacan navaid</txtRmk>
+            <Ttt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Ttt>
+            <txtRmk>vortac navaid</txtRmk>
           </Tcn>
         </AIXM-Snapshot>
       END