aipp 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6636c547c07869e9f9e29ff7af681d2120b2010b870821066c773d06c464dd3e
-  data.tar.gz: 47c014f42d4934e516e9d6fa31c66c2cb53a5713786c899d0cc26872ea538963
+  metadata.gz: '0897562e048a1f5eae251b19e4059ce16a319761acff603a0679e8688aad8a7a'
+  data.tar.gz: d83c038edceaab6eb9d996eba589e3aa277e702be8974d80a22c7f45b0e7f8bf
 SHA512:
-  metadata.gz: 69bebf7ef63cec882dce23b9072c5522e5de895b58308497105a0c0a042446cc099428cf7d40f01d811b8926a3d452cc3acdeb8573f4e1abb5e5b149dc50eb8e
-  data.tar.gz: 02b677a058bfd229d064452f22672814b079f9ccfa9bd8e210a0af81ce60fb6835a7d98d28a40a0b4905329e2edfcb3b055e70626b5411ec660837a45a76376c
+  metadata.gz: a1df374cfd53eaa0a5d767018996b6b62df24b7641d0755346b01c7846b4eaa40c307d777c684663335676f6003db0313e84d2ff379c74b2e0503cee5a4600e9
+  data.tar.gz: a3cb46a7fb3d6e43ff1f030fdd361b0a764eea73431e9880a896aae87fc101d3f91d45e084940797633f2e5f5eb6fe27c9771f1c9e14931df40e8a2c4194fe28

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.1.2
+
+* Additions:
+  * LF/ENR-4.3
+
+## 0.1.1
+
+* Additions:
+  * Helper modules
+  * LF/ENR-4.1
+
 ## 0.1.0
 
 * Initial implementation of aip2aixm executable and infrastructure

data/aipp.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-minitest'
 
-  spec.add_runtime_dependency 'aixm', '~> 0', '>= 0.2.0'
+  spec.add_runtime_dependency 'aixm', '~> 0', '>= 0.2.2'
   spec.add_runtime_dependency 'nokogiri', '~> 1'
   spec.add_runtime_dependency 'nokogumbo', '~> 1'
   spec.add_runtime_dependency 'pry', '~> 0'

data/exe/aip2aixm

@@ -42,7 +42,7 @@ class Executable
     extensions = [(:ofm if ofm)].compact
     filename = [fir, aip, airac].join('_') + '.aixm'
     loader = AIPP::Loader.new(fir: fir, aip: aip, airac: airac, limit: limit)
-    aixm = loader.aixm.to_xml(*extensions)
+    aixm = loader.aixm.to_aixm(*extensions)
     File.write(Pathname.new(Dir.pwd).join(filename), aixm)
   end
 end
@@ -51,7 +51,7 @@ begin
   executable = Executable.new
   executable.run
 rescue => exception
-  if executable.verbose
+  if executable&.verbose
     raise exception
   else
     puts "#{File.basename($0)}: #{exception.message}"

data/lib/aipp/loader.rb

@@ -4,19 +4,21 @@ module AIPP
 
     attr_accessor :aixm
 
+    def self.parsers_path
+      Pathname(__dir__).join('parsers')
+    end
+
     def self.list
-      parser_path = Pathname(__dir__).join('parser')
-      Dir.each_child(parser_path).each.with_object({}) do |fir, hash|
-        hash[fir] = Dir.children(parser_path.join(fir)).map do |aip_file|
-          File.basename(aip_file, '.rb')
+      parsers_path.each_child.each.with_object({}) do |fir, hash|
+        hash[fir.basename.to_s] = fir.glob('*.rb').map do |aip|
+          aip.basename('.rb').to_s
         end
       end
     end
 
     def initialize(fir:, aip:, airac:, limit:)
       @fir, @aip, @airac, @limit = fir.upcase, aip.upcase, airac, limit
-      require_relative "parser/#{@fir}/#{@aip}.rb"
-      self.singleton_class.send(:include, AIPP::Parser)
+      load_parser
       @aixm = AIXM.document(effective_at: @airac)
       convert!
       warn "WARNING: document is not complete" unless aixm.complete?
@@ -27,6 +29,14 @@ module AIPP
 
     private
 
+    def load_parser
+      self.class.parsers_path.join(@fir, 'helpers').glob('*.rb').each do |helper|
+        require helper
+      end
+      require_relative "parsers/#{@fir}/#{@aip}"
+      self.singleton_class.send(:include, AIPP::Parsers)
+    end
+
     def file
       file_name = "#{@fir}_#{@aip}_#{@airac}.html"
       Pathname.new(Dir.tmpdir).join(file_name).tap do |file_path|

data/lib/aipp/parsers/LF/ENR-4.1.rb

@@ -0,0 +1,102 @@
+module AIPP
+  module Parsers
+    include Helpers::URL
+    using AIPP::Refinements
+
+    def convert!
+      html.css('tbody').each do |tbody|
+        tbody.css('tr').to_enum.with_index(1).each do |tr, index|
+          break if index >= @limit
+          tds = tr.css('td')
+          master, slave = tds[1].text.strip.downcase.gsub(/[^\w-]/, '').downcase.split('-')
+          navaid = AIXM.send(master, base_from(tds).merge(send("#{master}_from", tds)))
+          navaid.schedule = schedule_from(tds[4])
+          navaid.remarks = remarks_from(tds[5], tds[7], tds[9])
+          navaid.send("associate_#{slave}", channel: channel_from(tds[3])) if slave
+          aixm.features << navaid
+        rescue => exception
+          warn("WARNING: error parsing navigational aid at ##{index}: #{exception.message}", binding)
+        end
+      end
+      true
+    end
+
+    private
+
+    def base_from(tds)
+      {
+        id: tds[2].text.strip,
+        name: tds[0].text.strip,
+        xy: xy_from(tds[5]),
+        z: z_from(tds[6])
+      }
+    end
+
+    def vor_from(tds)
+      {
+        type: :vor,
+        f: frequency_from(tds[3]),
+        north: :geographic,
+      }
+    end
+
+    def dme_from(tds)
+      {
+        channel: channel_from(tds[3])
+      }
+    end
+
+    def ndb_from(tds)
+      {
+        f: frequency_from(tds[3])
+      }
+    end
+
+    def tacan_from(tds)
+      {
+        channel: channel_from(tds[3])
+      }
+    end
+
+    def xy_from(td)
+      parts = td.text.strip.split(/\s+/)
+      AIXM.xy(lat: parts[0], long: parts[1])
+    end
+
+    def z_from(td)
+      parts = td.text.strip.split(/\s+/)
+      AIXM.z(parts[0].to_i, :qnh) if parts[1] == 'ft'
+    end
+
+    def frequency_from(td)
+      parts = td.text.strip.split(/\s+/)
+      AIXM.f(parts[0], parts[1]) if parts[1] =~ /hz$/i
+    end
+
+    def channel_from(td)
+      parts = td.text.strip.split(/\s+/)
+      parts.last if parts[-2].downcase == 'ch'
+    end
+
+    def schedule_from(td)
+      code = td.text.strip
+      AIXM.schedule(code: code) unless code.empty?
+    end
+
+    def remarks_from(*parts)
+      part_titles = ['RANGE', 'SITUATION', 'OBSERVATIONS']
+      [].tap do |remarks|
+        parts.each.with_index do |part, index|
+          text = if index == 0
+            part = part.text.strip.split(/\s+/)
+            part.shift(2)
+            part.join(' ').blank_to_nil
+          else
+            part.text.strip.blank_to_nil
+          end
+          remarks << "#{part_titles[index]}:\n#{text}" if text
+        end
+      end.join("\n\n").blank_to_nil
+    end
+  end
+end

data/lib/aipp/parsers/LF/ENR-4.3.rb

@@ -0,0 +1,31 @@
+module AIPP
+  module Parsers
+    include Helpers::URL
+#   using AIPP::Refinements
+
+    def convert!
+      html.css('tbody').each do |tbody|
+        tbody.css('tr').to_enum.with_index(1).each do |tr, index|
+          break if index >= @limit
+          tds = tr.css('td')
+          designated_point = AIXM.designated_point(
+            type: :icao,
+            id: tds[0].text.strip,
+            xy: xy_from(tds[1])
+          )
+          aixm.features << designated_point
+        rescue => exception
+          warn("WARNING: error parsing designated point at ##{index}: #{exception.message}", binding)
+        end
+      end
+      true
+    end
+
+    private
+
+    def xy_from(td)
+      parts = td.text.strip.split(/\s+/)
+      AIXM.xy(lat: parts[0], long: parts[1])
+    end
+  end
+end

data/lib/aipp/{parser → parsers}/LF/ENR-5.1.rb

@@ -1,13 +1,14 @@
 module AIPP
-  module Parser
+  module Parsers
+    include Helpers::URL
     using AIPP::Refinements
     using AIXM::Refinements
 
     TYPES = {
-      'D' => :D,
-      'P' => :P,
-      'R' => :R,
-      'ZIT' => :P
+      'D' => 'D',
+      'P' => 'P',
+      'R' => 'R',
+      'ZIT' => 'P'
     }.freeze
 
     BORDERS = {
@@ -19,18 +20,10 @@ module AIPP
       'franco-belge' => 'BELGIUM_FRANCE'
     }.freeze
 
-    def url
-      "https://www.sia.aviation-civile.gouv.fr/dvd/eAIP_%s/FRANCE/AIRAC-%s/html/eAIP/FR-%s-fr-FR.html" % [
-        aixm.effective_at.strftime('%d_%^b_%Y'),   # 04_JAN_2018
-        aixm.effective_at.to_date.xmlschema,       # 2018-01-04
-        @aip                                       # ENR-5.1
-      ]
-    end
-
     def convert!
       html.css('tbody:has(tr[id^=mid])').each do |tbody|
         airspace = nil
-        tbody.css('tr').each_with_index do |tr, index|
+        tbody.css('tr').to_enum.with_index(1).each do |tr, index|
           if tr.attr(:class) =~ /keep-with-next-row/
             airspace = airspace_from tr
           else
@@ -42,9 +35,9 @@ module AIPP
               airspace.remarks = remarks_from(tds[2], tds[3], tds[4])
               fail "airspace `#{airspace.name}' is not complete" unless airspace.complete?
               aixm.features << airspace
-              break if index / 2 > @limit
+              break if index / 2 >= @limit
             rescue => exception
-              warn("WARNING: error parsing airspace `#{airspace.name}': #{exception.message}", binding)
+              warn("WARNING: error parsing airspace `#{airspace.name}' at ##{index}: #{exception.message}", binding)
             end
           end
         end
@@ -135,6 +128,5 @@ module AIPP
         end
       end.join("\n\n")
     end
-
   end
 end

data/lib/aipp/parsers/LF/helpers/url.rb

@@ -0,0 +1,15 @@
+module AIPP
+  module Helpers
+    module URL
+
+      def url
+        "https://www.sia.aviation-civile.gouv.fr/dvd/eAIP_%s/FRANCE/AIRAC-%s/html/eAIP/FR-%s-fr-FR.html" % [
+          aixm.effective_at.strftime('%d_%^b_%Y'),   # 04_JAN_2018
+          aixm.effective_at.to_date.xmlschema,       # 2018-01-04
+          @aip                                       # ENR-5.1
+        ]
+      end
+
+    end
+  end
+end

data/lib/aipp/version.rb

@@ -1,3 +1,3 @@
 module AIPP
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aipp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Sven Schwyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ dependencies:
         version: '0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +206,10 @@ files:
 - lib/aipp.rb
 - lib/aipp/airac.rb
 - lib/aipp/loader.rb
-- lib/aipp/parser/LF/ENR-5.1.rb
+- lib/aipp/parsers/LF/ENR-4.1.rb
+- lib/aipp/parsers/LF/ENR-4.3.rb
+- lib/aipp/parsers/LF/ENR-5.1.rb
+- lib/aipp/parsers/LF/helpers/url.rb
 - lib/aipp/refinements.rb
 - lib/aipp/version.rb
 - spec/lib/aipp/airac_spec.rb