aixm 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d13df653e543e46983fa5d15d841afae85142eb249e0272ecfa9e440047f8998
-  data.tar.gz: 988b5d2736771137ba4764b320c886d456576ecdea0c1115d3dde4d9ab33dbb4
+  metadata.gz: bad5f1c431575562810faf541c197660e815e3652213dc8d6fedc8cde897f9d4
+  data.tar.gz: f1a750f511dc13146af92a25aea066a89a67d358534f2f4a582e415919855ef4
 SHA512:
-  metadata.gz: 86b872de155b94fd83a331b7935e4496a8558fdff94e60d64fcceb9973e1ce21acf7f08a52e5955f03352990f0a818b3844fda3ad598e394bcf83aabb7b5dd0e
-  data.tar.gz: da0e8ab2566abb6530085c632a4e84bc7628ec2aa42cc93566c0b35c2768657f7c42764848b9a0b5149d15617aa25990bb0c5a7a368f39f67cc19f17d702ebc4
+  metadata.gz: f587e9d97f7a1fdb21e38f79c2be3567a9a8a8a4c0bc692b74c19305db8b0c2c8fb734d0b90b7ba488916ca9bc23a2a60ba4e836510be6984d1bd95055ffbe28
+  data.tar.gz: ac70ee0a8c63f20f0fb0277ba075c0880ed2ad39ae32e6c5e38d9fa76d80943a7c8efb394bb33af52f5c6ce00081d066e59d9df9a1105812bfaf8bafc2a23596

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.3
+ruby-2.6.4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.7
+
+#### Additions
+* `AIXM::Document#select_features`
+* `AIXM::Document#group_obstacles!`
+
 ## 0.3.6
 
 #### Additions

data/aixm.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'minitest-sound'
   spec.add_development_dependency 'minitest-matchers'
+  spec.add_development_dependency 'minitest-focus'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'yard'

data/lib/aixm/document.rb

@@ -62,6 +62,53 @@ module AIXM
       @effective_at = value&.to_time || created_at || Time.now
     end
 
+    # Search features and return those matching the given class and attribute
+    # values
+    #
+    # @example
+    #   select_features(:airport, id: "LFNT")
+    #
+    # @param klass [Class, Symbol] feature class like AIXM::Feature::Airport or
+    #   AIXM::Feature::NavigationalAid::VOR, shorthand notations as symbols
+    #   e.g. :airport or :vor as listed in AIXM::CLASSES are recognized as well
+    # @param attributes [Hash] search attributes by their values
+    # @return [Array<AIXM::Feature>]
+    def select_features(klass, attributes={})
+      if klass.is_a? Symbol
+        klass = AIXM::CLASSES.fetch(klass, nil)
+        fail(ArgumentError, "unknown feature shortcut") unless klass
+      end
+      features.select do |feature|
+        if feature.is_a? klass
+          attributes.reduce(true) do |memo, (attribute, value)|
+            memo && feature.send(attribute) == value
+          end
+        end
+      end
+    end
+
+    # Compare all ungrouped obstacles and create new obstacle groups whose
+    # members are located within +max_distance+ pairwise.
+    #
+    # @param max_distance [AIXM::D] max distance between obstacle group member
+    #   pairs (default: 1 NM)
+    # @return [Integer] number of obstacle groups added
+    def group_obstacles!(max_distance: AIXM.d(1, :nm))
+      obstacles, list = select_features(:obstacle), {}
+      while subject = obstacles.shift
+        obstacles.each do |obstacle|
+          if subject.xy.distance(obstacle.xy) <= max_distance
+            [subject, obstacle].each { |o| list[o] = list[subject] || SecureRandom.uuid }
+          end
+        end
+      end
+      list.group_by(&:last).each do |_, grouped_list|
+        obstacle_group = AIXM.obstacle_group(source: grouped_list.first.first.source)
+        grouped_list.each { |o, _| obstacle_group.obstacles << features.delete(o) }
+        features << obstacle_group
+      end.count
+    end
+
     # Validate the generated AIXM or OFMX atainst it's XSD.
     #
     # @return [Boolean] whether valid or not

data/lib/aixm/feature/airport.rb

@@ -107,7 +107,8 @@ module AIXM
 
       def initialize(source: nil, organisation:, id: nil, name:, xy:)
         super(source: source)
-        self.organisation, self.id, self.name, self.xy = organisation, id, name, xy
+        self.organisation, self.name, self.xy = organisation, name, xy
+        self.id = id   # name must already be set
         @runways, @fatos, @helipads, @usage_limitations, @addresses = [], [], [], [], []
       end
 

data/lib/aixm/version.rb

@@ -1,3 +1,3 @@
 module AIXM
-  VERSION = "0.3.6".freeze
+  VERSION = "0.3.7".freeze
 end

data/spec/lib/aixm/document_spec.rb

@@ -79,6 +79,83 @@ describe AIXM::Document do
     end
   end
 
+  describe :select_features do
+    subject do
+      AIXM::Factory.document
+    end
+
+    it "returns array of features by class" do
+      subject.select_features(:airport).map(&:id).must_equal %w(LFNT)
+      subject.select_features(AIXM::Feature::Airport).map(&:id).must_equal %w(LFNT)
+    end
+
+    it "returns array of features by class and attributes" do
+      subject.select_features(:airport, id: "LFNT").map(&:id).must_equal %w(LFNT)
+      subject.select_features(AIXM::Feature::Airport, id: "LFNT").map(&:id).must_equal %w(LFNT)
+    end
+
+    it "returns empty array if nothing matches" do
+      subject.select_features(:airport, id: "FAKE").must_equal []
+    end
+
+    it "fails on invalid shortcut" do
+      -> { subject.select_features(:fake) }.must_raise ArgumentError
+    end
+  end
+
+  describe :group_obstacles! do
+    subject do
+      AIXM.document.tap do |document|
+        {
+          1 => AIXM.xy(lat: 32.665623, long: -111.488584),   # 4 north ends:
+          2 => AIXM.xy(lat: 32.665613, long: -111.487701),   # 84m distance between each
+          3 => AIXM.xy(lat: 32.665603, long: -111.486796),   # 505m distance to south ends
+          4 => AIXM.xy(lat: 32.665611, long: -111.485902),
+          5 => AIXM.xy(lat: 32.661062, long: -111.488624),   # 4 south ends:
+          6 => AIXM.xy(lat: 32.661061, long: -111.487731),   # 84m distance between each
+          7 => AIXM.xy(lat: 32.661042, long: -111.486814),   # 505m distance to north ends
+          8 => AIXM.xy(lat: 32.661054, long: -111.485931),
+          9 => AIXM.xy(lat: 0, long: 0)                      # far away from the others
+        }.to_a.shuffle.each do |index, xy|
+          document.features << AIXM.obstacle(
+            source: index.to_s,
+            name: index.to_s,
+            type: :other,
+            xy: xy,
+            radius: AIXM.d(10, :m),
+            z: AIXM.z(1680 , :qnh)
+          )
+        end
+      end
+    end
+
+    it "adds 1 group of obstacles with default max distance" do
+      subject.group_obstacles!.must_equal 1
+      obstacle_group = subject.select_features(:obstacle_group).first
+      obstacle_group.obstacles.count.must_equal 8
+    end
+
+    it "adds 2 groups of obstacles with max distance 400m" do
+      subject.group_obstacles!(max_distance: AIXM.d(400, :m)).must_equal 2
+      obstacle_groups = subject.features.select { |f| f.is_a? AIXM::Feature::ObstacleGroup }
+      obstacle_groups.each do |obstacle_group|
+        names = obstacle_group.obstacles.map(&:name).sort
+        names.must_equal names.include?('1') ? %w(1 2 3 4) : %w(5 6 7 8)
+      end
+    end
+
+    it "leaves ungrouped obstacles untouched" do
+      subject.group_obstacles!
+      subject.select_features(:obstacle).count.must_equal 1
+    end
+
+    it "copies source of first obstacle to obstacle group" do
+      subject.group_obstacles!
+      obstacle_group = subject.select_features(:obstacle_group).first
+      obstacle_group.source.must_equal obstacle_group.obstacles.first.source
+    end
+  end
+
   context "AIXM" do
     subject do
       AIXM.aixm!

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

@@ -33,6 +33,7 @@ describe AIXM::Feature::Airport do
 
     it "combines 2 character region with an 8 characters digest from name" do
       subject.tap { |s| s.id = 'lf' }.id.must_equal 'LFD18754F5'
+      subject.tap { |s| s.name = 'OTHER'; s.id = 'lf' }.id.must_equal 'LFD646E0F9'      
     end
 
     it "upcases valid values" do

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ Minitest::Sound.failure = Pathname(__dir__).join('sounds/failure.mp3').to_s
 require 'minitest/reporters'
 Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new, Minitest::Sound::Reporter.new]
 
+require 'minitest/focus'
 require 'minitest/matchers'
 require Pathname(__dir__).join('factory')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Sven Schwyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-focus
+  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: guard
   requirement: !ruby/object:Gem::Requirement
@@ -293,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Aeronautical Information Exchange Model (AIXM 4.5).