aixm 0.2.0 → 0.2.1

data/spec/lib/aixm/feature/airspace_spec.rb

@@ -31,10 +31,10 @@ describe AIXM::Feature::Airspace do
         end
       end
 
-      describe :to_xml do
+      describe :to_aixm do
         it "must build correct XML with OFM extensions" do
           digest = subject.to_digest
-          subject.to_xml(:ofm).must_equal <<~"END"
+          subject.to_aixm(:ofm).must_equal <<~"END"
             <!-- Airspace: [D] POLYGON AIRSPACE -->
             <Ase xt_classLayersAvail="false">
               <AseUid mid="#{digest}" newEntity="true">
@@ -116,10 +116,10 @@ describe AIXM::Feature::Airspace do
           end
         end
 
-        describe :to_xml do
+        describe :to_aixm do
           it "must build correct XML with OFM extensions" do
             digest = subject.to_digest
-            subject.to_xml(:ofm).must_equal <<~"END"
+            subject.to_aixm(:ofm).must_equal <<~"END"
               <!-- Airspace: [D] POLYGON AIRSPACE -->
               <Ase xt_classLayersAvail="true">
                 <AseUid mid="#{digest}" newEntity="true">
@@ -236,19 +236,23 @@ describe AIXM::Feature::Airspace do
     end
 
     context "partially complete" do
+      subject do
+        AIXM::Factory.polygon_airspace
+      end
+
       it "must build correct XML without short name" do
-        subject = AIXM::Factory.polygon_airspace(short_name: nil)
-        subject.to_xml.wont_match(/txtLocalType/)
+        subject.short_name = nil
+        subject.to_aixm.wont_match(/txtLocalType/)
       end
 
       it "must build correct XML with identical name and short name" do
-        subject = AIXM::Factory.polygon_airspace(short_name: 'POLYGON AIRSPACE')
-        subject.to_xml.wont_match(/txtLocalType/)
+        subject.short_name = 'POLYGON AIRSPACE'
+        subject.to_aixm.wont_match(/txtLocalType/)
       end
 
       it "must build correct XML without schedule" do
-        subject = AIXM::Factory.polygon_airspace(schedule: nil)
-        subject.to_xml.wont_match(/codeWorkHr/)
+        subject.schedule = nil
+        subject.to_aixm.wont_match(/codeWorkHr/)
       end
     end
   end

data/spec/lib/aixm/feature/navigational_aid/designated_point_spec.rb

@@ -8,23 +8,23 @@ describe AIXM::Feature::NavigationalAid::DesignatedPoint do
 
     describe :kind do
       it "must return class or type" do
-        subject.kind.must_equal :ICAO
+        subject.kind.must_equal "DesignatedPoint:ICAO"
       end
     end
 
     describe :to_digest do
       it "must return digest of payload" do
-        subject.to_digest.must_equal 582056647
+        subject.to_digest.must_equal 5317882
       end
     end
 
-    describe :to_xml do
+    describe :to_aixm do
       it "must build correct XML of VOR with OFM extension" do
-        subject.to_xml(:ofm).must_equal <<~END
-          <!-- Navigational aid: [ICAO] DESIGNATED POINT NAVAID -->
+        subject.to_aixm(:ofm).must_equal <<~END
+          <!-- 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>
@@ -34,6 +34,9 @@ describe AIXM::Feature::NavigationalAid::DesignatedPoint do
             <codeType>ICAO</codeType>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Dtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Dtt>
             <txtRmk>designated point navaid</txtRmk>
           </Dpn>
         END

data/spec/lib/aixm/feature/navigational_aid/dme_spec.rb

@@ -8,23 +8,23 @@ describe AIXM::Feature::NavigationalAid::DME do
 
     describe :kind do
       it "must return class or type" do
-        subject.kind.must_equal :DME
+        subject.kind.must_equal "DME"
       end
     end
 
     describe :to_digest do
       it "must return digest of payload" do
-        subject.to_digest.must_equal 30256638
+        subject.to_digest.must_equal 537506748
       end
     end
 
-    describe :to_xml do
+    describe :to_aixm do
       it "must build correct XML with OFM extension" do
-        subject.to_xml(:ofm).must_equal <<~END
-          <!-- Navigational aid: [DME] DME NAVAID -->
+        subject.to_aixm(:ofm).must_equal <<~END
+          <!-- NavigationalAid: [DME] DME NAVAID -->
           <Dme>
             <DmeUid newEntity="true">
-              <codeId>DME</codeId>
+              <codeId>MMM</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </DmeUid>
@@ -34,6 +34,9 @@ describe AIXM::Feature::NavigationalAid::DME do
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Dtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Dtt>
             <txtRmk>dme navaid</txtRmk>
           </Dme>
         END

data/spec/lib/aixm/feature/navigational_aid/marker_spec.rb

@@ -8,7 +8,7 @@ describe AIXM::Feature::NavigationalAid::Marker do
 
     describe :kind do
       it "must return class or type" do
-        subject.kind.must_equal :Marker
+        subject.kind.must_equal "Marker"
       end
     end
 
@@ -18,10 +18,10 @@ describe AIXM::Feature::NavigationalAid::Marker do
       end
     end
 
-    describe :to_xml do
+    describe :to_aixm do
       it "must build correct XML with OFM extension" do
-        subject.to_xml(:ofm).must_equal <<~END
-          <!-- Navigational aid: [Marker] MARKER NAVAID -->
+        subject.to_aixm(:ofm).must_equal <<~END
+          <!-- NavigationalAid: [Marker] MARKER NAVAID -->
           <Mkr>
             <MkrUid newEntity="true">
               <codeId>---</codeId>
@@ -35,6 +35,9 @@ describe AIXM::Feature::NavigationalAid::Marker do
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Mtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Mtt>
             <txtRmk>marker navaid</txtRmk>
           </Mkr>
         END

data/spec/lib/aixm/feature/navigational_aid/ndb_spec.rb

@@ -18,23 +18,23 @@ describe AIXM::Feature::NavigationalAid::NDB do
 
     describe :kind do
       it "must return class or type" do
-        subject.kind.must_equal :NDB
+        subject.kind.must_equal "NDB"
       end
     end
 
     describe :to_digest do
       it "must return digest of payload" do
-        subject.to_digest.must_equal 839752023
+        subject.to_digest.must_equal 387748611
       end
     end
 
-    describe :to_xml do
+    describe :to_aixm do
       it "must build correct XML with OFM extension" do
-        subject.to_xml(:ofm).must_equal <<~END
-          <!-- Navigational aid: [NDB] NDB NAVAID -->
+        subject.to_aixm(:ofm).must_equal <<~END
+          <!-- NavigationalAid: [NDB] NDB NAVAID -->
           <Ndb>
             <NdbUid newEntity="true">
-              <codeId>NDB</codeId>
+              <codeId>NNN</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </NdbUid>
@@ -45,6 +45,9 @@ describe AIXM::Feature::NavigationalAid::NDB do
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Ntt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Ntt>
             <txtRmk>ndb navaid</txtRmk>
           </Ndb>
         END

data/spec/lib/aixm/feature/navigational_aid/tacan_spec.rb

@@ -8,23 +8,23 @@ describe AIXM::Feature::NavigationalAid::TACAN do
 
     describe :kind do
       it "must return class or type" do
-        subject.kind.must_equal :TACAN
+        subject.kind.must_equal "TACAN"
       end
     end
 
     describe :to_digest do
       it "must return digest of payload" do
-        subject.to_digest.must_equal 518546211
+        subject.to_digest.must_equal 648449590
       end
     end
 
-    describe :to_xml do
+    describe :to_aixm do
       it "must build correct XML with OFM extension" do
-        subject.to_xml(:ofm).must_equal <<~END
-          <!-- Navigational aid: [TACAN] TACAN NAVAID -->
+        subject.to_aixm(:ofm).must_equal <<~END
+          <!-- NavigationalAid: [TACAN] TACAN NAVAID -->
           <Tcn>
             <TcnUid newEntity="true">
-              <codeId>TCN</codeId>
+              <codeId>TTT</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </TcnUid>
@@ -34,6 +34,9 @@ describe AIXM::Feature::NavigationalAid::TACAN do
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Ttt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Ttt>
             <txtRmk>tacan navaid</txtRmk>
           </Tcn>
         END

data/spec/lib/aixm/feature/navigational_aid/vor_spec.rb

@@ -13,30 +13,30 @@ describe AIXM::Feature::NavigationalAid::VOR do
     end
   end
 
-  context "complete" do
+  context "complete VOR" do
     subject do
       AIXM::Factory.vor
     end
 
     describe :kind do
       it "must return class or type" do
-        subject.kind.must_equal :VOR
+        subject.kind.must_equal "VOR:VOR"
       end
     end
 
     describe :to_digest do
       it "must return digest of payload" do
-        subject.to_digest.must_equal 276222546
+        subject.to_digest.must_equal 152119936
       end
     end
 
-    describe :to_xml do
+    describe :to_aixm do
       it "must build correct XML of VOR with OFM extension" do
-        subject.to_xml(:ofm).must_equal <<~END
-          <!-- Navigational aid: [VOR] VOR NAVAID -->
+        subject.to_aixm(:ofm).must_equal <<~END
+          <!-- NavigationalAid: [VOR:VOR] VOR NAVAID -->
           <Vor>
             <VorUid newEntity="true">
-              <codeId>VOR</codeId>
+              <codeId>VVV</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </VorUid>
@@ -49,10 +49,159 @@ describe AIXM::Feature::NavigationalAid::VOR do
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
+            <Vtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Vtt>
             <txtRmk>vor navaid</txtRmk>
           </Vor>
         END
       end
     end
   end
+
+  context "complete VOR/DME" do
+    subject do
+      AIXM::Factory.vor.tap do |vor|
+        vor.name = "VOR/DME NAVAID"
+        vor.remarks = "vor/dme navaid"
+        vor.associate_dme(channel: '84X')
+      end
+    end
+
+    describe :kind do
+      it "must return class or type" do
+        subject.kind.must_equal "VOR:VOR"
+      end
+    end
+
+    describe :to_digest do
+      it "must return digest of payload" do
+        subject.to_digest.must_equal 863096858
+      end
+    end
+
+    describe :to_aixm do
+      it "must build correct XML of VOR with OFM extension" do
+        subject.to_aixm(:ofm).must_equal <<~END
+          <!-- NavigationalAid: [VOR:VOR] VOR/DME NAVAID -->
+          <Vor>
+            <VorUid newEntity="true">
+              <codeId>VVV</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>VVV</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </DmeUid>
+            <OrgUid/>
+            <VorUid newEntity="true">
+              <codeId>VVV</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </VorUid>
+            <txtName>VOR/DME NAVAID</txtName>
+            <codeChannel>84X</codeChannel>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <Dtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Dtt>
+            <txtRmk>vor/dme navaid</txtRmk>
+          </Dme>
+        END
+      end
+    end
+  end
+
+  context "complete VORTAC" do
+    subject do
+      AIXM::Factory.vor.tap do |vor|
+        vor.name = "VORTAC NAVAID"
+        vor.remarks = "vortac navaid"
+        vor.associate_tacan(channel: '54X')
+      end
+    end
+
+    describe :kind do
+      it "must return class or type" do
+        subject.kind.must_equal "VOR:VOR"
+      end
+    end
+
+    describe :to_digest do
+      it "must return digest of payload" do
+        subject.to_digest.must_equal 458371299
+      end
+    end
+
+    describe :to_aixm do
+      it "must build correct XML of VOR with OFM extension" do
+        subject.to_aixm(:ofm).must_equal <<~END
+          <!-- NavigationalAid: [VOR:VOR] VORTAC NAVAID -->
+          <Vor>
+            <VorUid newEntity="true">
+              <codeId>VVV</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>VVV</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </TcnUid>
+            <OrgUid/>
+            <VorUid newEntity="true">
+              <codeId>VVV</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </VorUid>
+            <txtName>VORTAC NAVAID</txtName>
+            <codeChannel>54X</codeChannel>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <Ttt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Ttt>
+            <txtRmk>vortac navaid</txtRmk>
+          </Tcn>
+        END
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sven Schwyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler