rgeo 0.4.0 → 0.5.0

data/test/geos_capi/tc_polygon.rb

@@ -4,27 +4,21 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/polygon_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/polygon_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosCAPI  # :nodoc:
-
-      class TestPolygon < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosCAPI # :nodoc:
+      class TestPolygon < ::Test::Unit::TestCase # :nodoc:
         def setup
           @factory = ::RGeo::Geos.factory
         end
 
-
         include ::RGeo::Tests::Common::PolygonTests
 
-
         def test_intersection
           point1_ = @factory.point(0, 0)
           point2_ = @factory.point(0, 2)
@@ -36,7 +30,6 @@ module RGeo
           assert_equal(poly2_, poly3_)
         end
 
-
         def test_union
           point1_ = @factory.point(0, 0)
           point2_ = @factory.point(0, 2)
@@ -48,21 +41,63 @@ module RGeo
           assert_equal(poly1_, poly3_)
         end
 
-
         def test_simplify
           xys = [[0, 0], [5, 0], [10, 0], [10, 10], [5, 10.2], [0, 10], [0, 0]]
-          points = xys.collect { |x,y| @factory.point(x, y) }
+          points = xys.collect { |x, y| @factory.point(x, y) }
           poly = @factory.polygon(@factory.linear_ring(points))
           simplified = poly.simplify(0.3)
           new_points = simplified.exterior_ring.points
           extra = new_points.reject { |p| [0, 10].include?(p.x) and [0, 10].include?(p.y) }
           assert_equal 5, new_points.length, "Closed ring of the square should have 5 points"
-          assert_equal 0, extra.length , "Should only have x/y's on 0 and 10"
+          assert_equal 0, extra.length, "Should only have x/y's on 0 and 10"
         end
 
+        def test_buffer
+          polygon_coordinates = [[0.5527864045000421, 3.776393202250021],
+                                 [0.7763932022500211, 4.447213595499958],
+                                 [1.4472135954999579, 4.223606797749979],
+                                 [2.447213595499958, 2.223606797749979],
+                                 [2.223606797749979, 1.5527864045000421],
+                                 [1.5527864045000421, 1.776393202250021],
+                                 [0.5527864045000421, 3.776393202250021]]
+
+          points_arr = polygon_coordinates.map { |v| @factory.point(v[0], v[1]) }
+          outer_ring = @factory.linear_ring(points_arr)
+          polygon = @factory.polygon(outer_ring)
+
+          point1 = @factory.point(2, 2)
+          point2 = @factory.point(1, 4)
+          line_string = @factory.line_string([point1, point2])
+          polygon2 = line_string.buffer(0.5)
+
+          assert_equal polygon, polygon2
+        end
 
+        def test_buffer_with_style
+          polygon_coordinates = [[0.7316718427000253, 3.865835921350013],
+                                 [1.0, 4.3], [6.0, 4.3], [6.3, 4.3],
+                                 [6.3, 3.7], [1.4854101966249682, 3.7],
+                                 [2.2683281572999747, 2.134164078649987],
+                                 [2.4024922359499623, 1.8658359213500124],
+                                 [1.8658359213500126, 1.597507764050038],
+                                 [0.7316718427000253, 3.865835921350013]]
+
+          points_arr = polygon_coordinates.map { |v| @factory.point(v[0], v[1]) }
+          outer_ring = @factory.linear_ring(points_arr)
+          polygon = @factory.polygon(outer_ring)
+
+          point1 = @factory.point(2, 2)
+          point2 = @factory.point(1, 4)
+          point3 = @factory.point(6, 4)
+          line_string = @factory.line_string([point1, point2, point3])
+          buffered_line_string = line_string.buffer_with_style(0.3,
+                                                                 RGeo::Geos::CAP_FLAT,
+                                                                 RGeo::Geos::JOIN_ROUND,
+                                                                 0.0)
+
+          assert_equal polygon, buffered_line_string
+        end
       end
-
     end
   end
 end if ::RGeo::Geos.capi_supported?

data/test/geos_capi/tc_zmfactory.rb

@@ -4,35 +4,28 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/factory_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/factory_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosCAPI  # :nodoc:
-
-      class TestZMFactory < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosCAPI # :nodoc:
+      class TestZMFactory < ::Test::Unit::TestCase # :nodoc:
         def setup
-          @factory = ::RGeo::Geos.factory(:has_z_coordinate => true, :has_m_coordinate => true, :srid => 1000, :buffer_resolution => 2)
+          @factory = ::RGeo::Geos.factory(has_z_coordinate: true, has_m_coordinate: true, srid: 1000, buffer_resolution: 2)
           @srid = 1000
         end
 
-
         include ::RGeo::Tests::Common::FactoryTests
 
-
         def test_is_geos_factory
           assert_equal(true, ::RGeo::Geos.is_geos?(@factory))
           assert_equal(true, ::RGeo::Geos.is_capi_geos?(@factory))
           assert_equal(false, ::RGeo::Geos.is_ffi_geos?(@factory))
         end
 
-
         def test_factory_parts
           assert_equal(1000, @factory.srid)
           assert_equal(1000, @factory.z_factory.srid)
@@ -48,7 +41,6 @@ module RGeo
           assert(@factory.m_factory.property(:has_m_coordinate))
         end
 
-
         def test_4d_point
           point_ = @factory.point(1, 2, 3, 4)
           assert_equal(Feature::Point, point_.geometry_type)
@@ -59,10 +51,7 @@ module RGeo
           assert_nil(point_.m_geometry.z)
           assert_equal(4, point_.m_geometry.m)
         end
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.capi_supported?

data/test/geos_ffi/tc_factory.rb

@@ -4,37 +4,28 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/factory_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/factory_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosFFI  # :nodoc:
-
-      class TestFactory < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosFFI # :nodoc:
+      class TestFactory < ::Test::Unit::TestCase # :nodoc:
         def setup
-          @factory = ::RGeo::Geos.factory(:srid => 1000, :native_interface => :ffi)
+          @factory = ::RGeo::Geos.factory(srid: 1000, native_interface: :ffi)
           @srid = 1000
         end
 
-
         include ::RGeo::Tests::Common::FactoryTests
 
-
         def test_is_geos_factory
           assert_equal(true, ::RGeo::Geos.is_geos?(@factory))
           assert_equal(false, ::RGeo::Geos.is_capi_geos?(@factory))
           assert_equal(true, ::RGeo::Geos.is_ffi_geos?(@factory))
         end
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/tc_geometry_collection.rb

@@ -4,29 +4,21 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/geometry_collection_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/geometry_collection_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosFFI  # :nodoc:
-
-      class TestGeometryCollection < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosFFI # :nodoc:
+      class TestGeometryCollection < ::Test::Unit::TestCase # :nodoc:
         def create_factory
-          ::RGeo::Geos.factory(:native_interface => :ffi)
+          ::RGeo::Geos.factory(native_interface: :ffi)
         end
 
-
         include ::RGeo::Tests::Common::GeometryCollectionTests
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/tc_line_string.rb

@@ -4,29 +4,21 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/line_string_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/line_string_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosFFI  # :nodoc:
-
-      class TestLineString < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosFFI # :nodoc:
+      class TestLineString < ::Test::Unit::TestCase # :nodoc:
         def setup
-          @factory = ::RGeo::Geos.factory(:native_interface => :ffi)
+          @factory = ::RGeo::Geos.factory(native_interface: :ffi)
         end
 
-
         include ::RGeo::Tests::Common::LineStringTests
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/tc_misc.rb

@@ -4,22 +4,17 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
+require "test/unit"
+require "rgeo"
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosFFI  # :nodoc:
-
-      class TestMisc < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosFFI # :nodoc:
+      class TestMisc < ::Test::Unit::TestCase # :nodoc:
         def setup
-          @factory = ::RGeo::Geos.factory(:srid => 4326, :native_interface => :ffi)
+          @factory = ::RGeo::Geos.factory(srid: 4326, native_interface: :ffi)
         end
 
-
         def test_empty_geometries_equal
           geom1_ = @factory.collection([])
           geom2_ = @factory.line_string([])
@@ -27,7 +22,6 @@ module RGeo
           assert(geom1_.equals?(geom2_))
         end
 
-
         def test_prepare
           p1_ = @factory.point(1, 2)
           p2_ = @factory.point(3, 4)
@@ -38,7 +32,6 @@ module RGeo
           assert_equal(true, polygon_.prepared?)
         end
 
-
         def test_auto_prepare
           p1_ = @factory.point(1, 2)
           p2_ = @factory.point(3, 4)
@@ -50,8 +43,8 @@ module RGeo
           polygon_.intersects?(p2_)
           assert_equal(true, polygon_.prepared?)
 
-          factory_no_auto_prepare_ = ::RGeo::Geos.factory(:srid => 4326,
-            :native_interface => :ffi, :auto_prepare => :disabled)
+          factory_no_auto_prepare_ = ::RGeo::Geos.factory(srid: 4326,
+                                                          native_interface: :ffi, auto_prepare: :disabled)
           polygon2_ = factory_no_auto_prepare_.polygon(
             factory_no_auto_prepare_.linear_ring([p1_, p2_, p3_, p1_]))
           assert_equal(false, polygon2_.prepared?)
@@ -60,10 +53,7 @@ module RGeo
           polygon2_.intersects?(p2_)
           assert_equal(false, polygon2_.prepared?)
         end
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/tc_multi_line_string.rb

@@ -4,29 +4,21 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/multi_line_string_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/multi_line_string_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosFFI  # :nodoc:
-
-      class TestMultiLineString < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosFFI # :nodoc:
+      class TestMultiLineString < ::Test::Unit::TestCase # :nodoc:
         def create_factory
-          ::RGeo::Geos.factory(:native_interface => :ffi)
+          ::RGeo::Geos.factory(native_interface: :ffi)
         end
 
-
         include ::RGeo::Tests::Common::MultiLineStringTests
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/tc_multi_point.rb

@@ -4,29 +4,21 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/multi_point_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/multi_point_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosFFI  # :nodoc:
-
-      class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
-
-
-        def create_factory(opts_={})
-          ::RGeo::Geos.factory(opts_.merge(:native_interface => :ffi))
+  module Tests # :nodoc:
+    module GeosFFI # :nodoc:
+      class TestMultiPoint < ::Test::Unit::TestCase # :nodoc:
+        def create_factory(opts_ = {})
+          ::RGeo::Geos.factory(opts_.merge(native_interface: :ffi))
         end
 
-
         include ::RGeo::Tests::Common::MultiPointTests
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/tc_multi_polygon.rb

@@ -4,39 +4,30 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/multi_polygon_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/multi_polygon_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosFFI  # :nodoc:
-
-      class TestMultiPolygon < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosFFI # :nodoc:
+      class TestMultiPolygon < ::Test::Unit::TestCase # :nodoc:
         def create_factories
-          @factory = ::RGeo::Geos.factory(:native_interface => :ffi)
-          @lenient_factory = ::RGeo::Geos.factory(:lenient_multi_polygon_assertions => true,
-            :native_interface => :ffi)
+          @factory = ::RGeo::Geos.factory(native_interface: :ffi)
+          @lenient_factory = ::RGeo::Geos.factory(lenient_multi_polygon_assertions: true,
+                                                  native_interface: :ffi)
         end
 
-
         include ::RGeo::Tests::Common::MultiPolygonTests
 
-
         # Centroid of an empty should return an empty collection
         # rather than throw a weird exception out of ffi-geos
 
         def test_empty_centroid
           assert_equal(@factory.collection([]), @factory.multi_polygon([]).centroid)
         end
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.ffi_supported?