aixm 0.3.7 → 0.3.8

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

@@ -7,11 +7,11 @@ describe AIXM::Component::Helipad do
 
   describe :name= do
     it "fails on invalid values" do
-      [nil, :foobar, 123].wont_be_written_to subject, :name
+      _([nil, :foobar, 123]).wont_be_written_to subject, :name
     end
 
     it "upcases and transcodes valid values" do
-      subject.tap { |s| s.name = 'h1' }.name.must_equal 'H1'
+      _(subject.tap { |s| s.name = 'h1' }.name).must_equal 'H1'
     end
   end
 
@@ -19,7 +19,7 @@ describe AIXM::Component::Helipad do
     macro :xy
 
     it "fails on nil value" do
-      [nil].wont_be_written_to subject, :xy
+      _([nil]).wont_be_written_to subject, :xy
     end
   end
 
@@ -29,21 +29,21 @@ describe AIXM::Component::Helipad do
 
   describe :length= do
     it "fails on invalid values" do
-      [:foobar, 0, 1, AIXM.d(0, :m)].wont_be_written_to subject, :length
+      _([:foobar, 0, 1, AIXM.d(0, :m)]).wont_be_written_to subject, :length
     end
 
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :length
+      _([nil]).must_be_written_to subject, :length
     end
   end
 
   describe :width= do
     it "fails on invalid values" do
-      [:foobar, 0, 1, AIXM.d(0, :m)].wont_be_written_to subject, :width
+      _([:foobar, 0, 1, AIXM.d(0, :m)]).wont_be_written_to subject, :width
     end
 
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :width
+      _([nil]).must_be_written_to subject, :width
     end
   end
 
@@ -53,41 +53,41 @@ describe AIXM::Component::Helipad do
 
   describe :fato= do
     it "fails on invalid values" do
-      [:foobar, 0].wont_be_written_to subject, :fato
+      _([:foobar, 0]).wont_be_written_to subject, :fato
     end
 
     it "accepts valid values" do
-      [nil, AIXM::Factory.fato].must_be_written_to subject, :fato
+      _([nil, AIXM::Factory.fato]).must_be_written_to subject, :fato
     end
   end
 
   describe :helicopter_class= do
     it "fails on invalid values" do
-      [:foobar, 123].wont_be_written_to subject, :helicopter_class
+      _([:foobar, 123]).wont_be_written_to subject, :helicopter_class
     end
 
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :helicopter_class
+      _([nil]).must_be_written_to subject, :helicopter_class
     end
 
     it "looks up valid values" do
-      subject.tap { |s| s.helicopter_class = 1 }.helicopter_class.must_equal :'1'
-      subject.tap { |s| s.helicopter_class = :OTHER }.helicopter_class.must_equal :other
+      _(subject.tap { |s| s.helicopter_class = 1 }.helicopter_class).must_equal :'1'
+      _(subject.tap { |s| s.helicopter_class = :OTHER }.helicopter_class).must_equal :other
     end
   end
 
   describe :status= do
     it "fails on invalid values" do
-      [:foobar, 123].wont_be_written_to subject, :status
+      _([:foobar, 123]).wont_be_written_to subject, :status
     end
 
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :status
+      _([nil]).must_be_written_to subject, :status
     end
 
     it "looks up valid values" do
-      subject.tap { |s| s.status = :closed }.status.must_equal :closed
-      subject.tap { |s| s.status = :SPOWER }.status.must_equal :secondary_power
+      _(subject.tap { |s| s.status = :closed }.status).must_equal :closed
+      _(subject.tap { |s| s.status = :SPOWER }.status).must_equal :secondary_power
     end
   end
 
@@ -98,7 +98,7 @@ describe AIXM::Component::Helipad do
   describe :xml= do
     it "builds correct complete OFMX" do
       AIXM.ofmx!
-      subject.to_xml.must_equal <<~END
+      _(subject.to_xml).must_equal <<~END
         <Tla>
           <TlaUid>
             <AhpUid>
@@ -163,7 +163,7 @@ describe AIXM::Component::Helipad do
       %i(z length width helicopter_class marking status remarks).each { |a| subject.send(:"#{a}=", nil) }
       %i(composition preparation condition pcn siwl_weight siwl_tire_pressure auw_weight remarks).each { |a| subject.surface.send(:"#{a}=", nil) }
       subject.instance_eval { @lightings.clear }
-      subject.to_xml.must_equal <<~END
+      _(subject.to_xml).must_equal <<~END
         <Tla>
           <TlaUid>
             <AhpUid>
@@ -183,5 +183,11 @@ describe AIXM::Component::Helipad do
         </Tla>
       END
     end
+
+    it "builds OFMX with mid" do
+      AIXM.ofmx!
+      AIXM.config.mid_region = 'LF'
+      _(subject.to_xml).must_match /<TlaUid mid="c1f675f9-ed0f-e52e-b117-f9fe6a00fe7c">/
+    end
   end
 end

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

@@ -9,48 +9,48 @@ describe AIXM::Component::Layer do
 
     describe :initialize do
       it "sets defaults" do
-        subject.wont_be :selective?
+        _(subject).wont_be :selective?
       end
     end
 
     describe :class= do
       it "fails on invalid values" do
-        [:X, 'X'].wont_be_written_to subject, :class
+        _([:X, 'X']).wont_be_written_to subject, :class
       end
 
       it "symbolizes and upcases valid values" do
-        subject.tap { |s| s.class = 'c' }.class.must_equal :C
+        _(subject.tap { |s| s.class = 'c' }.class).must_equal :C
       end
     end
 
     describe :location_indicator= do
       it "fails on invalid values" do
-        [:foobar, 123, 'XXX', 'XXXXX'].wont_be_written_to subject, :location_indicator
+        _([: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
+        _([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'
+        _(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
+        _([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
+        _([: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
+        _(subject.tap { |s| s.activity = :aerodrome_traffic }.activity).must_equal :aerodrome_traffic
+        _(subject.tap { |s| s.activity = :GLIDER }.activity).must_equal :gliding
       end
     end
 
@@ -60,7 +60,7 @@ describe AIXM::Component::Layer do
 
     describe :selective= do
       it "fails on invalid values" do
-        [nil, 'N', 0].wont_be_written_to subject, :selective
+        _([nil, 'N', 0]).wont_be_written_to subject, :selective
       end
     end
 
@@ -71,7 +71,7 @@ describe AIXM::Component::Layer do
     describe :to_xml do
       it "builds correct OFMX" do
         AIXM.ofmx!
-        subject.to_xml.must_equal <<~END
+        _(subject.to_xml).must_equal <<~END
           <codeDistVerUpper>STD</codeDistVerUpper>
           <valDistVerUpper>65</valDistVerUpper>
           <uomDistVerUpper>FL</uomDistVerUpper>
@@ -89,10 +89,9 @@ describe AIXM::Component::Layer do
       end
 
       it "builds correct AIXM" do
-        AIXM.aixm!
-        subject.to_xml.wont_match(/<codeSelAvbl>/)
-        subject.to_xml.wont_match(/<Att>/)
-        subject.to_xml.wont_match(/<txtRmk>/)
+        _(subject.to_xml).wont_match(/<codeSelAvbl>/)
+        _(subject.to_xml).wont_match(/<Att>/)
+        _(subject.to_xml).wont_match(/<txtRmk>/)
       end
     end
   end
@@ -104,7 +103,7 @@ describe AIXM::Component::Layer do
 
     it "builds correct OFMX" do
       AIXM.ofmx!
-      subject.to_xml.must_equal <<~END
+      _(subject.to_xml).must_equal <<~END
         <codeClass>C</codeClass>
         <codeLocInd>XXXX</codeLocInd>
         <codeActivity>TFC-AD</codeActivity>
@@ -129,8 +128,7 @@ describe AIXM::Component::Layer do
     end
 
     it "builds correct AIXM" do
-      AIXM.aixm!
-      subject.to_xml.wont_match(/<codeSelAvbl>/)
+      _(subject.to_xml).wont_match(/<codeSelAvbl>/)
     end
   end
 

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

@@ -7,53 +7,53 @@ describe AIXM::Component::Lighting do
 
   describe :position= do
     it "fails on invalid values" do
-      [:foobar, 123, nil].wont_be_written_to subject, :position
+      _([:foobar, 123, nil]).wont_be_written_to subject, :position
     end
 
     it "looks up valid values" do
-      subject.tap { |s| s.position = :edge }.position.must_equal :edge
-      subject.tap { |s| s.position = :SWYEND }.position.must_equal :stopway_end
+      _(subject.tap { |s| s.position = :edge }.position).must_equal :edge
+      _(subject.tap { |s| s.position = :SWYEND }.position).must_equal :stopway_end
     end
   end
 
   describe :description= do
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :description
+      _([nil]).must_be_written_to subject, :description
     end
 
     it "stringifies valid values" do
-      subject.tap { |s| s.description = 'foobar' }.description.must_equal 'foobar'
-      subject.tap { |s| s.description = 123 }.description.must_equal '123'
+      _(subject.tap { |s| s.description = 'foobar' }.description).must_equal 'foobar'
+      _(subject.tap { |s| s.description = 123 }.description).must_equal '123'
     end
   end
 
   describe :intensity= do
     it "fails on invalid values" do
-      [:foobar, 123].wont_be_written_to subject, :intensity
+      _([:foobar, 123]).wont_be_written_to subject, :intensity
     end
 
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :intensity
+      _([nil]).must_be_written_to subject, :intensity
     end
 
     it "looks up valid values" do
-      subject.tap { |s| s.intensity = :low }.intensity.must_equal :low
-      subject.tap { |s| s.intensity = 'LIM' }.intensity.must_equal :medium
+      _(subject.tap { |s| s.intensity = :low }.intensity).must_equal :low
+      _(subject.tap { |s| s.intensity = 'LIM' }.intensity).must_equal :medium
     end
   end
 
   describe :color= do
     it "fails on invalid values" do
-      [:foobar, 123].wont_be_written_to subject, :color
+      _([:foobar, 123]).wont_be_written_to subject, :color
     end
 
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :color
+      _([nil]).must_be_written_to subject, :color
     end
 
     it "looks up valid values" do
-      subject.tap { |s| s.color = :blue }.color.must_equal :blue
-      subject.tap { |s| s.color = 'GRN' }.color.must_equal :green
+      _(subject.tap { |s| s.color = :blue }.color).must_equal :blue
+      _(subject.tap { |s| s.color = 'GRN' }.color).must_equal :green
     end
   end
 
@@ -63,7 +63,7 @@ describe AIXM::Component::Lighting do
 
   describe :to_xml do
     it "builds correct complete AIXM/OFMX" do
-      subject.to_xml(as: :Rls).must_equal <<~END
+      _(subject.to_xml(as: :Rls)).must_equal <<~END
         <Rls>
           <RlsUid>
             <RdnUid>
@@ -84,5 +84,11 @@ describe AIXM::Component::Lighting do
         </Rls>
       END
     end
+
+    it "builds OFMX with mid" do
+      AIXM.ofmx!
+      AIXM.config.mid_region = 'LF'
+      _(subject.to_xml(as: :Rls)).must_match /<RlsUid mid="e96565dc-d6b4-35ca-6e42-7c465cfbec52">/
+    end
   end
 end

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

@@ -7,63 +7,63 @@ describe AIXM::Component::Runway do
 
   describe :initialize do
     it "sets defaults for bidirectional runways" do
-      subject.forth.name.must_equal AIXM.a('16L')
-      subject.back.name.must_equal AIXM.a('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.a('30')
-      subject.back.must_be_nil
+      _(subject.forth.name).must_equal AIXM.a('30')
+      _(subject.back).must_be_nil
     end
 
     it "fails on non-inverse bidirectional runways" do
-      -> { AIXM.runway(name: '16L/14R') }.must_raise ArgumentError
+      _{ AIXM.runway(name: '16L/14R') }.must_raise ArgumentError
     end
   end
 
   describe :name= do
     it "fails on invalid values" do
-      [nil, :foobar, 123].wont_be_written_to subject, :name
+      _([nil, :foobar, 123]).wont_be_written_to subject, :name
     end
 
     it "upcases and transcodes valid values" do
-      subject.tap { |s| s.name = '10r/28l' }.name.must_equal '10R/28L'
+      _(subject.tap { |s| s.name = '10r/28l' }.name).must_equal '10R/28L'
     end
   end
 
   describe :length= do
     it "fails on invalid values" do
-      [:foobar, 0, 1, AIXM.d(0, :m)].wont_be_written_to subject, :length
+      _([:foobar, 0, 1, AIXM.d(0, :m)]).wont_be_written_to subject, :length
     end
 
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :length
+      _([nil]).must_be_written_to subject, :length
     end
   end
 
   describe :width= do
     it "fails on invalid values" do
-      [:foobar, 0, 1, AIXM.d(0, :m)].wont_be_written_to subject, :width
+      _([:foobar, 0, 1, AIXM.d(0, :m)]).wont_be_written_to subject, :width
     end
 
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :width
+      _([nil]).must_be_written_to subject, :width
     end
   end
 
   describe :status= do
     it "fails on invalid values" do
-      [:foobar, 123].wont_be_written_to subject, :status
+      _([:foobar, 123]).wont_be_written_to subject, :status
     end
 
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :status
+      _([nil]).must_be_written_to subject, :status
     end
 
     it "looks up valid values" do
-      subject.tap { |s| s.status = :closed }.status.must_equal :closed
-      subject.tap { |s| s.status = :SPOWER }.status.must_equal :secondary_power
+      _(subject.tap { |s| s.status = :closed }.status).must_equal :closed
+      _(subject.tap { |s| s.status = :SPOWER }.status).must_equal :secondary_power
     end
   end
 
@@ -74,7 +74,7 @@ describe AIXM::Component::Runway do
   describe :xml= do
     it "builds correct complete OFMX" do
       AIXM.ofmx!
-      subject.to_xml.must_equal <<~END
+      _(subject.to_xml).must_equal <<~END
         <Rwy>
           <RwyUid>
             <AhpUid>
@@ -116,7 +116,7 @@ describe AIXM::Component::Runway do
           <geoLat>44.00211944N</geoLat>
           <geoLong>004.75216944E</geoLong>
           <valTrueBrg>165</valTrueBrg>
-          <valMagBrg>166</valMagBrg>
+          <valMagBrg>164</valMagBrg>
           <valElevTdz>145</valElevTdz>
           <uomElevTdz>FT</uomElevTdz>
           <codeVfrPattern>E</codeVfrPattern>
@@ -171,7 +171,7 @@ describe AIXM::Component::Runway do
           <geoLat>43.99036389N</geoLat>
           <geoLong>004.75645556E</geoLong>
           <valTrueBrg>345</valTrueBrg>
-          <valMagBrg>346</valMagBrg>
+          <valMagBrg>344</valMagBrg>
           <valElevTdz>147</valElevTdz>
           <uomElevTdz>FT</uomElevTdz>
           <codeVfrPattern>L</codeVfrPattern>
@@ -221,7 +221,7 @@ describe AIXM::Component::Runway do
       %i(length width status remarks).each { |a| subject.send(:"#{a}=", nil) }
       %i(composition preparation condition pcn siwl_weight siwl_tire_pressure auw_weight remarks).each { |a| subject.surface.send(:"#{a}=", nil) }
       %i(forth back).each { |d| subject.send(d).instance_eval { @lightings.clear } }
-      subject.to_xml.must_equal <<~END
+      _(subject.to_xml).must_equal <<~END
         <Rwy>
           <RwyUid>
             <AhpUid>
@@ -243,7 +243,7 @@ describe AIXM::Component::Runway do
           <geoLat>44.00211944N</geoLat>
           <geoLong>004.75216944E</geoLong>
           <valTrueBrg>165</valTrueBrg>
-          <valMagBrg>166</valMagBrg>
+          <valMagBrg>164</valMagBrg>
           <valElevTdz>145</valElevTdz>
           <uomElevTdz>FT</uomElevTdz>
           <codeVfrPattern>E</codeVfrPattern>
@@ -280,7 +280,7 @@ describe AIXM::Component::Runway do
           <geoLat>43.99036389N</geoLat>
           <geoLong>004.75645556E</geoLong>
           <valTrueBrg>345</valTrueBrg>
-          <valMagBrg>346</valMagBrg>
+          <valMagBrg>344</valMagBrg>
           <valElevTdz>147</valElevTdz>
           <uomElevTdz>FT</uomElevTdz>
           <codeVfrPattern>L</codeVfrPattern>
@@ -306,6 +306,13 @@ describe AIXM::Component::Runway do
         </Rdd>
       END
     end
+
+    it "builds OFMX with mid" do
+      AIXM.ofmx!
+      AIXM.config.mid_region = 'LF'
+      _(subject.to_xml).must_match /<RwyUid mid="4d06b33a-91c8-ffec-ac25-b2b7efa103b2">/
+      _(subject.to_xml).must_match /<RdnUid mid="7e469f8c-b03a-9d1d-0e5a-2a2cec7c652d">/      
+    end
   end
 end
 
@@ -316,19 +323,19 @@ describe AIXM::Component::Runway::Direction do
 
   describe :name= do
     it "fails on invalid values" do
-      [nil, :foobar, '16R'].wont_be_written_to subject, :name
+      _([nil, :foobar, '16R']).wont_be_written_to subject, :name
     end
 
     it "overwrites preset name" do
-      subject.name.to_s.must_equal '16L'
+      _(subject.name.to_s).must_equal '16L'
       subject.name = AIXM.a('34L')
-      subject.name.to_s.must_equal '34L'
+      _(subject.name.to_s).must_equal '34L'
     end
   end
 
   describe :geographic_orientation= do
     it "fails on invalid values" do
-      [:foobar, -1, 10].wont_be_written_to subject, :geographic_orientation
+      _([:foobar, -1, 10]).wont_be_written_to subject, :geographic_orientation
     end
   end
 
@@ -336,7 +343,7 @@ describe AIXM::Component::Runway::Direction do
     macro :xy
 
     it "fails on nil value" do
-      [nil].wont_be_written_to subject, :xy
+      _([nil]).wont_be_written_to subject, :xy
     end
   end
 
@@ -344,34 +351,34 @@ describe AIXM::Component::Runway::Direction do
     macro :z_qnh
 
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :z
+      _([nil]).must_be_written_to subject, :z
     end
   end
 
   describe :displaced_threshold= do
     it "fails on invalid values" do
-      [:foobar, 1, AIXM.d(0, :m)].wont_be_written_to subject, :displaced_threshold
+      _([:foobar, 1, AIXM.d(0, :m)]).wont_be_written_to subject, :displaced_threshold
     end
 
     it "converts coordinates to distance" do
       subject.xy = AIXM.xy(lat: %q(43°59'54.71"N), long: %q(004°45'28.35"E))
       subject.displaced_threshold = AIXM.xy(lat: %q(43°59'48.47"N), long: %q(004°45'30.62"E))
-      subject.displaced_threshold.must_equal AIXM.d(199, :m)
+      _(subject.displaced_threshold).must_equal AIXM.d(199, :m)
     end
   end
 
   describe :vfr_pattern= do
     it "fails on invalid values" do
-      [:foobar, 123].wont_be_written_to subject, :vfr_pattern
+      _([:foobar, 123]).wont_be_written_to subject, :vfr_pattern
     end
 
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :vfr_pattern
+      _([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
+      _(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
 
@@ -382,14 +389,14 @@ describe AIXM::Component::Runway::Direction do
   describe :magnetic_orientation do
     it "is calculated correctly" do
       subject.geographic_orientation = AIXM.a(16)
-      subject.magnetic_orientation.must_equal AIXM.a(17)
+      _(subject.magnetic_orientation).must_equal AIXM.a(15)
     end
   end
 
   describe :xml= do
     it "builds correct complete OFMX" do
       AIXM.ofmx!
-      subject.to_xml.must_equal <<~END
+      _(subject.to_xml).must_equal <<~END
         <Rdn>
           <RdnUid>
             <RwyUid>
@@ -403,7 +410,7 @@ describe AIXM::Component::Runway::Direction do
           <geoLat>44.00211944N</geoLat>
           <geoLong>004.75216944E</geoLong>
           <valTrueBrg>165</valTrueBrg>
-          <valMagBrg>166</valMagBrg>
+          <valMagBrg>164</valMagBrg>
           <valElevTdz>145</valElevTdz>
           <uomElevTdz>FT</uomElevTdz>
           <codeVfrPattern>E</codeVfrPattern>
@@ -452,7 +459,7 @@ describe AIXM::Component::Runway::Direction do
       AIXM.ofmx!
       %i(geographic_orientation z displaced_threshold vfr_pattern remarks).each { |a| subject.send(:"#{a}=", nil) }
       subject.instance_eval { @lightings.clear }
-      subject.to_xml.must_equal <<~END
+      _(subject.to_xml).must_equal <<~END
         <Rdn>
           <RdnUid>
             <RwyUid>