aixm 0.3.3 → 0.3.4

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

@@ -71,6 +71,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
+    <xsd:attribute ref="source"/>
   </xsd:complexType>
   <xsd:complexType name="AerodromeHeliportAddressUidType">
     <xsd:annotation>
@@ -4083,6 +4084,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
+    <xsd:attribute ref="source"/>
   </xsd:complexType>
   <xsd:complexType name="IlsUidType">
     <xsd:annotation>

data/spec/factory.rb

@@ -20,12 +20,22 @@ module AIXM
         AIXM.f(123.35, :mhz)
       end
 
-      def h
-        AIXM.h('34L')
+      def a
+        AIXM.a('34L')
       end
 
       # Components
 
+      def address
+        AIXM.address(
+          source: 'LF|GEN|0.0 FACTORY|0|0',
+          type: :radio_frequency,
+          address: "123.35"
+        ).tap do |address|
+          address.remarks = "A/A (callsign PUJAUT)"
+        end
+      end
+
       def timetable
         AIXM.timetable(
           code: :sunrise_to_sunset
@@ -119,8 +129,9 @@ module AIXM
           name: 'DESIGNATED POINT NAVAID',
           xy: AIXM.xy(lat: %q(47°51'33"N), long: %q(007°33'36"E)),
           z: AIXM.z(500, :qnh),
-          type: :ICAO
+          type: :vfr_reporting_point
         ).tap do |designated_point|
+          designated_point.airport = airport
           designated_point.timetable = AIXM::H24
           designated_point.remarks = 'designated point navaid'
         end
@@ -264,14 +275,14 @@ module AIXM
           class: :icao
         ).tap do |unit|
           unit.airport = airport
-          unit.remarks = 'A/A FR only'
+          unit.remarks = 'FR only'
           unit.add_service(service)
         end
       end
 
       def service
         AIXM.service(
-          name: "PUJAUT TOWER",
+          source: 'LF|GEN|0.0 FACTORY|0|0',
           type: :approach_control_service
         ).tap do |service|
           service.timetable = AIXM::H24
@@ -316,6 +327,7 @@ module AIXM
             reservation_required.timetable = AIXM::H24
             reservation_required.remarks = "reservation remarks"
           end
+          airport.add_address(address)
         end
       end
 
@@ -323,18 +335,24 @@ module AIXM
         AIXM.runway(name: '16L/34R').tap do |runway|
           runway.length = AIXM.d(650, :m)
           runway.width = AIXM.d(80, :m)
-          runway.composition = :graded_earth
+          runway.surface.composition = :asphalt
+          runway.surface.preparation = :paved
+          runway.surface.condition = :good
+          runway.surface.pcn = "59/F/A/W/T"
+          runway.surface.remarks = "Paved shoulder on 2.5m on each side of the RWY."
           runway.status = :closed
           runway.remarks = "Markings eroded"
           runway.forth.xy = AIXM.xy(lat: %q(44°00'07.63"N), long: %q(004°45'07.81"E))
           runway.forth.z = AIXM.z(145, :qnh)
           runway.forth.displaced_threshold = AIXM.xy(lat: %q(44°00'03.54"N), long: %q(004°45'09.30"E))
-          runway.forth.geographic_orientation = 165
+          runway.forth.geographic_orientation = AIXM.a(165)
+          runway.forth.vfr_pattern = :left_or_right
           runway.forth.remarks = "forth remarks"
           runway.back.xy = AIXM.xy(lat: %q(43°59'25.31"N), long: %q(004°45'23.24"E))
-          runway.forth.z = AIXM.z(147, :qnh)
+          runway.back.z = AIXM.z(147, :qnh)
           runway.back.displaced_threshold = AIXM.xy(lat: %q(43°59'31.84"N), long: %q(004°45'20.85"E))
-          runway.back.geographic_orientation = 345
+          runway.back.geographic_orientation = AIXM.a(345)
+          runway.back.vfr_pattern = :left
           runway.back.remarks = "back remarks"
         end
       end
@@ -345,7 +363,11 @@ module AIXM
           helipad.z = AIXM.z(141, :qnh)
           helipad.length = AIXM.d(20, :m)
           helipad.width = AIXM.d(20, :m)
-          helipad.composition = :grass
+          helipad.surface.composition = :concrete
+          helipad.surface.preparation = :paved
+          helipad.surface.condition = :fair
+          helipad.surface.pcn = "30/F/A/W/U"
+          helipad.surface.remarks = "Cracks near the center."
           helipad.status = :other
           helipad.remarks = "Authorizaton by AD operator required"
         end

data/spec/lib/aixm/a_spec.rb

@@ -0,0 +1,203 @@
+require_relative '../../spec_helper'
+
+describe AIXM::A do
+  let :subject_2 do
+    AIXM.a('0')
+  end
+
+  let :subject_3 do
+    AIXM.a(0)
+  end
+
+  describe :initialize do
+    it "fails on invalid values" do
+      -> { AIXM.a('foobar') }.must_raise ArgumentError
+    end
+
+    it "parses String as angle with precision=2" do
+      AIXM.a('34L').tap do |h|
+        h.deg.must_equal 340
+        h.precision.must_equal 2
+        h.suffix.must_equal :L
+      end
+    end
+
+    it "parses Numeric as angle with precision=3" do
+      AIXM.a(12).tap do |h|
+        h.deg.must_equal 12
+        h.precision.must_equal 3
+        h.suffix.must_be :nil?
+      end
+    end
+  end
+
+  describe :to_s do
+    context "precision=2" do
+      it "rounds and zero-pad deg to length 2 and concats suffix" do
+        AIXM.a('05').to_s.must_equal '05'
+        AIXM.a('05').tap { |a| a.suffix = :L }.to_s.must_equal '05L'
+        AIXM.a('05').tap { |a| a.deg = 0 }.to_s.must_equal '36'
+      end
+    end
+
+    context "precition=3" do
+      it "rounds and zero-pad deg to length 3" do
+        AIXM.a(5).to_s.must_equal '005'
+        AIXM.a(5).tap { |a| a.deg = 0 }.to_s.must_equal '000'
+      end
+    end
+  end
+
+  describe :deg= do
+    it "fails on invalid values" do
+      [:foobar, '1', -1, 361].wont_be_written_to subject_2, :deg
+      [:foobar, '1', -1, 361].wont_be_written_to subject_3, :deg
+    end
+
+    context "precision=2" do
+      it "rounds to 10 degree steps" do
+        subject_2.tap { |s| s.deg = 0 }.deg.must_equal 0
+        subject_2.tap { |s| s.deg = 5 }.deg.must_equal 10
+        subject_2.tap { |s| s.deg = 154 }.deg.must_equal 150
+        subject_2.tap { |s| s.deg = 359 }.deg.must_equal 0
+        subject_2.tap { |s| s.deg = 360 }.deg.must_equal 0
+      end
+    end
+
+    context "precision=3" do
+      it "accepts 1 degree steps" do
+        subject_3.tap { |s| s.deg = 0 }.deg.must_equal 0
+        subject_3.tap { |s| s.deg = 5 }.deg.must_equal 5
+        subject_3.tap { |s| s.deg = 154 }.deg.must_equal 154
+        subject_3.tap { |s| s.deg = 359 }.deg.must_equal 359
+        subject_3.tap { |s| s.deg = 360 }.deg.must_equal 0
+      end
+    end
+  end
+
+  describe :suffix= do
+    context "precision=2" do
+      it "fails on invalid values" do
+        [123, 'r'].wont_be_written_to subject_2, :suffix
+      end
+
+      it "accepts nil value" do
+        [nil].must_be_written_to subject_2, :suffix
+      end
+
+      it "symbolizes valid values" do
+        subject_2.tap { |s| s.suffix = 'Z' }.suffix.must_equal :Z
+      end
+    end
+
+    context "precision=3" do
+      it "always fails" do
+        -> { subject_3.tap { |s| s.suffix = 'Z' } }.must_raise RuntimeError
+      end
+    end
+  end
+
+  describe :invert do
+    it "must calculate inverse deg correctly" do
+      { 0 => 180, 90 => 270, 179 => 359, 180 => 0, 270 => 90, 359 => 179, 360 => 180 }.each do |from, to|
+        AIXM.a(from).invert.deg.must_equal to
+      end
+    end
+
+    it "must invert left/right suffix" do
+      AIXM.a('34L').invert.suffix.must_equal :R
+    end
+
+    it "must leave other suffixes untouched" do
+      AIXM.a('35X').invert.suffix.must_equal :X
+    end
+  end
+
+  describe :inverse_of? do
+    it "must return true for inverse pairs" do
+      AIXM.a('34L').inverse_of?(AIXM.a('16R')).must_equal true
+    end
+
+    it "must return false for non-inverse pairs" do
+      AIXM.a('34L').inverse_of?(AIXM.a('12L')).must_equal false
+    end
+  end
+
+  describe :+ do
+    context "precision=2" do
+      it "adds degrees as Integer" do
+        (subject_2 + 14).must_equal AIXM.a('01')
+        (subject_2 + 16).must_equal AIXM.a('02')
+        (subject_2 + 370).must_equal AIXM.a('01')
+        (AIXM.a('05L') + 20).must_equal AIXM.a('07L')
+      end
+
+      it "adds another angle" do
+        (AIXM.a('10') + AIXM.a('08')).must_equal AIXM.a('18')
+      end
+    end
+
+    context "precision=3" do
+      it "adds degrees as Integer" do
+        (subject_3 + 15).must_equal AIXM.a(15)
+        (subject_3 + 370).must_equal AIXM.a(10)
+      end
+    end
+  end
+
+  describe :- do
+    context "precision=2" do
+      it "subtracts degrees as Integer" do
+        (subject_2 - 14).must_equal AIXM.a('35')
+        (subject_2 - 16).must_equal AIXM.a('34')
+        (AIXM.a('05') - 20).must_equal AIXM.a('03')
+        (AIXM.a('05L') - 20).must_equal AIXM.a('03L')
+      end
+
+      it "subtracts another angle" do
+        (AIXM.a('10') - AIXM.a('08')).must_equal AIXM.a('02')
+      end
+    end
+
+    context "precision=3" do
+      it "subtracts degrees as Integer" do
+        (subject_3 - 15).must_equal AIXM.a(345)
+        (AIXM.a(55) - 20).must_equal AIXM.a(35)
+      end
+    end
+  end
+
+  describe :== do
+    it "recognizes angles with identical deg and suffix as equal" do
+      AIXM.a('34L').must_equal AIXM.a('34L')
+    end
+
+    it "recognizes angles with different deg or suffix as unequal" do
+      AIXM.a('34L').wont_equal AIXM.a('35L')
+      AIXM.a('34L').wont_equal AIXM.a('34R')
+    end
+
+    it "recognizes angles with different precision as unequal" do
+      AIXM.a('34').wont_equal AIXM.a(340)
+    end
+
+    it "recognizes objects of different class as unequal" do
+      subject_2.wont_equal :oggy
+    end
+  end
+
+  describe :hash do
+    it "returns an integer" do
+      subject_2.hash.must_be_instance_of Integer
+    end
+
+    it "returns different hashes for different precisions" do
+      subject_2.hash.wont_equal subject_3.hash
+    end
+
+    it "allows for the use of instances as hash keys" do
+      dupe = subject_2.dup
+      { subject_2 => true }[dupe].must_equal true
+    end
+  end
+end

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

@@ -47,21 +47,6 @@ describe AIXM::Component::Helipad do
     end
   end
 
-  describe :composition= do
-    it "fails on invalid values" do
-      [:foobar, 123].wont_be_written_to subject, :composition
-    end
-
-    it "accepts nil value" do
-      [nil].must_be_written_to subject, :composition
-    end
-
-    it "looks up valid values" do
-      subject.tap { |s| s.composition = :macadam }.composition.must_equal :macadam
-      subject.tap { |s| s.composition = :GRADE }.composition.must_equal :graded_earth
-    end
-  end
-
   describe :status= do
     it "fails on invalid values" do
       [:foobar, 123].wont_be_written_to subject, :status
@@ -100,7 +85,15 @@ describe AIXM::Component::Helipad do
           <valLen>20</valLen>
           <valWid>20</valWid>
           <uomDim>M</uomDim>
-          <codeComposition>GRASS</codeComposition>
+          <codeComposition>CONC</codeComposition>
+          <codePreparation>PAVED</codePreparation>
+          <codeCondSfc>FAIR</codeCondSfc>
+          <valPcnClass>30</valPcnClass>
+          <codePcnPavementType>F</codePcnPavementType>
+          <codePcnPavementSubgrade>A</codePcnPavementSubgrade>
+          <codePcnMaxTirePressure>W</codePcnMaxTirePressure>
+          <codePcnEvalMethod>U</codePcnEvalMethod>
+          <txtPcnNote>Cracks near the center.</txtPcnNote>
           <codeSts>OTHER</codeSts>
           <txtRmk>Authorizaton by AD operator required</txtRmk>
         </Tla>
@@ -109,7 +102,8 @@ describe AIXM::Component::Helipad do
 
     it "builds correct minimal OFMX" do
       AIXM.ofmx!
-      subject.z = subject.length = subject.width = subject.composition = subject.status = subject.remarks = nil
+      %i(z length width status remarks).each { |a| subject.send(:"#{a}=", nil) }
+      %i(composition preparation condition pcn remarks).each { |a| subject.surface.send(:"#{a}=", nil) }
       subject.to_xml.must_equal <<~END
         <Tla>
           <TlaUid>

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

@@ -7,13 +7,13 @@ describe AIXM::Component::Runway do
 
   describe :initialize do
     it "sets defaults for bidirectional runways" do
-      subject.forth.name.must_equal AIXM.h('16L')
-      subject.back.name.must_equal AIXM.h('34R')
+      subject.forth.name.must_equal AIXM.a('16L')
+      subject.back.name.must_equal AIXM.a('34R')
     end
 
     it "sets defaults for unidirectional runways" do
       subject = AIXM::Component::Runway.new(name: '30')
-      subject.forth.name.must_equal AIXM.h('30')
+      subject.forth.name.must_equal AIXM.a('30')
       subject.back.must_be_nil
     end
 
@@ -52,21 +52,6 @@ describe AIXM::Component::Runway do
     end
   end
 
-  describe :composition= do
-    it "fails on invalid values" do
-      [:foobar, 123].wont_be_written_to subject, :composition
-    end
-
-    it "accepts nil value" do
-      [nil].must_be_written_to subject, :composition
-    end
-
-    it "looks up valid values" do
-      subject.tap { |s| s.composition = :macadam }.composition.must_equal :macadam
-      subject.tap { |s| s.composition = :GRADE }.composition.must_equal :graded_earth
-    end
-  end
-
   describe :status= do
     it "fails on invalid values" do
       [:foobar, 123].wont_be_written_to subject, :status
@@ -100,7 +85,15 @@ describe AIXM::Component::Runway do
           <valLen>650</valLen>
           <valWid>80</valWid>
           <uomDimRwy>M</uomDimRwy>
-          <codeComposition>GRADE</codeComposition>
+          <codeComposition>ASPH</codeComposition>
+          <codePreparation>PAVED</codePreparation>
+          <codeCondSfc>GOOD</codeCondSfc>
+          <valPcnClass>59</valPcnClass>
+          <codePcnPavementType>F</codePcnPavementType>
+          <codePcnPavementSubgrade>A</codePcnPavementSubgrade>
+          <codePcnMaxTirePressure>W</codePcnMaxTirePressure>
+          <codePcnEvalMethod>T</codePcnEvalMethod>
+          <txtPcnNote>Paved shoulder on 2.5m on each side of the RWY.</txtPcnNote>
           <codeSts>CLSD</codeSts>
           <txtRmk>Markings eroded</txtRmk>
         </Rwy>
@@ -118,8 +111,9 @@ describe AIXM::Component::Runway do
           <geoLong>004.75216944E</geoLong>
           <valTrueBrg>165</valTrueBrg>
           <valMagBrg>166</valMagBrg>
-          <valElevTdz>147</valElevTdz>
+          <valElevTdz>145</valElevTdz>
           <uomElevTdz>FT</uomElevTdz>
+          <codeVfrPattern>E</codeVfrPattern>
           <txtRmk>forth remarks</txtRmk>
         </Rdn>
         <Rdd>
@@ -154,6 +148,9 @@ describe AIXM::Component::Runway do
           <geoLong>004.75645556E</geoLong>
           <valTrueBrg>345</valTrueBrg>
           <valMagBrg>346</valMagBrg>
+          <valElevTdz>147</valElevTdz>
+          <uomElevTdz>FT</uomElevTdz>
+          <codeVfrPattern>L</codeVfrPattern>
           <txtRmk>back remarks</txtRmk>
         </Rdn>
         <Rdd>
@@ -179,7 +176,8 @@ describe AIXM::Component::Runway do
 
     it "builds correct minimal OFMX" do
       AIXM.ofmx!
-      %i(length width composition status remarks).each { |a| subject.send(:"#{a}=", nil) }
+      %i(length width status remarks).each { |a| subject.send(:"#{a}=", nil) }
+      %i(composition preparation condition pcn remarks).each { |a| subject.surface.send(:"#{a}=", nil) }
       subject.to_xml.must_equal <<~END
         <Rwy>
           <RwyUid>
@@ -203,8 +201,9 @@ describe AIXM::Component::Runway do
           <geoLong>004.75216944E</geoLong>
           <valTrueBrg>165</valTrueBrg>
           <valMagBrg>166</valMagBrg>
-          <valElevTdz>147</valElevTdz>
+          <valElevTdz>145</valElevTdz>
           <uomElevTdz>FT</uomElevTdz>
+          <codeVfrPattern>E</codeVfrPattern>
           <txtRmk>forth remarks</txtRmk>
         </Rdn>
         <Rdd>
@@ -239,6 +238,9 @@ describe AIXM::Component::Runway do
           <geoLong>004.75645556E</geoLong>
           <valTrueBrg>345</valTrueBrg>
           <valMagBrg>346</valMagBrg>
+          <valElevTdz>147</valElevTdz>
+          <uomElevTdz>FT</uomElevTdz>
+          <codeVfrPattern>L</codeVfrPattern>
           <txtRmk>back remarks</txtRmk>
         </Rdn>
         <Rdd>
@@ -277,18 +279,14 @@ describe AIXM::Component::Runway::Direction do
 
     it "overwrites preset name" do
       subject.name.to_s.must_equal '16L'
-      subject.name = AIXM.h('34L')
+      subject.name = AIXM.a('34L')
       subject.name.to_s.must_equal '34L'
     end
   end
 
   describe :geographic_orientation= do
     it "fails on invalid values" do
-      [:foobar, -1, 0, 361].wont_be_written_to subject, :geographic_orientation
-    end
-
-    it "converts valid Numeric values to integer" do
-      subject.tap { |s| s.geographic_orientation = 100.5 }.geographic_orientation.must_equal 100
+      [:foobar, -1, 10].wont_be_written_to subject, :geographic_orientation
     end
   end
 
@@ -320,14 +318,29 @@ describe AIXM::Component::Runway::Direction do
     end
   end
 
+  describe :vfr_pattern= do
+    it "fails on invalid values" do
+      [:foobar, 123].wont_be_written_to subject, :vfr_pattern
+    end
+
+    it "accepts nil value" do
+      [nil].must_be_written_to subject, :vfr_pattern
+    end
+
+    it "looks up valid values" do
+      subject.tap { |s| s.vfr_pattern = :left }.vfr_pattern.must_equal :left
+      subject.tap { |s| s.vfr_pattern = :E }.vfr_pattern.must_equal :left_or_right
+    end
+  end
+
   describe :remarks= do
     macro :remarks
   end
 
   describe :magnetic_orientation do
     it "is calculated correctly" do
-      subject.geographic_orientation = 16
-      subject.magnetic_orientation.must_equal 17
+      subject.geographic_orientation = AIXM.a(16)
+      subject.magnetic_orientation.must_equal AIXM.a(17)
     end
   end
 
@@ -349,8 +362,9 @@ describe AIXM::Component::Runway::Direction do
           <geoLong>004.75216944E</geoLong>
           <valTrueBrg>165</valTrueBrg>
           <valMagBrg>166</valMagBrg>
-          <valElevTdz>147</valElevTdz>
+          <valElevTdz>145</valElevTdz>
           <uomElevTdz>FT</uomElevTdz>
+          <codeVfrPattern>E</codeVfrPattern>
           <txtRmk>forth remarks</txtRmk>
         </Rdn>
         <Rdd>
@@ -376,7 +390,7 @@ describe AIXM::Component::Runway::Direction do
 
     it "builds correct minimal OFMX" do
       AIXM.ofmx!
-      %i(geographic_orientation z displaced_threshold remarks).each { |a| subject.send(:"#{a}=", nil) }
+      %i(geographic_orientation z displaced_threshold vfr_pattern remarks).each { |a| subject.send(:"#{a}=", nil) }
       subject.to_xml.must_equal <<~END
         <Rdn>
           <RdnUid>