aipp 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d97409845a7b08285c77294aa116873fdcb668bd0f10d13d2ceecd9ef3922a9
-  data.tar.gz: 2594b4ad9bd0b9deba766704778ff1710eaaf71ce675bb4fd378481f4f13dfc6
+  metadata.gz: 70da2e53874e0c550cbbacc863ff421cbd38dfc2cb1b7e4d2c77e2821839fdea
+  data.tar.gz: 62e9d5c5413756490d03f057e8851aba54c7d8802f4012a2f9626f78eb241d6f
 SHA512:
-  metadata.gz: aa0ac5dafcc6e36a113e2a97c270f768265379b09c34a833e785adf44f45e5dfcd5bb3951b0d6741ae15bc765386eb55c3118154a48ce568f9fae14f06bf6ae5
-  data.tar.gz: 92dd8d6134a1882b0ceada8e130ed834e3dc866e4b84e2dd513084c5313a42d8fd89b47d3726ff36e1f38bb8837fa190790bcc3f99d752e7504757e1a2b4eb84
+  metadata.gz: 6508c2a1565fdd92ed4fe2593b883278940e10fa10e68a0ffc75391b7e6d8ba8c66ca19c7e91495da39f60c4257e7882611a235ad9c8a5314b928140625a6e90
+  data.tar.gz: ade8abd0e5f521faf63b684d719c1e71a85278ec57f56edf4c83349c1ca4fc68422c9948c74f059c064cbb6ec21d66c91216f6418d3749bd53dd6eb1ecca24cc

data/.gitignore

@@ -1,5 +1,5 @@
 .DS_Store
-Gemfile.lock
+gems.locked
 pkg/*
 *.gem
 .bundle

data/.travis.yml

@@ -2,3 +2,7 @@
 language: ruby
 rvm:
   - 2.6.3
+before_install:
+  - gem update --system
+  - gem install bundler
+  - bundle install

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.4
+
+#### Additions
+* LF/AD-3.1
+* Automatically load fixtures for patches
+
 ## 0.2.3
 
 #### Additons

data/README.md

@@ -1,7 +1,5 @@
 [![Version](https://img.shields.io/gem/v/aipp.svg?style=flat)](https://rubygems.org/gems/aipp)
 [![Continuous Integration](https://img.shields.io/travis/svoop/aipp/master.svg?style=flat)](https://travis-ci.org/svoop/aipp)
-[![Code Climate](https://img.shields.io/codeclimate/github/svoop/aipp.svg?style=flat)](https://codeclimate.com/github/svoop/aipp)
-[![Gitter](https://img.shields.io/gitter/room/svoop/aipp.svg?style=flat)](https://gitter.im/svoop/aipp)
 [![Donorbox](https://img.shields.io/badge/donate-on_donorbox-yellow.svg)](https://donorbox.org/bitcetera)
 
 # AIPP
@@ -87,7 +85,7 @@ Inside the `parse` method, you have access to the following methods:
 * [`add`](https://www.rubydoc.info/gems/aipp/AIPP/AIP#add-instance_method) – add a [`AIXM::Feature`](https://www.rubydoc.info/gems/aixm/AIXM/Feature)
 * [`select`](https://www.rubydoc.info/gems/aipp/AIPP/AIP#find-instance_method – search previously written [`AIXM::Feature`s](https://www.rubydoc.info/gems/aixm/AIXM/Feature)
 * some core extensions from ActiveSupport – [`Object#blank`](https://www.rubydoc.info/gems/activesupport/Object#blank%3F-instance_method) and [`String`](https://www.rubydoc.info/gems/activesupport/String)
-* core extensions from this gem – [`Object`](https://www.rubydoc.info/gems/aipp/Object), [`Integer`](https://www.rubydoc.info/gems/aipp/Integer), [`String`](https://www.rubydoc.info/gems/aipp/String), [`NilClass`](https://www.rubydoc.info/gems/aipp/NilClass) and [`Enumerable`](https://www.rubydoc.info/gems/aipp/Enumerable)
+* core extensions from this gem – [`Object`](https://www.rubydoc.info/gems/aipp/Object), [`NilClass`](https://www.rubydoc.info/gems/aipp/NilClass), [`Integer`](https://www.rubydoc.info/gems/aipp/Integer), [`String`](https://www.rubydoc.info/gems/aipp/String), [`Hash`](https://www.rubydoc.info/gems/aipp/Hash) and [`Enumerable`](https://www.rubydoc.info/gems/aipp/Enumerable)
 
 As well as the following methods:
 
@@ -125,7 +123,7 @@ The [`borders`](https://www.rubydoc.info/gems/aipp/AIPP/Parser#borders-instance_
 borders   # => { "CUSTOM_BORDER" => #<AIPP::Border file=custom_border.geojson> }
 ```
 
-The border object implements simple nearest point and segment calculations to create arrays of [`AIXM::XY`](https://www.rubydoc.info/gems/aixm/AIXM/XY) which can be used with [`AIXM::Component::Geometry`](https://www.rubydoc.info/gems/aixm/AIXM/Component/Geometry). 
+The border object implements simple nearest point and segment calculations to create arrays of [`AIXM::XY`](https://www.rubydoc.info/gems/aixm/AIXM/XY) which can be used with [`AIXM::Component::Geometry`](https://www.rubydoc.info/gems/aixm/AIXM/Component/Geometry).
 
 See [`AIPP::Border`](https://www.rubydoc.info/gems/aipp/AIPP/Border) for more on this.
 
@@ -183,9 +181,11 @@ module AIPP
 end
 ```
 
-### Patches
+### Fixtures and Patches
 
-When parsed data is faulty or missing, you might have to use a different data source instead such as static data from a fixture file. This is where patches come in. You can patch any AIXM attribute setter by defining a patch block inside the AIP parser:
+Fixtures is static data defined as YAML in the <tt>lib/aipp/regions/{REGION}/fixtures/</tt> directory. All fixtures are read automatically. Please note that the name of the AIP parser (e.g. `AD-1.3.rb`) must match the name of the corresponding fixture (e.g. `fixtures/AD-1.3.yml`).
+
+When parsed data is faulty or missing, you may fall back to such static data instead. This is where patches come in. You can patch any AIXM attribute setter by defining a patch block inside the AIP parser and accessing the static data via `parser.fixture`:
 
 ```ruby
 module AIPP
@@ -197,7 +197,7 @@ module AIPP
         @fixtures ||= YAML.load_file(Pathname(__FILE__).dirname.join('AD-1.3.yml'))
         airport_id = parser.instance_variable_get(:@airport).id
         direction_name = object.name.to_s
-        throw :abort if (xy = @fixtures.dig('runways', airport_id, direction_name, 'xy')).nil?
+        throw :abort if (xy = parser.fixture.dig('runways', airport_id, direction_name, 'xy')).nil?
         lat, long = xy.split(/\s+/)
         AIXM.xy(lat: lat, long: long)
       end
@@ -280,7 +280,7 @@ airac.next_id     # => 1801
   * [OpenData – public data files](https://www.data.gouv.fr)
   * [Protected Planet – protected area data files](https://www.protectedplanet.net)
 * [Geo Maps – programmatically generated GeoJSON maps](https://github.com/simonepri/geo-maps)
-* [Open Flightmaps – open-source aeronautical maps](https://openflightmaps.org)
+* [open flightmaps – open-source aeronautical maps](https://openflightmaps.org)
 * [AIXM Rubygem – AIXM/OFMX generator for Ruby](https://github.com/svoop/aixm)
 
 ## Development

data/TODO.md

@@ -1,6 +1,5 @@
 ## LF
 
-* AD-3.1: helipads
 * ENR-5.4: obstacles
 * ENR-5.2: military and training areas
 * ENR-2.2: TMZ and RMZ

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.3.5'
+  spec.add_runtime_dependency 'aixm', '>= 0.3.6'
   spec.add_runtime_dependency 'activesupport', '~> 5'
   spec.add_runtime_dependency 'nokogiri', '~> 1'
   spec.add_runtime_dependency 'nokogumbo', '~> 2'

data/lib/aipp.rb

@@ -25,6 +25,7 @@ require_relative 'core_ext/integer'
 require_relative 'core_ext/string'
 require_relative 'core_ext/nil_class'
 require_relative 'core_ext/enumerable'
+require_relative 'core_ext/hash'
 
 require_relative 'aipp/version'
 require_relative 'aipp/pdf'

data/lib/aipp/aip.rb

@@ -10,6 +10,9 @@ module AIPP
     # @return [String] AIP name (e.g. "ENR-2.1")
     attr_reader :aip
 
+    # @return [Object] Fixture read from YAML file
+    attr_reader :fixture
+
     # @!method close
     #   @see AIPP::Downloader#close
     def_delegator :@downloader, :close
@@ -18,13 +21,15 @@ module AIPP
     #   @see AIPP::Parser#config
     # @!method options
     #   @see AIPP::Parser#options
+    # @!method borders
+    #   @see AIPP::Parser#borders
     # @!method cache
     #   @see AIPP::Parser#cache
     def_delegators :@parser, :aixm, :config, :options, :borders, :cache
     private :aixm
 
-    def initialize(aip:, downloader:, parser:)
-      @aip, @downloader, @parser = aip, downloader, parser
+    def initialize(aip:, downloader:, fixture:, parser:)
+      @aip, @downloader, @fixture, @parser = aip, downloader, fixture, parser
       self.class.include ("AIPP::%s::Helpers::URL" % options[:region]).constantize
     end
 
@@ -49,7 +54,7 @@ module AIPP
     #
     # @param feature [AIXM::Feature] e.g. airport or airspace
     def add(feature)
-      verbose_info "Adding #{feature.class}"
+      verbose_info "Adding #{feature.inspect}"
       aixm.features << feature
     end
 

data/lib/aipp/parser.rb

@@ -12,6 +12,9 @@ module AIPP
     # @return [AIXM::Document] target document
     attr_reader :aixm
 
+    # @return [Hash] map from AIP name to fixtures
+    attr_reader :fixtures
+
     # @return [Hash] map from border names to border objects
     attr_reader :borders
 
@@ -25,8 +28,10 @@ module AIPP
       @config = {}
       @aixm = AIXM.document(region: @options[:region], effective_at: @options[:airac].date)
       @dependencies = THash.new
+      @fixtures = {}
       @borders = {}
       @cache = OpenStruct.new
+      AIXM.send("#{options[:schema]}!")
     end
 
     # Read the configuration from config.yml.
@@ -42,13 +47,23 @@ module AIPP
       info("Reading region #{options[:region]}")
       dir = Pathname(__FILE__).dirname.join('regions', options[:region])
       fail("unknown region `#{options[:region]}'") unless dir.exist?
+      # Fixtures
+      dir.glob('fixtures/*.yml').each do |file|
+        verbose_info "Reading fixture fixtures/#{file.basename}"
+        fixture = YAML.load_file(file)
+        @fixtures[file.basename('.yml').to_s] = fixture
+      end
       # Borders
       dir.glob('borders/*.geojson').each do |file|
+        verbose_info "Reading border borders/#{file.basename}"
         border = AIPP::Border.new(file)
         @borders[border.name] = border
       end
       # Helpers
-      dir.glob('helpers/*.rb').each { |f| require f }
+      dir.glob('helpers/*.rb').each do |file|
+        verbose_info "Reading helper helpers/#{file.basename}"
+        require file
+      end
       # Parsers
       dir.glob('*.rb').each do |file|
         verbose_info "Requiring #{file.basename}"
@@ -67,6 +82,7 @@ module AIPP
           ("AIPP::%s::%s" % [options[:region], aip.remove(/\W/).classify]).constantize.new(
             aip: aip,
             downloader: downloader,
+            fixture: @fixtures[aip],
             parser: self
           ).attach_patches.tap(&:parse).detach_patches
         end
@@ -79,7 +95,7 @@ module AIPP
     def validate_aixm
       info("Validating #{options[:schema].upcase}")
       unless aixm.valid?
-        message = "invalid AIXM document:\n" + aixm.errors.map(&:message).join("\n")
+        message = "invalid #{options[:schema].upcase} document:\n" + aixm.errors.map(&:message).join("\n")
         @options[:force] ? warn(message, pry: binding) : fail(message)
       end
     end
@@ -88,7 +104,6 @@ module AIPP
     def write_aixm
       file = "#{options[:region]}_#{options[:airac].date.xmlschema}.#{options[:schema]}"
       info("Writing #{file}")
-      AIXM.send("#{options[:schema]}!")
       File.write(file, aixm.to_xml)
     end
 

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

@@ -93,15 +93,18 @@ module AIPP
 
       def runway_from(tr)
         tds = tr.css('td')
-        surface = tds[1].css('span[id*="SURFACE"]').text
         AIXM.runway(
           name: tds[0].text.strip.split.join('/')
         ).tap do |runway|
           @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)
-          runway.surface.composition = (COMPOSITIONS.fetch(surface)[:composition] unless surface.blank?)
-          runway.surface.preparation = (COMPOSITIONS.fetch(surface)[:preparation] unless surface.blank?)
+          unless (text = tds[1].css('span[id*="SURFACE"]').text).blank?
+            surface = SURFACES.metch(text)
+            runway.surface.composition = surface[:composition]
+            runway.surface.preparation = surface[:preparation]
+            runway.surface.remarks = surface[:remarks]
+          end
           runway.remarks = tds[7].text.cleanup.blank_to_nil
           values = tds[2].text.remove('°').strip.split
           runway.forth.geographic_orientation = AIXM.a(values.first.to_i)
@@ -131,29 +134,26 @@ module AIPP
 
       patch AIXM::Component::Runway, :width do |parser, object, value|
         throw :abort unless value.zero?
-        @fixtures ||= YAML.load_file(Pathname(__FILE__).dirname.join('AD-1.3.yml'))
         airport_id = parser.instance_variable_get(:@airport).id
         runway_name = object.name.to_s
-        throw :abort if (width = @fixtures.dig('runways', airport_id, runway_name, 'width')).nil?
+        throw :abort if (width = parser.fixture.dig('runways', airport_id, runway_name, 'width')).nil?
         AIXM.d(width.to_i, :m)
       end
 
       patch AIXM::Component::Runway::Direction, :xy do |parser, object, value|
         throw :abort unless value.nil?
-        @fixtures ||= YAML.load_file(Pathname(__FILE__).dirname.join('AD-1.3.yml'))
         airport_id = parser.instance_variable_get(:@airport).id
         direction_name = object.name.to_s
-        throw :abort if (xy = @fixtures.dig('runways', airport_id, direction_name, 'xy')).nil?
+        throw :abort if (xy = parser.fixture.dig('runways', airport_id, direction_name, 'xy')).nil?
         lat, long = xy.split(/\s+/)
         AIXM.xy(lat: lat, long: long)
       end
 
       patch AIXM::Component::Surface, :composition do |parser, object, value|
         throw :abort unless value.blank?
-        @fixtures ||= YAML.load_file(Pathname(__FILE__).dirname.join('AD-1.3.yml'))
         airport_id = parser.instance_variable_get(:@airport).id
         runway_name = parser.instance_variable_get(:@runway).name
-        throw :abort if (composition = @fixtures.dig('runways', airport_id, runway_name, 'composition')).nil?
+        throw :abort if (composition = parser.fixture.dig('runways', airport_id, runway_name, 'composition')).nil?
         composition
       end
 

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

@@ -87,11 +87,6 @@ module AIPP
 
       private
 
-      def elevation_from(text)
-        value, unit = text.strip.split
-        AIXM.z(AIXM.d(value.to_i, unit).to_ft.dist, :qnh)
-      end
-
       def declination_from(text)
         value, direction = text.strip.split('°')
         value = value.to_f * (direction == 'W' ? -1 : 1)
@@ -126,9 +121,12 @@ 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)
-                  text = tr.css('td:nth-of-type(5)').text.strip.split(%r<\W+/\W+>).first
-                  runway.surface.composition = COMPOSITIONS.fetch(text)[:composition]
-                  runway.surface.preparation = COMPOSITIONS.fetch(text)[:preparation]
+                  unless (text = tr.css('td:nth-of-type(5)').text.strip.split(%r<\W+/\W+>).first).blank?
+                    surface = SURFACES.metch(text)
+                    runway.surface.composition = surface[:composition]
+                    runway.surface.preparation = surface[:preparation]
+                    runway.surface.remarks = surface[:remarks]
+                  end
                   if (text = tr.css('td:nth-of-type(4)').text).match?(AIXM::PCN_RE)
                     runway.surface.pcn = text
                   end
@@ -164,9 +162,10 @@ module AIPP
           []
         when AIXM::DMS_RE
           text_fr.scan(AIXM::DMS_RE).each_slice(2).with_index(1).map do |(lat, long), index|
-            AIXM.helipad(name: "H#{index}").tap do |helipad|
-              helipad.xy = AIXM.xy(lat: lat.first, long: long.first)
-            end
+            AIXM.helipad(
+              name: "H#{index}",
+              xy: AIXM.xy(lat: lat.first, long: long.first)
+            )
           end
         else
           @remarks << ['HELICOPTER:', text_fr.blank_to_nil, text_en.blank_to_nil].compact.join("\n")
@@ -297,18 +296,16 @@ module AIPP
 
       patch AIXM::Component::Runway::Direction, :xy do |parser, object, value|
         throw :abort unless value.nil?
-        @fixtures ||= YAML.load_file(Pathname(__FILE__).dirname.join('AD-2.yml'))
         airport_id = parser.instance_variable_get(:@airport).id
         direction_name = object.name.to_s
-        throw :abort if (xy = @fixtures.dig('runways', airport_id, direction_name, 'xy')).nil?
+        throw :abort if (xy = parser.fixture.dig('runways', airport_id, direction_name, 'xy')).nil?
         lat, long = xy.split(/\s+/)
         AIXM.xy(lat: lat, long: long)
       end
 
       patch AIXM::Feature::NavigationalAid, :remarks do |parser, object, value|
-        @fixtures ||= YAML.load_file(Pathname(__FILE__).dirname.join('AD-2.yml'))
         airport_id, designated_point_id = object.airport.id, object.id
-        @fixtures.dig('designated_points', airport_id, designated_point_id, 'remarks') || throw(:abort)
+        parser.fixture.dig('designated_points', airport_id, designated_point_id, 'remarks') || throw(:abort)
       end
 
     end

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

@@ -0,0 +1,185 @@
+module AIPP
+  module LF
+
+    # Helipads
+    class AD31 < AIP
+
+      include AIPP::LF::Helpers::Common
+      using AIXM::Refinements
+
+      DEPENDS = %w(AD-2)
+
+      HOSTILITIES = {
+        'zone hostile habitée' => 'Zone hostile habitée / hostile populated area',
+        'zone hostile non habitée' => 'Zone hostile non habitée / hostile unpopulated area',
+        'zone non hostile' => 'Zone non hostile / non-hostile area'
+      }.freeze
+
+      POSITIONINGS = {
+        'en terrasse' => 'En terrasse / on deck',
+        'en surface' => 'En surface / on ground'
+      }.freeze
+
+      DIMENSIONS_RE = /( diam.tre\s+\d+ | (?:\d[\s\d,.m]*x\s*){1,}[\s\d,.m]+ )/ix.freeze
+
+      def parse
+        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?
+              verbose_info "Skipping #{name} in favor of AD-2"
+              next
+            end
+            # Airport
+            @airport = AIXM.airport(
+              source: source(position: trs[0].line),
+              organisation: organisation_lf,   # TODO: not yet implemented
+              id: options[:region],
+              name: name,
+              xy: xy_from(trs[1].css('td:nth-of-type(1)').text.cleanup)
+            ).tap do |airport|
+              airport.z = elevation_from(trs[1].css('td:nth-of-type(2)').text)
+            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|
+                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|
+                other.remarks = "Réservé aux administrations de l'État / reserved for State administrations"
+              end
+            end
+            # FATOs and helipads
+            text = trs[2].css('span[id*="ADHP.REVETEMENT"]').text.remove(/tlof\s*|\s*\(.*?\)/i).downcase
+            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 }
+            helipads_from(trs[1].css('span[id*="ADHP.DIM_TLOF"]').text).each do |helipad|
+              helipad.surface.composition = surface[:composition]
+              helipad.surface.preparation = surface[:preparation]
+              helipad.surface.remarks = surface[:remarks]
+              helipad.surface.auw_weight = auw_weight_from(trs[2].css('span[id*="ADHP.RESISTANCE"]').text)
+              helipad.add_lighting(lighting) if lighting
+              @airport.add_helipad helipad
+            end
+            # Operator and addresses
+            operator = trs[0].css('span[id*="ADHP.EXPLOITANT"]')
+            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) }
+            # Remarks
+            @airport.remarks = [].tap do |remarks|
+              hostility = trs[2].css('span[id*="ADHP.ZONE_HABITEE"]').text.cleanup.downcase.blank_to_nil
+              hostility = HOSTILITIES.fetch(hostility) if hostility
+              positioning = trs[2].css('span[id*="ADHP.EN_TERRASSE"]').text.cleanup.downcase.blank_to_nil
+              positioning = POSITIONINGS.fetch(positioning) if positioning
+              remarks << ('**SITUATION**' if hostility || positioning) << hostility << positioning << ''
+              remarks << trs[2].css('td:nth-of-type(5)').text.cleanup
+              remarks << raw_addresses unless raw_addresses.blank?
+            end.compact.join("\n").strip
+            add(@airport) if @airport.fatos.any? || @airport.helipads.any?
+          end
+        end
+      end
+
+      private
+
+      def fatos_from(text)
+        [
+          if text.cleanup.match DIMENSIONS_RE
+            AIXM.fato(name: 'FATO').tap do |fato|
+              fato.length, fato.width = dimensions_from($1)
+            end
+          end
+        ].compact
+      end
+
+      def helipads_from(text)
+        [
+          if text.cleanup.match DIMENSIONS_RE
+            AIXM.helipad(name: 'TLOF', xy: @airport.xy).tap do |helipad|
+              helipad.z = @airport.z
+              helipad.length, helipad.width = dimensions_from($1)
+            end
+          end
+        ].compact
+      end
+
+      def dimensions_from(text)
+        dims = text.remove(/[^x\d.,]/i).split(/x/i).map { |s| s.to_ff.floor }
+        case dims.size
+        when 1
+          [dim = AIXM.d(dims[0], :m), dim]
+        when 2
+          [AIXM.d(dims[0], :m), AIXM.d(dims[1], :m)]
+        when 4
+          [dim = AIXM.d(dims.min, :m), dim]
+        else
+          warn("bad dimensions for #{@airport.name}", pry: binding)
+        end
+      end
+
+      def auw_weight_from(text)
+        if wgt = text.match(/(\d+(?:[,.]\d+)?)\s*t/i)&.captures&.first
+          AIXM.w(wgt.to_ff, :t)
+        end
+      end
+
+      def lighting_from(text)
+        return if text.blank? || text.match?(/nil|balisage\s*:\s*non/i)
+        description = text.remove(/balisage\s*:|oui\.?\s*:?/i).compact.full_strip
+        AIXM.lighting(position: :edge).tap do |lighting|
+          lighting.description = description unless description.blank?
+        end
+      end
+
+      def addresses_from(text, source)
+        [].tap do |addresses|
+          text.sub! /(?<!\p{L})t[ée]l\D*([\d\s.]{10,}(?:poste[\d\s.]{2,})?)[-\/]?/i do |m|
+            addresses << AIXM.address(
+              source: source,
+              type: :phone,
+              address: m.strip.sub(/poste/i, '-').remove(/[^\d-]|-$/)
+            )
+          end
+          text.sub! /fax\D*([\d\s.]{10,}(?:poste[\d\s.]{2,})?)[-\/]?/i do |m|
+            addresses << AIXM.address(
+              source: source,
+              type: :fax,
+              address: m.strip.sub(/poste/i, '-').remove(/[^\d-]|-$/)
+            )
+          end
+          text.sub! /e-mail\W*(\S+)[-\/]?/i do |m|
+            addresses << AIXM.address(
+              source: source,
+              type: :email,
+              address: m.strip
+            )
+          end
+          text.sub! /(\d[\d\s]{9,}(?:poste[\d\s.]{2,})?)[-\/]?/i do |m|
+            addresses << AIXM.address(
+              source: source,
+              type: :phone,
+              address: m.strip.sub(/poste/i, '-').remove(/[^\d-]|-$/)
+            )
+          end
+        end
+      end
+
+      patch AIXM::Feature::Airport, :xy do |parser, object, value|
+        throw :abort if value.seconds?
+        if xy = parser.fixture.dig(object.name, 'xy')
+          lat, long = xy.split(/\s+/)
+          AIXM.xy(lat: lat, long: long)
+        else
+          warn("coordinates for #{object.name} appear not to be exact", pry: binding)
+          throw :abort
+        end
+      end
+
+    end
+  end
+end

data/lib/aipp/regions/LF/fixtures/AD-3.1.yml

@@ -0,0 +1,10 @@
+# On Google Maps, click in the middle of the runway beginning, then click on
+# the coordinates in the little window displayed at the bottom. The DMS
+# coordinates will then appear in the left column ready for copy/paste.
+---
+FLAMANVILLE:
+  xy: 49°32'03.5"N 1°52'46.8"W
+ILE D'YEU PORT JOINVILLE:
+  xy: 46°43'42.2"N 2°21'02.3"W
+VARCES QUARTIER REYNIES:
+  xy: 45°06'09.1"N 5°40'56.1"E

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

@@ -30,19 +30,35 @@ module AIPP
           'FRANCE_LUXEMBOURG|FRANCE_GERMANY' => AIXM.xy(lat: 49.469438, long: 6.367516),
           'FRANCE_GERMANY|FRANCE_SWITZERLAND' => AIXM.xy(lat: 47.589831, long: 7.589049),
           'GERMANY_SWITZERLAND|FRANCE_GERMANY' => AIXM.xy(lat: 47.589831, long: 7.589049)
-        }
+        }.freeze
 
-        # Map surface compositions to OFMX composition and preparation
-        COMPOSITIONS = {
-          'revêtue' => { preparation: :paved },
-          'non revêtue' => { preparation: :natural },
+        # Map surface to OFMX composition, preparation and remarks
+        SURFACES = {
+          /^revêtue?$/ => { preparation: :paved },
+          /^non revêtue?$/ => { preparation: :natural },
           'macadam' => { composition: :macadam },
-          'béton' => { composition: :concrete, preparation: :paved },
-          'béton bitumineux' => { composition: :bitumen, preparation: :paved },
-          'enrobé bitumineux' => { composition: :bitumen },
-          'asphalte' => { composition: :asphalt, preparation: :paved },
-          'gazon' => { composition: :grass }
-        }
+          /^bitume ?(traité|psp)?$/ =>  { composition: :bitumen },
+          'ciment' => { 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' },
+          "béton + asphalte d'étanchéité sablé" => { composition: :concrete_and_asphalt, preparation: :paved, remarks: 'Étanchéité sablé / sandblasted waterproofing' },
+          'béton armé + support bitumastic' => { composition: :concrete, preparation: :paved, remarks: 'Support bitumastic / bitumen support' },
+          /résine (époxy )?su[er] béton/ => { composition: :concrete, preparation: :paved, remarks: 'Avec couche résine / with resin seal coat' },
+          /^(asphalte|tarmac)$/ => { composition: :asphalt, preparation: :paved },
+          'enrobé' => { preparation: :other, remarks: 'Enrobé / coated' },
+          'enrobé anti-kérozène' => { preparation: :other, remarks: 'Enrobé anti-kérozène / anti-kerosene coating' },
+          /^enrobé bitum(e|iné|ineux)$/ => { composition: :bitumen, preparation: :paved, remarks: 'Enrobé / coated' },
+          'enrobé béton' => { composition: :concrete, preparation: :paved, remarks: 'Enrobé / coated' },
+          /^résine( époxy)?$/ => { composition: :other, remarks: 'Résine / resin' },
+          'tole acier larmé' => { composition: :metal, preparation: :grooved },
+          /^(structure métallique|aluminium)$/ => { composition: :metal },
+          'matériaux composites ignifugés' => { composition: :other, remarks: 'Matériaux composites ignifugés / fire resistant mixed materials' },
+          /^(gazon|herbe)$/ => { composition: :grass },
+          'neige' => { composition: :snow },
+          'neige damée' => { composition: :snow, preparation: :rolled }
+        }.freeze
 
         # Transform French text fragments to English
         ANGLICISE_MAP = {
@@ -125,6 +141,11 @@ module AIPP
           end
         end
 
+        def elevation_from(text)
+          value, unit = text.strip.split
+          AIXM.z(AIXM.d(value.to_i, unit).to_ft.dist, :qnh)
+        end
+
         def layer_from(text_for_limits, text_for_class=nil)
           above, below = text_for_limits.gsub(/ /, '').split(/\n+/).select(&:blank_to_nil).split { |e| e.match? '---+' }
           AIXM.layer(

data/lib/aipp/version.rb

@@ -1,3 +1,3 @@
 module AIPP
-  VERSION = "0.2.3".freeze
+  VERSION = "0.2.4".freeze
 end

data/lib/core_ext/hash.rb

@@ -0,0 +1,31 @@
+class Hash
+
+  # Returns a value from the hash for the matching key
+  #
+  # Similar to +fetch+, search the hash keys for the search string and return
+  # the corresponding value. Unlike +fetch+, however, if a hash key is a Regexp,
+  # the search string is matched against this Regexp. The hash is searched
+  # in it's natural order.
+  #
+  # @example
+  #   h = { /aa/ => :aa, /a/ => :a, 'b' => :b }
+  #   h.metch('abc')          # => :a
+  #   h.metch('bcd')          # => KeyError
+  #   h.metch('b')            # => :b
+  #   h.metch('x', :foobar)   # => :foobar
+  #
+  # @param search [String] string to search or matche against
+  # @param default [Object] fallback value if no key matched
+  # @return [Object] hash value
+  # @raise [KeyError] no key matched and no default given
+  def metch(search, default=nil)
+    fetch search
+  rescue KeyError
+    each do |key, value|
+      next unless key.is_a? Regexp
+      return value if search.match? key
+    end
+    default ? default : raise(KeyError, "no match found: #{search.inspect}")
+  end
+
+end

data/lib/core_ext/object.rb

@@ -11,6 +11,7 @@ class Object
   #   end
   # @example with binding context
   #   warn("oops", pry: binding)
+  #
   # @param message [String] warning message
   # @param pry [Exception, Binding, nil] attach the Pry session to this error
   #   or binding

data/lib/core_ext/string.rb

@@ -13,19 +13,6 @@ class String
     self if present?
   end
 
-  # Strip and collapse unnecessary whitespace
-  #
-  # @note While similar to +String#squish+ from ActiveSupport, newlines +\n+
-  #   are preserved and not collapsed into one space.
-  #
-  # @example
-  #   "  foo\n\nbar \r".copact   # => "foo\nbar"
-  #
-  # @return [String] compacted string
-  def compact
-    split("\n").map { |s| s.squish.blank_to_nil }.compact.join("\n")
-  end
-
   # Fix messy oddities such as the use of two apostrophes instead of a quote
   #
   # @example
@@ -39,21 +26,17 @@ class String
       split(/\r?\n/).map { |s| s.strip.blank_to_nil }.compact.join("\n")   # remove blank lines
   end
 
-  # Add spaces between obviously glued words:
-  # * camel glued words
-  # * three-or-more-letter and number-only words
+  # Strip and collapse unnecessary whitespace
+  #
+  # @note While similar to +String#squish+ from ActiveSupport, newlines +\n+
+  #   are preserved and not collapsed into one space.
   #
   # @example
-  #   "thisString has spaceProblems".unglue   # => "this String has space problems"
-  #   "the first123meters of D25".unglue      # => "the first 123 meters of D25"
+  #   "  foo\n\nbar \r".copact   # => "foo\nbar"
   #
-  # @return [String] unglued string
-  def unglue
-    self.dup.tap do |string|
-      [/([[:lower:]])([[:upper:]])/, /([[:alpha:]]{3,})(\d)/, /(\d)([[:alpha:]]{3,})/].freeze.each do |regexp|
-        string.gsub!(regexp, '\1 \2')
-      end
-    end
+  # @return [String] compacted string
+  def compact
+    split("\n").map { |s| s.squish.blank_to_nil }.compact.join("\n")
   end
 
   # Calculate the correlation of two strings by counting mutual words
@@ -102,4 +85,40 @@ class String
     end
     (self_words & other_words).count
   end
+
+  # Similar to +strip+, but remove any leading or trailing non-letters/numbers
+  # which includes whitespace
+  def full_strip
+    remove(/\A[^\p{L}\p{N}]*|[^\p{L}\p{N}]*\z/)
+  end
+
+  # Same as +to_f+ but accept both dot and comma as decimal separator
+  #
+  # @example
+  #   "5.5".to_ff    # => 5.5
+  #   "5,6".to_ff    # => 5.6
+  #   "5,6".to_f     # => 5.0   (sic!)
+  #
+  # @return [Float] number parsed from text
+  def to_ff
+    sub(/,/, '.').to_f
+  end
+
+  # Add spaces between obviously glued words:
+  # * camel glued words
+  # * three-or-more-letter and number-only words
+  #
+  # @example
+  #   "thisString has spaceProblems".unglue   # => "this String has space problems"
+  #   "the first123meters of D25".unglue      # => "the first 123 meters of D25"
+  #
+  # @return [String] unglued string
+  def unglue
+    self.dup.tap do |string|
+      [/([[:lower:]])([[:upper:]])/, /([[:alpha:]]{3,})(\d)/, /(\d)([[:alpha:]]{3,})/].freeze.each do |regexp|
+        string.gsub!(regexp, '\1 \2')
+      end
+    end
+  end
+
 end

data/spec/lib/core_ext/hash_spec.rb

@@ -0,0 +1,27 @@
+require_relative '../../spec_helper'
+
+describe Hash do
+
+  describe :metch do
+    subject do
+      { /aa/ => :aa, /a/ => :a, 'b' => :b }
+    end
+
+    it "must return value of matching regexp key" do
+      subject.metch('abc').must_equal :a
+    end
+
+    it "must return value of equal non-regexp key" do
+      subject.metch('b').must_equal :b
+    end
+
+    it "fails with KeyError if nothing matches" do
+      -> { subject.metch('bcd') }.must_raise KeyError
+    end
+
+    it "returns fallback value if nothing matches" do
+      subject.metch('x', :foobar).must_equal :foobar
+    end
+  end
+
+end

data/spec/lib/core_ext/string_spec.rb

@@ -16,16 +16,6 @@ describe String do
     end
   end
 
-  describe :compact do
-    it "must remove unneccessary whitespace" do
-      "  foo\n\nbar \r".compact.must_equal "foo\nbar"
-      "foo\n \nbar".compact.must_equal "foo\nbar"
-      "   ".compact.must_equal ""
-      "\n \r \v ".compact.must_equal ""
-      "okay".compact.must_equal "okay"
-    end
-  end
-
   describe :cleanup do
     it "must replace double apostrophes" do
       "the ''Terror'' was a fine ship".cleanup.must_equal 'the "Terror" was a fine ship'
@@ -37,17 +27,17 @@ describe String do
 
     it "must remove whitespace within quotes" do
       'the " best " way to fly'.cleanup.must_equal 'the "best" way to fly'
-      %Q(the " best\nway " to fly).cleanup.must_equal %Q(the "best\nway" to fly) 
+      %Q(the " best\nway " to fly).cleanup.must_equal %Q(the "best\nway" to fly)
     end
   end
 
-  describe :unglue do
-    it "must insert spaces between camel glued words" do
-      "thisString has spaceProblems".unglue.must_equal "this String has space Problems"
-    end
-
-    it "must insert spaces between three-or-more-letter and number-only words" do
-      "the first123meters of D25".unglue.must_equal "the first 123 meters of D25"
+  describe :compact do
+    it "must remove unneccessary whitespace" do
+      "  foo\n\nbar \r".compact.must_equal "foo\nbar"
+      "foo\n \nbar".compact.must_equal "foo\nbar"
+      "   ".compact.must_equal ""
+      "\n \r \v ".compact.must_equal ""
+      "okay".compact.must_equal "okay"
     end
   end
 
@@ -85,4 +75,38 @@ describe String do
     end
   end
 
+  describe :to_ff do
+    it "must convert normal float numbers as does to_f" do
+      "5".to_ff.must_equal "5".to_f
+      "5.1".to_ff.must_equal "5.1".to_f
+      " 5.2 ".to_ff.must_equal " 5.2 ".to_f
+    end
+
+    it "must convert comma float numbers as well" do
+      "5,1".to_ff.must_equal "5.1".to_f
+      " 5,2 ".to_ff.must_equal "5.2".to_f
+    end
+  end
+
+  describe :full_strip do
+    it "must behave like strip" do
+      subject = "  foobar\t\t"
+      subject.full_strip.must_equal subject.strip
+    end
+
+    it "must remove non-letterlike characters as well" do
+      " - foobar :.".full_strip.must_equal "foobar"
+    end
+  end
+
+  describe :unglue do
+    it "must insert spaces between camel glued words" do
+      "thisString has spaceProblems".unglue.must_equal "this String has space Problems"
+    end
+
+    it "must insert spaces between three-or-more-letter and number-only words" do
+      "the first123meters of D25".unglue.must_equal "the first 123 meters of D25"
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aipp
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Sven Schwyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -290,15 +290,14 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
-- Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - TODO.md
 - aipp.gemspec
 - exe/aip2aixm
 - exe/aip2ofmx
+- gems.rb
 - lib/aipp.rb
 - lib/aipp/aip.rb
 - lib/aipp/airac.rb
@@ -309,11 +308,9 @@ files:
 - lib/aipp/patcher.rb
 - lib/aipp/pdf.rb
 - lib/aipp/regions/LF/AD-1.3.rb
-- lib/aipp/regions/LF/AD-1.3.yml
 - lib/aipp/regions/LF/AD-1.6.rb
 - lib/aipp/regions/LF/AD-2.rb
-- lib/aipp/regions/LF/AD-2.yml
-- lib/aipp/regions/LF/AD-3.1.rb-NEW
+- lib/aipp/regions/LF/AD-3.1.rb
 - lib/aipp/regions/LF/ENR-2.1.rb
 - lib/aipp/regions/LF/ENR-4.1.rb
 - lib/aipp/regions/LF/ENR-4.3.rb
@@ -323,16 +320,21 @@ files:
 - lib/aipp/regions/LF/borders/france_atlantic_territorial_sea.geojson
 - lib/aipp/regions/LF/borders/france_ecrins_national_park.geojson
 - lib/aipp/regions/LF/borders/france_mediterranean_coast.geojson
+- lib/aipp/regions/LF/fixtures/AD-1.3.yml
+- lib/aipp/regions/LF/fixtures/AD-2.yml
+- lib/aipp/regions/LF/fixtures/AD-3.1.yml
 - lib/aipp/regions/LF/helpers/AD_radio.rb
 - lib/aipp/regions/LF/helpers/URL.rb
 - lib/aipp/regions/LF/helpers/common.rb
 - lib/aipp/t_hash.rb
 - lib/aipp/version.rb
 - lib/core_ext/enumerable.rb
+- lib/core_ext/hash.rb
 - lib/core_ext/integer.rb
 - lib/core_ext/nil_class.rb
 - lib/core_ext/object.rb
 - lib/core_ext/string.rb
+- rakefile.rb
 - spec/fixtures/archive.zip
 - spec/fixtures/border.geojson
 - spec/fixtures/document.pdf
@@ -348,6 +350,7 @@ files:
 - spec/lib/aipp/t_hash_spec.rb
 - spec/lib/aipp/version_spec.rb
 - spec/lib/core_ext/enumberable_spec.rb
+- spec/lib/core_ext/hash_spec.rb
 - spec/lib/core_ext/integer_spec.rb
 - spec/lib/core_ext/nil_class_spec.rb
 - spec/lib/core_ext/string_spec.rb
@@ -393,6 +396,7 @@ test_files:
 - spec/lib/aipp/t_hash_spec.rb
 - spec/lib/aipp/version_spec.rb
 - spec/lib/core_ext/enumberable_spec.rb
+- spec/lib/core_ext/hash_spec.rb
 - spec/lib/core_ext/integer_spec.rb
 - spec/lib/core_ext/nil_class_spec.rb
 - spec/lib/core_ext/string_spec.rb

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

@@ -1,11 +0,0 @@
-module AIPP
-  module LF
-
-    # Helipads
-    class AD31 < AIP
-
-      include AIPP::LF::Helpers::Common
-
-    end
-  end
-end