terraformer 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bdd47e750c746d35d7e55ac4ecbca82548ca9b0
-  data.tar.gz: b5612978bf4ba8145a4cbb4103574680e3e1e8a9
+  metadata.gz: 8870157d8b1074418f97a8760cece253047829e0
+  data.tar.gz: de0f63a4d2a320e9e3c8a2c5b70025d2208a56fc
 SHA512:
-  metadata.gz: de22c0fe889529a57e7cbd8538344b1e2aa73ce6a218c1f0908d239c177b56eb77f9fa47f436f81dd90302ab93f5c3aaec05f28fda7f38a98d8091b084619891
-  data.tar.gz: a7b86a474675c9c63023820afa8131d6288a6158780ed2e03b0f9fcd43c7a13a82d83df287c34cfe04d2057d155859059caf343f8a239d5047903d249d476048
+  metadata.gz: 252e0d88535889c9bc9fe641bba534917288d77412b86db9de20a99fecfdd422ef245f6e2b8cbefc16cc69001726084d4633847d284aed1ab522bea4b2dc4954
+  data.tar.gz: c92efd04400e6a059fae22304b6d6f7b7344a79ffa530fd3a1dff08aa58e4690588c0c986bc765c7fb364ff255a09ebb755e150749f8f8cd4a32fa2e4b62158f

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+changelog
+=========
+
+### 0.2.0 3 feb 2015
+
+thanks: @davy
+
+* major refactor to compose from Array vs. descend from it (#5)

data/README.md

@@ -25,8 +25,8 @@ require 'terraformer'
 
 ##### Create a Terraformer primitive from GeoJSON
 
-```
-> polygon = Terraformer.parse '{
+```ruby
+polygon = Terraformer.parse '{
   "type": "Polygon",
   "coordinates": [
     [
@@ -41,24 +41,32 @@ require 'terraformer'
   ]
 }'
 
-> point = Terraformer.parse '{
+point = Terraformer.parse '{
   "type": "Point",
   "coordinates": [-122.66947746276854, 45.51775972687403]
 }'
 
 ```
+
 Now that you have a point and a polygon primitive you can use the primitive helper methods.
 
-```
+```ruby
 # add a new vertex to our polygon
-> new_point = Terraformer::Point.new -122.6708507537842, 45.513188859735436
-> polygon.insert_vertex 2, new_point
+new_point = Terraformer::Point.new -122.6708507537842, 45.513188859735436
+polygon.insert_vertex 2, new_point
 ```
+
 You can also have Terraformer perform many geometric operations like convex hulls and bounding boxes.
-```
-> convex_hull = polygon.convex_hull
-> point.within? convex_hull #returns true
-> bounding_box = polygon.bbox #returns the bounding box for this object.
+
+```ruby
+# returns convex hull
+convex_hull = polygon.convex_hull
+
+point.within? convex_hull
+=> true
+
+# returns the bounding box
+bounding_box = polygon.bbox
 ```
 
 ## Contributing

data/Rakefile

@@ -1,4 +1,7 @@
 require 'rake/testtask'
+require 'bundler'
+
+Bundler::GemHelper.install_tasks
 
 Rake::TestTask.new do |t|
   t.pattern = ENV['TEST_PATTERN'] || "test/**/*_spec.rb"

data/lib/ext/array.rb

@@ -1,5 +1,22 @@
 class Array
 
+  def rotate_until &block
+    return if block[]
+    found = false
+    length.times do
+      push shift
+      if block[]
+        found = true
+        break
+      end
+    end
+    raise IndexError unless found
+  end
+
+  def rotate_until_first_equals obj
+    rotate_until { at(0) == obj }
+  end
+
   def slice_exists? slice
     start = slice.first
     len = slice.size

data/lib/terraformer/arcgis.rb

@@ -98,53 +98,68 @@ module Terraformer
         end
       end
 
+      def parse_point arcgis
+        Coordinate.new(%w[x y z].map {|k| arcgis[k]}).to_point
+      end
+
+      def parse_points arcgis
+        require_array arcgis['points']
+        MultiPoint.new arcgis['points']
+      end
+
+      def parse_paths arcgis
+        require_array arcgis['paths']
+        if arcgis['paths'].length == 1
+          LineString.new arcgis['paths'][0]
+        else
+          MultiLineString.new arcgis['paths']
+        end
+      end
+
+      def parse_geometry arcgis, opts
+        if arcgis['compressedGeometry']
+          arcgis['geometry'] = {'paths' => [decompress_geometry(arcgis['compressedGeometry'])]}
+        end
+
+        o = Feature.new
+        o.geometry = parse arcgis['geometry'] if arcgis['geometry']
+        if attrs = arcgis['attributes']
+          o.properties = attrs.clone
+          if opts[:id_attribute] && o.properties[opts[:id_attribute]]
+            o.id = o.properties.delete opts[:id_attribute]
+          elsif o.properties[OBJECT_ID]
+            o.id = o.properties.delete OBJECT_ID
+          elsif o.properties['FID']
+            o.id = o.properties.delete 'FID'
+          end
+        end
+
+        return o
+      end
+
       def parse arcgis, opts = {}
         arcgis = JSON.parse arcgis if String === arcgis
         raise ArgumentError.new 'argument not hash nor json' unless Hash === arcgis
 
         obj = case
               when Numeric === arcgis['x'] && Numeric === arcgis['y']
-                Coordinate.new(%w[x y z].map {|k| arcgis[k]}).to_point
+                parse_point arcgis
 
               when arcgis['points']
-                require_array arcgis['points']
-                MultiPoint.new arcgis['points']
+                parse_points arcgis
 
               when arcgis['paths']
-                require_array arcgis['paths']
-                if arcgis['paths'].length == 1
-                  LineString.new arcgis['paths'][0]
-                else
-                  MultiLineString.new arcgis['paths']
-                end
+                parse_paths arcgis
 
               when arcgis['rings']
                 convert_rings arcgis['rings']
 
               when !(%w[compressedGeometry geometry attributes].map {|k| arcgis[k]}.empty?)
-
-                if arcgis['compressedGeometry']
-                  arcgis['geometry'] = {'paths' => [decompress_geometry(arcgis['compressedGeometry'])]}
-                end
-
-                o = Feature.new
-                o.geometry = parse arcgis['geometry'] if arcgis['geometry']
-                if attrs = arcgis['attributes']
-                  o.properties = attrs.clone
-                  if opts[:id_attribute] and o.properties[opts[:id_attribute]]
-                    o.id = o.properties.delete opts[:id_attribute]
-                  elsif o.properties[OBJECT_ID]
-                    o.id = o.properties.delete OBJECT_ID
-                  elsif o.properties['FID']
-                    o.id = o.properties.delete 'FID'
-                  end
-                end
-                o
-
+                parse_geometry arcgis, opts
               end
 
         isr = arcgis['geometry'] ? arcgis['geometry']['spatialReference'] : arcgis['spatialReference']
-        if isr and Integer(isr['wkid']) == 102100
+        if isr && Integer(isr['wkid']) == 102100
           if Feature === obj
             obj.geometry = obj.geometry.to_geographic
           else

data/lib/terraformer/bounds.rb

@@ -7,25 +7,19 @@ module Terraformer
 
         obj = Terraformer.parse obj unless Geometry === obj
 
-        bbox = case obj.type
-               when 'Point'
+        bbox = case obj
+               when Point
                  [ obj.coordinates[0], obj.coordinates[1],
                    obj.coordinates[0], obj.coordinates[1] ]
-               when 'MultiPoint'
+               when MultiPoint, LineString,
+                    MultiLineString, Polygon,
+                    MultiPolygon
                  bounds_for_array obj.coordinates
-               when 'LineString'
-                 bounds_for_array obj.coordinates
-               when 'MultiLineString'
-                 bounds_for_array obj.coordinates, 1
-               when 'Polygon'
-                 bounds_for_array obj.coordinates, 1
-               when 'MultiPolygon'
-                 bounds_for_array obj.coordinates, 2
-               when 'Feature'
+               when Feature
                  obj.geometry ? bounds(obj.geometry) : nil
-               when 'FeatureCollection'
+               when FeatureCollection
                  bounds_for_feature_collection obj
-               when 'GeometryCollection'
+               when GeometryCollection
                  bounds_for_geometry_collection obj
                else
                  raise ArgumentError.new 'unknown type: ' + obj.type
@@ -45,22 +39,19 @@ module Terraformer
 
       X1, Y1, X2, Y2 = 0, 1, 2, 3
 
-      def bounds_for_array array, nesting = 0, box = Array.new(4)
-        if nesting > 0
-          array.reduce box do |b, a|
-            bounds_for_array a, (nesting - 1), b
-          end
-        else
-          bbox = array.reduce box do |b, lonlat|
-            lon, lat = *lonlat
+      def bounds_for_array array, box = Array.new(4)
+        array.reduce box do |b, a|
+          case a
+          when Coordinate
             set = ->(d, i, t){ b[i] = d if b[i].nil? or d.send(t, b[i])}
-            set[lon, X1, :<]
-            set[lon, X2, :>]
-            set[lat, Y1, :<]
-            set[lat, Y2, :>]
+            set[a[0], X1, :<]
+            set[a[0], X2, :>]
+            set[a[1], Y1, :<]
+            set[a[1], Y2, :>]
             b
+          else
+            bounds_for_array a, box
           end
-          bbox
         end
       end
 

data/lib/terraformer/convex_hull.rb

@@ -32,7 +32,9 @@ module Terraformer
 
       def flatten_coordinates_from points
         cs = []
-        points.each_coordinate {|c| cs << c}
+        Geometry.iter_coordinate points, :each do |c|
+          cs << c
+        end
         cs.sort!.uniq!
         cs
       end

data/lib/terraformer/coordinate.rb

@@ -1,6 +1,6 @@
 module Terraformer
 
-  class Coordinate < ::Array
+  class Coordinate
 
     # http://en.wikipedia.org/wiki/Earth_radius#Mean_radius
     #
@@ -8,14 +8,21 @@ module Terraformer
 
     attr_accessor :crs
 
-    class << self
+    # array holding the numeric coordinate values
+    attr_accessor :ary
 
-      def from arys
-        arys.map {|e| Coordinate.from_array e}
-      end
+    class << self
 
       def from_array a
-        Coordinate.__send__ Numeric === a[0] ? :new : :from, a
+        if Coordinate === a
+          a.dup
+        elsif Numeric === a[0]
+          Coordinate.new a
+        elsif Array === a
+          a.map {|e| Coordinate.from_array e }
+        else
+          raise ArgumentError
+        end
       end
 
       def big_decimal n
@@ -34,14 +41,21 @@ module Terraformer
     end
 
     def initialize _x, _y = nil, _z = nil
-      super 3
-      case
-      when Array === _x
+      @ary = Array.new 3
+      case _x
+      when Array
         raise ArgumentError if _y
         self.x = _x[0]
         self.y = _x[1]
         self.z = _x[2] if _x[2]
-      when Numeric === _x || String === _x
+
+      when Coordinate
+        raise ArgumentError if _y
+        self.x = _x.x
+        self.y = _x.y
+        self.z = _x.z if _x.z
+
+      when Numeric, String
         raise ArgumentError unless _y
         self.x = _x
         self.y = _y
@@ -51,32 +65,53 @@ module Terraformer
       end
     end
 
+    def dup
+      Coordinate.new @ary.dup
+    end
+
     def x
-      self[0]
+      @ary[0]
     end
+    alias_method :lon, :x
 
     def x= _x
-      self[0] = Coordinate.big_decimal _x
+      @ary[0] = Coordinate.big_decimal _x
     end
 
     def y
-      self[1]
+      @ary[1]
     end
+    alias_method :lat, :y
 
     def y= _y
-      self[1] = Coordinate.big_decimal _y
+      @ary[1] = Coordinate.big_decimal _y
     end
 
     def z
-      self[2]
+      @ary[2]
     end
 
     def z= _z
-      self[2] = Coordinate.big_decimal _z
+      @ary[2] = Coordinate.big_decimal _z
+    end
+
+    def [] index
+      @ary[index]
+    end
+
+    def == other
+      case other
+      when Array
+        @ary == other
+      when Coordinate
+        @ary == other.ary
+      else
+        false
+      end
     end
 
-    [:<<, :*, :&, :|].each do |sym|
-      define_method(sym){|*a| raise NotImplementedError }
+    def inspect
+      "#<Terraformer::Coordinate lon=#{lon.to_s 'F'} lat=#{lat.to_s 'F'} #{z if z }>"
     end
 
     def to_geographic
@@ -101,11 +136,11 @@ module Terraformer
     end
 
     def to_s
-      [x,y,z].compact.join ','
+      @ary.compact.join ','
     end
 
     def to_json *args
-      compact.to_json(*args)
+      @ary.compact.to_json(*args)
     end
 
     def to_point

data/lib/terraformer/geometry/class_methods.rb

@@ -6,6 +6,10 @@ module Terraformer
     module ClassMethods
 
       def coordinates_contain_point? coordinates, point
+        if Terraformer::Coordinate === coordinates
+          return coordinates == point
+        end
+
         contains = false
         i = -1
         l = coordinates.length

data/lib/terraformer/geometry.rb

@@ -13,7 +13,7 @@ module Terraformer
       case
       when args.length > 1
         self.coordinates = Coordinate.from_array args
-      when Array === args[0]
+      when Array === args[0] || Coordinate === args[0]
         self.coordinates = Coordinate.from_array args[0]
       else
         super *args do |arg|
@@ -22,6 +22,28 @@ module Terraformer
       end
     end
 
+    def each_coordinate &block
+      Geometry.iter_coordinate coordinates, :each, &block
+    end
+
+    def map_coordinate &block
+      Geometry.iter_coordinate coordinates, :map, &block
+    end
+
+    def self.iter_coordinate obj, meth, &block
+      if Terraformer::Coordinate === obj
+        block.call obj
+      elsif Array === obj
+        obj.__send__ meth do |pair|
+          if Array === pair
+            Geometry.iter_coordinate pair, meth, &block
+          else
+            block.call pair
+          end
+        end
+      end
+    end
+
     def to_hash *args
       h = {
         type: type,
@@ -33,11 +55,11 @@ module Terraformer
     end
 
     def to_mercator
-      self.class.new *coordinates.map_coordinate(&:to_mercator)
+      self.class.new *map_coordinate(&:to_mercator)
     end
 
     def to_geographic
-      self.class.new *coordinates.map_coordinate(&:to_geographic)
+      self.class.new *map_coordinate(&:to_geographic)
     end
 
     def to_feature
@@ -85,8 +107,9 @@ module Terraformer
           raise ArgumentError.new "unsupported type: #{e.type rescue e.class}"
         end
       end
-      return true if begin
-        within? other or other.within? self
+
+      begin
+        return true if within? other or other.within? self
       rescue ArgumentError
         false
       end

data/lib/terraformer/line_string.rb

@@ -2,6 +2,16 @@ module Terraformer
 
   class LineString < Geometry
 
+    def initialize *args
+      super *args
+
+      # must be an array of coordinates
+      unless Array === coordinates &&
+             Terraformer::Coordinate === coordinates[0]
+        raise ArgumentError.new 'invalid coordinates for Terraformer::LineString'
+      end
+    end
+
     def first_coordinate
       coordinates[0]
     end

data/lib/terraformer/multi_line_string.rb

@@ -3,16 +3,20 @@ module Terraformer
   class MultiLineString < Geometry
 
     def initialize *args
+
       case
-      when Coordinate === args[0] # only one
-        self.coordinates = [Coordinate.from_array(args)]
-      when Array === args[0] # multiple?
-        self.coordinates = Coordinate.from args
       when LineString === args[0]
         self.coordinates = args.map &:coordinates
       else
         super *args
       end
+
+      # must be an array of arrays of coordinates
+      unless Array === coordinates &&
+             Array === coordinates[0] &&
+             Terraformer::Coordinate === coordinates[0][0]
+        raise ArgumentError.new 'invalid coordinates for Terraformer::MultiLineString'
+      end
     end
 
     def first_coordinate
@@ -25,14 +29,9 @@ module Terraformer
 
     def == obj
       super obj do |o|
-        equal = true
-        lses = line_strings.sort
-        olses = o.line_strings.sort
-        lses.each_with_index do |ls, i|
-          equal = ls == olses[i]
-          break unless equal
-        end
-        equal
+        lses = line_strings.sort {|a,b| a.first_coordinate <=> b.first_coordinate }
+        olses = o.line_strings.sort {|a,b| a.first_coordinate <=> b.first_coordinate }
+        lses == olses
       end
     end
 

data/lib/terraformer/multi_point.rb

@@ -9,6 +9,12 @@ module Terraformer
       else
         super *args
       end
+
+      # must be an array of coordinates
+      unless Array === coordinates &&
+             Terraformer::Coordinate === coordinates[0]
+        raise ArgumentError.new 'invalid coordinates for Terraformer::MultiPoint'
+      end
     end
 
     def first_coordinate

data/lib/terraformer/multi_polygon.rb

@@ -7,18 +7,28 @@ module Terraformer
 
       # arg is an array of arrays of polygon, holes
       when Array === args[0] && Array === args[0][0] && Array === args[0][0][0] && Array === args[0][0][0][0]
-        self.coordinates = Coordinate.from(*args)
+        self.coordinates = Coordinate.from_array(*args)
 
       when Coordinate === args[0] # only one
         self.coordinates = [[Coordinate.from_array(args)]]
+
       when Array === args[0] # multiple?
-        self.coordinates = [Coordinate.from(args)]
+        self.coordinates = [Coordinate.from_array(args)]
+
       when Polygon === args[0]
         self.coordinates = args.map &:coordinates
 
       else
         super *args
       end
+
+      # must be an array of arrays of arrays of coordinates (whew!)
+      unless Array === coordinates &&
+             Array === coordinates[0] &&
+             Array === coordinates[0][0] &&
+             Terraformer::Coordinate === coordinates[0][0][0]
+        raise ArgumentError.new 'invalid coordinates for Terraformer::MultiPolygon'
+      end
     end
 
     def first_coordinate

data/lib/terraformer/point.rb

@@ -2,6 +2,15 @@ module Terraformer
 
   class Point < Geometry
 
+    def initialize *args
+      super
+
+      # must be a single point
+      unless Terraformer::Coordinate === coordinates
+        raise ArgumentError.new 'invalid coordinates for Terraformer::Point'
+      end
+    end
+
     def first_coordinate
       coordinates
     end

data/lib/terraformer/polygon.rb

@@ -3,24 +3,34 @@ module Terraformer
   class Polygon < Geometry
 
     def initialize *args
-      case
 
       # each arg is a position of the polygon
-      when Coordinate === args[0] || (Array === args[0] && Numeric === args[0][0])
+      if Coordinate === args[0] || (Array === args[0] && Numeric === args[0][0])
         self.coordinates = [Coordinate.from_array(args)]
 
-      # each arg is an array of positions; first is polygon, rest are "holes"
-      when Array === args[0] && Array === args[0][0] && Numeric === args[0][0][0]
-        self.coordinates = Coordinate.from args
+      elsif Array === args[0]
 
-      # arg is an array of polygon, holes
-      when Array === args[0] && Array === args[0][0] && Array === args[0][0][0]
-        self.coordinates = Coordinate.from *args
+        # each arg is an array of positions; first is polygon, rest are "holes"
+        if Coordinate === args[0][0] ||
+           Array === args[0][0] && Numeric === args[0][0][0]
+          self.coordinates = Coordinate.from_array args
+
+        # arg is an array of polygon, holes
+        elsif Array === args[0][0] && Array === args[0][0][0]
+          self.coordinates = Coordinate.from_array *args
+        end
 
       else
         super *args
       end
 
+      # must be an array of arrays of coordinates
+      unless Array === coordinates &&
+             Array === coordinates[0] &&
+             Terraformer::Coordinate === coordinates[0][0]
+        raise ArgumentError.new 'invalid coordinates for Terraformer::Polygon'
+      end
+
       if line_strings.map(&:linear_ring?).include? false
         raise ArgumentError.new 'not linear ring'
       end
@@ -40,7 +50,7 @@ module Terraformer
         equal = true
 
         # first check outer polygon
-        equal = self.coordinates[0].polygonally_equal_to? obj.coordinates[0]
+        equal = Polygon.polygonally_equal? self.coordinates[0], obj.coordinates[0]
 
         # then inner polygons (holes)
         #
@@ -51,7 +61,7 @@ module Terraformer
             obj_holes = obj.coordinates[1..-1].sort
 
             self_holes.each_with_index do |hole, idx|
-              equal = hole.polygonally_equal_to? obj_holes[idx]
+              equal = Polygon.polygonally_equal? hole, obj_holes[idx]
               break unless equal
             end
           end
@@ -130,6 +140,42 @@ module Terraformer
       coordinates[0].delete_at idx
     end
 
+
+    def self.polygonally_equal? a, b
+      if Terraformer::Coordinate === a ||
+         Terraformer::Coordinate === b
+        return a == b
+      end
+
+      raise ArgumentError unless Enumerable === a
+      raise ArgumentError unless Enumerable === b
+
+      # polygons must be the same length
+      return false if a.length != b.length
+
+      # polygons must have the last element be a duplicate
+      # polygon-closing coordinate
+      return false if a[0] != a[-1]
+      return false if b[0] != b[-1]
+
+      equal = true
+
+      # clone so can pop/rotate
+      a = a.clone
+      b = b.clone
+
+      # pop to drop the duplicate, polygon-closing, coordinate
+      a.pop
+      b.pop
+
+      begin
+        b.rotate_until_first_equals a[0]
+        return a == b
+      rescue IndexError
+        return false
+      end
+    end
+
   end
 
 end

data/lib/terraformer/version.rb

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

data/lib/terraformer.rb

@@ -5,7 +5,6 @@ require 'bigdecimal/util'
 require 'ext/array'
 require 'ext/big_decimal'
 require 'ext/big_math'
-require 'ext/enumerable'
 require 'forwardable'
 
 # terraformer.rb - a toolkit for working with geojson in ruby
@@ -73,7 +72,9 @@ module Terraformer
     # handles basic JSON parsing for terraformer object constructors.
     #
     def initialize *args
-      arg = String === args[0] ? JSON.parse(args[0]) : args[0]
+      arg = args[0]
+      arg = JSON.parse(arg) if String === arg
+
       raise ArgumentError.new "invalid argument(s): #{args}" unless Hash === arg
       raise ArgumentError.new "invalid type: #{arg['type']}" unless arg['type'] == self.type
       yield arg if block_given?

data/terraformer.gemspec

@@ -2,10 +2,10 @@
 require File.expand_path('../lib/terraformer/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Kenichi Nakamura"]
-  gem.email         = ["kenichi.nakamura@gmail.com"]
-  gem.description   = gem.summary = ""
-  gem.homepage      = "https://github.com/esripdx/terraformer-ruby"
+  gem.authors       = ["Kenichi Nakamura", "Davy Stevenson"]
+  gem.email         = ["kenichi.nakamura@gmail.com", "davy.stevenson@gmail.com"]
+  gem.description   = gem.summary = "toolkit for working with GeoJSON in pure Ruby"
+  gem.homepage      = "https://github.com/kenichi/terraformer-ruby"
   gem.files         = `git ls-files | grep -Ev '^(myapp|examples)'`.split("\n")
   gem.test_files    = `git ls-files -- test/*`.split("\n")
   gem.name          = "terraformer"

data/test/coordinate_spec.rb

@@ -2,35 +2,6 @@ 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

data/test/multi_line_string_spec.rb

@@ -8,15 +8,13 @@ describe Terraformer::MultiLineString do
       a = Terraformer::Coordinate.new -122.6764, 45.5165
       b = a + [0.02, 0.02]
       c = b + [0.1, -0.1]
-      mls = Terraformer::MultiLineString.new a, b, c
+      mls = Terraformer::MultiLineString.new [[a, b, c]]
       mls.to_json.must_equal '{"type":"MultiLineString","coordinates":[[[-122.6764,45.5165],[-122.6564,45.5365],[-122.5564,45.4365]]]}'
       mls.must_be_valid_geojson
     end
 
     it 'constructs from array - single line' do
-      ## unlike point, multipoint and linestring, passing in the coordinates array directly into multilinestring doesn't work
-      # mls = Terraformer::MultiLineString.new [[[-122.6764,45.5165],[-122.6564,45.5365],[-122.5564,45.4365]]]
-      mls = Terraformer::MultiLineString.new [[-122.6764,45.5165],[-122.6564,45.5365],[-122.5564,45.4365]]
+      mls = Terraformer::MultiLineString.new [[[-122.6764,45.5165],[-122.6564,45.5365],[-122.5564,45.4365]]]
       mls.to_json.must_equal '{"type":"MultiLineString","coordinates":[[[-122.6764,45.5165],[-122.6564,45.5365],[-122.5564,45.4365]]]}'
       mls.must_be_valid_geojson
     end
@@ -47,9 +45,7 @@ describe Terraformer::MultiLineString do
     end
 
     it 'constructs from array - multiple lines' do
-        ## unlike point, multipoint and linestring, passing in the coordinates array directly into multilinestring doesn't work
-        # mls = Terraformer::MultiLineString.new [[[-122.6764,45.5165],[-122.6564,45.5365],[-122.5564,45.4365]],[[-121.5564,46.4365],[-121.5364,46.4565],[-121.4364,46.3565]]]
-        mls = Terraformer::MultiLineString.new [[-122.6764,45.5165],[-122.6564,45.5365],[-122.5564,45.4365]],[[-121.5564,46.4365],[-121.5364,46.4565],[-121.4364,46.3565]]
+      mls = Terraformer::MultiLineString.new [[[-122.6764,45.5165],[-122.6564,45.5365],[-122.5564,45.4365]],[[-121.5564,46.4365],[-121.5364,46.4565],[-121.4364,46.3565]]]
       mls.to_json.must_equal '{"type":"MultiLineString","coordinates":[[[-122.6764,45.5165],[-122.6564,45.5365],[-122.5564,45.4365]],[[-121.5564,46.4365],[-121.5364,46.4565],[-121.4364,46.3565]]]}'
       mls.must_be_valid_geojson
     end

data/test/terraformer_spec.rb

@@ -163,7 +163,7 @@ describe Terraformer do
         a = d.split
         a[1][a[3]..-1].length
       }
-      c.coordinates.each_coordinate do |c|
+      c.each_coordinate do |c|
         splitter[c.x].must_be :<=, Terraformer::PRECISION
         splitter[c.x].must_be :<=, Terraformer::PRECISION
       end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: terraformer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kenichi Nakamura
+- Davy Stevenson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -24,21 +25,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-description: ''
+description: toolkit for working with GeoJSON in pure Ruby
 email:
 - kenichi.nakamura@gmail.com
+- davy.stevenson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
 - lib/ext/array.rb
 - lib/ext/big_decimal.rb
 - lib/ext/big_math.rb
-- lib/ext/enumerable.rb
 - lib/terraformer.rb
 - lib/terraformer/arcgis.rb
 - lib/terraformer/bounds.rb
@@ -82,7 +84,7 @@ files:
 - test/polygon_spec.rb
 - test/primitive_spec.rb
 - test/terraformer_spec.rb
-homepage: https://github.com/esripdx/terraformer-ruby
+homepage: https://github.com/kenichi/terraformer-ruby
 licenses:
 - apache
 metadata: {}
@@ -105,7 +107,7 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: ''
+summary: toolkit for working with GeoJSON in pure Ruby
 test_files:
 - test/arcgis_spec.rb
 - test/circle_spec.rb

data/lib/ext/enumerable.rb

@@ -1,79 +0,0 @@
-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!
-
-  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
-    end
-  end
-
-  def rotate_until &block
-    return if block[]
-    found = false
-    length.times do
-      push shift
-      if block[]
-        found = true
-        break
-      end
-    end
-    raise IndexError unless found
-  end
-
-  def rotate_until_first_equals obj
-    rotate_until { at(0) == obj }
-  end
-
-  def polygonally_equal_to? obj
-    raise ArgumentError unless Enumerable === obj
-    return false if self.length != obj.length
-
-    equal = true
-
-    # clone so can pop/rotate
-    me = self.clone
-    obj = obj.clone
-
-    # pop to drop the duplicate, polygon-closing, coordinate
-    me.pop
-    obj.pop
-
-    begin
-      obj.rotate_until_first_equals me[0]
-      equal = me == obj
-    rescue IndexError
-      equal = false
-    end
-
-    equal
-  end
-
-end