aixm 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3f7a1a1f47a40725a1f7444d97ca6f11acf3c1805d3d2521d9c79c72494abe5
-  data.tar.gz: a45d00f0667b808e4e44f5a065392c4d0f6a00fbcd7e085c8bab072288fcdf7b
+  metadata.gz: a4e0b32c04cba8526128ce56c60abf4343b7ac8f2e8a3e8252e1046ce3ccbfe3
+  data.tar.gz: c88875a5a1921f90a1d4055302469c1608ae610bce5b513c9a3e2d50ed32f842
 SHA512:
-  metadata.gz: e58d749b2c1face5c6ec67c1e0f23e5fba2ebca6e3d111cc5075ce561c6c7d6b022585f2cdf0ace8e9320f7b1684385f7ab7bb7c1ca80ecf485afb19e7257cba
-  data.tar.gz: 5888395288986381ed501d7b7a488729e6be98dc65ed1e77c1bb9522022b95cc7d62f13031272edb86c86a3ce41c301917c30e5cce1e88756d88688b8ca2bd87
+  metadata.gz: e0f11994c12259bee9a013b92162ed14f763206855adfb5f0d25fc45807a885da5b330010c1c7768590cd3cca19c260976c68674b0354091b2ef64288a70914e
+  data.tar.gz: 800ef3ea1d7e298281454957f3471e06452d9a23a4333c0f978c24590cd9fc140b21948d7588a07a896995731897810bffc317ae610e39822b6e27e51554cb10

data/.travis.yml

@@ -1,5 +1,5 @@
 ---
 language: ruby
 rvm:
-  - 2.5.0
-before_install: gem install bundler -v 1.16.1
+  - 2.5.3
+before_install: gem install bundler -v 1.17.1

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.3.3
+
+#### Additions
+* `AIXM::H` (heading)
+
+#### Changes
+* Updated OFMX schema URI
+* Added `eql?` and `hash` to `AIXM::XY|Z|D|H|F` to allow for instances of these classes to be used as Hash keys.
+
 ## 0.3.2
 
 #### Additions

data/lib/aixm/component/layer.rb

@@ -106,9 +106,11 @@ module AIXM
 
       # @return [String]
       def inspect
-        %Q(#<#{self.class} class=#{@klass.inspect}>)
+        %Q(#<#{original_class} class=#{@klass.inspect}>)
       end
 
+      alias_method :original_class, :class
+
       # @!attribute class
       # @return [Symbol] class of layer (see {CLASSES})
       def class

data/lib/aixm/component/runway.rb

@@ -21,7 +21,7 @@ module AIXM
     #   runway.composition = COMPOSITIONS or nil
     #   runway.status = STATUSES or nil
     #   runway.remarks = String or nil
-    #   runway.forth.name = String   # preset based on the runway name
+    #   runway.forth.name = AIXM.h   # preset based on the runway name
     #   runway.forth.geographic_orientation = Integer or nil   # degrees
     #   runway.forth.xy = AIXM.xy
     #   runway.forth.z = AIXM.z or nil
@@ -31,15 +31,15 @@ module AIXM
     # @example Bidirectional runway
     #   runway = AIXM.runway(name: '16L/34R')
     #   runway.name   # => '16L/34R'
-    #   runway.forth.name = '16L'
+    #   runway.forth.name.to_s = '16L'
     #   runway.forth.geographic_orientation = 165
-    #   runway.back.name = '34R'
+    #   runway.back.name.to_s = '34R'
     #   runway.back.geographic_orientation = 345
     #
     # @example Unidirectional runway:
     #   runway = AIXM.runway(name: '16L')
     #   runway.name   # => '16L'
-    #   runway.forth.name = '16L'
+    #   runway.forth.name.to_s = '16L'
     #   runway.forth.geographic_orientation = 165
     #   runway.back = nil
     #
@@ -97,8 +97,9 @@ module AIXM
       def initialize(name:)
         self.name = name
         @name.split('/').tap do |forth, back|
-          @forth = Direction.new(runway: self, name: forth)
-          @back = Direction.new(runway: self, name: back) if back
+          @forth = Direction.new(runway: self, name: AIXM.h(forth))
+          @back = Direction.new(runway: self, name: AIXM.h(back)) if back
+          fail(ArgumentError, "invalid name") unless !@back || @back.name.inverse_of?(@forth.name)
         end
       end
 
@@ -183,7 +184,7 @@ module AIXM
         # @return [AIXM::Component::Runway] runway the runway direction is further describing
         attr_reader :runway
 
-        # @return [String] partial name of runway (e.g. "12" or "16L")
+        # @return [AIXM::H] partial name of runway (e.g. "12" or "16L")
         attr_reader :name
 
         # @return [Integer, nil] geographic orientation (true bearing) in degrees
@@ -219,15 +220,15 @@ module AIXM
         private :runway
 
         def name=(value)
-          fail(ArgumentError, "invalid name") unless value.is_a? String
-          @name = value.uptrans
+          fail(ArgumentError, "invalid name") unless value.is_a? AIXM::H
+          @name = value
         end
 
         def geographic_orientation=(value)
           return @geographic_orientation = nil if value.nil?
           fail(ArgumentError, "invalid geographic orientation") unless value.is_a? Numeric
           @geographic_orientation = value.to_i
-          fail(ArgumentError, "invalid geographic orientation") unless (0..359).include? @geographic_orientation
+          fail(ArgumentError, "invalid geographic orientation") unless (1..360).include? @geographic_orientation
         end
 
         def xy=(value)

data/lib/aixm/config.rb

@@ -9,7 +9,7 @@ module AIXM
     },
     ofmx: {
       version: '0',
-      namespace: 'http://openflightmaps.org/schema/0/OFMX-Snapshot.xsd',
+      namespace: 'http://schema.openflightmaps.org/0/OFMX-Snapshot.xsd',
       xsd: Pathname(__dir__).join('..', '..', 'schemas', 'ofmx', '0', 'OFMX-Snapshot.xsd'),
       root: 'OFMX-Snapshot'
     }

data/lib/aixm/d.rb

@@ -47,10 +47,6 @@ module AIXM
       fail(ArgumentError, "invalid unit") unless UNITS.has_key? @unit
     end
 
-    def <=>(other)
-      to_m.dist <=> other.to_m.dist
-    end
-
     # @!method to_ft
     # @!method to_km
     # @!method to_m
@@ -62,5 +58,24 @@ module AIXM
         self.class.new((dist * UNITS[unit][target_unit]).round(8), target_unit)
       end
     end
+
+    # @see Object#<=>
+    # @return [Integer]
+    def <=>(other)
+      to_m.dist <=> other.to_m.dist
+    end
+
+    # @see Object#==
+    # @return [Boolean]
+    def ==(other)
+      self.class === other  && (self <=> other).zero?
+    end
+    alias_method :eql?, :==
+
+    # @see Object#hash
+    # @return [Integer]
+    def hash
+      to_s.hash
+    end
   end
 end

data/lib/aixm/f.rb

@@ -40,14 +40,22 @@ module AIXM
       fail(ArgumentError, "invalid unit") unless UNITS.include? @unit
     end
 
+    # @return [Boolean] whether this frequency is part of a frequency band
+    def between?(lower_freq, upper_freq, unit)
+      freq.between?(lower_freq, upper_freq) && self.unit == unit
+    end
+
+    # @see Object#==
     # @return [Boolean]
     def ==(other)
-      other.is_a?(self.class) && freq == other.freq && unit == other.unit
+      self.class === other && freq == other.freq && unit == other.unit
     end
+    alias_method :eql?, :==
 
-    # @return [Boolean] whether this frequency is part of a frequency band
-    def between?(lower_freq, upper_freq, unit)
-      freq.between?(lower_freq, upper_freq) && self.unit == unit
+    # @see Object#hash
+    # @return [Integer]
+    def hash
+      to_s.hash
     end
 
   end

data/lib/aixm/feature.rb

@@ -19,7 +19,7 @@ module AIXM
 
     # @return [Boolean]
     def ==(other)
-      other.is_a?(self.class) && self.to_uid == other.to_uid
+      self.class === other && self.to_uid == other.to_uid
     end
   end
 

data/lib/aixm/h.rb

@@ -0,0 +1,87 @@
+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

data/lib/aixm/refinements.rb

@@ -33,7 +33,7 @@ module AIXM
     #
     #   @example
     #     ['foo', :bar, nil, [123]].to_uuid
-    #     # => "f3920098"
+    #     # => "a68e9aae-81ef-c6f1-d954-2eefe2820c50"
     #
     #   @note This is a refinement for +Array+
     #   @return [String] UUID version 3

data/lib/aixm/shortcuts.rb

@@ -6,6 +6,7 @@ module AIXM
     z: Z,
     d: D,
     f: F,
+    h: H,
     organisation: Feature::Organisation,
     unit: Feature::Unit,
     service: Component::Service,

data/lib/aixm/version.rb

@@ -1,3 +1,3 @@
 module AIXM
-  VERSION = "0.3.2".freeze
+  VERSION = "0.3.3".freeze
 end

data/lib/aixm/xy.rb

@@ -6,12 +6,13 @@ module AIXM
   #
   # ===Recognized notations:
   # * DD - examples: 12.12345678 (north or east), -12.12345678 (south or west)
-  # * DMS - examples: 11°22'33.44"N, 1112233.44W
+  # * DMS - examples: 11°22'33.44"N, 1112233.44W,
   #
   # @example All of the below are equivalent
+  #   AIXM.xy(lat: 11.375955555555556, long: -111.37595555555555)
   #   AIXM.xy(lat: %q(11°22'33.44"), long: %q(-111°22'33.44"))
+  #   AIXM.xy(lat: %q(11°22'33.44N"), long: %q(111°22'33.44W"))
   #   AIXM.xy(lat: '112233.44N', long: '1112233.44W')
-  #   AIXM.xy(lat: 11.375955555555556, long: -111.37595555555555)
   #
   # @see https://github.com/openflightmaps/ofmx/wiki/Coordinates
   class XY
@@ -63,11 +64,6 @@ module AIXM
       end
     end
 
-    # @return [Boolean]
-    def ==(other)
-      other.is_a?(self.class) && lat == other.lat && long == other.long
-    end
-
     # @return [AIXM::D] distance as calculated by use of the Haversine formula
     def distance(other)
       if self == other
@@ -84,6 +80,19 @@ module AIXM
       end
     end
 
+    # @see Object#==
+    # @return [Boolean]
+    def ==(other)
+      self.class === other && lat == other.lat && long == other.long
+    end
+    alias_method :eql?, :==
+
+    # @see Object#hash
+    # @return [Integer]
+    def hash
+      to_s.hash
+    end
+
     private
 
     def float_for(value)

data/lib/aixm/z.rb

@@ -46,11 +46,6 @@ module AIXM
       fail(ArgumentError, "invalid code") unless CODES.include? @code
     end
 
-    # @return [Boolean]
-    def ==(other)
-      other.is_a?(self.class) && alt == other.alt && code == other.code
-    end
-
     # @example
     #   z = AIXM.z(123, :qnh)
     #   z.qnh?   # => true
@@ -74,6 +69,19 @@ module AIXM
       qne? ? :fl : :ft
     end
 
+    # @see Object#==
+    # @return [Boolean]
+    def ==(other)
+      self.class === other && alt == other.alt && code == other.code
+    end
+    alias_method :eql?, :==
+
+    # @see Object#hash
+    # @return [Integer]
+    def hash
+      to_s.hash
+    end
+
   end
 
 end

data/lib/aixm.rb

@@ -16,6 +16,7 @@ require_relative 'aixm/xy'
 require_relative 'aixm/z'
 require_relative 'aixm/d'
 require_relative 'aixm/f'
+require_relative 'aixm/h'
 
 require_relative 'aixm/component'
 require_relative 'aixm/component/service'

data/spec/factory.rb

@@ -20,6 +20,10 @@ module AIXM
         AIXM.f(123.35, :mhz)
       end
 
+      def h
+        AIXM.h('34L')
+      end
+
       # Components
 
       def timetable

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

@@ -7,15 +7,19 @@ describe AIXM::Component::Runway do
 
   describe :initialize do
     it "sets defaults for bidirectional runways" do
-      subject.forth.name.must_equal '16L'
-      subject.back.name.must_equal '34R'
+      subject.forth.name.must_equal AIXM.h('16L')
+      subject.back.name.must_equal AIXM.h('34R')
     end
 
     it "sets defaults for unidirectional runways" do
       subject = AIXM::Component::Runway.new(name: '30')
-      subject.forth.name.must_equal '30'
+      subject.forth.name.must_equal AIXM.h('30')
       subject.back.must_be_nil
     end
+
+    it "fails on non-inverse bidirectional runways" do
+      -> { AIXM.runway(name: '16L/14R') }.must_raise ArgumentError
+    end
   end
 
   describe :name= do
@@ -267,16 +271,20 @@ describe AIXM::Component::Runway::Direction do
   end
 
   describe :name= do
+    it "fails on invalid values" do
+      [nil, :foobar, '16R'].wont_be_written_to subject, :name
+    end
+
     it "overwrites preset name" do
-      subject.name.must_equal '16L'
-      subject.name = 'x01x'
-      subject.name.must_equal 'X01X'
+      subject.name.to_s.must_equal '16L'
+      subject.name = AIXM.h('34L')
+      subject.name.to_s.must_equal '34L'
     end
   end
 
   describe :geographic_orientation= do
     it "fails on invalid values" do
-      [:foobar, -1, 360].wont_be_written_to subject, :geographic_orientation
+      [:foobar, -1, 0, 361].wont_be_written_to subject, :geographic_orientation
     end
 
     it "converts valid Numeric values to integer" do

data/spec/lib/aixm/d_spec.rb

@@ -25,32 +25,6 @@ describe AIXM::D do
     end
   end
 
-  describe :<=> do
-    it "recognizes objects with identical unit and distance as equal" do
-      a = AIXM.d(123, :m)
-      b = AIXM.d(123.0, 'M')
-      a.must_equal b
-    end
-
-    it "recognizes objects with different units and converted distance as equal" do
-      a = AIXM.d(123, :m)
-      b = AIXM.d(403.54330709, 'FT')
-      a.must_equal b
-    end
-
-    it "recognizes objects with different units and identical distance as unequal" do
-      a = AIXM.d(123, :m)
-      b = AIXM.d(123, :ft)
-      a.wont_equal b
-    end
-
-    it "recognizes objects of different class as unequal" do
-      a = AIXM.d(123, :m)
-      b = :oggy
-      a.wont_equal b
-    end
-  end
-
   describe :to_ft do
     it "leaves feet untouched" do
       subject = AIXM.d(2, :ft)
@@ -127,4 +101,40 @@ describe AIXM::D do
     end
   end
 
+  describe :<=> do
+    it "recognizes objects with identical unit and distance as equal" do
+      a = AIXM.d(123, :m)
+      b = AIXM.d(123.0, 'M')
+      a.must_equal b
+    end
+
+    it "recognizes objects with different units and converted distance as equal" do
+      a = AIXM.d(123, :m)
+      b = AIXM.d(403.54330709, 'FT')
+      a.must_equal b
+    end
+
+    it "recognizes objects with different units and identical distance as unequal" do
+      a = AIXM.d(123, :m)
+      b = AIXM.d(123, :ft)
+      a.wont_equal b
+    end
+
+    it "recognizes objects of different class as unequal" do
+      a = AIXM.d(123, :m)
+      b = :oggy
+      a.wont_equal b
+    end
+  end
+
+  describe :hash do
+    it "returns an integer" do
+      subject.hash.must_be_instance_of Integer
+    end
+
+    it "allows for the use of instances as hash keys" do
+      dupe = subject.dup
+      { subject => true }[dupe].must_equal true
+    end
+  end
 end

data/spec/lib/aixm/document_spec.rb

@@ -727,7 +727,7 @@ describe AIXM::Document do
     it "builds correct OFMX" do
       subject.to_xml.must_equal <<~"END"
         <?xml version="1.0" encoding="UTF-8"?>
-        <OFMX-Snapshot xmlns:xsi="http://openflightmaps.org/schema/0/OFMX-Snapshot.xsd" version="0" origin="rubygem aixm-#{AIXM::VERSION}" region="LF" namespace="00000000-0000-0000-0000-000000000000" created="2018-01-01T12:00:00+01:00" effective="2018-01-01T12:00:00+01:00">
+        <OFMX-Snapshot xmlns:xsi="http://schema.openflightmaps.org/0/OFMX-Snapshot.xsd" version="0" origin="rubygem aixm-#{AIXM::VERSION}" region="LF" namespace="00000000-0000-0000-0000-000000000000" created="2018-01-01T12:00:00+01:00" effective="2018-01-01T12:00:00+01:00">
           <!-- Organisation: FRANCE -->
           <Org source="LF|GEN|0.0 FACTORY|0|0">
             <OrgUid>

data/spec/lib/aixm/f_spec.rb

@@ -25,6 +25,23 @@ describe AIXM::F do
     end
   end
 
+  describe :between? do
+    subject do
+      AIXM.f(100, :mhz)
+    end
+
+    it "detect frequencies within a frequency band" do
+      subject.between?(90, 110, :mhz).must_equal true
+      subject.between?(90, 100, :mhz).must_equal true
+      subject.between?(100.0, 100.1, :mhz).must_equal true
+    end
+
+    it "detect frequencies outside of a frequency band" do
+      subject.between?(90, 110, :khz).must_equal false
+      subject.between?(90, 95, :mhz).must_equal false
+    end
+  end
+
   describe :== do
     it "recognizes objects with identical frequency and unit as equal" do
       a = AIXM.f(123.0, :mhz)
@@ -45,21 +62,14 @@ describe AIXM::F do
     end
   end
 
-  describe :between? do
-    subject do
-      AIXM.f(100, :mhz)
+  describe :hash do
+    it "returns an integer" do
+      subject.hash.must_be_instance_of Integer
     end
 
-    it "detect frequencies within a frequency band" do
-      subject.between?(90, 110, :mhz).must_equal true
-      subject.between?(90, 100, :mhz).must_equal true
-      subject.between?(100.0, 100.1, :mhz).must_equal true
-    end
-
-    it "detect frequencies outside of a frequency band" do
-      subject.between?(90, 110, :khz).must_equal false
-      subject.between?(90, 95, :mhz).must_equal false
+    it "allows for the use of instances as hash keys" do
+      dupe = subject.dup
+      { subject => true }[dupe].must_equal true
     end
   end
-
 end

data/spec/lib/aixm/h_spec.rb

@@ -0,0 +1,113 @@
+require_relative '../../spec_helper'
+
+describe AIXM::H do
+  subject do
+    AIXM::Factory.h
+  end
+
+  describe :initialize do
+    it "fails on invalid values" do
+      -> { AIXM.h('foobar') }.must_raise ArgumentError
+    end
+
+    it "parses valid values" do
+      AIXM.h('34L').tap do |h|
+        h.deg.must_equal 34
+        h.suffix.must_equal :L
+      end
+      AIXM.h(12).tap do |h|
+        h.deg.must_equal 12
+        h.suffix.must_be :nil?
+      end
+    end
+  end
+
+  describe :to_s do
+    it "pads deg with zero and concats suffix" do
+      AIXM.h(5).to_s.must_equal '05'
+      AIXM.h('5L').to_s.must_equal '05L'
+      AIXM.h('16L').to_s.must_equal '16L'
+    end
+  end
+
+  describe :deg= do
+    it "fails on invalid values" do
+      [:foobar, '1', 0, 37].wont_be_written_to subject, :deg
+    end
+
+    it "accepts valid values" do
+      (1..36).to_a.must_be_written_to subject, :deg
+    end
+  end
+
+  describe :suffix= do
+    it "fails on invalid values" do
+      [123, 'r'].wont_be_written_to subject, :suffix
+    end
+
+    it "accepts nil value" do
+      [nil].must_be_written_to subject, :suffix
+    end
+
+    it "symbolizes valid values" do
+      subject.tap { |s| s.suffix = 'Z' }.suffix.must_equal :Z
+    end
+  end
+
+  describe :invert do
+    it "must calculate inverse deg correctly" do
+      {
+        1 => 19, 2 => 20, 3 => 21, 4 => 22, 5 => 23, 6 => 24, 7 => 25, 8 => 26, 9 => 27,
+        10 => 28, 11 => 29, 12 => 30, 13 => 31, 14 => 32, 15 => 33, 16 => 34, 17 => 35, 18 => 36,
+        19 => 1, 20 => 2, 21 => 3, 22 => 4, 23 => 5, 24 => 6, 25 => 7, 26 => 8, 27 => 9,
+        28 => 10, 29 => 11, 30 => 12, 31 => 13, 32 => 14, 33 => 15, 34 => 16, 35 => 17, 36 => 18
+      }.each do |from, to|
+        AIXM.h(from).invert.deg.must_equal to
+      end
+    end
+
+    it "must invert left/right suffix" do
+      AIXM.h('34L').invert.suffix.must_equal :R
+    end
+
+    it "must leave other suffixes untouched" do
+      AIXM.h('35X').invert.suffix.must_equal :X
+    end
+  end
+
+  describe :inverse_of? do
+    it "must return true for inverse pairs" do
+      AIXM.h('34L').inverse_of?(AIXM.h('16R')).must_equal true
+    end
+
+    it "must return false for non-inverse pairs" do
+      AIXM.h('34L').inverse_of?(AIXM.h('12L')).must_equal false
+    end
+  end
+
+  describe :== do
+    it "recognizes objects with identical deg and suffix as equal" do
+      AIXM.h('34L').must_equal AIXM.h('34L')
+    end
+
+    it "recognizes objects with different deg or suffix as unequal" do
+      AIXM.h('34L').wont_equal AIXM.h('35L')
+      AIXM.h('34L').wont_equal AIXM.h('34R')
+    end
+
+    it "recognizes objects of different class as unequal" do
+      subject.wont_equal :oggy
+    end
+  end
+
+  describe :hash do
+    it "returns an integer" do
+      subject.hash.must_be_instance_of Integer
+    end
+
+    it "allows for the use of instances as hash keys" do
+      dupe = subject.dup
+      { subject => true }[dupe].must_equal true
+    end
+  end
+end

data/spec/lib/aixm/xy_spec.rb

@@ -111,6 +111,21 @@ describe AIXM::XY do
     end
   end
 
+  describe :distance do
+    subject do
+      AIXM.xy(lat: %q(44°00'07.63"N), long: %q(004°45'07.81"E))
+    end
+
+    it "calculates the distance between the same point as zero" do
+      subject.distance(subject).must_equal AIXM.d(0, :m)
+    end
+
+    it "calculates the distance between two points correctly" do
+      other = AIXM.xy(lat: %q(43°59'25.31"N), long: %q(004°45'23.24"E))
+      subject.distance(other).must_equal AIXM.d(1351, :m)
+    end
+  end
+
   describe :== do
     it "recognizes objects with identical latitude and longitude as equal" do
       a = AIXM.xy(lat: "112233N", long: "0223344E")
@@ -131,18 +146,14 @@ describe AIXM::XY do
     end
   end
 
-  describe :distance do
-    subject do
-      AIXM.xy(lat: %q(44°00'07.63"N), long: %q(004°45'07.81"E))
-    end
-
-    it "calculates the distance between the same point as zero" do
-      subject.distance(subject).must_equal AIXM.d(0, :m)
+  describe :hash do
+    it "returns an integer" do
+      subject.hash.must_be_instance_of Integer
     end
 
-    it "calculates the distance between two points correctly" do
-      other = AIXM.xy(lat: %q(43°59'25.31"N), long: %q(004°45'23.24"E))
-      subject.distance(other).must_equal AIXM.d(1351, :m)
+    it "allows for the use of instances as hash keys" do
+      dupe = subject.dup
+      { subject => true }[dupe].must_equal true
     end
   end
 end

data/spec/lib/aixm/z_spec.rb

@@ -25,26 +25,6 @@ describe AIXM::Z do
     end
   end
 
-  describe :== do
-    it "recognizes objects with identical altitude and Q code as equal" do
-      a = AIXM.z(111, :qnh)
-      b = AIXM.z(111, :qnh)
-      a.must_equal b
-    end
-
-    it "recognizes objects with different altitude or Q code as unequal" do
-      a = AIXM.z(111, :qnh)
-      b = AIXM.z(222, :qnh)
-      a.wont_equal b
-    end
-
-    it "recognizes objects of different class as unequal" do
-      a = AIXM.z(111, :qnh)
-      b = :oggy
-      a.wont_equal b
-    end
-  end
-
   describe :qfe? do
     it "recognizes same Q code" do
       AIXM.z(111, :qfe).must_be :qfe?
@@ -70,4 +50,35 @@ describe AIXM::Z do
       AIXM.z(0, :qne).unit.must_equal :fl
     end
   end
+
+  describe :== do
+    it "recognizes objects with identical altitude and Q code as equal" do
+      a = AIXM.z(111, :qnh)
+      b = AIXM.z(111, :qnh)
+      a.must_equal b
+    end
+
+    it "recognizes objects with different altitude or Q code as unequal" do
+      a = AIXM.z(111, :qnh)
+      b = AIXM.z(222, :qnh)
+      a.wont_equal b
+    end
+
+    it "recognizes objects of different class as unequal" do
+      a = AIXM.z(111, :qnh)
+      b = :oggy
+      a.wont_equal b
+    end
+  end
+
+  describe :hash do
+    it "returns an integer" do
+      subject.hash.must_be_instance_of Integer
+    end
+
+    it "allows for the use of instances as hash keys" do
+      dupe = subject.dup
+      { subject => true }[dupe].must_equal true
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Sven Schwyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -201,6 +201,7 @@ files:
 - lib/aixm/feature/obstacle_group.rb
 - lib/aixm/feature/organisation.rb
 - lib/aixm/feature/unit.rb
+- lib/aixm/h.rb
 - lib/aixm/refinements.rb
 - lib/aixm/shortcuts.rb
 - lib/aixm/version.rb
@@ -246,6 +247,7 @@ files:
 - spec/lib/aixm/feature/organisation_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
@@ -315,6 +317,7 @@ test_files:
 - spec/lib/aixm/feature/organisation_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