aipp 0.2.4 → 0.2.5

data/lib/aipp/regions/LF/AD-1.3.rb

@@ -4,7 +4,7 @@ module AIPP
     # Aerodromes
     class AD13 < AIP
 
-      include AIPP::LF::Helpers::Common
+      include AIPP::LF::Helpers::Base
 
       DEPENDS = %w(AD-2)
 
@@ -25,7 +25,13 @@ module AIPP
         "SAINT CYR LA CAMPAGNE" => 'LF9013',
         "SEPTFONDS" => 'LF9014',
         "TALMONT VENDEE AIR PARK" => 'LF9015'
-      }
+      }.freeze
+
+      PURPOSES = {
+        "s" => :scheduled,
+        "ns" => :not_scheduled,
+        "p" =>  :private
+      }.freeze
 
       def parse
         ad2_exists = false
@@ -76,15 +82,23 @@ module AIPP
           when /usa.+restr|priv/ then :reservation_required
         end
         @airport.add_usage_limitation(limitation) do |l|
-          l.add_condition do |c|
-            c.realm = :military if raw_limitation.match?(/milit/)
-            c.origin = :national if raw_conditions.include?('ntl')
-            c.origin = :international if raw_conditions.include?('intl')
-            c.rule = :ifr if raw_conditions.include?('ifr')
-            c.rule = :vfr if raw_conditions.include?('vfr')
-            c.purpose = :scheduled if raw_conditions.include?('s')
-            c.purpose = :not_scheduled if raw_conditions.include?('ns')
-            c.purpose = :private if raw_conditions.include?('p')
+          (%w(s ns p) & raw_conditions).each do |raw_purpose|
+            l.add_condition do |c|
+              c.realm = raw_limitation.match?(/milit/) ? :military : :civilian
+              if (%w(intl ntl) - raw_conditions).empty?
+                c.origin = :any
+              else
+                c.origin = :national if raw_conditions.include?('ntl')
+                c.origin = :international if raw_conditions.include?('intl')
+              end
+              if (%w(ifr vfr) - raw_conditions).empty?
+                c.rule = :ifr_and_vfr
+              else
+                c.rule = :ifr if raw_conditions.include?('ifr')
+                c.rule = :vfr if raw_conditions.include?('vfr')
+              end
+              c.purpose = PURPOSES[raw_purpose]
+            end
           end
           l.remarks = "Usage restreint (voir VAC) / restricted use (see VAC)" if raw_limitation.match?(/usa.+restr/)
           l.remarks = "Propriété privée / privately owned" if raw_limitation.match?(/priv/)
@@ -99,7 +113,7 @@ module AIPP
           @runway = runway   # TODO: needed for now for surface composition patches to work
           runway.length = AIXM.d(tds[1].css('span[id$="VAL_LEN"]').text.to_i, :m)
           runway.width = AIXM.d(tds[1].css('span[id$="VAL_WID"]').text.to_i, :m)
-          unless (text = tds[1].css('span[id*="SURFACE"]').text).blank?
+          unless (text = tds[1].css('span[id*="SURFACE"]').text.compact).blank?
             surface = SURFACES.metch(text)
             runway.surface.composition = surface[:composition]
             runway.surface.preparation = surface[:preparation]
@@ -109,7 +123,7 @@ module AIPP
           values = tds[2].text.remove('°').strip.split
           runway.forth.geographic_orientation = AIXM.a(values.first.to_i)
           runway.back.geographic_orientation = AIXM.a(values.last.to_i)
-          parts = tds[3].text.strip.split(/\n\s+\n\s+/)
+          parts = tds[3].text.strip.split(/\n\s+\n\s+/, 2)
           runway.forth.xy = (xy_from(parts[0]) unless parts[0].blank?)
           runway.back.xy = (xy_from(parts[1]) unless parts[1].blank?)
           values = tds[4].text.strip.split

data/lib/aipp/regions/LF/AD-1.6.rb

@@ -4,8 +4,8 @@ module AIPP
     # Aerodromes radiocommunication facilities (VFR only)
     class AD16 < AIP
 
-      include AIPP::LF::Helpers::Common
-      include AIPP::LF::Helpers::ADRadio
+      include AIPP::LF::Helpers::Base
+      include AIPP::LF::Helpers::RadioAD
 
       DEPENDS = %w(AD-1.3)
 

data/lib/aipp/regions/LF/AD-2.rb

@@ -4,8 +4,9 @@ module AIPP
     # Airports (IFR capable) and their CTR, AD navigational aids etc
     class AD2 < AIP
 
-      include AIPP::LF::Helpers::Common
-      include AIPP::LF::Helpers::ADRadio
+      include AIPP::LF::Helpers::Base
+      include AIPP::LF::Helpers::NavigationalAid
+      include AIPP::LF::Helpers::RadioAD
       using AIXM::Refinements
 
       # Map source types to type and optional local type
@@ -21,7 +22,7 @@ module AIPP
 
       # Airports without VFR reporting points
       # TODO: designated points on map but no list (LFLD LFSN LFBS) or no AD info (LFRL)
-      NO_DESIGNATED_POINTS = %w(LFAB LFAC LFAV LFAY LFBK LFBN LFBX LFCC LFCI LFCK LFCY LFDH LFDJ LFDN LFEC LFEY LFGA LFHP LFHV LFHY LFJR LFJY LFLA LFLH LFLO LFLV LFLW LFMQ LFMQ LFNB LFOH LFOQ LFOU LFOV LFOZ LFPO LFQA LFQB LFQG LFQM LFRC LFRI LFRM LFRT LFRU LFSD LFSG LFSM LFLD LFSN LFBS LFRL).freeze
+      NO_DESIGNATED_POINTS = %w(LFAB LFAC LFAV LFAY LFBK LFBN LFBX LFCC LFCI LFCK LFCY LFDH LFDJ LFDN LFEC LFFK LFEV LFEY LFGA LFHP LFHV LFHY LFJR LFJY LFLA LFLH LFLO LFLV LFLW LFMQ LFMQ LFNB LFOH LFOQ LFOU LFOV LFOZ LFPO LFQA LFQB LFQG LFQM LFRC LFRI LFRM LFRT LFRU LFSD LFSG LFSM LFLD LFSN LFBS LFRL).freeze
 
       # Map synonyms for +correlate+
       SYNONYMS = [
@@ -68,8 +69,8 @@ module AIPP
             trs = html.css('div[id*="-AD-2\.18"] tbody tr')
             addresses_from(trs).each { |a| @airport.add_address(a) }
             units_from(trs).each(&method(:add))
-            # Landing aids
-            # TODO: LOC/GP/DME as of section 2.19
+            # Navigational aids
+            navigational_aids_from(html.css('div[id*="-AD-2\.19"] tbody')).each(&method(:add))
             # Designated points
             unless NO_VAC.include?(@id) || NO_DESIGNATED_POINTS.include?(@id)
               pdf = read("VAC-#{@id}")
@@ -121,7 +122,7 @@ module AIPP
                   length, width = tr.css('td:nth-of-type(3)').text.strip.split('x')
                   runway.length = AIXM.d(length.strip.to_i, :m)
                   runway.width = AIXM.d(width.strip.to_i, :m)
-                  unless (text = tr.css('td:nth-of-type(5)').text.strip.split(%r<\W+/\W+>).first).blank?
+                  unless (text = tr.css('td:nth-of-type(5)').text.strip.split(%r<\W+/\W+>).first.compact).blank?
                     surface = SURFACES.metch(text)
                     runway.surface.composition = surface[:composition]
                     runway.surface.preparation = surface[:preparation]
@@ -204,6 +205,28 @@ module AIPP
         end
       end
 
+      def navigational_aids_from(tbody)
+        tbody.css('tr').to_enum.with_object([]) do |tr, array|
+          tds = tr.css('td')
+          array << navigational_aid_from(
+            {
+              name: OpenStruct.new(text: @airport.name),   # simulate td
+              type: tds[0],
+              id: tds[1],
+              f: tds[2],
+              schedule: tds[3],
+              xy: tds[4],
+              z: tds[5]
+            },
+            source: source(position: tr.line),
+            sections: {
+              range: tds[6],
+              situation: tds[8]
+            }
+          )
+        end.compact
+      end
+
       def designated_points_from(pdf, recursive=false)
         from = (pdf.text =~ /^(.*?coordinates.*?names?)/i)
         return [] if recursive && !from
@@ -304,6 +327,7 @@ module AIPP
       end
 
       patch AIXM::Feature::NavigationalAid, :remarks do |parser, object, value|
+        throw :abort unless object.is_a? AIXM::Feature::NavigationalAid::DesignatedPoint
         airport_id, designated_point_id = object.airport.id, object.id
         parser.fixture.dig('designated_points', airport_id, designated_point_id, 'remarks') || throw(:abort)
       end

data/lib/aipp/regions/LF/AD-3.1.rb

@@ -4,7 +4,7 @@ module AIPP
     # Helipads
     class AD31 < AIP
 
-      include AIPP::LF::Helpers::Common
+      include AIPP::LF::Helpers::Base
       using AIXM::Refinements
 
       DEPENDS = %w(AD-2)
@@ -52,7 +52,7 @@ module AIPP
               end
             end
             # FATOs and helipads
-            text = trs[2].css('span[id*="ADHP.REVETEMENT"]').text.remove(/tlof\s*|\s*\(.*?\)/i).downcase
+            text = trs[2].css('span[id*="ADHP.REVETEMENT"]').text.remove(/tlof\s*|\s*\(.*?\)/i).downcase.compact
             surface = text.blank? ? {} : SURFACES.metch(text)
             lighting = lighting_from(trs[1].css('span[id*="ADHP.BALISAGE"]').text.cleanup)
             fatos_from(trs[1].css('span[id*="ADHP.DIM_FATO"]').text).each { |f| @airport.add_fato f }

data/lib/aipp/regions/LF/ENR-2.1.rb

@@ -4,7 +4,7 @@ module AIPP
     # FIR, TMA etc
     class ENR21 < AIP
 
-      include AIPP::LF::Helpers::Common
+      include AIPP::LF::Helpers::Base
 
       # Map source types to type and optional local type
       SOURCE_TYPES = {

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

@@ -4,94 +4,36 @@ module AIPP
     # ENR Navaids
     class ENR41 < AIP
 
-      include AIPP::LF::Helpers::Common
+      include AIPP::LF::Helpers::Base
+      include AIPP::LF::Helpers::NavigationalAid
 
       def parse
         prepare(html: read).css('tbody').each do |tbody|
           tbody.css('tr').to_enum.with_index(1).each do |tr, index|
             tds = tr.css('td')
-            master, slave = tds[1].text.strip.gsub(/[^\w-]/, '').downcase.split('-')
-            navaid = AIXM.send(master, base_from(tds).merge(send("#{master}_from", tds)))
-            navaid.source = source(position: tr.line)
-            navaid.timetable = timetable_from! tds[4].text
-            navaid.remarks = remarks_from(tds[5], tds[7], tds[9])
-            navaid.send("associate_#{slave}", channel: channel_from(tds[3].text)) if slave
-            add navaid
+            navigational_aid = navigational_aid_from(
+              {
+                name: tds[0],
+                type: tds[1],
+                id: tds[2],
+                f: tds[3],
+                schedule: tds[4],
+                xy: tds[5],
+                z: tds[6]
+              },
+              source: source(position: tr.line),
+              sections: {
+                range: tds[5].css('span[id*="PORTEE"], span[id*="COUVERTURE"]'),
+                situation: tds[7],
+                observations: tds[9]
+              }
+            )
+            add navigational_aid if navigational_aid
           rescue => error
             warn("error parsing navigational aid at ##{index}: #{error.message}", pry: error)
           end
         end
       end
-
-      private
-
-      def base_from(tds)
-        {
-          organisation: organisation_lf,
-          id: tds[2].text.strip,
-          name: tds[0].text.strip,
-          xy: xy_from(tds[5].text),
-          z: z_from(tds[6].text)
-        }
-      end
-
-      def vor_from(tds)
-        {
-          type: :conventional,
-          f: f_from(tds[3].text),
-          north: :magnetic,
-        }
-      end
-
-      def dme_from(tds)
-        {
-          channel: channel_from(tds[3].text)
-        }
-      end
-
-      def ndb_from(tds)
-        {
-          type: :en_route,
-          f: f_from(tds[3].text)
-        }
-      end
-
-      def tacan_from(tds)
-        {
-          channel: channel_from(tds[3].text)
-        }
-      end
-
-      def z_from(text)
-        parts = text.strip.split(/\s+/)
-        AIXM.z(parts[0].to_i, :qnh) if parts[1] == 'ft'
-      end
-
-      def f_from(text)
-        parts = text.strip.split(/\s+/)
-        AIXM.f(parts[0].to_f, parts[1]) if parts[1] =~ /hz$/i
-      end
-
-      def channel_from(text)
-        parts = text.strip.split(/\s+/)
-        parts.last if parts[-2].downcase == 'ch'
-      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
 end

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

@@ -4,7 +4,7 @@ module AIPP
     # Designated Points
     class ENR43 < AIP
 
-      include AIPP::LF::Helpers::Common
+      include AIPP::LF::Helpers::Base
 
       def parse
         prepare(html: read).css('tbody').each do |tbody|

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

@@ -4,7 +4,17 @@ module AIPP
     # D/P/R Zones
     class ENR51 < AIP
 
-      include AIPP::LF::Helpers::Common
+      include AIPP::LF::Helpers::Base
+
+      # Map sections to whether to parse them
+      SECTIONS = {
+        '5.1-1':   true,
+        '5.1-2':   false,
+        '5.1-3':   true,
+        '5.1-4':   true,
+        '5.1-5-1': false,
+        '5.1-5-2': true
+      }
 
       # Map source types to type and optional local type
       SOURCE_TYPES = {
@@ -15,28 +25,37 @@ module AIPP
       }.freeze
 
       def parse
-        prepare(html: read).css('tbody:has(tr[id^=mid])').each do |tbody|
-          airspace = nil
-          tbody.css('tr').to_enum.with_index(1).each do |tr, index|
-            tds = tr.css('td')
-            case
-            when tr.attr(:id).match?(/TXT_NAME/)   # airspace
-              airspace = airspace_from tr
-            when tds.count == 1   # big comment on separate row
-              airspace.layers.first.remarks.
-                concat("\n", tds.text.cleanup).
-                remove!(/\((\d)\)\s*\(\1\)\W*/)
-            else   # layer
-              begin
-                tds = tr.css('td')
-                airspace.geometry = geometry_from tds[0].text
-                fail("geometry is not closed") unless airspace.geometry.closed?
-                airspace.layers << layer_from(tds[1].text)
-                airspace.layers.first.timetable = timetable_from! tds[2].text
-                airspace.layers.first.remarks = remarks_from(tds[2], tds[3], tds[4])
-                add airspace
-              rescue => error
-                warn("error parsing airspace `#{airspace.name}' at ##{index}: #{error.message}", pry: error)
+        skip = false
+        prepare(html: read).css('h4, thead ~ tbody').each do |tag|
+          case tag.name
+          when 'h4'
+            section = tag.text.match(/^ENR ([\d.-]+)/).captures.first
+            skip = !SECTIONS.fetch(section.to_sym)
+            verbose_info "#{skip ? :Skipping : :Parsing} section #{section}"
+          when 'tbody'
+            next if skip
+            airspace = nil
+            tag.css('tr').to_enum.with_index(1).each do |tr, index|
+              tds = tr.css('td')
+              case
+              when tr.attr(:id).match?(/TXT_NAME/)   # airspace
+                airspace = airspace_from tr
+              when tds.count == 1   # big comment on separate row
+                airspace.layers.first.remarks.
+                  concat("\n", tds.text.cleanup).
+                  remove!(/\((\d)\)\s*\(\1\)\W*/)
+              else   # layer
+                begin
+                  tds = tr.css('td')
+                  airspace.geometry = geometry_from tds[0].text
+                  fail("geometry is not closed") unless airspace.geometry.closed?
+                  airspace.layers << layer_from(tds[1].text)
+                  airspace.layers.first.timetable = timetable_from! tds[2].text
+                  airspace.layers.first.remarks = remarks_from(tds[2], tds[3], tds[4])
+                  add airspace
+                rescue => error
+                  warn("error parsing airspace `#{airspace.name}' at ##{index}: #{error.message}", pry: error)
+                end
               end
             end
           end
@@ -46,11 +65,10 @@ module AIPP
       private
 
       def airspace_from(tr)
-        spans = tr.css('span:not([class*=strong])')
-        source_type = spans[1].text.blank_to_nil
+        region, source_type, name = tr.text.cleanup.gsub(/\s/, ' ').split(nil, 3)
         fail "unknown type `#{source_type}'" unless SOURCE_TYPES.has_key? source_type
         AIXM.airspace(
-          name: spans.map { |s| s.text.strip.blank_to_nil }.compact.join(' '),
+          name: [region, source_type, name].join(' '),
           type: SOURCE_TYPES.dig(source_type, :type),
           local_type: SOURCE_TYPES.dig(source_type, :local_type)
         ).tap do |airspace|

data/lib/aipp/regions/LF/ENR-5.5.rb

@@ -4,7 +4,7 @@ module AIPP
     # Sporting and Recreational Activities
     class ENR55 < AIP
 
-      include AIPP::LF::Helpers::Common
+      include AIPP::LF::Helpers::Base
 
       # Map raw activities to activity and airspace type
       ACTIVITIES = {

data/lib/aipp/regions/LF/helpers/{common.rb → base.rb}

@@ -1,7 +1,7 @@
 module AIPP
   module LF
     module Helpers
-      module Common
+      module Base
 
         using AIXM::Refinements
 
@@ -39,7 +39,7 @@ module AIPP
           'macadam' => { composition: :macadam },
           /^bitume ?(traité|psp)?$/ =>  { composition: :bitumen },
           'ciment' => { composition: :concrete, preparation: :paved },
-          /^b[eé]ton ?(armé|bitume|bitumineux)?$/ => { composition: :concrete, preparation: :paved },
+          /^b[eéè]ton ?(armé|bitume|bitumineux)?$/ => { composition: :concrete, preparation: :paved },
           /^béton( de)? ciment$/ => { composition: :concrete, preparation: :paved },
           'béton herbe' => { composition: :concrete_and_grass },
           'béton avec résine' => { composition: :concrete, preparation: :paved, remarks: 'Avec résine / with resin' },

data/lib/aipp/regions/LF/helpers/navigational_aid.rb

@@ -0,0 +1,104 @@
+module AIPP
+  module LF
+    module Helpers
+      module NavigationalAid
+
+        def navigational_aid_from(tds, source:, sections:)
+          NavigationalAid.new(tds, source: source, sections: sections).build
+        end
+
+        class NavigationalAid
+          include AIPP::LF::Helpers::Base
+
+          # Map atypical navigational aid denominations
+          NAVIGATIONAL_AIDS = {
+            'vor' => 'vor',
+            'dme' => 'dme',
+            'ndb' => 'ndb',
+            'tacan' => 'tacan',
+            'l' => 'ndb'   # L denominates a NDB of class locator
+          }.freeze
+
+          def initialize(tds, source:, sections:)
+            @tds, @source, @sections = tds, source, sections
+          end
+
+          def build
+            master, slave = @tds[:type].text.strip.gsub(/[^\w-]/, '').downcase.split('-')
+            master = NAVIGATIONAL_AIDS.fetch(master, master)
+            slave = NAVIGATIONAL_AIDS.fetch(slave, slave)
+            return nil unless NAVIGATIONAL_AIDS.keys.include? master
+            AIXM.send(master, common.merge(send(master))).tap do |navigational_aid|
+              navigational_aid.source = @source
+              navigational_aid.remarks = remarks
+              navigational_aid.timetable = timetable_from!(@tds[:schedule].text)
+              navigational_aid.send("associate_#{slave}", channel: channel_from(@tds[:f].text)) if slave
+            end
+          end
+
+          private
+
+          def common
+            {
+              organisation: organisation_lf,
+              id: @tds[:id].text.strip,
+              name: @tds[:name].text.strip,
+              xy: xy_from(@tds[:xy].text),
+              z: z_from(@tds[:z].text)
+            }
+          end
+
+          def vor
+            {
+              type: :conventional,
+              f: f_from(@tds[:f].text),
+              north: :magnetic,
+            }
+          end
+
+          def dme
+            {
+              channel: channel_from(@tds[:f].text)
+            }
+          end
+
+          def ndb
+            {
+              type: @tds[:type].text.strip == 'L' ? :locator : :en_route,
+              f: f_from(@tds[:f].text)
+            }
+          end
+
+          def tacan
+            {
+              channel: channel_from(@tds[:f].text)
+            }
+          end
+
+          def remarks
+            @sections.map do |section, td|
+              if text = td.text.strip.blank_to_nil
+                "**#{section.upcase}**\n#{text}"
+              end
+            end.compact.join("\n\n").blank_to_nil
+          end
+
+          def z_from(text)
+            parts = text.strip.split(/\s+/)
+            AIXM.z(parts[0].to_i, :qnh) if parts[1] == 'ft'
+          end
+
+          def f_from(text)
+            parts = text.strip.split(/\s+/)
+            AIXM.f(parts[0].to_f, parts[1]) if parts[1] =~ /hz$/i
+          end
+
+          def channel_from(text)
+            parts = text.strip.split(/\s+/)
+            parts.last if parts[-2].downcase == 'ch'
+          end
+        end
+      end
+    end
+  end
+end