rgeo 0.4.0 → 0.5.0

data/test/projected_geographic/tc_multi_polygon.rb

@@ -4,30 +4,22 @@
 #
 # -----------------------------------------------------------------------------
 
-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 ProjectedGeographic  # :nodoc:
-
-      class TestMultiPolygon < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module ProjectedGeographic # :nodoc:
+      class TestMultiPolygon < ::Test::Unit::TestCase # :nodoc:
         def create_factories
-          @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)
-          @lenient_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, :lenient_multi_polygon_assertions => true)
+          @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)
+          @lenient_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, lenient_multi_polygon_assertions: true)
         end
 
-
         include ::RGeo::Tests::Common::MultiPolygonTests
-
-
       end
-
     end
   end
 end if ::RGeo::CoordSys::Proj4.supported?

data/test/projected_geographic/tc_point.rb

@@ -4,60 +4,48 @@
 #
 # -----------------------------------------------------------------------------
 
-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 ProjectedGeographic  # :nodoc:
-
-      class TestPoint < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module ProjectedGeographic # :nodoc:
+      class TestPoint < ::Test::Unit::TestCase # :nodoc:
         def setup
-          @factory = ::RGeo::Geographic.projected_factory(:buffer_resolution => 8, :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)
-          @zfactory = ::RGeo::Geographic.projected_factory(:has_z_coordinate => true, :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)
-          @mfactory = ::RGeo::Geographic.projected_factory(:has_m_coordinate => true, :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)
-          @zmfactory = ::RGeo::Geographic.projected_factory(:has_z_coordinate => true, :has_m_coordinate => true, :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(buffer_resolution: 8, 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)
+          @zfactory = ::RGeo::Geographic.projected_factory(has_z_coordinate: true, 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)
+          @mfactory = ::RGeo::Geographic.projected_factory(has_m_coordinate: true, 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)
+          @zmfactory = ::RGeo::Geographic.projected_factory(has_z_coordinate: true, has_m_coordinate: true, 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::PointTests
 
-
         def test_has_projection
           point_ = @factory.point(21, -22)
           assert(point_.respond_to?(:projection))
         end
 
-
         def test_latlon
           point_ = @factory.point(21, -22)
           assert_equal(21, point_.longitude)
           assert_equal(-22, point_.latitude)
         end
 
-
         def test_srid
           point_ = @factory.point(11, 12)
           assert_equal(4326, point_.srid)
         end
 
-
         def test_distance
           point1_ = @factory.point(11, 12)
           point2_ = @factory.point(11, 12)
           point3_ = @factory.point(13, 12)
           assert_in_delta(0, point1_.distance(point2_), 0.0001)
-          assert_in_delta(222638, point1_.distance(point3_), 1)
+          assert_in_delta(222_638, point1_.distance(point3_), 1)
         end
-
-
       end
-
     end
   end
 end if ::RGeo::CoordSys::Proj4.supported?

data/test/projected_geographic/tc_polygon.rb

@@ -4,29 +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 ProjectedGeographic  # :nodoc:
-
-      class TestPolygon < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module ProjectedGeographic # :nodoc:
+      class TestPolygon < ::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::PolygonTests
-
-
       end
-
     end
   end
 end if ::RGeo::CoordSys::Proj4.supported?

data/test/simple_cartesian/tc_calculations.rb

@@ -4,17 +4,13 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
+require "test/unit"
+require "rgeo"
 
 module RGeo
-  module Tests  # :nodoc:
-    module Cartesian  # :nodoc:
-
-      class TestCalculations < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module Cartesian # :nodoc:
+      class TestCalculations < ::Test::Unit::TestCase # :nodoc:
         def setup
           @factory = ::RGeo::Cartesian.simple_factory
           @point1 = @factory.point(3, 4)
@@ -36,7 +32,6 @@ module RGeo
           @degenerate_seg = ::RGeo::Cartesian::Segment.new(@point5, @point5)
         end
 
-
         def assert_close_enough(v1_, v2_)
           diff_ = (v1_ - v2_).abs
           # denom_ = (v1_ + v2_).abs
@@ -44,7 +39,6 @@ module RGeo
           assert(diff_ < 0.00000001, "#{v1_} is not close to #{v2_}")
         end
 
-
         def test_segment_degenerate
           assert(@degenerate_seg.degenerate?)
           assert_equal(0, @degenerate_seg.dx)
@@ -53,7 +47,6 @@ module RGeo
           assert_equal(@point5, @degenerate_seg.e)
         end
 
-
         def test_segment_basic
           assert(!@short_rising_seg.degenerate?)
           assert_equal(2, @short_rising_seg.dx)
@@ -62,20 +55,17 @@ module RGeo
           assert_equal(@point2, @short_rising_seg.e)
         end
 
-
         def test_segment_side_basic
           assert_equal(0.0, @short_rising_seg.side(@point5))
           assert(@short_rising_seg.side(@point4) > 0.0)
           assert(@short_rising_seg.side(@point6) < 0.0)
         end
 
-
         def test_segment_tproj_basic
           assert_equal(-2, @short_rising_seg.tproj(@point5))
-          assert_close_enough(2.0/3.0, @long_rising_seg.tproj(@point1))
+          assert_close_enough(2.0 / 3.0, @long_rising_seg.tproj(@point1))
         end
 
-
         def test_segment_contains_point
           assert(@long_rising_seg.contains_point?(@point1))
           assert(@long_rising_seg.contains_point?(@point2))
@@ -83,7 +73,6 @@ module RGeo
           assert(!@short_rising_seg.contains_point?(@point5))
         end
 
-
         def test_segment_intersects_parallel
           assert(@long_rising_seg.intersects_segment?(@long_rising_seg))
           assert(!@long_rising_seg.intersects_segment?(@parallel_rising_seg))
@@ -93,7 +82,6 @@ module RGeo
           assert(@long_rising_seg.intersects_segment?(@touching_collinear_rising_seg))
         end
 
-
         def test_segment_intersects_basic
           assert(@long_rising_seg.intersects_segment?(@steep_rising_seg))
           assert(@steep_rising_seg.intersects_segment?(@long_rising_seg))
@@ -101,15 +89,11 @@ module RGeo
           assert(!@steep_rising_seg.intersects_segment?(@short_rising_seg))
         end
 
-
         def test_segment_intersects_endpoints
           assert(@horiz_seg.intersects_segment?(@vert_seg))
           assert(@vert_seg.intersects_segment?(@horiz_seg))
         end
-
-
       end
-
     end
   end
 end

data/test/simple_cartesian/tc_factory.rb

@@ -4,33 +4,24 @@
 #
 # -----------------------------------------------------------------------------
 
-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 SimpleCartesian  # :nodoc:
-
-      class TestFactory < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module SimpleCartesian # :nodoc:
+      class TestFactory < ::Test::Unit::TestCase # :nodoc:
         def setup
-          @factory = ::RGeo::Cartesian.simple_factory(:srid => 1000)
+          @factory = ::RGeo::Cartesian.simple_factory(srid: 1000)
           @srid = 1000
         end
 
-
         include ::RGeo::Tests::Common::FactoryTests
 
-
         undef_method :test_srid_preserved_through_geom_operations
-
-
       end
-
     end
   end
 end

data/test/simple_cartesian/tc_geometry_collection.rb

@@ -4,36 +4,27 @@
 #
 # -----------------------------------------------------------------------------
 
-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 SimpleCartesian  # :nodoc:
-
-      class TestGeometryCollection < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module SimpleCartesian # :nodoc:
+      class TestGeometryCollection < ::Test::Unit::TestCase # :nodoc:
         def create_factory
           @factory = ::RGeo::Cartesian.simple_factory
         end
 
-
         include ::RGeo::Tests::Common::GeometryCollectionTests
 
-
         undef_method :test_fully_equal
         undef_method :test_geometrically_equal
         undef_method :test_empty_equal
         undef_method :test_not_equal
         undef_method :test_empty_collection_boundary
-
-
       end
-
     end
   end
 end

data/test/simple_cartesian/tc_line_string.rb

@@ -4,37 +4,28 @@
 #
 # -----------------------------------------------------------------------------
 
-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 SimpleCartesian  # :nodoc:
-
-      class TestLineString < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module SimpleCartesian # :nodoc:
+      class TestLineString < ::Test::Unit::TestCase # :nodoc:
         def setup
           @factory = ::RGeo::Cartesian.simple_factory
         end
 
-
         include ::RGeo::Tests::Common::LineStringTests
 
-
         undef_method :test_fully_equal
         undef_method :test_geometrically_equal_but_different_type
         undef_method :test_geometrically_equal_but_different_type2
         undef_method :test_geometrically_equal_but_different_overlap
         undef_method :test_empty_equal
         undef_method :test_not_equal
-
-
       end
-
     end
   end
 end

data/test/simple_cartesian/tc_multi_line_string.rb

@@ -4,34 +4,25 @@
 #
 # -----------------------------------------------------------------------------
 
-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 SimpleCartesian  # :nodoc:
-
-      class TestMultiLineString < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module SimpleCartesian # :nodoc:
+      class TestMultiLineString < ::Test::Unit::TestCase # :nodoc:
         def create_factory
           @factory = ::RGeo::Cartesian.simple_factory
         end
 
-
         include ::RGeo::Tests::Common::MultiLineStringTests
 
-
         undef_method :test_fully_equal
         undef_method :test_geometrically_equal
         undef_method :test_not_equal
-
-
       end
-
     end
   end
 end

data/test/simple_cartesian/tc_multi_point.rb

@@ -4,37 +4,28 @@
 #
 # -----------------------------------------------------------------------------
 
-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 SimpleCartesian  # :nodoc:
-
-      class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
-
-
-        def create_factory(opts_={})
+  module Tests # :nodoc:
+    module SimpleCartesian # :nodoc:
+      class TestMultiPoint < ::Test::Unit::TestCase # :nodoc:
+        def create_factory(opts_ = {})
           @factory = ::RGeo::Cartesian.simple_factory(opts_)
         end
 
-
         include ::RGeo::Tests::Common::MultiPointTests
 
-
         undef_method :test_fully_equal
         undef_method :test_geometrically_equal
         undef_method :test_not_equal
         undef_method :test_union
         undef_method :test_difference
         undef_method :test_intersection
-
-
       end
-
     end
   end
 end