aipp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0897562e048a1f5eae251b19e4059ce16a319761acff603a0679e8688aad8a7a'
-  data.tar.gz: d83c038edceaab6eb9d996eba589e3aa277e702be8974d80a22c7f45b0e7f8bf
+  metadata.gz: 6ce24174fda71fe6649f2d1f02eab03a2d9de0a59da6dbb581d581fe2dc2df4c
+  data.tar.gz: 7643f1ec9c399e244ddbc13ef9a3a5df31eaf63e78c197a55c55838a0536d8ad
 SHA512:
-  metadata.gz: a1df374cfd53eaa0a5d767018996b6b62df24b7641d0755346b01c7846b4eaa40c307d777c684663335676f6003db0313e84d2ff379c74b2e0503cee5a4600e9
-  data.tar.gz: a3cb46a7fb3d6e43ff1f030fdd361b0a764eea73431e9880a896aae87fc101d3f91d45e084940797633f2e5f5eb6fe27c9771f1c9e14931df40e8a2c4194fe28
+  metadata.gz: d4029172c77e70998f89c10eb19c6bb827d042fd7a9c9190538bb422e319c0387c85534de28e8d0357b0c676f99e7a222479419bbc34d00cc34ca3c918636987
+  data.tar.gz: 3a294be41d8eb5067dc286b60ed304db554607694e094b7fa92a114ce9bac663261ba4246d45d4da133b753689535f2a708d09dd47dc06204dd5f86c5dd982f6

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.1.3
+
+* Additons:
+  LF/AD-1.5
+* Minor changes:
+  * Summary at end of run
+
 ## 0.1.2
 
 * Additions:

data/README.md

@@ -31,7 +31,7 @@ aip2aixm --help
 
 ## Parsers
 
-Parsers are defined as modules and named +lib/aipp/parser/{FIR}/{AIP}.rb+. For
+Parsers are defined as modules and named <tt>lib/aipp/parser/{FIR}/{AIP}.rb</tt>. For
 them to plug in, you have to define the following public methods:
 
 * `url`<br>Must return the download URL of the AIP HTML as a string.
@@ -53,6 +53,11 @@ You should `fail` on fatal and `warn` on non-fatal problems. If `$DEBUG` is
 warn("my message", binding)
 ```
 
+## Helpers
+
+Any modules in <tt>lib/aipp/parser/{FIR}/helpers</tt> are required automatically and
+can be included and used in the parsers.
+
 ## AIRAC date calculations
 
 ```ruby

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.2'
+  spec.add_runtime_dependency 'aixm', '~> 0', '>= 0.2.3'
   spec.add_runtime_dependency 'nokogiri', '~> 1'
   spec.add_runtime_dependency 'nokogumbo', '~> 1'
   spec.add_runtime_dependency 'pry', '~> 0'

data/exe/aip2aixm

@@ -20,7 +20,7 @@ class Executable
     @verbose = false
     OptionParser.new do |o|
       o.banner = <<~END
-        Download online AIP and convert it to AIXM.
+        Download online AIP and convert it to AIXM for VFR.
         Usage: #{File.basename($0)} [options]
       END
       o.on('-A', '--about', 'author and license information') { puts 'Written by Sven Schwyn (bitcetera.com) and distributed under MIT license.'; exit }
@@ -42,8 +42,8 @@ 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_aixm(*extensions)
-    File.write(Pathname.new(Dir.pwd).join(filename), aixm)
+    File.write(Pathname.new(Dir.pwd).join(filename), loader.aixm.to_aixm(*extensions))
+    puts "#{loader.aixm.features.count} feature(s) written to #{filename}"
   end
 end
 

data/lib/aipp/parsers/LF/AD-1.5.rb

@@ -0,0 +1,128 @@
+module AIPP
+  module Parsers
+    include Helpers::URL
+    include Helpers::HTML
+    using AIPP::Refinements
+
+    MASTER_MAP = {
+      'l' => 'ndb'
+    }.freeze
+
+    def convert!
+      cleanup!
+      html.css('tbody').each do |tbody|
+        name = last_id = nil
+        tbody.css('tr').to_enum.with_index(1).each do |tr, index|
+          break if index >= @limit
+          case tr.attr(:id)
+          when /TXT_NAME/
+            index -= 1
+            name = tr.css('td').text.strip.split("\n").first
+          when /GEO_LAT/
+            tds = tr.css('td')
+            type, runway = tds[0].text.strip.gsub(/\s+/, ' ').split(' ', 2)
+            master, slave = type.downcase.split('-')
+            if respond_to?("#{master}_from", true)
+              id = tds[1].text.strip.blank_to_nil || last_id
+              navaid = AIXM.send(
+                (MASTER_MAP[master] || master),
+                { id: id, name: [name, runway].compact.join(' ') }.
+                  merge(base_from(tds)).
+                  merge(send("#{master}_from", tds))
+              )
+              navaid.schedule = schedule_from(tds[3])
+              navaid.remarks = remarks_from(tds[6], tds[7], tds[8])
+              navaid.send("associate_#{slave}", channel: channel_from(tds[2])) if slave
+              aixm.features << navaid
+              last_id = id
+            else
+              warn("WARNING: navigational aid `#{master}' at ##{index} skipped: not relevant to VFR")
+            end
+          end
+        rescue => exception
+          warn("WARNING: error parsing navigational aid at ##{index}: #{exception.message}", binding)
+        end
+      end
+      true
+    end
+
+    private
+
+    def base_from(tds)
+      {
+        xy: xy_from(tds[4]),
+        z: z_from(tds[5])
+      }
+    end
+
+    def vor_from(tds)
+      {
+        type: :conventional,
+        f: frequency_from(tds[2]),
+        north: :geographic,
+      }
+    end
+
+    def dme_from(tds)
+      {
+        channel: channel_from(tds[2])
+      }
+    end
+
+    def ndb_from(tds)
+      {
+        type: :en_route,
+        f: frequency_from(tds[2])
+      }
+    end
+
+    def l_from(tds)
+      {
+        type: :locator,
+        f: frequency_from(tds[2])
+      }
+    end
+
+    def tacan_from(tds)
+      {
+        channel: channel_from(tds[2])
+      }
+    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 = ['COVERAGE', 'RDH (SLOPE)', 'LOCATION']
+      [].tap do |remarks|
+        parts.each.with_index do |part, index|
+          if part = part.text.gsub(/ +/, ' ').strip.blank_to_nil
+            remarks << "#{part_titles[index]}:\n#{part}"
+          end
+        end
+      end.join("\n\n").blank_to_nil
+    end
+  end
+end

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

@@ -1,14 +1,16 @@
 module AIPP
   module Parsers
     include Helpers::URL
+    include Helpers::HTML
     using AIPP::Refinements
 
     def convert!
+      cleanup!
       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('-')
+          master, slave = tds[1].text.strip.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])
@@ -34,7 +36,7 @@ module AIPP
 
     def vor_from(tds)
       {
-        type: :vor,
+        type: :conventional,
         f: frequency_from(tds[3]),
         north: :geographic,
       }
@@ -48,6 +50,7 @@ module AIPP
 
     def ndb_from(tds)
       {
+        type: :en_route,
         f: frequency_from(tds[3])
       }
     end

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

@@ -1,9 +1,10 @@
 module AIPP
   module Parsers
     include Helpers::URL
-#   using AIPP::Refinements
+    include Helpers::HTML
 
     def convert!
+      cleanup!
       html.css('tbody').each do |tbody|
         tbody.css('tr').to_enum.with_index(1).each do |tr, index|
           break if index >= @limit

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

@@ -1,6 +1,7 @@
 module AIPP
   module Parsers
     include Helpers::URL
+    include Helpers::HTML
     using AIPP::Refinements
     using AIXM::Refinements
 
@@ -21,6 +22,7 @@ module AIPP
     }.freeze
 
     def convert!
+      cleanup!
       html.css('tbody:has(tr[id^=mid])').each do |tbody|
         airspace = nil
         tbody.css('tr').to_enum.with_index(1).each do |tr, index|
@@ -126,7 +128,7 @@ module AIPP
             end
           end
         end
-      end.join("\n\n")
+      end.join("\n\n").blank_to_nil
     end
   end
 end

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

@@ -0,0 +1,11 @@
+module AIPP
+  module Helpers
+    module HTML
+
+      def cleanup!
+        html.css('del').each { |n| n.remove }   # remove deleted entries
+      end
+
+    end
+  end
+end

data/lib/aipp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aipp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sven Schwyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2018-01-29 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.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ dependencies:
         version: '0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -206,9 +206,11 @@ files:
 - lib/aipp.rb
 - lib/aipp/airac.rb
 - lib/aipp/loader.rb
+- lib/aipp/parsers/LF/AD-1.5.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/html.rb
 - lib/aipp/parsers/LF/helpers/url.rb
 - lib/aipp/refinements.rb
 - lib/aipp/version.rb