Merge pull request rgeo#228 from rgeo/standardize-validation

Standardize validation for projection factories across libgeos versions.

.travis.yml

@@ -1,11 +1,67 @@
-dist: trusty
+language: ruby
+
+os:
+  - linux
+dist: xenial
+
 addons:
   apt:
     packages:
-      - libgeos-3.4.2
-language: ruby
+    - libgeos-dev
+    - libgeos-3.5.0
+
+jobs:
+  include:
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          packages:
+          - libgeos-dev
+          - libgeos-3.4.2
+
+    - os: linux
+      dist: xenial
+      addons:
+        apt:
+          packages:
+          - libgeos-dev
+          - libgeos-3.5.0
+
+    - os: linux
+      dist: bionic
+      addons:
+        apt:
+          packages:
+          - libgeos-dev
+          - libgeos-3.6.2
+
+    - os: linux
+      dist: eoan
+      addons:
+        apt:
+          packages:
+          - libgeos-dev
+          - libgeos-3.7.2
+
+    - os: linux
+      dist: focal
+      addons:
+        apt:
+          packages:
+          - libgeos-dev
+          - libgeos-3.8.0
+
+    - os: osx
+      addons:
+        homebrew:
+          packages:
+          - geos
+          update: true
+
 rvm:
+  - 2.7
   - 2.6
   - 2.5
   - 2.4
-  - jruby-9.2.6.0
+  - jruby-9.2.13.0

History.md

@@ -1,7 +1,9 @@
 ### Current
+
 * Add SphericalPolygonMethods#centroid #208 (allknowingfrog)
 * Expand gemspec
 * Drop Ruby 2.3 support
+* Change ProjectedLinearRing #is_simple? method to be uniform across geos versions #228
 
 ### 2.1.1 / 2019-8-26
 

lib/rgeo/geographic/projected_feature_classes.rb

@@ -33,6 +33,7 @@ class ProjectedLinearRingImpl  # :nodoc:
       include ProjectedGeometryMethods
       include ProjectedNCurveMethods
       include ProjectedLineStringMethods
+      include ProjectedLinearRingMethods
     end
 
     class ProjectedLineImpl # :nodoc:

lib/rgeo/geographic/projected_feature_methods.rb

@@ -166,6 +166,12 @@ def validate_geometry
       end
     end
 
+    module ProjectedLinearRingMethods # :nodoc:
+      def is_simple?
+        projection.valid?
+      end
+    end
+
     module ProjectedNSurfaceMethods # :nodoc:
       def area
         projection.area

lib/rgeo/geos/ffi_feature_methods.rb

@@ -121,6 +121,10 @@ def is_simple?
         @fg_geom.simple?
       end
 
+      def valid?
+        @fg_geom.valid?
+      end
+
       def equals?(rhs)
         return false unless rhs.is_a?(RGeo::Feature::Instance)
         fg = factory.convert_to_fg_geometry(rhs)

test/common/multi_polygon_tests.rb

@@ -200,7 +200,7 @@ def test_boundary
           parsed_coordinates.zip(boundary_coordinates).each do |parsed_line, boundary_line|
             parsed_line.zip(boundary_line).each do |p_coord, b_coord|
               p_coord.zip(b_coord).each do |p_val, b_val|
-                assert_in_delta(p_val, b_val, 0.00000000000001)
+                assert_in_delta(p_val, b_val, 1e-13)
               end
             end
           end

test/geos_capi/polygon_test.rb

@@ -109,7 +109,17 @@ def test_buffer_with_style
     buffered_line_string =
       line_string.buffer_with_style(0.3, RGeo::Geos::CAP_SQUARE, RGeo::Geos::JOIN_MITRE, 5)
 
-    assert_equal polygon, buffered_line_string
+    # having issues with floating point errors on some systems
+    # 4.3 -> 4.29999999999999, for example, and throws an error
+    # iterating through points and using assert_in_delta instead
+    # of assert_equal
+    b_coords = buffered_line_string.exterior_ring.coordinates
+    p_coords = polygon.exterior_ring.coordinates
+    p_coords.zip(b_coords).each do |p_coord, b_coord|
+      p_coord.zip(b_coord).each do |pt1, pt2|
+        assert_in_delta(pt1, pt2, 1e-7)
+      end
+    end
   end
 
   def test_is_valid_polygon

test/geos_ffi/polygon_test.rb

@@ -36,4 +36,20 @@ def test_union
     poly3 = poly1.union(poly2)
     assert_equal(poly1, poly3)
   end
+
+  def test_is_valid_polygon
+    polygon_coordinates = [[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]
+    points_arr = polygon_coordinates.map { |v| @factory.point(v[0], v[1]) }
+    outer_ring = @factory.linear_ring(points_arr)
+    polygon = @factory.polygon(outer_ring)
+
+    assert_equal(polygon.valid?, true)
+
+    polygon_coordinates = [[-1, -1], [-1, 0], [1, 0], [1, 1], [0, 1], [0, -1], [-1, -1]]
+    points_arr = polygon_coordinates.map { |v| @factory.point(v[0], v[1]) }
+    outer_ring = @factory.linear_ring(points_arr)
+    polygon = @factory.polygon(outer_ring)
+
+    assert_equal(polygon.valid?, false)
+  end
 end if RGeo::Geos.ffi_supported?

test/simple_mercator/polygon_test.rb

@@ -15,6 +15,14 @@ def setup
     @factory = RGeo::Geographic.simple_mercator_factory
   end
 
+  def test_is_simple_validation_behavior
+    # See https://github.com/rgeo/rgeo/issues/218
+    assert_raises RGeo::Error::InvalidGeometry do
+      wkt = "POLYGON((0 0, 1 1, 1 0, 0 1, 0 0))"
+      @factory.parse_wkt(wkt)
+    end
+  end
+
   # These tests suffer from floating point issues
   undef_method :test_point_on_surface
   undef_method :test_boundary_one_hole