rgeo 0.4.0 → 0.5.0

data/test/common/multi_line_string_tests.rb

@@ -4,16 +4,12 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'rgeo'
-
+require "rgeo"
 
 module RGeo
-  module Tests  # :nodoc:
-    module Common  # :nodoc:
-
-      module MultiLineStringTests  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module Common # :nodoc:
+      module MultiLineStringTests # :nodoc:
         def setup
           @factory = create_factory
           point1_ = @factory.point(0, 0)
@@ -27,7 +23,6 @@ module RGeo
           @line1 = @factory.line(point1_, point2_)
         end
 
-
         def test_creation_simple
           geom_ = @factory.multi_line_string([@linestring1, @linestring2])
           assert_not_nil(geom_)
@@ -38,7 +33,6 @@ module RGeo
           assert(@linestring2.eql?(geom_[1]))
         end
 
-
         def test_creation_empty
           geom_ = @factory.multi_line_string([])
           assert_not_nil(geom_)
@@ -48,7 +42,6 @@ module RGeo
           assert_equal([], geom_.to_a)
         end
 
-
         def test_creation_save_types
           geom_ = @factory.multi_line_string([@linestring1, @linearring1, @line1])
           assert_not_nil(geom_)
@@ -59,7 +52,6 @@ module RGeo
           assert(geom_[2].eql?(@line1))
         end
 
-
         def test_creation_casting
           mls1_ = @factory.collection([@line1])
           mls2_ = @factory.multi_line_string([@linearring1])
@@ -73,7 +65,6 @@ module RGeo
           assert(@linearring1.eql?(geom_[3]))
         end
 
-
         def test_required_equivalences
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           geom2_ = @factory.multi_line_string([@linestring1, @linestring2])
@@ -81,7 +72,6 @@ module RGeo
           assert(geom1_ == geom2_)
         end
 
-
         def test_fully_equal
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           geom2_ = @factory.multi_line_string([@linestring1, @linestring2])
@@ -89,7 +79,6 @@ module RGeo
           assert(geom1_.equals?(geom2_))
         end
 
-
         def test_geometrically_equal
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2, @linearring1])
           geom2_ = @factory.multi_line_string([@line1, @linearring1])
@@ -97,7 +86,6 @@ module RGeo
           assert(geom1_.equals?(geom2_))
         end
 
-
         def test_not_equal
           geom1_ = @factory.multi_line_string([@linestring2])
           geom2_ = @factory.multi_line_string([@linearring1])
@@ -105,29 +93,25 @@ module RGeo
           assert(!geom1_.equals?(geom2_))
         end
 
-
         def test_hashes_equal_for_representationally_equivalent_objects
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           geom2_ = @factory.multi_line_string([@linestring1, @linestring2])
           assert_equal(geom1_.hash, geom2_.hash)
         end
 
-
         def test_wkt_creation_simple
-          parsed_geom_ = @factory.parse_wkt('MULTILINESTRING((0 0, 1 0), (-4 2, -7 6, 5 11))')
+          parsed_geom_ = @factory.parse_wkt("MULTILINESTRING((0 0, 1 0), (-4 2, -7 6, 5 11))")
           built_geom_ = @factory.multi_line_string([@linestring1, @linestring2])
           assert(built_geom_.eql?(parsed_geom_))
         end
 
-
         def test_wkt_creation_empty
-          parsed_geom_ = @factory.parse_wkt('MULTILINESTRING EMPTY')
+          parsed_geom_ = @factory.parse_wkt("MULTILINESTRING EMPTY")
           assert_equal(::RGeo::Feature::MultiLineString, parsed_geom_.geometry_type)
           assert_equal(0, parsed_geom_.num_geometries)
           assert_equal([], parsed_geom_.to_a)
         end
 
-
         def test_clone
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           geom2_ = geom1_.clone
@@ -138,7 +122,6 @@ module RGeo
           assert(@linestring2.eql?(geom2_[1]))
         end
 
-
         def test_type_check
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           assert(::RGeo::Feature::Geometry.check_type(geom1_))
@@ -154,7 +137,6 @@ module RGeo
           assert(::RGeo::Feature::MultiLineString.check_type(geom2_))
         end
 
-
         def test_as_text_wkt_round_trip
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           text_ = geom1_.as_text
@@ -162,7 +144,6 @@ module RGeo
           assert(geom1_.eql?(geom2_))
         end
 
-
         def test_as_binary_wkb_round_trip
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           binary_ = geom1_.as_binary
@@ -170,7 +151,6 @@ module RGeo
           assert(geom1_.eql?(geom2_))
         end
 
-
         def test_dimension
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           assert_equal(1, geom1_.dimension)
@@ -178,7 +158,6 @@ module RGeo
           assert_equal(-1, geom2_.dimension)
         end
 
-
         def test_is_empty
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           assert(!geom1_.is_empty?)
@@ -186,7 +165,6 @@ module RGeo
           assert(geom2_.is_empty?)
         end
 
-
         def test_length
           geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
           assert_equal(19, geom1_.length)
@@ -194,9 +172,11 @@ module RGeo
           assert_equal(0, geom2_.length)
         end
 
-
+        def test_coordinates
+          ml = @factory.multi_line_string([@linestring1, @linestring2])
+          assert_equal(ml.coordinates, [@linestring1, @linestring2].map(&:coordinates))
+        end
       end
-
     end
   end
 end

data/test/common/multi_point_tests.rb

@@ -4,16 +4,12 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'rgeo'
-
+require "rgeo"
 
 module RGeo
-  module Tests  # :nodoc:
-    module Common  # :nodoc:
-
-      module MultiPointTests  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module Common # :nodoc:
+      module MultiPointTests # :nodoc:
         def setup
           @factory = create_factory
           @point1 = @factory.point(0, 0)
@@ -23,7 +19,6 @@ module RGeo
           @point5 = @factory.point(-5, 3)
         end
 
-
         def test_creation_simple
           geom_ = @factory.multi_point([@point1, @point2])
           assert_not_nil(geom_)
@@ -34,7 +29,6 @@ module RGeo
           assert(@point2.eql?(geom_[1]))
         end
 
-
         def test_creation_empty
           geom_ = @factory.multi_point([])
           assert_not_nil(geom_)
@@ -44,7 +38,6 @@ module RGeo
           assert_equal([], geom_.to_a)
         end
 
-
         def test_creation_casting
           mp1_ = @factory.collection([@point3])
           mp2_ = @factory.multi_point([@point4])
@@ -58,14 +51,12 @@ module RGeo
           assert(@point4.eql?(geom_[3]))
         end
 
-
         def test_creation_wrong_type
           line_ = @factory.line_string([@point1, @point2])
           geom_ = @factory.multi_point([@point3, line_])
           assert_nil(geom_)
         end
 
-
         def test_required_equivalences
           geom1_ = @factory.multi_point([@point1, @point2])
           geom2_ = @factory.multi_point([@point1, @point2])
@@ -73,7 +64,6 @@ module RGeo
           assert(geom1_ == geom2_)
         end
 
-
         def test_fully_equal
           geom1_ = @factory.multi_point([@point1, @point2])
           geom2_ = @factory.multi_point([@point1, @point2])
@@ -81,7 +71,6 @@ module RGeo
           assert(geom1_.equals?(geom2_))
         end
 
-
         def test_geometrically_equal
           geom1_ = @factory.multi_point([@point1, @point4])
           geom2_ = @factory.multi_point([@point1, @point4, @point5])
@@ -89,7 +78,6 @@ module RGeo
           assert(geom1_.equals?(geom2_))
         end
 
-
         def test_not_equal
           geom1_ = @factory.multi_point([@point1, @point2])
           geom2_ = @factory.multi_point([@point1])
@@ -97,29 +85,25 @@ module RGeo
           assert(!geom1_.equals?(geom2_))
         end
 
-
         def test_hashes_equal_for_representationally_equivalent_objects
           geom1_ = @factory.multi_point([@point1, @point2])
           geom2_ = @factory.multi_point([@point1, @point2])
           assert_equal(geom1_.hash, geom2_.hash)
         end
 
-
         def test_wkt_creation_simple
-          parsed_geom_ = @factory.parse_wkt('MULTIPOINT((0 0), (-4 2), (-5 3))')
+          parsed_geom_ = @factory.parse_wkt("MULTIPOINT((0 0), (-4 2), (-5 3))")
           built_geom_ = @factory.multi_point([@point1, @point3, @point4])
           assert(built_geom_.eql?(parsed_geom_))
         end
 
-
         def test_wkt_creation_empty
-          parsed_geom_ = @factory.parse_wkt('MULTIPOINT EMPTY')
+          parsed_geom_ = @factory.parse_wkt("MULTIPOINT EMPTY")
           assert(::RGeo::Feature::MultiPoint === parsed_geom_)
           assert_equal(0, parsed_geom_.num_geometries)
           assert_equal([], parsed_geom_.to_a)
         end
 
-
         def test_clone
           geom1_ = @factory.multi_point([@point1, @point2])
           geom2_ = geom1_.clone
@@ -130,7 +114,6 @@ module RGeo
           assert(@point2.eql?(geom2_[1]))
         end
 
-
         def test_type_check
           geom1_ = @factory.multi_point([@point1, @point2])
           assert(::RGeo::Feature::Geometry.check_type(geom1_))
@@ -146,7 +129,6 @@ module RGeo
           assert(!::RGeo::Feature::MultiLineString.check_type(geom2_))
         end
 
-
         def test_as_text_wkt_round_trip
           geom1_ = @factory.multi_point([@point1, @point2])
           text_ = geom1_.as_text
@@ -154,7 +136,6 @@ module RGeo
           assert(geom1_.eql?(geom2_))
         end
 
-
         def test_as_binary_wkb_round_trip
           geom1_ = @factory.multi_point([@point1, @point2])
           binary_ = geom1_.as_binary
@@ -162,7 +143,6 @@ module RGeo
           assert(geom1_.eql?(geom2_))
         end
 
-
         def test_dimension
           geom1_ = @factory.multi_point([@point1, @point2])
           assert_equal(0, geom1_.dimension)
@@ -170,7 +150,6 @@ module RGeo
           assert_equal(-1, geom2_.dimension)
         end
 
-
         def test_is_empty
           geom1_ = @factory.multi_point([@point1, @point2])
           assert(!geom1_.is_empty?)
@@ -178,7 +157,6 @@ module RGeo
           assert(geom2_.is_empty?)
         end
 
-
         def test_union
           geom1_ = @factory.multi_point([@point1, @point2])
           geom2_ = @factory.multi_point([@point1, @point3])
@@ -187,7 +165,6 @@ module RGeo
           assert_equal(geom3_, geom1_ + geom2_)
         end
 
-
         def test_difference
           geom1_ = @factory.multi_point([@point1, @point2])
           geom2_ = @factory.multi_point([@point1, @point3])
@@ -195,7 +172,6 @@ module RGeo
           assert_equal(@point2, geom1_ - geom2_)
         end
 
-
         def test_intersection
           geom1_ = @factory.multi_point([@point1, @point2])
           geom2_ = @factory.multi_point([@point1, @point3])
@@ -203,17 +179,22 @@ module RGeo
           assert_equal(@point1, geom1_ * geom2_)
         end
 
-
         def test_zm
-          factory_ = create_factory(:has_z_coordinate => true, :has_m_coordinate => true)
+          factory_ = create_factory(has_z_coordinate: true, has_m_coordinate: true)
           p1_ = factory_.point(1, 2, 3, 4)
           mp_ = factory_.multi_point([p1_])
           assert_equal(p1_, mp_[0])
         end
 
-
+        def test_coordinate
+          p0 = @factory.point(0, 0)
+          p1 = @factory.point(1, 1)
+          p2 = @factory.point(2, 2)
+          points = [p0, p1, p2]
+          mp = @factory.multi_point(points)
+          assert_equal(mp.coordinates, points.map(&:coordinates))
+        end
       end
-
     end
   end
 end

data/test/common/multi_polygon_tests.rb

@@ -4,16 +4,12 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'rgeo'
-
+require "rgeo"
 
 module RGeo
-  module Tests  # :nodoc:
-    module Common  # :nodoc:
-
-      module MultiPolygonTests  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module Common # :nodoc:
+      module MultiPolygonTests # :nodoc:
         def setup
           create_factories
           point1_ = @factory.point(0, 0)
@@ -37,7 +33,6 @@ module RGeo
           @line1 = interior1_
         end
 
-
         def test_creation_simple
           geom_ = @factory.multi_polygon([@poly1, @poly2])
           assert_not_nil(geom_)
@@ -48,7 +43,6 @@ module RGeo
           assert(@poly2.eql?(geom_[1]))
         end
 
-
         def test_creation_empty
           geom_ = @factory.multi_polygon([])
           assert_not_nil(geom_)
@@ -58,13 +52,11 @@ module RGeo
           assert_equal([], geom_.to_a)
         end
 
-
         def test_creation_wrong_type
           geom_ = @factory.multi_polygon([@poly1, @line1])
           assert_nil(geom_)
         end
 
-
         def test_creation_overlapping
           geom_ = @factory.multi_polygon([@poly1, @poly1])
           assert_nil(geom_)
@@ -72,7 +64,6 @@ module RGeo
           assert_not_nil(geom2_)
         end
 
-
         def test_creation_connected
           geom_ = @factory.multi_polygon([@poly3, @poly4])
           assert_nil(geom_)
@@ -80,7 +71,6 @@ module RGeo
           assert_not_nil(geom2_)
         end
 
-
         def test_required_equivalences
           geom1_ = @factory.multi_polygon([@poly1, @poly2])
           geom2_ = @factory.multi_polygon([@poly1, @poly2])
@@ -88,7 +78,6 @@ module RGeo
           assert(geom1_ == geom2_)
         end
 
-
         def test_equal
           geom1_ = @factory.multi_polygon([@poly1, @poly2])
           geom2_ = @factory.multi_polygon([@poly1, @poly2])
@@ -96,7 +85,6 @@ module RGeo
           assert(geom1_.equals?(geom2_))
         end
 
-
         def test_not_equal
           geom1_ = @factory.multi_polygon([@poly1])
           geom2_ = @factory.multi_polygon([@poly2])
@@ -104,29 +92,25 @@ module RGeo
           assert(!geom1_.equals?(geom2_))
         end
 
-
         def test_hashes_equal_for_representationally_equivalent_objects
           geom1_ = @factory.multi_polygon([@poly1, @poly2])
           geom2_ = @factory.multi_polygon([@poly1, @poly2])
           assert_equal(geom1_.hash, geom2_.hash)
         end
 
-
         def test_wkt_creation_simple
-          parsed_geom_ = @factory.parse_wkt('MULTIPOLYGON(((0 0, 0 -10, -10 0, 0 0)), ((0 0, 0 10, 10 10, 10 0, 0 0), (4 4, 5 6, 6 4, 4 4)))')
+          parsed_geom_ = @factory.parse_wkt("MULTIPOLYGON(((0 0, 0 -10, -10 0, 0 0)), ((0 0, 0 10, 10 10, 10 0, 0 0), (4 4, 5 6, 6 4, 4 4)))")
           built_geom_ = @factory.multi_polygon([@poly1, @poly2])
           assert(built_geom_.eql?(parsed_geom_))
         end
 
-
         def test_wkt_creation_empty
-          parsed_geom_ = @factory.parse_wkt('MULTIPOLYGON EMPTY')
+          parsed_geom_ = @factory.parse_wkt("MULTIPOLYGON EMPTY")
           assert_equal(::RGeo::Feature::MultiPolygon, parsed_geom_.geometry_type)
           assert_equal(0, parsed_geom_.num_geometries)
           assert_equal([], parsed_geom_.to_a)
         end
 
-
         def test_clone
           geom1_ = @factory.multi_polygon([@poly1, @poly2])
           geom2_ = geom1_.clone
@@ -137,7 +121,6 @@ module RGeo
           assert(@poly2.eql?(geom2_[1]))
         end
 
-
         def test_type_check
           geom1_ = @factory.multi_polygon([@poly1, @poly2])
           assert(::RGeo::Feature::Geometry.check_type(geom1_))
@@ -153,7 +136,6 @@ module RGeo
           assert(::RGeo::Feature::MultiPolygon.check_type(geom2_))
         end
 
-
         def test_as_text_wkt_round_trip
           geom1_ = @factory.multi_polygon([@poly1, @poly2])
           text_ = geom1_.as_text
@@ -161,7 +143,6 @@ module RGeo
           assert(geom1_.eql?(geom2_))
         end
 
-
         def test_as_binary_wkb_round_trip
           geom1_ = @factory.multi_polygon([@poly1, @poly2])
           binary_ = geom1_.as_binary
@@ -169,7 +150,6 @@ module RGeo
           assert(geom1_.eql?(geom2_))
         end
 
-
         def test_dimension
           geom1_ = @factory.multi_polygon([@poly1, @poly2])
           assert_equal(2, geom1_.dimension)
@@ -177,7 +157,6 @@ module RGeo
           assert_equal(-1, geom2_.dimension)
         end
 
-
         def test_is_empty
           geom1_ = @factory.multi_polygon([@poly1, @poly2])
           assert(!geom1_.is_empty?)
@@ -185,9 +164,28 @@ module RGeo
           assert(geom2_.is_empty?)
         end
 
+        def test_multi_polygon_coordinates
+          poly1_coordinates = [
+            [[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 1.0], [0.0, 0.0]],
+            [[0.25, 0.25], [0.75, 0.25], [0.75, 0.75], [0.25, 0.75], [0.25, 0.25]]
+          ]
+          poly2_coordinates = [
+            [[2.0, 2.0], [3.0, 2.0], [3.0, 3.0], [2.0, 3.0], [2.0, 2.0]],
+            [[2.25, 2.25], [2.75, 2.25], [2.75, 2.75], [2.25, 2.75], [2.25, 2.25]]
+          ]
 
-      end
+          ring = @factory.line_string(poly1_coordinates.first.map { |(x, y)| @factory.point x, y })
+          inner_ring = @factory.line_string(poly1_coordinates.last.map { |(x, y)| @factory.point x, y })
+          poly1 = @factory.polygon ring, [inner_ring]
 
+          ring = @factory.line_string(poly2_coordinates.first.map { |(x, y)| @factory.point x, y })
+          inner_ring = @factory.line_string(poly2_coordinates.last.map { |(x, y)| @factory.point x, y })
+          poly2 = @factory.polygon ring, [inner_ring]
+
+          multi_polygon = @factory.multi_polygon [poly1, poly2]
+          assert_equal(multi_polygon.coordinates, [poly1_coordinates, poly2_coordinates])
+        end
+      end
     end
   end
 end