aixm 0.3.0 → 0.3.1

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

@@ -9,7 +9,7 @@ describe AIXM::Feature::Airport do
     it "sets defaults" do
       subject = AIXM::Feature::Airport.new(
         organisation: AIXM::Factory.organisation,
-        code: 'LFNT',
+        id: 'LFNT',
         name: 'Avignon-Pujaut',
         xy: AIXM.xy(lat: %q(43°59'46"N), long: %q(004°45'16"E))
       )
@@ -25,13 +25,13 @@ describe AIXM::Feature::Airport do
     end
   end
 
-  describe :code= do
+  describe :id= do
     it "fails on invalid values" do
-      [nil, 'A', 'AB', 'ABCDE', 'AB12345'].wont_be_written_to subject, :code
+      [nil, 'A', 'AB', 'ABCDE', 'AB 1234'].wont_be_written_to subject, :id
     end
 
     it "upcases valid values" do
-      subject.tap { |s| s.code = 'lfnt' }.code.must_equal 'LFNT'
+      subject.tap { |s| s.id = 'lfnt' }.id.must_equal 'LFNT'
     end
   end
 
@@ -184,10 +184,10 @@ describe AIXM::Feature::Airport do
       subject.to_xml.must_equal <<~END
         <!-- 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>
@@ -206,7 +206,7 @@ describe AIXM::Feature::Airport do
         </Ahp>
         <Rwy>
           <RwyUid>
-            <AhpUid region="LF">
+            <AhpUid>
               <codeId>LFNT</codeId>
             </AhpUid>
             <txtDesig>16L/34R</txtDesig>
@@ -221,7 +221,7 @@ describe AIXM::Feature::Airport do
         <Rdn>
           <RdnUid>
             <RwyUid>
-              <AhpUid region="LF">
+              <AhpUid>
                 <codeId>LFNT</codeId>
               </AhpUid>
               <txtDesig>16L/34R</txtDesig>
@@ -240,7 +240,7 @@ describe AIXM::Feature::Airport do
           <RddUid>
             <RdnUid>
               <RwyUid>
-                <AhpUid region="LF">
+                <AhpUid>
                   <codeId>LFNT</codeId>
                 </AhpUid>
                 <txtDesig>16L/34R</txtDesig>
@@ -257,7 +257,7 @@ describe AIXM::Feature::Airport do
         <Rdn>
           <RdnUid>
             <RwyUid>
-              <AhpUid region="LF">
+              <AhpUid>
                 <codeId>LFNT</codeId>
               </AhpUid>
               <txtDesig>16L/34R</txtDesig>
@@ -274,7 +274,7 @@ describe AIXM::Feature::Airport do
           <RddUid>
             <RdnUid>
               <RwyUid>
-                <AhpUid region="LF">
+                <AhpUid>
                   <codeId>LFNT</codeId>
                 </AhpUid>
                 <txtDesig>16L/34R</txtDesig>
@@ -290,7 +290,7 @@ describe AIXM::Feature::Airport do
         </Rdd>
         <Tla>
           <TlaUid>
-            <AhpUid region=\"LF\">
+            <AhpUid>
               <codeId>LFNT</codeId>
             </AhpUid>
             <txtDesig>H1</txtDesig>
@@ -309,7 +309,7 @@ describe AIXM::Feature::Airport do
         </Tla>
         <Ahu>
           <AhuUid>
-            <AhpUid region="LF">
+            <AhpUid>
               <codeId>LFNT</codeId>
             </AhpUid>
           </AhuUid>
@@ -346,10 +346,10 @@ describe AIXM::Feature::Airport do
       subject.to_xml.must_equal <<~END
         <!-- 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>

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

@@ -9,7 +9,7 @@ describe AIXM::Feature::Airspace do
 
     describe :initialize do
       it "sets defaults" do
-        subject.id.must_equal '22E2F734'
+        subject.id.must_equal 'C55466EC'
         subject.layers.must_equal []
         subject.geometry.must_be_instance_of AIXM::Component::Geometry
       end
@@ -20,8 +20,8 @@ describe AIXM::Feature::Airspace do
         [:foobar, 123].wont_be_written_to subject, :id
       end
 
-      it "falls back to id derived from digest of id, name and short_name" do
-        subject.tap { |s| s.id = nil }.id.must_equal '22E2F734'
+      it "falls back to id derived from digest of type, local_type and name" do
+        subject.tap { |s| s.id = nil }.id.must_equal 'C55466EC'
       end
 
       it "upcases value" do
@@ -40,31 +40,31 @@ describe AIXM::Feature::Airspace do
       end
     end
 
-    describe :name= do
+    describe :local_type= do
       it "fails on invalid values" do
-        [:foobar, 123].wont_be_written_to subject, :name
+        [:foobar, 123].wont_be_written_to subject, :local_type
       end
 
       it "accepts nil value" do
-        [nil].must_be_written_to subject, :name
+        [nil].must_be_written_to subject, :local_type
       end
 
       it "upcases value" do
-        subject.tap { |s| s.name = 'löl' }.name.must_equal 'LOEL'
+        subject.tap { |s| s.local_type = 'löl' }.local_type.must_equal 'LOEL'
       end
     end
 
-    describe :short_name= do
+    describe :name= do
       it "fails on invalid values" do
-        [:foobar, 123].wont_be_written_to subject, :short_name
+        [:foobar, 123].wont_be_written_to subject, :name
       end
 
       it "accepts nil value" do
-        [nil].must_be_written_to subject, :short_name
+        [nil].must_be_written_to subject, :name
       end
 
       it "upcases value" do
-        subject.tap { |s| s.short_name = 'löl' }.short_name.must_equal 'LOEL'
+        subject.tap { |s| s.name = 'löl' }.name.must_equal 'LOEL'
       end
     end
 
@@ -99,7 +99,7 @@ describe AIXM::Feature::Airspace do
     describe :to_xml do
       it "builds correct AIXM without id" do
         AIXM.aixm!
-        subject.to_xml.must_match(%r{<codeId>22E2F734</codeId>})
+        subject.to_xml.must_match(%r{<codeId>C55466EC</codeId>})
       end
 
       it "builds correct AIXM without short name" do
@@ -125,13 +125,15 @@ describe AIXM::Feature::Airspace do
         subject.to_xml.must_equal <<~"END"
           <!-- 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>
@@ -152,7 +154,7 @@ describe AIXM::Feature::Airspace do
           </Ase>
           <Abd>
             <AbdUid>
-              <AseUid region="LF">
+              <AseUid>
                 <codeType>D</codeType>
                 <codeId>PA</codeId>
               </AseUid>
@@ -186,15 +188,17 @@ describe AIXM::Feature::Airspace do
 
       it "builds correct minimal OFMX" do
         AIXM.ofmx!
-        subject.short_name = subject.name = nil
+        subject.local_type = subject.name = nil
         subject.to_xml.must_equal <<~"END"
           <!-- Airspace: [D] UNNAMED -->
           <Ase source="LF|GEN|0.0 FACTORY|0|0">
-            <AseUid region="LF">
+            <AseUid>
               <codeType>D</codeType>
               <codeId>PA</codeId>
             </AseUid>
             <codeClass>C</codeClass>
+            <codeLocInd>XXXX</codeLocInd>
+            <codeActivity>TFC-AD</codeActivity>
             <codeDistVerUpper>STD</codeDistVerUpper>
             <valDistVerUpper>65</valDistVerUpper>
             <uomDistVerUpper>FL</uomDistVerUpper>
@@ -215,7 +219,7 @@ describe AIXM::Feature::Airspace do
           </Ase>
           <Abd>
             <AbdUid>
-              <AseUid region="LF">
+              <AseUid>
                 <codeType>D</codeType>
                 <codeId>PA</codeId>
               </AseUid>
@@ -261,8 +265,8 @@ describe AIXM::Feature::Airspace do
         AIXM.ofmx!
         subject.to_xml.must_equal <<~"END"
           <!-- Airspace: [D] POLYGON AIRSPACE -->
-          <Ase source="LF|GEN|0.0 FACTORY|0|0" classLayers="2">
-            <AseUid region="LF">
+          <Ase source="LF|GEN|0.0 FACTORY|0|0">
+            <AseUid>
               <codeType>D</codeType>
               <codeId>PA</codeId>
             </AseUid>
@@ -271,7 +275,7 @@ describe AIXM::Feature::Airspace do
           </Ase>
           <Abd>
             <AbdUid>
-              <AseUid region="LF">
+              <AseUid>
                 <codeType>D</codeType>
                 <codeId>PA</codeId>
               </AseUid>
@@ -301,12 +305,14 @@ describe AIXM::Feature::Airspace do
             </Avx>
           </Abd>
           <Ase>
-            <AseUid region="LF">
+            <AseUid>
               <codeType>CLASS</codeType>
-              <codeId>522496D6</codeId>
+              <codeId>B794588D</codeId>
             </AseUid>
             <txtName>POLYGON AIRSPACE LAYER 1</txtName>
             <codeClass>C</codeClass>
+            <codeLocInd>XXXX</codeLocInd>
+            <codeActivity>TFC-AD</codeActivity>
             <codeDistVerUpper>STD</codeDistVerUpper>
             <valDistVerUpper>65</valDistVerUpper>
             <uomDistVerUpper>FL</uomDistVerUpper>
@@ -327,23 +333,25 @@ describe AIXM::Feature::Airspace do
           </Ase>
           <Adg>
             <AdgUid>
-              <AseUid region="LF">
+              <AseUid>
                 <codeType>CLASS</codeType>
-                <codeId>522496D6</codeId>
+                <codeId>B794588D</codeId>
               </AseUid>
             </AdgUid>
-            <AseUidSameExtent region="LF">
+            <AseUidSameExtent>
               <codeType>D</codeType>
               <codeId>PA</codeId>
             </AseUidSameExtent>
           </Adg>
           <Ase>
-            <AseUid region="LF">
+            <AseUid>
               <codeType>CLASS</codeType>
-              <codeId>CAA85949</codeId>
+              <codeId>64589EAF</codeId>
             </AseUid>
             <txtName>POLYGON AIRSPACE LAYER 2</txtName>
             <codeClass>C</codeClass>
+            <codeLocInd>XXXX</codeLocInd>
+            <codeActivity>TFC-AD</codeActivity>
             <codeDistVerUpper>STD</codeDistVerUpper>
             <valDistVerUpper>65</valDistVerUpper>
             <uomDistVerUpper>FL</uomDistVerUpper>
@@ -364,12 +372,12 @@ describe AIXM::Feature::Airspace do
           </Ase>
           <Adg>
             <AdgUid>
-              <AseUid region="LF">
+              <AseUid>
                 <codeType>CLASS</codeType>
-                <codeId>CAA85949</codeId>
+                <codeId>64589EAF</codeId>
               </AseUid>
             </AdgUid>
-            <AseUidSameExtent region="LF">
+            <AseUidSameExtent>
               <codeType>D</codeType>
               <codeId>PA</codeId>
             </AseUidSameExtent>

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

@@ -28,7 +28,7 @@ describe AIXM::Feature::NavigationalAid::DesignatedPoint do
       subject.to_xml.must_equal <<~END
         <!-- 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>
@@ -47,7 +47,7 @@ describe AIXM::Feature::NavigationalAid::DesignatedPoint do
       subject.to_xml.must_equal <<~END
         <!-- NavigationalAid: [DesignatedPoint:ICAO] UNNAMED -->
         <Dpn source="LF|GEN|0.0 FACTORY|0|0">
-          <DpnUid region="LF">
+          <DpnUid>
             <codeId>DDD</codeId>
             <geoLat>47.85916667N</geoLat>
             <geoLong>007.56000000E</geoLong>

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

@@ -11,11 +11,24 @@ describe AIXM::Feature::NavigationalAid::DME do
 
   describe :channel= do
     it "fails on invalid values" do
-      [nil, :foobar, 123].wont_be_written_to subject, :channel
+      [nil, :foobar, 123, '0X', '127Y', '12Z'].wont_be_written_to subject, :channel
     end
+  end
 
-    it "upcases value" do
-      subject.tap { |s| s.channel = '3x' }.channel.must_equal '3X'
+  describe :ghost_f do
+    it "must be derived from the channel" do
+      subject.tap { |s| s.channel = '1X' }.ghost_f.freq.must_equal 134.4
+      subject.tap { |s| s.channel = '12Y' }.ghost_f.freq.must_equal 135.55
+      subject.tap { |s| s.channel = '16Y' }.ghost_f.freq.must_equal 135.95
+      subject.tap { |s| s.channel = '17X' }.ghost_f.freq.must_equal 108
+      subject.tap { |s| s.channel = '30X' }.ghost_f.freq.must_equal 109.3
+      subject.tap { |s| s.channel = '59Y' }.ghost_f.freq.must_equal 112.25
+      subject.tap { |s| s.channel = '60X' }.ghost_f.freq.must_equal 133.3
+      subject.tap { |s| s.channel = '64Y' }.ghost_f.freq.must_equal 133.75
+      subject.tap { |s| s.channel = '69Y' }.ghost_f.freq.must_equal 134.25
+      subject.tap { |s| s.channel = '70X' }.ghost_f.freq.must_equal 112.30
+      subject.tap { |s| s.channel = '100X' }.ghost_f.freq.must_equal 115.3
+      subject.tap { |s| s.channel = '126Y' }.ghost_f.freq.must_equal 117.95
     end
   end
 
@@ -31,16 +44,18 @@ describe AIXM::Feature::NavigationalAid::DME do
       subject.to_xml.must_equal <<~END
         <!-- 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>
@@ -58,15 +73,17 @@ describe AIXM::Feature::NavigationalAid::DME do
       subject.to_xml.must_equal <<~END
         <!-- NavigationalAid: [DME] UNNAMED -->
         <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>
           <codeChannel>95X</codeChannel>
+          <valGhostFreq>114.8</valGhostFreq>
+          <uomGhostFreq>MHZ</uomGhostFreq>
           <codeDatum>WGE</codeDatum>
         </Dme>
       END

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

@@ -32,12 +32,12 @@ describe AIXM::Feature::NavigationalAid::Marker do
       subject.to_xml.must_equal <<~END
         <!-- 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>
@@ -61,12 +61,12 @@ describe AIXM::Feature::NavigationalAid::Marker do
       subject.to_xml.must_equal <<~END
         <!-- NavigationalAid: [Marker] UNNAMED -->
         <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>
           <valFreq>75</valFreq>

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

@@ -42,12 +42,12 @@ describe AIXM::Feature::NavigationalAid::NDB do
       subject.to_xml.must_equal <<~END
         <!-- 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>
@@ -71,12 +71,12 @@ describe AIXM::Feature::NavigationalAid::NDB do
       subject.to_xml.must_equal <<~END
         <!-- NavigationalAid: [NDB] UNNAMED -->
         <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>
           <valFreq>555</valFreq>