aipp 0.2.2 → 0.2.3

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

@@ -15,10 +15,10 @@ module AIPP
           'franco-belge' => 'BELGIUM_FRANCE',
           'germano-suisse' => 'GERMANY_SWITZERLAND',
           'hispano-andorrane' => 'ANDORRA_SPAIN',
-          'la côte atlantique française' => 'FRANCE_ATLANTIC_COAST',   # TODO: handle internally
-          'côte méditérrannéenne' => 'FRANCE_MEDITERRANEAN_COAST',   # TODO: handle internally
-          'limite des eaux territoriales atlantique françaises' => 'FRANCE_ATLANTIC_TERRITORIAL_SEA',   # TODO: handle internally
-          'parc national des écrins' => 'FRANCE_ECRINS_NATIONAL_PARK'   # TODO: handle internally
+          'la côte atlantique française' => 'FRANCE_ATLANTIC_COAST',
+          'côte méditérrannéenne' => 'FRANCE_MEDITERRANEAN_COAST',
+          'limite des eaux territoriales atlantique françaises' => 'FRANCE_ATLANTIC_TERRITORIAL_SEA',
+          'parc national des écrins' => 'FRANCE_ECRINS_NATIONAL_PARK'
         }.freeze
 
         # Intersection points between three countries
@@ -127,12 +127,11 @@ module AIPP
 
         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? '---+' }
-          above.reverse!
           AIXM.layer(
             class: text_for_class,
             vertical_limits: AIXM.vertical_limits(
-              max_z: z_from(above[1]),
               upper_z: z_from(above[0]),
+              max_z: z_from(above[1]),
               lower_z: z_from(below[0]),
               min_z: z_from(below[1])
             )
@@ -158,17 +157,26 @@ module AIPP
               when /end|(\S+) , (\S+)/
                 geometry << AIXM.point(xy: buffer[:xy]) if buffer.has_key?(:xy)
                 buffer[:xy] = AIXM.xy(lat: $1, long: $2) if $1
+                if border = buffer.delete(:border)
+                  from = border.nearest(xy: geometry.segments.last.xy)
+                  to = border.nearest(xy: buffer[:xy], geometry_index: from.geometry_index)
+                  geometry.concat border.segment(from_position: from, to_position: to).map(&:to_point)
+                end
               when /^frontière ([\w-]+)/i, /^(\D[^(]+)/i
                 border_name = BORDERS.fetch($1.downcase.strip)
-                buffer[:xy] ||= INTERSECTIONS.fetch("#{buffer[:border_name]}|#{border_name}")
-                buffer[:border_name] = border_name
-                if border_name == 'FRANCE_SPAIN'   # specify which part of this split border
-                  border_name += buffer[:xy].lat < 42.55 ? '_EAST' : '_WEST'
+                if borders.has_key? border_name   # border from GeoJSON
+                  buffer[:border] = borders[border_name]
+                else   # named border
+                  buffer[:xy] ||= INTERSECTIONS.fetch("#{buffer[:border_name]}|#{border_name}")
+                  buffer[:border_name] = border_name
+                  if border_name == 'FRANCE_SPAIN'   # specify which part of this split border
+                    border_name += buffer[:xy].lat < 42.55 ? '_EAST' : '_WEST'
+                  end
+                  geometry << AIXM.border(
+                    xy: buffer.delete(:xy),
+                    name: border_name
+                  )
                 end
-                geometry << AIXM.border(
-                  xy: buffer.delete(:xy),
-                  name: border_name
-                )
               else
                 fail "geometry `#{element}' not recognized"
               end
@@ -176,8 +184,10 @@ module AIPP
           end
         end
 
-        def timetable_from(text)
-          AIXM::H24 if text.gsub(/\W/, '') == 'H24'
+        def timetable_from!(text)
+          if text.gsub!(/^\s*#{AIXM::H_RE}\s*$/, '')
+            AIXM.timetable(code: Regexp.last_match&.to_s&.strip)
+          end
         end
 
       end

data/lib/aipp/version.rb

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

data/lib/core_ext/integer.rb

@@ -0,0 +1,16 @@
+class Integer
+
+  # Iterates the given block, passing in increasing or decreasing values to and
+  # including limit
+  #
+  # If no block is given, an Enumerator is returned instead.
+  #
+  # @example
+  #   10.up_or_downto(12).to_a   # => [10, 11, 12]
+  #   10.upto(12).to_a           # => [10, 11, 12]
+  #   10.up_or_downto(8).to_a    # => [10, 9, 8]
+  #   10.downto(8).to_a          # => [10, 9, 8]
+  def up_or_downto(limit)
+    self > limit ? self.downto(limit) : self.upto(limit)
+  end
+end

data/lib/core_ext/object.rb

@@ -32,11 +32,11 @@ class Object
     puts message.send(color)
   end
 
-  # Issue a debug message.
+  # Issue a verbose informational message.
   #
-  # @param message [String] debug message
-  def debug(message, color: :blue)
-    info(message, color: color) if $DEBUG
+  # @param message [String] verbose informational message
+  def verbose_info(message, color: :blue)
+    info(message, color: color) if $VERBOSE_INFO
   end
 
 end

data/spec/fixtures/border.geojson

@@ -0,0 +1,201 @@
+{
+  "type": "GeometryCollection",
+  "geometries": [
+    {
+      "type": "LineString",
+      "coordinates": [
+        [
+          4.757294654846191,
+          43.989202079482276
+        ],
+        [
+          4.764375686645508,
+          43.99701327763528
+        ],
+        [
+          4.7519731521606445,
+          44.00269350325321
+        ],
+        [
+          4.745192527770996,
+          43.99506829280446
+        ],
+        [
+          4.751286506652832,
+          43.99235138187902
+        ],
+        [
+          4.750943183898926,
+          43.99198088438825
+        ],
+        [
+          4.757294654846191,
+          43.989202079482276
+        ]
+      ]
+    },
+    {
+      "type": "LineString",
+      "coordinates": [
+        [
+          4.777421951293944,
+          44.00115001749186
+        ],
+        [
+          4.78205680847168,
+          43.994111213373934
+        ],
+        [
+          4.784030914306641,
+          43.99818641226534
+        ],
+        [
+          4.787635803222656,
+          44.00077957493397
+        ],
+        [
+          4.785747528076171,
+          44.00448389642906
+        ],
+        [
+          4.790983200073242,
+          44.004669106432225
+        ],
+        [
+          4.798364639282227,
+          44.008373185063874
+        ],
+        [
+          4.793901443481445,
+          44.01528684632061
+        ],
+        [
+          4.787378311157227,
+          44.01584237340163
+        ],
+        [
+          4.785575866699219,
+          44.01960747533136
+        ],
+        [
+          4.768667221069335,
+          44.01831131968508
+        ],
+        [
+          4.763689041137695,
+          44.01460786170962
+        ],
+        [
+          4.760427474975586,
+          44.01065725159039
+        ],
+        [
+          4.770212173461914,
+          44.002940457248556
+        ],
+        [
+          4.777421951293944,
+          44.00115001749186
+        ]
+      ]
+    },
+    {
+      "type": "LineString",
+      "coordinates": [
+        [
+          4.752960205078125,
+          43.93721446391471
+        ],
+        [
+          4.744377136230469,
+          43.950068873803815
+        ],
+        [
+          4.737510681152343,
+          43.97033364196856
+        ],
+        [
+          4.7344207763671875,
+          43.98713332912919
+        ],
+        [
+          4.7371673583984375,
+          44.00516299694704
+        ],
+        [
+          4.743347167968749,
+          44.02195282780904
+        ],
+        [
+          4.749870300292969,
+          44.037503870182896
+        ],
+        [
+          4.755706787109375,
+          44.05379106204314
+        ],
+        [
+          4.7646331787109375,
+          44.070073775703484
+        ]
+      ]
+    },
+    {
+      "type": "LineString",
+      "coordinates": [
+        [
+          4.7948455810546875,
+          43.95328204198018
+        ],
+        [
+          4.801368713378906,
+          43.956989327857265
+        ],
+        [
+          4.815788269042969,
+          43.9646503190861
+        ],
+        [
+          4.82025146484375,
+          43.98614524381678
+        ],
+        [
+          4.840850830078125,
+          43.98491011404692
+        ],
+        [
+          4.845314025878906,
+          43.99479043262446
+        ],
+        [
+          4.8538970947265625,
+          43.98367495857784
+        ],
+        [
+          4.851493835449218,
+          43.967121395851485
+        ],
+        [
+          4.8442840576171875,
+          43.96069638244953
+        ],
+        [
+          4.829521179199219,
+          43.96069638244953
+        ],
+        [
+          4.819221496582031,
+          43.95501213750488
+        ],
+        [
+          4.805145263671875,
+          43.955506441260546
+        ],
+        [
+          4.799995422363281,
+          43.952046228624724
+        ]
+      ]
+    }
+  ]
+}

data/spec/lib/aipp/border_spec.rb

@@ -0,0 +1,135 @@
+require_relative '../../spec_helper'
+
+describe AIPP::Border::Position do
+  subject do
+    AIPP::Border::Position.new(
+      geometries: [
+        [AIXM.xy(long: 0, lat: 0), AIXM.xy(long: 1, lat: 1), AIXM.xy(long: 2, lat: 2)],
+        [AIXM.xy(long: 10, lat: 10), AIXM.xy(long: 11, lat: 11), AIXM.xy(long: 12, lat: 12)]
+      ],
+      geometry_index: 0,
+      coordinates_index: 0
+    )
+  end
+
+  describe :xy do
+    it "returns the coordinates" do
+      subject.xy.must_equal AIXM.xy(long: 0, lat: 0)
+    end
+
+    it "returns nil if the geometry index is out of bounds" do
+      subject.tap { |s| s.geometry_index = 2 }.xy.must_be_nil
+    end
+
+    it "returns nil if the coordinates index is out of bounds" do
+      subject.tap { |s| s.coordinates_index = 3 }.xy.must_be_nil
+    end
+  end
+end
+
+describe AIPP::Border do
+  let :fixtures_dir do
+    Pathname(__FILE__).join('..', '..', '..', 'fixtures')
+  end
+
+  # The border.geojson fixture defines three geometries:
+  # * index 0: closed geometry circumventing the airfield of Pujaut
+  # * index 1: closed geometry circumventing the village of Pujaut
+  # * index 2: unclosed I-shaped geometry following the TGV from the S to N bridges over the Rhône
+  # * index 3: unclosed U-shaped geometry around Île de Bartelasse from N to S end of Pont Daladier
+  subject do
+    AIPP::Border.new(fixtures_dir.join('border.geojson'))
+  end
+
+  describe :initialize do
+    it "fails for files unless the extension is .geojson" do
+      -> { AIPP::Border.new("/path/to/another.txt") }.must_raise ArgumentError
+    end
+  end
+
+  describe :name do
+    it "returns the upcased file name" do
+      subject.name.must_equal 'BORDER'
+    end
+  end
+
+  describe :closed? do
+    it "returns true for closed geometries" do
+      subject.closed?(geometry_index: 0).must_equal true
+      subject.closed?(geometry_index: 1).must_equal true
+    end
+
+    it "returns false for unclosed geometries" do
+      subject.closed?(geometry_index: 2).must_equal false
+      subject.closed?(geometry_index: 3).must_equal false
+    end
+  end
+
+  describe :nearest do
+    let :point do
+      AIXM.xy(lat: 44.008187986625636, long: 4.759397506713866)
+    end
+
+    it "finds the nearest position on any geometry" do
+      position = subject.nearest(xy: point)
+      position.geometry_index.must_equal 1
+      position.coordinates_index.must_equal 12
+      position.xy.must_equal AIXM.xy(lat: 44.01065725159039, long: 4.760427474975586)
+    end
+
+    it "finds the nearest postition on a given geometry" do
+      position = subject.nearest(xy: point, geometry_index: 0)
+      position.geometry_index.must_equal 0
+      position.coordinates_index.must_equal 2
+      position.xy.must_equal AIXM.xy(lat: 44.00269350325321, long: 4.7519731521606445)
+    end
+  end
+
+  describe :segment do
+    it "fails if positions are not on the same geometry" do
+      from_position = AIPP::Border::Position.new(geometries: subject.geometries, geometry_index: 0, coordinates_index: 0)
+      to_position = AIPP::Border::Position.new(geometries: subject.geometries, geometry_index: 1, coordinates_index: 0)
+      -> { subject.segment(from_position: from_position, to_position: to_position) }.must_raise ArgumentError
+    end
+
+    it "returns shortest segment on an unclosed I-shaped geometry" do
+      from_position = subject.nearest(xy: AIXM.xy(lat: 44.002940457248556, long: 4.734249114990234))
+      to_position = subject.nearest(xy: AIXM.xy(lat: 44.07155380033749, long: 4.7687530517578125), geometry_index: from_position.geometry_index)
+      subject.segment(from_position: from_position, to_position: to_position).must_equal [
+        AIXM.xy(lat: 44.00516299694704, long: 4.7371673583984375),
+        AIXM.xy(lat: 44.02195282780904, long: 4.743347167968749),
+        AIXM.xy(lat: 44.037503870182896, long: 4.749870300292969),
+        AIXM.xy(lat: 44.05379106204314, long: 4.755706787109375),
+        AIXM.xy(lat: 44.070073775703484, long: 4.7646331787109375)
+      ]
+    end
+
+    it "returns shortest segment on an unclosed U-shaped geometry" do
+      from_position = subject.nearest(xy: AIXM.xy(lat: 43.96563876212758, long: 4.8126983642578125))
+      to_position = subject.nearest(xy: AIXM.xy(lat: 43.956989327857265, long: 4.83123779296875), geometry_index: from_position.geometry_index)
+      subject.segment(from_position: from_position, to_position: to_position).must_equal [
+        AIXM.xy(lat: 43.9646503190861, long: 4.815788269042969),
+        AIXM.xy(lat: 43.98614524381678, long: 4.82025146484375),
+        AIXM.xy(lat: 43.98491011404692, long: 4.840850830078125),
+        AIXM.xy(lat: 43.99479043262446, long: 4.845314025878906),
+        AIXM.xy(lat: 43.98367495857784, long: 4.8538970947265625),
+        AIXM.xy(lat: 43.967121395851485, long: 4.851493835449218),
+        AIXM.xy(lat: 43.96069638244953, long: 4.8442840576171875),
+        AIXM.xy(lat: 43.96069638244953, long: 4.829521179199219)
+      ]
+    end
+
+    it "returns shortest segment ignoring endings on a closed geometry" do
+      from_position = subject.nearest(xy: AIXM.xy(lat: 44.00022390676026, long: 4.789009094238281))
+      to_position = subject.nearest(xy: AIXM.xy(lat: 43.99800118202362, long: 4.765834808349609), geometry_index: from_position.geometry_index)
+      subject.segment(from_position: from_position, to_position: to_position).must_equal [
+        AIXM.xy(lat: 44.00077957493397, long: 4.787635803222656),
+        AIXM.xy(lat: 43.99818641226534, long: 4.784030914306641),
+        AIXM.xy(lat: 43.994111213373934, long: 4.78205680847168),
+        AIXM.xy(lat: 44.00115001749186, long: 4.777421951293944),
+        AIXM.xy(lat: 44.002940457248556, long: 4.770212173461914)
+      ]
+    end
+
+  end
+end