rgeo 0.4.0 → 0.5.0

data/test/geos_ffi/tc_parsing_unparsing.rb

@@ -4,48 +4,38 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
+require "test/unit"
+require "rgeo"
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosFFI  # :nodoc:
-
-      class TestParsingUnparsing < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosFFI # :nodoc:
+      class TestParsingUnparsing < ::Test::Unit::TestCase # :nodoc:
         def test_wkt_generator_default_floating_point
           # Bug report GH-4
-          factory_ = ::RGeo::Geos.factory(:native_interface => :ffi)
+          factory_ = ::RGeo::Geos.factory(native_interface: :ffi)
           point_ = factory_.point(111.99, -40.37)
-          assert_equal('POINT (111.99 -40.37)', point_.as_text)
+          assert_equal("POINT (111.99 -40.37)", point_.as_text)
         end
 
-
         def test_wkt_generator_downcase
-          factory_ = ::RGeo::Geos.factory(:wkt_generator => {:convert_case => :lower},
-            :native_interface => :ffi)
+          factory_ = ::RGeo::Geos.factory(wkt_generator: { convert_case: :lower },
+                                          native_interface: :ffi)
           point_ = factory_.point(1, 1)
-          assert_equal('point (1.0 1.0)', point_.as_text)
+          assert_equal("point (1.0 1.0)", point_.as_text)
         end
 
-
         def test_wkt_generator_geos
-          factory_ = ::RGeo::Geos.factory(:wkt_generator => :geos, :native_interface => :ffi)
+          factory_ = ::RGeo::Geos.factory(wkt_generator: :geos, native_interface: :ffi)
           point_ = factory_.point(1, 1)
-          assert_equal('POINT (1.0000000000000000 1.0000000000000000)', point_.as_text)
+          assert_equal("POINT (1.0000000000000000 1.0000000000000000)", point_.as_text)
         end
 
-
         def test_wkt_parser_default_with_non_geosable_input
-          factory_ = ::RGeo::Geos.factory(:native_interface => :ffi)
-          assert_not_nil(factory_.parse_wkt('Point (1 1)'))
+          factory_ = ::RGeo::Geos.factory(native_interface: :ffi)
+          assert_not_nil(factory_.parse_wkt("Point (1 1)"))
         end
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/tc_point.rb

@@ -4,36 +4,29 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/point_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/point_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosFFI  # :nodoc:
-
-      class TestPoint < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosFFI # :nodoc:
+      class TestPoint < ::Test::Unit::TestCase # :nodoc:
         def setup
-          @factory = ::RGeo::Geos.factory(:native_interface => :ffi, :buffer_resolution => 8)
-          @zfactory = ::RGeo::Geos.factory(:has_z_coordinate => true, :native_interface => :ffi)
-          @mfactory = ::RGeo::Geos.factory(:has_m_coordinate => true, :native_interface => :ffi)
-          @zmfactory = ::RGeo::Geos.factory(:has_z_coordinate => true, :has_m_coordinate => true,
-            :native_interface => :ffi)
+          @factory = ::RGeo::Geos.factory(native_interface: :ffi, buffer_resolution: 8)
+          @zfactory = ::RGeo::Geos.factory(has_z_coordinate: true, native_interface: :ffi)
+          @mfactory = ::RGeo::Geos.factory(has_m_coordinate: true, native_interface: :ffi)
+          @zmfactory = ::RGeo::Geos.factory(has_z_coordinate: true, has_m_coordinate: true,
+                                            native_interface: :ffi)
         end
 
-
         include ::RGeo::Tests::Common::PointTests
 
-
         # TEMP until ffi-geos 0.0.5 is released
         undef_method :test_buffer
         # END_TEMP
 
-
         def test_is_geos
           point_ = @factory.point(21, -22)
           assert_equal(true, ::RGeo::Geos.is_geos?(point_))
@@ -45,19 +38,16 @@ module RGeo
           assert_equal(true, ::RGeo::Geos.is_ffi_geos?(point2_))
         end
 
-
         def test_has_no_projection
           point_ = @factory.point(21, -22)
           assert(!point_.respond_to?(:projection))
         end
 
-
         def test_srid
           point_ = @factory.point(11, 12)
           assert_equal(0, point_.srid)
         end
 
-
         def test_distance
           point1_ = @factory.point(11, 12)
           point2_ = @factory.point(11, 12)
@@ -66,27 +56,22 @@ module RGeo
           assert_equal(2, point1_.distance(point3_))
         end
 
-
         if defined?(::Encoding)
 
           def test_as_text_encoding
-            factory_ = ::RGeo::Geos.factory(:native_interface => :ffi, :wkt_generator => :geos)
+            factory_ = ::RGeo::Geos.factory(native_interface: :ffi, wkt_generator: :geos)
             point_ = factory_.point(11, 12)
             assert_equal(::Encoding::US_ASCII, point_.as_text.encoding)
           end
 
-
           def test_as_binary_encoding
-            factory_ = ::RGeo::Geos.factory(:native_interface => :ffi, :wkb_generator => :geos)
+            factory_ = ::RGeo::Geos.factory(native_interface: :ffi, wkb_generator: :geos)
             point_ = factory_.point(11, 12)
             assert_equal(::Encoding::ASCII_8BIT, point_.as_binary.encoding)
           end
 
         end
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/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 GeosFFI  # :nodoc:
-
-      class TestPolygon < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosFFI # :nodoc:
+      class TestPolygon < ::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::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)
@@ -47,10 +40,7 @@ module RGeo
           poly3_ = poly1_.union(poly2_)
           assert_equal(poly1_, poly3_)
         end
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/geos_ffi/tc_zmfactory.rb

@@ -4,36 +4,29 @@
 #
 # -----------------------------------------------------------------------------
 
-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 TestZMFactory < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosFFI # :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, :native_interface => :ffi)
+          @factory = ::RGeo::Geos.factory(has_z_coordinate: true, has_m_coordinate: true,
+                                          srid: 1000, buffer_resolution: 2, 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
 
-
         def test_factory_parts
           assert_equal(1000, @factory.srid)
           assert_equal(1000, @factory.z_factory.srid)
@@ -49,7 +42,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)
@@ -60,10 +52,7 @@ module RGeo
           assert_nil(point_.m_geometry.z)
           assert_equal(4, point_.m_geometry.m)
         end
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.ffi_supported?

data/test/projected_geographic/tc_factory.rb

@@ -4,30 +4,22 @@
 #
 # -----------------------------------------------------------------------------
 
-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 ProjectedGeographic  # :nodoc:
-
-      class TestFactory < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module ProjectedGeographic # :nodoc:
+      class TestFactory < ::Test::Unit::TestCase # :nodoc:
         def setup
-          @factory = ::RGeo::Geographic.projected_factory(:projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+          @factory = ::RGeo::Geographic.projected_factory(projection_proj4: "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs", projection_srid: 3857)
           @srid = 4326
         end
 
-
         include ::RGeo::Tests::Common::FactoryTests
-
-
       end
-
     end
   end
 end if ::RGeo::CoordSys::Proj4.supported?

data/test/projected_geographic/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 ProjectedGeographic  # :nodoc:
-
-      class TestGeometryCollection < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module ProjectedGeographic # :nodoc:
+      class TestGeometryCollection < ::Test::Unit::TestCase # :nodoc:
         def create_factory
-          ::RGeo::Geographic.projected_factory(:projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+          ::RGeo::Geographic.projected_factory(projection_proj4: "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs", projection_srid: 3857)
         end
 
-
         include ::RGeo::Tests::Common::GeometryCollectionTests
-
-
       end
-
     end
   end
 end if ::RGeo::CoordSys::Proj4.supported?

data/test/projected_geographic/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 ProjectedGeographic  # :nodoc:
-
-      class TestLineString < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module ProjectedGeographic # :nodoc:
+      class TestLineString < ::Test::Unit::TestCase # :nodoc:
         def setup
-          @factory = ::RGeo::Geographic.projected_factory(:projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+          @factory = ::RGeo::Geographic.projected_factory(projection_proj4: "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs", projection_srid: 3857)
         end
 
-
         include ::RGeo::Tests::Common::LineStringTests
-
-
       end
-
     end
   end
 end if ::RGeo::CoordSys::Proj4.supported?

data/test/projected_geographic/tc_multi_line_string.rb

@@ -4,32 +4,23 @@
 #
 # -----------------------------------------------------------------------------
 
-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 ProjectedGeographic  # :nodoc:
-
-      class TestMultiLineString < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module ProjectedGeographic # :nodoc:
+      class TestMultiLineString < ::Test::Unit::TestCase # :nodoc:
         def create_factory
-          ::RGeo::Geographic.projected_factory(:projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+          ::RGeo::Geographic.projected_factory(projection_proj4: "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs", projection_srid: 3857)
         end
 
-
         include ::RGeo::Tests::Common::MultiLineStringTests
 
-
         undef_method :test_length
-
-
       end
-
     end
   end
 end if ::RGeo::CoordSys::Proj4.supported?

data/test/projected_geographic/tc_multi_point.rb

@@ -4,36 +4,27 @@
 #
 # -----------------------------------------------------------------------------
 
-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 ProjectedGeographic  # :nodoc:
-
-      class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
-
-
-        def create_factory(opts_={})
+  module Tests # :nodoc:
+    module ProjectedGeographic # :nodoc:
+      class TestMultiPoint < ::Test::Unit::TestCase # :nodoc:
+        def create_factory(opts_ = {})
           ::RGeo::Geographic.projected_factory(opts_.merge(
-            :projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857))
+                                                 projection_proj4: "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs", projection_srid: 3857))
         end
 
-
         include ::RGeo::Tests::Common::MultiPointTests
 
-
         # These tests suffer from floating point issues
         undef_method :test_union
         undef_method :test_difference
         undef_method :test_intersection
-
-
       end
-
     end
   end
 end if ::RGeo::CoordSys::Proj4.supported?