aipp 0.2.5 → 0.2.6

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

@@ -15,13 +15,15 @@ module AIPP
       }
 
       def parse
-        prepare(html: read).css('tbody').first do |tbody|
-          tbody.css('tr').group_by_chunks { |e| e.attr(:id).match?(/-TXT_NAME-/) }.each do |tr, trs|
+        document = prepare(html: read)
+        document.css('tbody').each do |tbody|
+          tbody.css('tr').group_by_chunks { _1.attr(:id).match?(/-TXT_NAME-/) }.each do |tr, trs|
+            trs = Nokogiri::XML::NodeSet.new(document, trs)   # convert array to node set
             id = tr.css('span[id*="CODE_ICAO"]').text.cleanup
             next unless id = ID_FIXES.fetch(id, id)
-            @airport = select(:airport, id: id).first
-            addresses_from(trs).each { |a| @airport.add_address(a) }
-            units_from(trs).each(&method(:add))
+            @airport = find_by(:airport, id: id).first
+            addresses_from(trs).each { @airport.add_address(_1) }
+            units_from(trs, airport: @airport).each(&method(:add))
           end
         end
       end

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

@@ -50,7 +50,7 @@ module AIPP
               source: source(position: html.css('tr[id*="CODE_ICAO"]').first.line, aip_file: aip_file),
               organisation: organisation_lf,   # TODO: not yet implemented
               id: @id,
-              name: html.css('tr[id*="CODE_ICAO"] td span:nth-of-type(2)').text.uptrans,
+              name: html.css('tr[id*="CODE_ICAO"] td span:nth-of-type(2)').text.strip.uptrans,
               xy: xy_from(html.css('#AD-2\.2-Position_Geo_Arp td:nth-of-type(3)').text)
             ).tap do |airport|
               airport.z = elevation_from(html.css('#AD-2\.2-Altitude_Reference td:nth-of-type(3)').text)
@@ -58,26 +58,33 @@ module AIPP
   #           airport.transition_z = AIXM.z(5000, :qnh)   # TODO: default - exceptions may exist
               airport.timetable = timetable_from!(html.css('#AD-2\.3-Gestionnaire_AD td:nth-of-type(3)').text)
             end
-            runways_from(html.css('div[id*="-AD-2\.12"] tbody')).each { |r| @airport.add_runway(r) if r }
-            helipads_from(html.css('div[id*="-AD-2\.16"] tbody')).each { |h| @airport.add_helipad(h) if h }
+            runways_from(html.css('div[id*="-AD-2\.12"] tbody')).each { @airport.add_runway(_1) if _1 }
+            helipads_from(html.css('div[id*="-AD-2\.16"] tbody')).each { @airport.add_helipad(_1) if _1 }
             text = html.css('#AD-2\.2-Observations td:nth-of-type(3)').text
             @airport.remarks = ([remarks_from(text)] + @remarks).compact.join("\n\n").blank_to_nil
             add @airport
             # Airspaces
-            airspaces_from(html.css('div[id*="-AD-2\.17"] tbody')).each(&method(:add))
+            airspaces_from(html.css('div[id*="-AD-2\.17"] tbody')).
+              reject { aixm.features.find_by(_1.class, type: _1.type, id: _1.id).any? }.
+              each(&method(:add))
             # Radio
             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))
+            addresses_from(trs).each { @airport.add_address(_1) }
+            units_from(trs, airport: @airport).each(&method(:add))
             # Navigational aids
-            navigational_aids_from(html.css('div[id*="-AD-2\.19"] tbody')).each(&method(:add))
+            navigational_aids_from(html.css('div[id*="-AD-2\.19"] tbody')).
+              reject { aixm.features.find_by(_1.class, id: _1.id, xy: _1.xy).any? }.
+              each(&method(:add))
             # Designated points
             unless NO_VAC.include?(@id) || NO_DESIGNATED_POINTS.include?(@id)
               pdf = read("VAC-#{@id}")
               designated_points_from(pdf).tap do |designated_points|
                 fix_designated_point_remarks(designated_points)
 #               debug(designated_points)
-                designated_points.each(&method(:add))
+                designated_points.
+                  uniq(&:to_uid).
+                  reject { aixm.features.find_by(_1.class, id: _1.id, xy: _1.xy).any? }.
+                  each(&method(:add))
               end
             end
           rescue => error
@@ -184,7 +191,7 @@ module AIPP
             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[2].text, tds[1].text.strip)
+            airspace.add_layer layer_from(tds[2].text, tds[1].text.strip)
             airspace.layers.first.timetable = timetable_from! tds[4].text
             airspace.layers.first.remarks = remarks_from(tds[4].text)
             array << airspace

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

@@ -26,7 +26,7 @@ module AIPP
         prepare(html: read).css('tbody').each do |tbody|
           tbody.css('tr').to_enum.each_slice(3).with_index(1) do |trs, index|
             name = trs[0].css('span[id*="ADHP.TXT_NAME"]').text.cleanup.remove(/[^\w' ]/)
-            if select(:airport, name: name).any?
+            if find_by(:airport, name: name).any?
               verbose_info "Skipping #{name} in favor of AD-2"
               next
             end
@@ -42,12 +42,12 @@ module AIPP
             end
             # Usage restrictions
             if trs[0].css('span[id*="ADHP.STATUT"]').text.match?(/usage\s+restreint/i)
-              @airport.add_usage_limitation(:reservation_required) do |reservation_required|
+              @airport.add_usage_limitation(type: :reservation_required) do |reservation_required|
                 reservation_required.remarks = "Usage restreint / restricted use"
               end
             end
             if trs[0].css('span[id*="ADHP.STATUT"]').text.match?(/r.serv.\s+aux\s+administrations/i)
-              @airport.add_usage_limitation(:other) do |other|
+              @airport.add_usage_limitation(type: :other) do |other|
                 other.remarks = "Réservé aux administrations de l'État / reserved for State administrations"
               end
             end
@@ -55,7 +55,7 @@ module AIPP
             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 }
+            fatos_from(trs[1].css('span[id*="ADHP.DIM_FATO"]').text).each { @airport.add_fato(_1) }
             helipads_from(trs[1].css('span[id*="ADHP.DIM_TLOF"]').text).each do |helipad|
               helipad.surface.composition = surface[:composition]
               helipad.surface.preparation = surface[:preparation]
@@ -69,7 +69,7 @@ module AIPP
             splitted = operator.text.split(/( (?<!\p{L})t[ée]l | fax | standard | [\d\s]{10,} | \.\s | \( )/ix, 2)
             @airport.operator = splitted[0].full_strip.truncate(60, omission: '…').blank_to_nil
             raw_addresses = splitted[1..].join.cleanup.full_strip
-            addresses_from(splitted[1..].join, source(position: operator.first.line)).each { |a| @airport.add_address(a) }
+            addresses_from(splitted[1..].join, source(position: operator.first.line)).each { @airport.add_address(_1) }
             # Remarks
             @airport.remarks = [].tap do |remarks|
               hostility = trs[2].css('span[id*="ADHP.ZONE_HABITEE"]').text.cleanup.downcase.blank_to_nil
@@ -109,7 +109,7 @@ module AIPP
       end
 
       def dimensions_from(text)
-        dims = text.remove(/[^x\d.,]/i).split(/x/i).map { |s| s.to_ff.floor }
+        dims = text.remove(/[^x\d.,]/i).split(/x/i).map { _1.to_ff.floor }
         case dims.size
         when 1
           [dim = AIXM.d(dims[0], :m), dim]

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

@@ -6,6 +6,9 @@ module AIPP
 
       include AIPP::LF::Helpers::Base
 
+      # Airspaces to be ignored
+      NAME_BLACKLIST_RE = /deleg/i.freeze
+
       # Map source types to type and optional local type
       SOURCE_TYPES = {
         'FIR' => { type: 'FIR' },
@@ -26,12 +29,24 @@ module AIPP
         'FIR REIMS' => 'LFRR'
       }.freeze
 
+      # Fix incomplete SIV service columns
+      SERVICE_FIXES = {
+        "IROISE INFO 135.825 / 119.575 (1)" => "APP IROISE\nIROISE INFO 135.825 / 119.575 (1)",
+        "APP TOULOUSE\nTOULOUSE INFO" => "APP TOULOUSE\nTOULOUSE INFO 121.250"
+      }.freeze
+
       def parse
         prepare(html: read).css('tbody').each do |tbody|
           airspace = nil
           tbody.css('tr').to_enum.with_index(1).each do |tr, index|
             if tr.attr(:id).match?(/--TXT_NAME/)
-              add airspace if airspace
+              if airspace
+                if airspace.name.match? NAME_BLACKLIST_RE
+                  verbose_info "Ignoring #{airspace.type} #{airspace.name}" unless airspace.type == :terminal_control_area
+                else
+                  add airspace
+                end
+              end
               airspace = airspace_from tr.css(:td).first
               verbose_info "Parsing #{airspace.type} #{airspace.name}" unless airspace.type == :terminal_control_area
               next
@@ -39,11 +54,18 @@ module AIPP
             begin
               tds = tr.css('td')
               if airspace.type == :terminal_control_area && tds[0].text.blank_to_nil
-                add airspace if airspace.layers.any?
+                if airspace.layers.any?
+                  if airspace.name.match? NAME_BLACKLIST_RE
+                    verbose_info "Ignoring #{airspace.type} #{airspace.name}"
+                  else
+                    add airspace
+                  end
+                end
                 airspace = airspace_from tds[0]
                 verbose_info "Parsing #{airspace.type} #{airspace.name}"
               end
               if airspace
+                remarks = tds[-1].text
                 if tds[0].text.blank_to_nil
                   airspace.geometry = geometry_from tds[0].text
                   fail("geometry is not closed") unless airspace.geometry.closed?
@@ -51,11 +73,12 @@ module AIPP
                 layer = layer_from(tds[-3].text)
                 layer.class = class_from(tds[1].text) if tds.count == 5
                 layer.location_indicator = LOCATION_INDICATORS.fetch("#{airspace.type} #{airspace.name}", nil)
-                # TODO: unit, call sign and frequency from tds[-2] and with extracted remarks such as (1), (2) etc
-                remarks = tds[-1].text
+                if airspace.local_type == 'SIV'   # services parsed for SIV only
+                  layer.add_services services_from(tds[-2], remarks)
+                end
                 layer.timetable = timetable_from! remarks
                 layer.remarks = remarks_from remarks
-                airspace.layers << layer
+                airspace.add_layer layer
               end
             rescue => error
               warn("error parsing #{airspace.type} `#{airspace.name}' at ##{index}: #{error.message}", pry: error)
@@ -68,7 +91,7 @@ module AIPP
       private
 
       def airspace_from(td)
-        spans = td.children.split { |e| e.name == 'br' }.first.css(:span).drop_while { |e| e.text.match? '\s' }
+        spans = td.children.split { _1.name == 'br' }.first.css(:span).drop_while { _1.text.match? '\s' }
         source_type = spans[0].text.blank_to_nil
         fail "unknown type `#{source_type}'" unless SOURCE_TYPES.has_key? source_type
         AIXM.airspace(
@@ -84,6 +107,58 @@ module AIPP
         text.strip
       end
 
+      def services_from(td, remarks)
+        text = td.text.cleanup
+        text = SERVICE_FIXES.fetch(text, text)   # fix incomplete service columns
+        text.gsub!(/(info|app)\s+([\d.]{3,})/i, "\\1\n\\2")   # put frequencies on separate line
+        text.gsub!(/(\d)\s*\/\s*(\d)/, "\\1\n\\2")   # split frequencies onto separate lines
+        units, services = [], []
+        text.split("\n").each do |line|
+          case line
+          when /^(.+(?:info|app))$/i   # service
+            callsign = $1
+            service = AIXM.service(
+# TODO: add source as soon as it is supported by components
+#             source: source(position: td.line),
+              type: :flight_information_service
+            ).tap do |service|
+              service.timetable = AIXM::H24 if remarks.match? /h\s?24/i
+            end
+            services << [service, callsign]
+            units.shift.add_service service
+          when /^(.*?)(\d{3}[.\d]*)(.*)$/   # frequency
+            label, freq, footnote = $1, $2, $3
+            service, callsign = services.last
+            frequency = AIXM.frequency(
+              transmission_f: AIXM.f(freq.to_f, :mhz),
+              callsigns: { en: callsign, fr: callsign }
+            ).tap do |frequency|
+              frequency.type = :standard
+              frequency.timetable = AIXM::H24 if remarks.match? /h\s?24/i
+              frequency.remarks = [
+                (remarks.extract(/#{Regexp.escape(footnote.strip)}\s*([^\n]+)/).join(' / ') unless footnote.empty?),
+                label.strip
+              ].map(&:blank_to_nil).compact.join(' / ').blank_to_nil
+            end
+            service.add_frequency frequency
+          when /.*(?<!info|app|\d{3}|\))$/i   # unit
+            unit = AIXM.unit(
+              source: source(position: td.line),
+              organisation: organisation_lf,   # TODO: not yet implemented
+              name: line,
+              type: :flight_information_centre,
+              class: :icao
+            )
+            units << ((u = find(unit).first) ? (unit = u) : (add unit))
+          else
+            fail("cannot parse `#{text}'")
+          end
+        end
+        services = services.map(&:first)
+        fail("at least one service has no frequency") if services.any? { _1.frequencies.none? }
+        services
+      end
+
       def remarks_from(text)
         text.strip.gsub(/(\s)\s+/, '\1').blank_to_nil
       end

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

@@ -28,7 +28,9 @@ module AIPP
                 observations: tds[9]
               }
             )
-            add navigational_aid if navigational_aid
+            if navigational_aid && aixm.features.find_by(navigational_aid.class, id: navigational_aid.id, xy: navigational_aid.xy).none?
+              add navigational_aid
+            end
           rescue => error
             warn("error parsing navigational aid at ##{index}: #{error.message}", pry: error)
           end

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

@@ -10,13 +10,12 @@ module AIPP
         prepare(html: read).css('tbody').each do |tbody|
           tbody.css('tr').to_enum.with_index(1).each do |tr, index|
             tds = tr.css('td')
-            designated_point = AIXM.designated_point(
+            add AIXM.designated_point(
+              source: source(position: tr.line),
               type: :icao,
               id: tds[0].text.strip,
               xy: xy_from(tds[1].text)
             )
-            designated_point.source = source(position: tr.line)
-            add designated_point
           rescue => error
             warn("error parsing designated point at ##{index}: #{error.message}", pry: error)
           end

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

@@ -24,6 +24,9 @@ module AIPP
         'ZIT' => { type: 'P', local_type: 'ZIT' }
       }.freeze
 
+      # Radius to use for zones consisting of one point only
+      POINT_RADIUS = AIXM.d(1, :km).freeze
+
       def parse
         skip = false
         prepare(html: read).css('h4, thead ~ tbody').each do |tag|
@@ -48,11 +51,21 @@ module AIPP
                 begin
                   tds = tr.css('td')
                   airspace.geometry = geometry_from tds[0].text
+                  if airspace.geometry.point?   # convert point to circle
+                    airspace.geometry = AIXM.geometry(
+                      AIXM.circle(
+                        center_xy: airspace.geometry.segments.first.xy,
+                        radius: POINT_RADIUS
+                      )
+                    )
+                  end
                   fail("geometry is not closed") unless airspace.geometry.closed?
-                  airspace.layers << layer_from(tds[1].text)
+                  airspace.add_layer 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
+                  if aixm.features.find_by(:airspace, type: airspace.type, id: airspace.id).none?
+                    add airspace
+                  end
                 rescue => error
                   warn("error parsing airspace `#{airspace.name}' at ##{index}: #{error.message}", pry: error)
                 end

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

@@ -0,0 +1,90 @@
+module AIPP
+  module LF
+
+    # Obstacles
+    class ENR54 < AIP
+
+      include AIPP::LF::Helpers::Base
+
+      # Obstacles to be ignored
+      NAME_BLACKLIST = %w(51076 52055 59000 72039).freeze   # all duplicates
+
+      # Map type descriptions to AIXM types and remarks
+      TYPES = {
+        'Antenne' => [:antenna],
+        'Bâtiment' => [:building],
+        'Câble' => [:other, 'Cable / Câble'],
+        'Centrale thermique' => [:building, 'Thermal power plant / Centrale thermique'],
+        "Château d'eau" => [:tower, "Water tower / Château d'eau"],
+        'Cheminée' => [:chimney],
+        'Derrick' => [:tower, 'Derrick'],
+        'Eglise' => [:tower, 'Church / Eglise'],
+        'Eolienne(s)' => [:wind_turbine],
+        'Grue' => [:tower, 'Crane / Grue'],
+        'Mât' => [:mast],
+        'Phare marin' => [:tower, 'Lighthouse / Phare marin'],
+        'Pile de pont' => [:other, 'Bridge piers / Pile de pont'],
+        'Portique' => [:building, 'Arch / Portique'],
+        'Pylône' => [:mast, 'Pylon / Pylône'],
+        'Silo' => [:tower, 'Silo'],
+        'Terril' => [:other, 'Spoil heap / Teril'],
+        'Torchère' => [:chimney, 'Flare / Torchère'],
+        'Tour' => [:tower],
+        'Treillis métallique' => [:other, 'Metallic grid / Treillis métallique']
+      }.freeze
+
+      def parse
+        tbody = prepare(html: read).css('tbody').last
+        tbody.css('tr').to_enum.with_index(1).each do |tr, index|
+          tds = tr.css('td')
+          name = tds[0].text.cleanup
+          next if NAME_BLACKLIST.include? name
+          elevation, height = tds[4].text.cleanup.split(/[()]/).map { _1.cleanup.remove("\n") }
+          type, type_remarks = TYPES.fetch(tds[2].text.cleanup)
+          count = tds[3].text.cleanup.to_i
+          visibility = tds[5].text.cleanup
+          obstacle = AIXM.obstacle(
+            source: source(position: tr.line),
+            name: name,
+            type: type,
+            xy: xy_from(tds[1].text),
+            z: z_from(elevation + 'AMSL')
+          ).tap do |obstacle|
+            obstacle.height = d_from(height)
+            obstacle.marking = visibility.match?(/jour/i)
+            obstacle.lighting = visibility.match?(/nuit/i)
+            obstacle.remarks = remarks_from(type_remarks, (count if count > 1), tds[6].text)
+          end
+          if count > 1
+            obstacle_group = AIXM.obstacle_group(
+              source: obstacle.source,
+              name: obstacle.name
+            ).tap do |obstacle_group|
+              obstacle_group.remarks = "#{count} obstacles"
+            end
+            obstacle_group.add_obstacle obstacle
+            add obstacle_group
+          else
+            add obstacle
+          end
+        rescue => error
+          warn("error parsing obstacle at ##{index}: #{error.message}", pry: error)
+        end
+      end
+
+      private
+
+      def remarks_from(*parts)
+        part_titles = ['TYPE', 'NUMBER/NOMBRE', 'DETAILS']
+        [].tap do |remarks|
+          parts.each.with_index do |part, index|
+            if part
+              part = part.to_s.cleanup.blank_to_nil
+              remarks << "**#{part_titles[index]}**\n#{part}"
+            end
+          end
+        end.join("\n\n").blank_to_nil
+      end
+    end
+  end
+end

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

@@ -19,15 +19,15 @@ module AIPP
         prepare(html: read).css('tbody').each do |tbody|
           tbody.css('tr').to_enum.each_slice(2).with_index(1) do |trs, index|
             begin
-              id, activity_and_name, upper_limits, timetable = trs.first.css('td')
+              id, activity_and_name, upper_limit, timetable = trs.first.css('td')
               activity, name = activity_and_name.css('span')
-              lateral_limits, lower_limits, remarks = trs.last.css('td')
-              lateral_limits.search('br').each { |br| br.replace("|||") }
-              geometry, lateral_limits = lateral_limits.text.split('|||', 2)
-              lateral_limits&.gsub!('|||', "\n")
+              lateral_limit, lower_limit, remarks = trs.last.css('td')
+              lateral_limit.search('br').each { _1.replace("|||") }
+              geometry, lateral_limit = lateral_limit.text.split('|||', 2)
+              lateral_limit&.gsub!('|||', "\n")
               remarks = [remarks&.text&.cleanup&.blank_to_nil]
               s = timetable&.text&.cleanup and remarks.prepend('**SCHEDULE**', s, '')
-              s = lateral_limits&.cleanup and remarks.prepend('**LATERAL LIMITS**', s, '')
+              s = lateral_limit&.cleanup and remarks.prepend('**LATERAL LIMIT**', s, '')
               airspace = AIXM.airspace(
                 source: source(position: trs.first.line),
                 id: id.text.strip,
@@ -35,10 +35,12 @@ module AIPP
                 name: [id.text.strip, name.text.cleanup].join(' ')
               ).tap do |airspace|
                 airspace.geometry = geometry_from(geometry)
-                airspace.layers << layer_from([upper_limits.text, lower_limits.text].join('---').cleanup).tap do |layer|
-                  layer.activity = ACTIVITIES.fetch(activity.text.downcase).fetch(:activity)
-                  layer.remarks = remarks.compact.join("\n")
-                end
+                airspace.add_layer(
+                  layer_from([upper_limit.text, lower_limit.text].join('---').cleanup).tap do |layer|
+                    layer.activity = ACTIVITIES.fetch(activity.text.downcase).fetch(:activity)
+                    layer.remarks = remarks.compact.join("\n")
+                  end
+                )
               end
             rescue => error
               warn("error parsing #{airspace.type} `#{airspace.name}' at ##{index}: #{error.message}", pry: error)