terraformer 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94f290a9625b7c0820cf1489bc822ec82f24243d
-  data.tar.gz: 8ccdb74b6538360ca45f7af6bc2e6c5ba84cdcd3
+  metadata.gz: 4bdd47e750c746d35d7e55ac4ecbca82548ca9b0
+  data.tar.gz: b5612978bf4ba8145a4cbb4103574680e3e1e8a9
 SHA512:
-  metadata.gz: 21a14a49544eb19c39f96f6d7a8061f060600985b0e15820dcb06aa5f99ad9ea9036140400906139855acc2050120d32186774c249235b062a267cce252d302e
-  data.tar.gz: a98fe28abc34063e50b8b269c3cf4c0a83ceb7a9613f11d7b05761cdeb902cc937b6b123c4c8b2bacfa1d45e719ce0cb2bb04b7251616dcfa8128bc0dae1c559
+  metadata.gz: de22c0fe889529a57e7cbd8538344b1e2aa73ce6a218c1f0908d239c177b56eb77f9fa47f436f81dd90302ab93f5c3aaec05f28fda7f38a98d8091b084619891
+  data.tar.gz: a7b86a474675c9c63023820afa8131d6288a6158780ed2e03b0f9fcd43c7a13a82d83df287c34cfe04d2057d155859059caf343f8a239d5047903d249d476048

data/.gitignore

@@ -1,2 +1,4 @@
 Gemfile.lock
 tmp
+
+coverage/

data/Gemfile

@@ -7,4 +7,5 @@ group :test do
   gem 'pry', '~>0.10'
   gem 'pry-nav', '~>0.2'
   gem 'ruby-prof', '~>0.15'
+  gem 'simplecov', :require => false
 end

data/README.md

@@ -1,19 +1,27 @@
 terraformer-ruby
 ================
 
-mostly faithful port of [terraformer](https://github.com/Esri/Terraformer)
+[terraformer-ruby](https://github.com/kenichi/terraformer-ruby) is a mostly faithful port of [terraformer](https://github.com/Esri/Terraformer).
 
-### Installation
+## Installation
 
-`gem install terraformer`
+In your application's Gemfile:
 
-or include in an application's `Gemfile`
+```ruby
+gem 'terraformer'
+```
+
+Or install it manually:
 
-`gem terraformer`
+```sh
+$ gem install terraformer
+```
 
-### Basic usage
+## Usage
 
-[terraformer-ruby](https://github.com/esripdx/terraformer-ruby) is a port of [terraformer](https://github.com/Esri/Terraformer).
+```ruby
+require 'terraformer'
+```
 
 ##### Create a Terraformer primitive from GeoJSON
 
@@ -51,4 +59,21 @@ You can also have Terraformer perform many geometric operations like convex hull
 > convex_hull = polygon.convex_hull
 > point.within? convex_hull #returns true
 > bounding_box = polygon.bbox #returns the bounding box for this object.
-```
+```
+
+## Contributing
+
+After checking out the source, run the tests:
+
+```
+$ git clone git@github.com:kenichi/terraformer-ruby.git
+$ cd terraformer-ruby
+$ bundle install
+$ bundle exec rake test
+```
+
+You can also generate RDoc:
+
+```
+$ bundle exec rdoc --main README.md
+```

data/lib/terraformer.rb

@@ -6,7 +6,6 @@ require 'ext/array'
 require 'ext/big_decimal'
 require 'ext/big_math'
 require 'ext/enumerable'
-require 'ext/hash'
 require 'forwardable'
 
 # terraformer.rb - a toolkit for working with geojson in ruby

data/lib/terraformer/feature.rb

@@ -22,12 +22,12 @@ module Terraformer
       @properties ||= {}
     end
 
-    def to_hash
+    def to_hash *args
       h = {
         type: type,
         properties: properties,
       }
-      h[:geometry] = geometry.to_hash if geometry
+      h[:geometry] = geometry.to_hash(*args) if geometry
       h[:id] = id if id
       h
     end
@@ -77,10 +77,10 @@ module Terraformer
       features << feature
     end
 
-    def to_hash
+    def to_hash *args
       h = {
         type: type,
-        features: features.map(&:to_hash)
+        features: features.map {|f| f.to_hash *args}
       }
       h[:crs] = crs if crs
       h

data/lib/terraformer/geometry.rb

@@ -120,10 +120,10 @@ module Terraformer
       @geometries ||= []
     end
 
-    def to_hash
+    def to_hash *args
       {
         type: type,
-        geometries: geometries.map(&:to_hash)
+        geometries: geometries.map {|g| g.to_hash *args}
       }
     end
 

data/lib/terraformer/multi_point.rb

@@ -48,20 +48,20 @@ module Terraformer
 
     def add_point p
       p = p.coordinates if Point === p
-      raise ArugmentError unless Coordinate === p
+      raise ArgumentError unless Coordinate === p
       coordinates << p
     end
     alias_method :<<, :add_point
 
     def insert_point idx, p
       p = p.coordinates if Point === p
-      raise ArugmentError unless Coordinate === p
+      raise ArgumentError unless Coordinate === p
       coordinates.insert idx, p
     end
 
     def remove_point p
       p = p.coordinates if Point === p
-      raise ArugmentError unless Coordinate === p
+      raise ArgumentError unless Coordinate === p
       coordinates.delete p
     end
 

data/lib/terraformer/polygon.rb

@@ -110,7 +110,7 @@ module Terraformer
     end
 
     def add_vertex p
-      insert_vertex coordinates[0].length - 2, p
+      insert_vertex -2, p
     end
     alias_method :<<, :add_vertex
 

data/lib/terraformer/version.rb

@@ -1,3 +1,3 @@
 module Terraformer
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
 end

data/test/circle_spec.rb

@@ -0,0 +1,64 @@
+require_relative './helper'
+
+describe Terraformer::Circle do
+
+  describe 'construction' do
+    it 'constrcuts from integers' do
+      c = Terraformer::Circle.new [-122.6764, 45.5165], 100
+
+      assert !c.dirty?
+      c.center.x.must_equal -122.6764
+      c.center.y.must_equal 45.5165
+      c.radius.must_equal 100
+      c.resolution.must_equal Terraformer::DEFAULT_BUFFER_RESOLUTION
+    end
+
+    it 'constructs from coordinate' do
+      a = Terraformer::Coordinate.new -122.6764, 45.5165
+      c = Terraformer::Circle.new a, 100
+
+      assert !c.dirty?
+      c.center.must_equal a
+      c.radius.must_equal 100
+      c.resolution.must_equal Terraformer::DEFAULT_BUFFER_RESOLUTION
+    end
+
+    it 'constructs from point' do
+      a = Terraformer::Coordinate.new -122.6764, 45.5165
+      p = Terraformer::Point.new a
+      c = Terraformer::Circle.new p, 100
+
+      assert !c.dirty?
+      c.center.must_equal a
+      c.radius.must_equal 100
+      c.resolution.must_equal Terraformer::DEFAULT_BUFFER_RESOLUTION
+    end
+
+
+    it 'constructs from coordinate with res' do
+      a = Terraformer::Coordinate.new -122.6764, 45.5165
+      c = Terraformer::Circle.new a, 100, 10
+
+      assert !c.dirty?
+      c.center.must_equal a
+      c.radius.must_equal 100
+      c.resolution.must_equal 10
+
+      # todo: how to test size of polygon?
+    end
+  end
+
+  describe 'modification' do
+    before :each do
+      @c = Terraformer::Circle.new [-122.6764, 45.5165], 100
+    end
+
+    it 'should be dirty after setting center' do
+      @c.center = [-122, 45]
+
+      assert @c.dirty?
+      @c.center.x.must_equal -122
+    end
+
+  end
+end

data/test/convex_hull_spec.rb

@@ -2,7 +2,7 @@ require_relative './helper'
 
 describe Terraformer::ConvexHull do
 
-  EXAMPLES.not(:multi_line_string).each do |key, geo|
+  EXAMPLES.reject {|k,v| k == :multi_line_string }.each do |key, geo|
     it "works on #{key}" do
       ch = Terraformer.parse(geo).convex_hull
       ch.dont_be_terrible_ok
@@ -23,4 +23,15 @@ describe Terraformer::ConvexHull do
     ch.must_be_valid_geojson
   end
 
+  it 'works on feature collections - jarvis march' do
+    Terraformer::ConvexHull.impl = :jarvis_march
+
+    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/coordinate_spec.rb

@@ -0,0 +1,269 @@
+require_relative './helper'
+
+describe Terraformer::Coordinate do
+
+  describe 'from' do
+    it 'should accept nested arrays' do
+      arys = [[100,0], [101,1], [102,2]]
+      c = Terraformer::Coordinate.from arys
+
+      c.class.must_equal Array
+      c[0].class.must_equal Terraformer::Coordinate
+      c[0].x.must_equal 100
+      c[0].y.must_equal 0
+      c[1].class.must_equal Terraformer::Coordinate
+      c[1].x.must_equal 101
+      c[1].y.must_equal 1
+      c[2].class.must_equal Terraformer::Coordinate
+      c[2].x.must_equal 102
+      c[2].y.must_equal 2
+    end
+
+    it 'should accept double nested arrays' do
+      arys = [[[100,0], [101,1]], [[102,2], [103,3]]]
+      c = Terraformer::Coordinate.from arys
+
+      c.class.must_equal Array
+      c[0].class.must_equal Array
+      c[0][0].class.must_equal Terraformer::Coordinate
+      c[0][0].x.must_equal 100
+      c[0][0].y.must_equal 0
+    end
+  end
+
+  describe 'from_array' do
+
+    it 'should be called from Array.to_c' do
+      c = [100,0].to_c
+
+      c.class.must_equal Terraformer::Coordinate
+      c.x.must_equal 100
+      c.y.must_equal 0
+    end
+
+    it 'should accept [100, 0]' do
+      c = Terraformer::Coordinate.from_array [100, 0]
+
+      c.class.must_equal Terraformer::Coordinate
+      c.x.must_equal 100
+      c.y.must_equal 0
+    end
+
+    it 'should accept nested arrays' do
+      arys = [[100,0], [101,1], [102,2]]
+      c = Terraformer::Coordinate.from_array arys
+
+      c.class.must_equal Array
+      c[0].class.must_equal Terraformer::Coordinate
+      c[0].x.must_equal 100
+      c[0].y.must_equal 0
+      c[1].class.must_equal Terraformer::Coordinate
+      c[1].x.must_equal 101
+      c[1].y.must_equal 1
+      c[2].class.must_equal Terraformer::Coordinate
+      c[2].x.must_equal 102
+      c[2].y.must_equal 2
+    end
+
+    it 'should accept double nested arrays' do
+      arys = [[[100,0], [101,1]], [[102,2], [103,3]]]
+      c = Terraformer::Coordinate.from_array arys
+
+      c.class.must_equal Array
+      c[0].class.must_equal Array
+      c[0][0].class.must_equal Terraformer::Coordinate
+      c[0][0].x.must_equal 100
+      c[0][0].y.must_equal 0
+    end
+
+    it 'should accept triple nested arrays' do
+      arys = [[[[100,0], [101,1]]]]
+      c = Terraformer::Coordinate.from_array arys
+
+      c.class.must_equal Array
+      c[0].class.must_equal Array
+      c[0][0].class.must_equal Array
+      c[0][0][0].class.must_equal Terraformer::Coordinate
+      c[0][0][0].x.must_equal 100
+      c[0][0][0].y.must_equal 0
+    end
+  end
+
+  describe 'initialize' do
+
+    it 'accepts numbers as params: x,y' do
+      c = Terraformer::Coordinate.new 100, 0
+
+      c.x.must_equal 100
+      c.y.must_equal 0
+      c.z.must_equal nil
+      #c.to_s.must_equal '100,0'
+    end
+
+    it 'accepts numbers as params: x,y,z' do
+      c = Terraformer::Coordinate.new 100, 0, 0
+
+      c.x.must_equal 100
+      c.y.must_equal 0
+      c.z.must_equal 0
+      #c.to_s.must_equal '100,0,0'
+    end
+
+    it 'accepts strings as params: x,y' do
+      c = Terraformer::Coordinate.new '100', '0'
+
+      c.x.must_equal 100
+      c.y.must_equal 0
+      c.z.must_equal nil
+      #c.to_s.must_equal '100,0'
+    end
+
+    it 'accepts strings as params: x,y,z' do
+      c = Terraformer::Coordinate.new '100', '0', '0'
+
+      c.x.must_equal 100
+      c.y.must_equal 0
+      c.z.must_equal 0
+      #c.to_s.must_equal '100,0,0'
+    end
+    it 'accepts an array as params: x,y' do
+      c = Terraformer::Coordinate.new [100, 0]
+
+      c.x.must_equal 100
+      c.y.must_equal 0
+      c.z.must_equal nil
+      #c.to_s.must_equal '100,0'
+    end
+
+    it 'accepts an array as params: x,y,z' do
+      c = Terraformer::Coordinate.new [100, 0, 0]
+
+      c.x.must_equal 100
+      c.y.must_equal 0
+      c.z.must_equal 0
+      #c.to_s.must_equal '100,0,0'
+    end
+
+    it 'does not allow mixed params' do
+      assert_raises ArgumentError do
+        Terraformer::Coordinate.new [100,0], 0
+      end
+
+      assert_raises ArgumentError do
+        Terraformer::Coordinate.new 100
+      end
+
+      assert_raises ArgumentError do
+        Terraformer::Coordinate.new {}
+      end
+    end
+
+    it 'does not allow invalid types' do
+      assert_raises ArgumentError do
+        Terraformer::Coordinate.new :foo, :bar
+      end
+    end
+
+  end
+
+  describe 'methods' do
+    before :each do
+      @c = Terraformer::Coordinate.new 100, 0, 0
+    end
+
+    describe 'modification' do
+
+      it 'should allow modification of x' do
+        @c.x = 101
+        @c.x.must_equal 101
+
+        @c.x = '102'
+        @c.x.must_equal 102
+
+        assert_raises ArgumentError do
+          @c.x = :foo
+        end
+      end
+
+      it 'should allow modification of y' do
+        @c.y = 101
+        @c.y.must_equal 101
+
+        @c.y = '102'
+        @c.y.must_equal 102
+
+        assert_raises ArgumentError do
+          @c.y = :foo
+        end
+      end
+    end
+
+    describe 'equality' do
+
+      it 'should be equal' do
+        c2 = Terraformer::Coordinate.new 100, 0, 0
+        @c.must_equal c2
+      end
+
+      it 'should not be equal' do
+        c2 = Terraformer::Coordinate.new 101, 0, 0
+        @c.wont_equal c2
+      end
+    end
+
+    describe 'maths' do
+      before :each do
+        @c2 = Terraformer::Coordinate.new 102, 2
+      end
+
+      it 'should add' do
+        @c = @c + [1, 1]
+
+        @c.x.must_equal 101
+        @c.y.must_equal 1
+      end
+
+      it 'should subtract' do
+        @c = @c - [1, 1]
+
+        @c.x.must_equal 99
+        @c.y.must_equal -1
+      end
+
+      it 'should calculate euclidean distance' do
+        ed = @c.euclidean_distance_to(@c2)
+        ed.to_s('F').must_equal "2.82842712474619"
+      end
+
+      it 'should calculate squared euclidean distance' do
+        ed = @c.squared_euclidean_distance_to(@c2)
+        ed.to_s('F').must_equal "8.0"
+      end
+
+      it 'should calculate haversine distance' do
+        ed = @c.haversine_distance_to(@c2)
+        ed.to_s('F').must_equal "314475.2493440403"
+      end
+
+      it 'should calculate distance and bearing' do
+        db = @c.distance_and_bearing_to(@c2)
+        db.class.must_equal Hash
+
+        db[:distance].to_s('F').must_equal "314037.6739419673"
+        db[:bearing][:initial].to_s('F').must_equal "45.17484844056842"
+        db[:bearing][:final].to_s('F').must_equal "45.20976211316248"
+
+        d = @c.distance_to @c2
+        d.must_equal db[:distance]
+
+        ib = @c.initial_bearing_to @c2
+        ib.must_equal db[:bearing][:initial]
+
+        fb = @c.final_bearing_to @c2
+        fb.must_equal db[:bearing][:final]
+
+      end
+    end
+  end
+end
+