aixm 0.3.3 → 0.3.4

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

@@ -83,9 +83,10 @@ describe AIXM::Feature::Unit do
           </AhpUid>
           <codeType>TWR</codeType>
           <codeClass>ICAO</codeClass>
-          <txtRmk>A/A FR only</txtRmk>
+          <txtRmk>FR only</txtRmk>
         </Uni>
-        <Ser>
+        <!-- Service: AFIS by PUJAUT TWR -->
+        <Ser source="LF|GEN|0.0 FACTORY|0|0">
           <SerUid>
             <UniUid>
               <txtName>PUJAUT TWR</txtName>
@@ -124,7 +125,8 @@ describe AIXM::Feature::Unit do
             <codeLang>FR</codeLang>
           </Cdl>
         </Fqy>
-        <Ser>
+        <!-- Service: AFIS by PUJAUT TWR -->
+        <Ser source="LF|GEN|0.0 FACTORY|0|0">
           <SerUid>
             <UniUid>
               <txtName>PUJAUT TWR</txtName>
@@ -163,7 +165,8 @@ describe AIXM::Feature::Unit do
             <codeLang>FR</codeLang>
           </Cdl>
         </Fqy>
-        <Ser>
+        <!-- Service: APP by PUJAUT TWR -->
+        <Ser source="LF|GEN|0.0 FACTORY|0|0">
           <SerUid>
             <UniUid>
               <txtName>PUJAUT TWR</txtName>

data/spec/lib/aixm/refinements_spec.rb

@@ -155,6 +155,32 @@ describe AIXM::Refinements do
     end
   end
 
+  context Regexp do
+    describe :decapture do
+      it "should replace capture groups with non-capture groups" do
+        /(foo) baz (bar)/.decapture.must_equal /(?-mix:(?:foo) baz (?:bar))/
+        /(foo) baz (bar)/i.decapture.must_equal /(?i-mx:(?:foo) baz (?:bar))/
+      end
+
+      it "should replace named capture groups with non-capture groups" do
+        /(?<a>foo) baz (?<b>bar)/.decapture.must_equal /(?-mix:(?:foo) baz (?:bar))/
+        /(?<a>foo) baz (?<b>bar)/i.decapture.must_equal /(?i-mx:(?:foo) baz (?:bar))/
+      end
+
+      it "should not replace special groups" do
+        /(?:foo) (?<=baz) bar/.decapture.must_equal /(?-mix:(?:foo) (?<=baz) bar)/
+      end
+
+      it "should not replace literal round brackets" do
+        /\(foo\)/.decapture.must_equal /(?-mix:\(foo\))/
+      end
+
+      it "should replace literal backslash followed by literal round brackets" do
+        /\\(foo\\)/.decapture.must_equal /(?-mix:\\(?:foo\\))/
+      end
+    end
+  end
+
   context String do
     describe :indent do
       it "must indent single line string" do
@@ -167,77 +193,137 @@ describe AIXM::Refinements do
       end
     end
 
+    describe :payload_hash do
+      subject do
+        <<~END
+          <?xml version="1.0" encoding="utf-8"?>
+          <OFMX-Snapshot region="LF">
+            <Ser type="essential" active="true">
+              <SerUid>
+                <UniUid>
+                  <txtName>STRASBOURG APP</txtName>
+                </UniUid>
+                <codeType version="1" subversion="2">APP</codeType>
+                <noSeq>1</noSeq>
+              </SerUid>
+              <Stt priority="1">
+                <codeWorkHr>H24</codeWorkHr>
+              </Stt>
+              <Stt priority="2">
+                <codeWorkHr>HX</codeWorkHr>
+              </Stt>
+              <txtRmk>aka STRASBOURG approche</txtRmk>
+            </Ser>
+          </OFMX-Snapshot>
+        END
+      end
+
+      it "must calculate the hash" do
+        subject.payload_hash(region: 'LF', element: 'Ser').must_equal "269b1f18-cabe-3c9e-1d71-48a7414a4cb9"
+      end
+    end
+
     describe :to_dd do
       it "must convert +6.2 DMS to DD" do
+        %q(12°34'56.78"N).to_dd.must_equal 12.58243888888889
         %q(12°34'56.78").to_dd.must_equal 12.58243888888889
+        %q(12°34'56.78'').to_dd.must_equal 12.58243888888889
         %q(12 34 56.78).to_dd.must_equal 12.58243888888889
-        %q(123456.78).to_dd.must_equal 12.58243888888889
+        %q(123456.78N).to_dd.must_equal 12.58243888888889
       end
 
       it "must convert -6.2 DMS to DD" do
+        %q(12°34'56.78"S).to_dd.must_equal(-12.58243888888889)
         %q(-12°34'56.78").to_dd.must_equal(-12.58243888888889)
         %q(-12 34 56.78).to_dd.must_equal(-12.58243888888889)
-        %q(-123456.78).to_dd.must_equal(-12.58243888888889)
+        %q(123456.78S).to_dd.must_equal(-12.58243888888889)
       end
 
       it "must convert +7.2 DMS to DD" do
+        %q(111°22'33.44"N).to_dd.must_equal 111.37595555555555
         %q(111°22'33.44").to_dd.must_equal 111.37595555555555
         %q(111 22 33.44).to_dd.must_equal 111.37595555555555
-        %q(1112233.44).to_dd.must_equal 111.37595555555555
+        %q(1112233.44N).to_dd.must_equal 111.37595555555555
       end
 
       it "must convert -7.2 DMS to DD" do
+        %q(111°22'33.44"S).to_dd.must_equal(-111.37595555555555)
         %q(-111°22'33.44").to_dd.must_equal(-111.37595555555555)
         %q(-111 22 33.44).to_dd.must_equal(-111.37595555555555)
-        %q(-1112233.44).to_dd.must_equal(-111.37595555555555)
+        %q(1112233.44S).to_dd.must_equal(-111.37595555555555)
       end
 
       it "must convert +6.1 DMS to DD" do
+        %q(12°34'56.7"N).to_dd.must_equal 12.582416666666667
         %q(12°34'56.7").to_dd.must_equal 12.582416666666667
         %q(12 34 56.7).to_dd.must_equal 12.582416666666667
-        %q(123456.7).to_dd.must_equal 12.582416666666667
+        %q(123456.7N).to_dd.must_equal 12.582416666666667
       end
 
       it "must convert -6.1 DMS to DD" do
+        %q(12°34'56.7"S).to_dd.must_equal(-12.582416666666667)
         %q(-12°34'56.7").to_dd.must_equal(-12.582416666666667)
         %q(-12 34 56.7).to_dd.must_equal(-12.582416666666667)
-        %q(-123456.7).to_dd.must_equal(-12.582416666666667)
+        %q(123456.7S).to_dd.must_equal(-12.582416666666667)
       end
 
       it "must convert +7.1 DMS to DD" do
+        %q(111°22'33.4"N).to_dd.must_equal 111.37594444444444
         %q(111°22'33.4").to_dd.must_equal 111.37594444444444
         %q(111 22 33.4).to_dd.must_equal 111.37594444444444
-        %q(1112233.4).to_dd.must_equal 111.37594444444444
+        %q(1112233.4N).to_dd.must_equal 111.37594444444444
       end
 
-      it "must convert +7.1 DMS to DD" do
+      it "must convert -7.1 DMS to DD" do
+        %q(111°22'33.4"S).to_dd.must_equal(-111.37594444444444)
         %q(-111°22'33.4").to_dd.must_equal(-111.37594444444444)
         %q(-111 22 33.4).to_dd.must_equal(-111.37594444444444)
-        %q(-1112233.4).to_dd.must_equal(-111.37594444444444)
+        %q(1112233.4S).to_dd.must_equal(-111.37594444444444)
       end
 
       it "must convert +6.0 DMS to DD" do
+        %q(12°34'56"N).to_dd.must_equal 12.582222222222223
         %q(12°34'56").to_dd.must_equal 12.582222222222223
         %q(12 34 56).to_dd.must_equal 12.582222222222223
-        %q(123456).to_dd.must_equal 12.582222222222223
+        %q(123456N).to_dd.must_equal 12.582222222222223
       end
 
       it "must convert -6.0 DMS to DD" do
+        %q(12°34'56"S).to_dd.must_equal(-12.582222222222223)
         %q(-12°34'56").to_dd.must_equal(-12.582222222222223)
         %q(-12 34 56).to_dd.must_equal(-12.582222222222223)
-        %q(-123456).to_dd.must_equal(-12.582222222222223)
+        %q(123456S).to_dd.must_equal(-12.582222222222223)
       end
 
       it "must convert +7.0 DMS to DD" do
+        %q(111°22'33"N).to_dd.must_equal 111.37583333333333
         %q(111°22'33").to_dd.must_equal 111.37583333333333
         %q(111 22 33).to_dd.must_equal 111.37583333333333
-        %q(1112233).to_dd.must_equal 111.37583333333333
+        %q(1112233N).to_dd.must_equal 111.37583333333333
       end
 
-      it "must convert +7.0 DMS to DD" do
+      it "must convert -7.0 DMS to DD" do
+        %q(111°22'33"S).to_dd.must_equal(-111.37583333333333)
         %q(-111°22'33").to_dd.must_equal(-111.37583333333333)
         %q(-111 22 33).to_dd.must_equal(-111.37583333333333)
-        %q(-1112233).to_dd.must_equal(-111.37583333333333)
+        %q(1112233S).to_dd.must_equal(-111.37583333333333)
+      end
+
+      it "must convert all cardinal directions to DD" do
+        %q(111°22'33.44"N).to_dd.must_equal 111.37595555555555
+        %q(111°22'33.44"E).to_dd.must_equal 111.37595555555555
+        %q(111°22'33.44"S).to_dd.must_equal -111.37595555555555
+        %q(111°22'33.44"W).to_dd.must_equal -111.37595555555555
+      end
+
+      it "must ignore minor typos when converting to DD" do
+        %q(111°22'33,44"N).to_dd.must_equal 111.37595555555555
+        %q(111°22'33.44"n).to_dd.must_equal 111.37595555555555
+        %q(111°22"33.44"N).to_dd.must_equal 111.37595555555555
+        %q(111°22'33.44'N).to_dd.must_equal 111.37595555555555
+        %q(111°22'33.44" N).to_dd.must_equal 111.37595555555555
+        %q(111° 22' 33.44" N).to_dd.must_equal 111.37595555555555
+        %q(-111°22'33.44"S).to_dd.must_equal 111.37595555555555
       end
 
       it "must do all possible roundtrip conversions" do
@@ -276,5 +362,4 @@ describe AIXM::Refinements do
       end
     end
   end
-
 end

data/spec/lib/aixm/z_spec.rb

@@ -81,4 +81,14 @@ describe AIXM::Z do
       { subject => true }[dupe].must_equal true
     end
   end
+
+  describe :zero? do
+    it "returns true for zero height, elevation or altitude" do
+      subject.tap { |s| s.alt = 0 }.must_be :zero?
+    end
+
+    it "returns false for non-zero height, elevation or altitude" do
+      subject.tap { |s| s.alt = 1 }.wont_be :zero?
+    end
+  end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Sven Schwyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +155,7 @@ files:
 - Rakefile
 - aixm.gemspec
 - lib/aixm.rb
+- lib/aixm/a.rb
 - lib/aixm/component.rb
 - lib/aixm/component/frequency.rb
 - lib/aixm/component/geometry.rb
@@ -179,15 +166,17 @@ files:
 - lib/aixm/component/helipad.rb
 - lib/aixm/component/layer.rb
 - lib/aixm/component/runway.rb
-- lib/aixm/component/service.rb
+- lib/aixm/component/surface.rb
 - lib/aixm/component/timetable.rb
 - lib/aixm/component/vertical_limits.rb
 - lib/aixm/config.rb
+- lib/aixm/constants.rb
 - lib/aixm/d.rb
 - lib/aixm/document.rb
 - lib/aixm/errors.rb
 - lib/aixm/f.rb
 - lib/aixm/feature.rb
+- lib/aixm/feature/address.rb
 - lib/aixm/feature/airport.rb
 - lib/aixm/feature/airspace.rb
 - lib/aixm/feature/navigational_aid.rb
@@ -200,8 +189,8 @@ files:
 - lib/aixm/feature/obstacle.rb
 - lib/aixm/feature/obstacle_group.rb
 - lib/aixm/feature/organisation.rb
+- lib/aixm/feature/service.rb
 - lib/aixm/feature/unit.rb
-- lib/aixm/h.rb
 - lib/aixm/refinements.rb
 - lib/aixm/shortcuts.rb
 - lib/aixm/version.rb
@@ -216,6 +205,7 @@ files:
 - schemas/ofmx/0/OFMX-Features.xsd
 - schemas/ofmx/0/OFMX-Snapshot.xsd
 - spec/factory.rb
+- spec/lib/aixm/a_spec.rb
 - spec/lib/aixm/component/frequency_spec.rb
 - spec/lib/aixm/component/geometry/arc_spec.rb
 - spec/lib/aixm/component/geometry/border_spec.rb
@@ -225,7 +215,7 @@ files:
 - spec/lib/aixm/component/helipad_spec.rb
 - spec/lib/aixm/component/layer_spec.rb
 - spec/lib/aixm/component/runway_spec.rb
-- spec/lib/aixm/component/service_spec.rb
+- spec/lib/aixm/component/surface_spec.rb
 - spec/lib/aixm/component/timetable_spec.rb
 - spec/lib/aixm/component/vertical_limits_spec.rb
 - spec/lib/aixm/config_spec.rb
@@ -233,6 +223,7 @@ files:
 - spec/lib/aixm/document_spec.rb
 - spec/lib/aixm/errors_spec.rb
 - spec/lib/aixm/f_spec.rb
+- spec/lib/aixm/feature/address_spec.rb
 - spec/lib/aixm/feature/airport_spec.rb
 - spec/lib/aixm/feature/airspace_spec.rb
 - spec/lib/aixm/feature/navigational_aid/designated_point_spec.rb
@@ -245,9 +236,9 @@ files:
 - spec/lib/aixm/feature/obstacle_group_spec.rb
 - spec/lib/aixm/feature/obstacle_spec.rb
 - spec/lib/aixm/feature/organisation_spec.rb
+- spec/lib/aixm/feature/service_spec.rb
 - spec/lib/aixm/feature/unit_spec.rb
 - spec/lib/aixm/feature_spec.rb
-- spec/lib/aixm/h_spec.rb
 - spec/lib/aixm/refinements_spec.rb
 - spec/lib/aixm/version_spec.rb
 - spec/lib/aixm/xy_spec.rb
@@ -272,20 +263,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Aeronautical Information Exchange Model (AIXM 4.5).
 test_files:
 - spec/factory.rb
+- spec/lib/aixm/a_spec.rb
 - spec/lib/aixm/component/frequency_spec.rb
 - spec/lib/aixm/component/geometry/arc_spec.rb
 - spec/lib/aixm/component/geometry/border_spec.rb
@@ -295,7 +286,7 @@ test_files:
 - spec/lib/aixm/component/helipad_spec.rb
 - spec/lib/aixm/component/layer_spec.rb
 - spec/lib/aixm/component/runway_spec.rb
-- spec/lib/aixm/component/service_spec.rb
+- spec/lib/aixm/component/surface_spec.rb
 - spec/lib/aixm/component/timetable_spec.rb
 - spec/lib/aixm/component/vertical_limits_spec.rb
 - spec/lib/aixm/config_spec.rb
@@ -303,6 +294,7 @@ test_files:
 - spec/lib/aixm/document_spec.rb
 - spec/lib/aixm/errors_spec.rb
 - spec/lib/aixm/f_spec.rb
+- spec/lib/aixm/feature/address_spec.rb
 - spec/lib/aixm/feature/airport_spec.rb
 - spec/lib/aixm/feature/airspace_spec.rb
 - spec/lib/aixm/feature/navigational_aid/designated_point_spec.rb
@@ -315,9 +307,9 @@ test_files:
 - spec/lib/aixm/feature/obstacle_group_spec.rb
 - spec/lib/aixm/feature/obstacle_spec.rb
 - spec/lib/aixm/feature/organisation_spec.rb
+- spec/lib/aixm/feature/service_spec.rb
 - spec/lib/aixm/feature/unit_spec.rb
 - spec/lib/aixm/feature_spec.rb
-- spec/lib/aixm/h_spec.rb
 - spec/lib/aixm/refinements_spec.rb
 - spec/lib/aixm/version_spec.rb
 - spec/lib/aixm/xy_spec.rb

data/lib/aixm/h.rb

@@ -1,87 +0,0 @@
-using AIXM::Refinements
-
-module AIXM
-
-  # Heading of an aircraft or runway
-  #
-  # @example
-  #   AIXM.h(12)
-  #   AIXM.h('12')
-  #   AIXM.h('34L')
-  #   AIXM.h('05X')
-  class H
-    SUFFIX_INVERSIONS = {
-      R: :L,
-      L: :R
-    }.freeze
-
-    # @return [Integer] heading
-    attr_reader :deg
-
-    # @return [Symbol, nil] suffix
-    attr_reader :suffix
-
-    def initialize(deg_and_suffix)
-      fail(ArgumentError, "invalid heading") unless deg_and_suffix.to_s =~ /\A(\d+)([A-Z]+)?\z/
-      self.deg, self.suffix = $1.to_i, $2
-    end
-
-    # @return [String]
-    def inspect
-      %Q(#<#{self.class} #{to_s}>)
-    end
-
-    # @return [String] human readable representation (e.g. "05" or "34L")
-    def to_s
-      [('%02d' % deg), suffix].map(&:to_s).join
-    end
-
-    def deg=(value)
-      fail(ArgumentError, "invalid deg") unless value.between?(1, 36)
-      @deg = value
-    end
-
-    def suffix=(value)
-      fail(ArgumentError, "invalid suffix") unless value.nil? || value.to_s =~ /\A[A-Z]+\z/
-      @suffix = value&.to_s&.to_sym
-    end
-
-    # Invert a heading by 180 degrees
-    #
-    # @example
-    #   AIXM.h('12').invert    # => AIXM.h(30)
-    #   AIXM.h('34L').invert   # => AIXM.h(16, 'R')
-    #   AIXM.h('33X').invert   # => AIXM.h(17, 'bravo')
-    #
-    # @return [AIXM::H] inverted heading
-    def invert
-      AIXM.h([(((deg + 17) % 36) + 1), SUFFIX_INVERSIONS.fetch(suffix, suffix)].join)
-    end
-
-    # Check whether +other+ heading is the inverse
-    #
-    # @example
-    #   AIXM.h('12').inverse_of? AIXM.h('30')     # => true
-    #   AIXM.h('34L').inverse_of? AIXM.h('16R')   # => true
-    #   AIXM.h('16R').inverse_of? AIXM.h('16L')   # => false
-    #
-    # @return [AIXM::H] inverted heading
-    def inverse_of?(other)
-      invert == other
-    end
-
-    # @see Object#==
-    # @return [Boolean]
-    def ==(other)
-      self.class === other  && deg == other.deg && suffix == other.suffix
-    end
-    alias_method :eql?, :==
-
-    # @see Object#hash
-    # @return [Integer]
-    def hash
-      to_s.hash
-    end
-  end
-
-end