terraformer 0.0.1 → 0.0.2

data/lib/terraformer/polygon.rb

@@ -2,6 +2,21 @@ module Terraformer
 
   class Polygon < Geometry
 
+    def initialize *args
+      case
+      when Coordinate === args[0] # each arg is a position of the polygon
+        self.coordinates = [Coordinate.from_array(args)]
+      when Array === args[0] # each arg is an array of positions; first is polygon, rest are "holes"
+        self.coordinates = Coordinate.from args
+      else
+        super *args
+      end
+
+      if line_strings.map(&:linear_ring?).include? false
+        raise ArgumentError.new 'not linear ring'
+      end
+    end
+
     def has_holes?
       coordinates.length > 1
     end
@@ -10,6 +25,97 @@ module Terraformer
       coordinates[0][0]
     end
 
+    def == obj
+      super obj do |o|
+
+        equal = true
+
+        # first check outer polygon
+        equal = self.coordinates[0].polygonally_equal_to? obj.coordinates[0]
+
+
+        # then inner polygons (holes)
+        #
+        if equal and obj.coordinates.length > 1
+          1.upto(obj.coordinates.length - 1) do |i|
+            equal = self.coordinates[i].polygonally_equal_to? obj.coordinates[i]
+            break unless equal
+          end
+        end
+
+        equal
+      end
+    end
+
+    def line_strings
+      coordinates.map {|lr| LineString.new lr}
+    end
+
+    def holes
+      return nil unless has_holes?
+      coordinates[1..-1].map {|hole| Polygon.new hole}
+    end
+
+    def contains? obj
+      obj = Coordinate.new obj if Array === obj and Numeric === obj[0]
+      obj = obj.to_point if Coordinate === obj
+      contained = false
+      case obj
+      when Point
+        contained = Geometry.coordinates_contain_point? coordinates[0], obj.coordinates
+        contained = !holes.any? {|h| h.contains? obj} if contained and has_holes?
+      when MultiPoint
+        contained = obj.points.all? {|p| contains? p}
+      when LineString
+        contained = contains?(obj.first_coordinate) && !Geometry.array_intersects_multi_array?(obj.coordinates, coordinates)
+      when MultiLineString
+        contained = obj.line_strings.all? {|ls| contains? ls}
+      when Polygon
+        contained = obj.within? self
+      when MultiPolygon
+        contained = obj.polygons.all? {|p| p.within? self}
+      else
+        raise ArgumentError.new "unsupported type: #{obj.type rescue obj.class}"
+      end
+      contained
+    end
+
+    def within? obj
+      case obj
+      when Polygon
+        if self == obj
+          true
+        elsif obj.contains? first_coordinate
+          !Geometry.arrays_intersect_arrays?(coordinates, obj.coordinates)
+        end
+      when MultiPolygon
+        obj.polygons.any? {|p| p.contains? self}
+      else
+        raise ArgumentError.new "unsupported type: #{obj.type rescue obj.class}"
+      end
+    end
+
+    def add_vertex p
+      insert_vertex coordinates[0].length - 2, p
+    end
+    alias_method :<<, :add_vertex
+
+    def insert_vertex idx, p
+      p = p.coordinates if Point === p
+      raise ArgumentError unless Coordinate === p
+      coordinates[0].insert idx, p
+    end
+
+    def remove_vertex p
+      p = p.coordinates if Point === p
+      raise ArgumentError unless Coordinate === p
+      coordinates[0].delete p
+    end
+
+    def remove_vertex_at idx
+      coordinates[0].delete_at idx
+    end
+
   end
 
 end

data/lib/terraformer/version.rb

@@ -1,3 +1,3 @@
 module Terraformer
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/terraformer.rb

@@ -2,10 +2,17 @@ require 'json'
 require 'bigdecimal'
 require 'bigdecimal/math'
 require 'bigdecimal/util'
+require 'ext/array'
+require 'ext/big_decimal'
+require 'ext/big_math'
+require 'ext/enumerable'
+require 'ext/hash'
+require 'forwardable'
 
 module Terraformer
 
-  PRECISION = 8
+  PRECISION = BigDecimal.double_fig
+  BigDecimal.limit PRECISION
   PI = BigMath.PI PRECISION
   DEFAULT_BUFFER_RESOLUTION = 64
 
@@ -28,7 +35,10 @@ module Terraformer
   }
 
   def self.parse geojson
-    geojson = JSON.parse geojson if String === geojson
+    if String === geojson
+      geojson = File.read geojson if File.readable? geojson
+      geojson = JSON.parse geojson
+    end
     raise ArgumentError.new "invalid arg: #{geojson}" unless Hash === geojson
 
     if klass = Terraformer.const_get(geojson['type'])
@@ -60,69 +70,26 @@ module Terraformer
     end
 
     def to_json *args
-      self.to_hash.to_json *args
-    end
-
-    def [] prop
-      self.__send__ prop.to_sym
+      h = self.to_hash
+      h[:bbox] = bbox if Hash === args.last and args.pop[:include_bbox]
+      h.to_json *args
     end
 
   end
 
-end
-
-module Enumerable
-
-  def each_coordinate opts = {}, &block
-    iter_coordinate :each, opts, &block
-  end
-
-  def map_coordinate opts = {}, &block
-    iter_coordinate :map, opts, &block
-  end
-  alias_method :collect_coordinate, :map_coordinate
-
-  def map_coordinate! opts = {}, &block
-    iter_coordinate :map!, opts, &block
-  end
-  alias_method :collect_coordinate!, :map_coordinate!
+  # yikes!
+  module BBox
 
-  def iter_coordinate meth, opts = {}, &block
-    opts[:recurse] = true if opts[:recurse].nil?
-
-    if Array === self and Numeric === self[0]
-      yield self
-    else
-
-      self.__send__ meth do |pair|
-        raise IndexError unless Array === pair
-        case pair[0]
-        when Numeric
-          yield pair
-        when Array
-          pair.iter_coordinate meth, opts, &block if opts[:recurse]
-        else
-          raise IndexError.new "#{pair[0]} is not a Numeric or Array type"
-        end
-      end
+    def to_json *args
+      map {|e| e.to_f if e}.to_json *args
     end
-  end
-
-end
-
-class BigDecimal
-
-  def to_deg
-    self * Terraformer::DEGREES_PER_RADIAN
-  end
 
-  def to_rad
-    self * Terraformer::RADIANS_PER_DEGREE
   end
 
 end
 
 require 'terraformer/coordinate'
+require 'terraformer/geodesic'
 require 'terraformer/bounds'
 require 'terraformer/geometry'
 require 'terraformer/feature'
@@ -132,3 +99,5 @@ require 'terraformer/line_string'
 require 'terraformer/multi_line_string'
 require 'terraformer/polygon'
 require 'terraformer/multi_polygon'
+require 'terraformer/convex_hull'
+require 'terraformer/circle'

data/test/convex_hull_spec.rb

@@ -0,0 +1,26 @@
+require_relative './helper'
+
+describe Terraformer::ConvexHull do
+
+  EXAMPLES.not(:multi_line_string).each do |key, geo|
+    it "works on #{key}" do
+      ch = Terraformer.parse(geo).convex_hull
+      ch.dont_be_terrible_ok
+      ch.must_be_valid_geojson
+    end
+  end
+
+  it 'raises without enough points' do
+    ->{ Terraformer.parse(EXAMPLES[:multi_line_string]).convex_hull }.must_raise ArgumentError
+  end
+
+  it 'works on feature collections' do
+    fc = Terraformer::FeatureCollection.new
+    fc << Terraformer.parse(EXAMPLES[:waldocanyon])
+    fc << Terraformer.parse(EXAMPLES[:sf_county]).to_feature
+    ch = fc.convex_hull
+    ch.dont_be_terrible_ok
+    ch.must_be_valid_geojson
+  end
+
+end

data/test/examples/circle.geojson

@@ -3,264 +3,264 @@
   "coordinates": [
     [
       [
-        100.00089398965049,
-        8.82355685852279e-05
+        100.0008939896505,
+        8.80502953952e-05
       ],
       [
-        100.00088105440783,
-        0.00017532535375140864
+        100.0008810544078,
+        0.0001752526182957
       ],
       [
-        100.00085963412958,
-        0.0002606963900620961
+        100.0008596341295,
+        0.0002607671625167
       ],
       [
-        100.00082993510475,
-        0.0003437757085983607
+        100.0008299351047,
+        0.0003437703763427
       ],
       [
-        100.00079224335116,
-        0.00042341737532065687
+        100.000792243351,
+        0.000423462893695
       ],
       [
-        100.00074692186101,
-        0.0004990484131054821
+        100.000746921861,
+        0.0004990772318774
       ],
       [
-        100.00069440710504,
-        0.0005700958425710862
+        100.000694407105,
+        0.0005698851833621
       ],
       [
-        100.00063520482904,
-        0.0006354137183563783
+        100.000635204829,
+        0.0006352048291938
       ],
       [
-        100.00056988518331,
-        0.0006944290561239309
+        100.0005698851833,
+        0.0006944071051437
       ],
       [
-        100.00049907723172,
-        0.0007471418363985708
+        100.0004990772316,
+        0.0007469218611963
       ],
       [
-        100.00042346289358,
-        0.0007924061103353283
+        100.0004234628935,
+        0.0007922433512302
       ],
       [
-        100.00034377037628,
-        0.0008296488941866115
+        100.0003437703763,
+        0.0008299351049923
       ],
       [
-        100.00026076716232,
-        0.0008594431386974881
+        100.0002607671623,
+        0.0008596341297125
       ],
       [
-        100.00017525261805,
-        0.0008812158656376033
+        100.000175252618,
+        0.0008810544079536
       ],
       [
-        100.00008805029526,
-        0.000893821132384516
+        100.0000880502952,
+        0.0008939896506158
       ],
       [
-        100.0,
-        0.0008984048664345436
+        99.99999999999993,
+        0.0008983152842413
       ],
       [
-        99.99991194970474,
-        0.000893821132384516
+        99.9999119497047,
+        0.0008939896506158
       ],
       [
-        99.99982474738195,
-        0.0008812158656376033
+        99.99982474738192,
+        0.0008810544079536
       ],
       [
-        99.99973923283768,
-        0.0008594431386974881
+        99.99973923283758,
+        0.0008596341297125
       ],
       [
-        99.99965622962372,
-        0.0008296488941866115
+        99.99965622962364,
+        0.0008299351049923
       ],
       [
-        99.99957653710642,
-        0.0007924061103353283
+        99.9995765371064,
+        0.0007922433512302
       ],
       [
-        99.99950092276828,
-        0.0007471418363985708
+        99.99950092276822,
+        0.0007469218611963
       ],
       [
-        99.99943011481669,
-        0.0006944290561239309
+        99.99943011481662,
+        0.0006944071051437
       ],
       [
-        99.99936479517096,
-        0.0006354137183563783
+        99.9993647951709,
+        0.0006352048291938
       ],
       [
-        99.99930559289496,
-        0.0005700958425710862
+        99.9993055928949,
+        0.0005698851833621
       ],
       [
-        99.99925307813899,
-        0.0004990484131054821
+        99.99925307813896,
+        0.0004990772318774
       ],
       [
-        99.99920775664884,
-        0.00042341737532065687
+        99.99920775664887,
+        0.000423462893695
       ],
       [
-        99.99917006489525,
-        0.0003437757085983607
+        99.99917006489522,
+        0.0003437703763427
       ],
       [
-        99.99914036587042,
-        0.0002606963900620961
+        99.99914036587037,
+        0.0002607671625167
       ],
       [
-        99.99911894559217,
-        0.00017532535375140864
+        99.99911894559214,
+        0.0001752526182957
       ],
       [
-        99.99910601034951,
-        8.82355685852279e-05
+        99.99910601034942,
+        8.80502953952e-05
       ],
       [
-        99.99910168471588,
-        1.9370377676740394e-13
+        99.99910168471585,
+        1.719e-13
       ],
       [
-        99.99910601034951,
-        -8.594373353370475e-05
+        99.99910601034942,
+        -8.80502950514e-05
       ],
       [
-        99.99911894559217,
-        -0.00017761719160345075
+        99.99911894559214,
+        -0.0001752526179519
       ],
       [
-        99.99914036587042,
-        -0.0002635611917568658
+        99.99914036587037,
+        -0.000260767162173
       ],
       [
-        99.99917006489525,
-        -0.00034377570821095315
+        99.99917006489522,
+        -0.0003437703759989
       ],
       [
-        99.99920775664884,
-        -0.0004239903369654551
+        99.99920775664887,
+        -0.0004234628933512
       ],
       [
-        99.99925307813899,
-        -0.0004984754499351452
+        99.99925307813896,
+        -0.0004990772315336
       ],
       [
-        99.99930559289496,
-        -0.0005672310247747656
+        99.9993055928949,
+        -0.0005698851830183
       ],
       [
-        99.99936479517096,
-        -0.0006359866821211351
+        99.9993647951709,
+        -0.00063520482885
       ],
       [
-        99.99943011481669,
-        -0.0006932831262689893
+        99.99943011481662,
+        -0.0006944071047999
       ],
       [
-        99.99950092276828,
-        -0.000744849974990818
+        99.99950092276822,
+        -0.0007469218608526
       ],
       [
-        99.99957653710642,
-        -0.0007906872128161134
+        99.9995765371064,
+        -0.0007922433508864
       ],
       [
-        99.99965622962372,
-        -0.0008307948259940207
+        99.99965622962364,
+        -0.0008299351046485
       ],
       [
-        99.99973923283768,
-        -0.0008594431383100805
+        99.99973923283758,
+        -0.0008596341293688
       ],
       [
-        99.99982474738195,
-        -0.0008823617984762712
+        99.99982474738192,
+        -0.0008810544076098
       ],
       [
-        99.99991194970474,
-        -0.0008938211319971085
+        99.9999119497047,
+        -0.0008939896502721
       ],
       [
-        100.0,
-        -0.0008995507996170583
+        99.99999999999993,
+        -0.0008983152838976
       ],
       [
-        100.00008805029526,
-        -0.0008938211319971085
+        100.0000880502952,
+        -0.0008939896502721
       ],
       [
-        100.00017525261805,
-        -0.0008823617984762712
+        100.000175252618,
+        -0.0008810544076098
       ],
       [
-        100.00026076716232,
-        -0.0008594431383100805
+        100.0002607671623,
+        -0.0008596341293688
       ],
       [
-        100.00034377037628,
-        -0.0008307948259940207
+        100.0003437703763,
+        -0.0008299351046485
       ],
       [
-        100.00042346289358,
-        -0.0007906872128161134
+        100.0004234628935,
+        -0.0007922433508864
       ],
       [
-        100.00049907723172,
-        -0.000744849974990818
+        100.0004990772316,
+        -0.0007469218608526
       ],
       [
-        100.00056988518331,
-        -0.0006932831262689893
+        100.0005698851833,
+        -0.0006944071047999
       ],
       [
-        100.00063520482904,
-        -0.0006359866821211351
+        100.000635204829,
+        -0.00063520482885
       ],
       [
-        100.00069440710504,
-        -0.0005672310247747656
+        100.000694407105,
+        -0.0005698851830183
       ],
       [
-        100.00074692186101,
-        -0.0004984754499351452
+        100.000746921861,
+        -0.0004990772315336
       ],
       [
-        100.00079224335116,
-        -0.0004239903369654551
+        100.000792243351,
+        -0.0004234628933512
       ],
       [
-        100.00082993510475,
-        -0.00034377570821095315
+        100.0008299351047,
+        -0.0003437703759989
       ],
       [
-        100.00085963412958,
-        -0.0002635611917568658
+        100.0008596341295,
+        -0.000260767162173
       ],
       [
-        100.00088105440783,
-        -0.00017761719160345075
+        100.0008810544078,
+        -0.0001752526179519
       ],
       [
-        100.00089398965049,
-        -8.594373353370475e-05
+        100.0008939896505,
+        -8.80502950514e-05
       ],
       [
-        100.00089831528412,
-        1.9370377676740394e-13
+        100.0008983152841,
+        1.719e-13
       ],
       [
-        100.00089398965049,
-        8.82355685852279e-05
+        100.0008939896505,
+        8.80502953952e-05
       ]
     ]
   ]

data/test/examples/line_string.geojson

@@ -1,3 +1,3 @@
 { "type": "LineString",
-  "coordinates": [ [100.0, 0.0], [101.0, 1.0] ]
+  "coordinates": [ [100.0, 0.0], [101.0, 1.0], [100.0, 1.0], [99.0,0.0] ]
 }

data/test/examples/multi_point.geojson

@@ -1,3 +1,3 @@
 { "type": "MultiPoint",
-  "coordinates": [ [100.0, 0.0], [101.0, 1.0] ]
+  "coordinates": [ [100.0, 0.0], [101.0, 1.0], [100.0, 1.0], [99.0,0.0] ]
   }