ffi-geos 2.3.0 → 2.4.0

data/ffi-geos.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version = Geos::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 2.6'
 
   s.authors = ['J Smith']
   s.description = 'An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).'

data/lib/ffi-geos/geojson_reader.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Geos
+  class GeoJSONReader
+    include Geos::Tools
+
+    attr_reader :ptr
+
+    class ParseError < Geos::ParseError
+    end
+
+    def initialize(*args)
+      ptr = if args.first.is_a?(FFI::Pointer)
+        args.first
+      else
+        FFIGeos.GEOSGeoJSONReader_create_r(Geos.current_handle_pointer, *args)
+      end
+
+      @ptr = FFI::AutoPointer.new(
+        ptr,
+        self.class.method(:release)
+      )
+    end
+
+    def read(json, options = {})
+      cast_geometry_ptr(FFIGeos.GEOSGeoJSONReader_readGeometry_r(Geos.current_handle_pointer, ptr, json), srid: options[:srid])
+    rescue Geos::GEOSException => e
+      raise ParseError, e
+    end
+
+    def self.release(ptr) # :nodoc:
+      FFIGeos.GEOSGeoJSONReader_destroy_r(Geos.current_handle_pointer, ptr)
+    end
+  end
+end

data/lib/ffi-geos/geojson_writer.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Geos
+  class GeoJSONWriter
+    attr_accessor :indentation
+    attr_reader :ptr
+
+    def initialize(options = {})
+      options = {
+        indentation: -1
+      }.merge(options)
+
+      ptr = FFIGeos.GEOSGeoJSONWriter_create_r(Geos.current_handle_pointer)
+      @ptr = FFI::AutoPointer.new(
+        ptr,
+        self.class.method(:release)
+      )
+
+      set_options(options)
+    end
+
+    def self.release(ptr) # :nodoc:
+      FFIGeos.GEOSGeoJSONWriter_destroy_r(Geos.current_handle_pointer, ptr)
+    end
+
+    def set_options(options) # :nodoc:
+      [:indentation].each do |k|
+        send("#{k}=", options[k]) if respond_to?("#{k}=") && options.key?(k)
+      end
+    end
+    private :set_options
+
+    # Options can be set temporarily for individual writes using an options
+    # Hash. Options include :indentation.
+    def write(geom, options = nil)
+      unless options.nil?
+        old_options = {
+          indentation: indentation
+        }
+
+        set_options(options)
+      end
+
+      FFIGeos.GEOSGeoJSONWriter_writeGeometry_r(Geos.current_handle_pointer, ptr, geom.ptr, indentation)
+    ensure
+      set_options(old_options) unless options.nil?
+    end
+  end
+end

data/lib/ffi-geos/geometry.rb

@@ -637,6 +637,12 @@ module Geos
       end
     end
 
+    if FFIGeos.respond_to?(:GEOSConstrainedDelaunayTriangulation_r)
+      def constrained_delaunay_triangulation
+        cast_geometry_ptr(FFIGeos.GEOSConstrainedDelaunayTriangulation_r(Geos.current_handle_pointer, ptr))
+      end
+    end
+
     if FFIGeos.respond_to?(:GEOSVoronoiDiagram_r)
       # Available in GEOS 3.5.0+
       #

data/lib/ffi-geos/geometry_collection.rb

@@ -46,7 +46,7 @@ module Geos
 
     %w{ x y z }.each do |dimension|
       %w{ max min }.each do |op|
-        native_method = "GEOSGeom_get#{dimension.upcase}#{op[0].upcase}#{op[1..-1]}_r"
+        native_method = "GEOSGeom_get#{dimension.upcase}#{op[0].upcase}#{op[1..]}_r"
 
         if FFIGeos.respond_to?(native_method)
           class_eval(<<-RUBY, __FILE__, __LINE__ + 1)

data/lib/ffi-geos/line_string.rb

@@ -146,7 +146,7 @@ module Geos
 
     %w{ max min }.each do |op|
       %w{ x y }.each do |dimension|
-        native_method = "GEOSGeom_get#{dimension.upcase}#{op[0].upcase}#{op[1..-1]}_r"
+        native_method = "GEOSGeom_get#{dimension.upcase}#{op[0].upcase}#{op[1..]}_r"
 
         if FFIGeos.respond_to?(native_method)
           class_eval(<<-RUBY, __FILE__, __LINE__ + 1)

data/lib/ffi-geos/polygon.rb

@@ -78,7 +78,7 @@ module Geos
 
     %w{ max min }.each do |op|
       %w{ x y }.each do |dimension|
-        native_method = "GEOSGeom_get#{dimension.upcase}#{op[0].upcase}#{op[1..-1]}_r"
+        native_method = "GEOSGeom_get#{dimension.upcase}#{op[0].upcase}#{op[1..]}_r"
 
         if FFIGeos.respond_to?(native_method)
           class_eval(<<-RUBY, __FILE__, __LINE__ + 1)

data/lib/ffi-geos/prepared_geometry.rb

@@ -77,5 +77,25 @@ module Geos
       check_geometry(geom)
       bool_result(FFIGeos.GEOSPreparedWithin_r(Geos.current_handle_pointer, ptr, geom.ptr))
     end
+
+    def distance(geom)
+      check_geometry(geom)
+      double_ptr = FFI::MemoryPointer.new(:double)
+      FFIGeos.GEOSPreparedDistance_r(Geos.current_handle_pointer, ptr, geom.ptr, double_ptr)
+      double_ptr.read_double
+    end
+
+    def distance_within?(geom, distance)
+      check_geometry(geom)
+      bool_result(FFIGeos.GEOSPreparedDistanceWithin_r(Geos.current_handle_pointer, ptr, geom.ptr, distance))
+    end
+
+    def nearest_points(geom)
+      check_geometry(geom)
+
+      coord_seq_ptr = FFIGeos.GEOSPreparedNearestPoints_r(Geos.current_handle_pointer, ptr, geom.ptr)
+
+      Geos::CoordinateSequence.new(coord_seq_ptr)
+    end
   end
 end

data/lib/ffi-geos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geos
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

data/lib/ffi-geos/wkb_writer.rb

@@ -83,6 +83,18 @@ module Geos
       FFIGeos.GEOSWKBWriter_setByteOrder_r(Geos.current_handle_pointer, ptr, val)
     end
 
+    if FFIGeos.respond_to?(:GEOSWKBWriter_getFlavor_r)
+      def flavor
+        FFIGeos.GEOSWKBWriter_getFlavor_r(Geos.current_handle_pointer, ptr)
+      end
+    end
+
+    if FFIGeos.respond_to?(:GEOSWKBWriter_setFlavor_r)
+      def flavor=(val)
+        FFIGeos.GEOSWKBWriter_setFlavor_r(Geos.current_handle_pointer, ptr, val)
+      end
+    end
+
     private
 
       def set_options(options) # :nodoc:

data/lib/ffi-geos.rb

@@ -15,6 +15,10 @@ module Geos
     File.join(GEOS_BASE, 'wkb_reader')
   autoload :WkbWriter,
     File.join(GEOS_BASE, 'wkb_writer')
+  autoload :GeoJSONReader,
+    File.join(GEOS_BASE, 'geojson_reader')
+  autoload :GeoJSONWriter,
+    File.join(GEOS_BASE, 'geojson_writer')
   autoload :CoordinateSequence,
     File.join(GEOS_BASE, 'coordinate_sequence')
   autoload :Geometry,
@@ -56,7 +60,13 @@ module Geos
         elsif FFI::Platform::IS_WINDOWS
           ENV['PATH'].split(File::PATH_SEPARATOR)
         else
-          ['/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}', '/usr/lib/{x86_64,i386,aarch64}-linux-gnu']
+          [
+            '/usr/local/{lib64,lib}',
+            '/opt/local/{lib64,lib}',
+            '/usr/{lib64,lib}',
+            '/opt/homebrew/lib',
+            '/usr/lib/{x86_64,i386,aarch64}-linux-gnu'
+          ]
         end
     end
 
@@ -98,6 +108,11 @@ module Geos
       :ndr, 1 # Little Endian
     ])
 
+    Geos::Flavors = enum(:flavor, [
+      :extended, 1,
+      :iso, 2
+    ])
+
     Geos::BufferCapStyles = enum(:buffer_cap_style, [
       :round, 1,
       :flat, 2,
@@ -581,6 +596,11 @@ module Geos
         :pointer, :pointer, :pointer, :double, :int
       ],
 
+      GEOSConstrainedDelaunayTriangulation_r: [
+        # *geom, *handle, *geom
+        :pointer, :pointer, :pointer
+      ],
+
       GEOSVoronoiDiagram_r: [
         # *geom, *handle, *geom, *envelope, tolerance, only_edges
         :pointer, :pointer, :pointer, :pointer, :double, :int
@@ -721,6 +741,11 @@ module Geos
         :int, :pointer, :pointer, :pointer, :pointer
       ],
 
+      GEOSDistanceWithin_r: [
+        # (0 on exception, 1 otherwise), *handle, *geom_a, *geom_b, double distance
+        :char, :pointer, :pointer, :pointer, :double
+      ],
+
       GEOSHausdorffDistance_r: [
         # (0 on exception, 1 otherwise), *handle, *geom_a, *geom_b, (double *) distance
         :int, :pointer, :pointer, :pointer, :pointer
@@ -949,6 +974,21 @@ module Geos
         # (2 on exception, 1 on true, 0 on false), *handle, *prepared, *geom
         :char, :pointer, :pointer, :pointer
       ],
+
+      GEOSPreparedDistance_r: [
+        # (1 on success, 0 on failure), *handle, *prepared, *geom, *distance
+        :int, :pointer, :pointer, :pointer, :pointer
+      ],
+
+      GEOSPreparedDistanceWithin_r: [
+        # (1 on true, 0 on false), *handle, *prepared, *geom, max_distance
+        :char, :pointer, :pointer, :pointer, :double
+      ],
+
+      GEOSPreparedNearestPoints_r: [
+        # *coord_seq, *handle, *prepared, *geom
+        :pointer, :pointer, :pointer, :pointer
+      ],
       #### /PreparedGeometry functions ####
 
       #### WktReader functions ####
@@ -1082,8 +1122,52 @@ module Geos
         # void, *handle, *geom, bool
         :void, :pointer, :pointer, :char
       ],
+
+      GEOSWKBWriter_getFlavor_r: [
+        # flavor, *handle, *geom
+        :flavor, :pointer, :pointer
+      ],
+
+      GEOSWKBWriter_setFlavor_r: [
+        # void, *handle, *geom, flavor
+        :void, :pointer, :pointer, :flavor
+      ],
       #### /WkbWriter functions ####
 
+      #### GeoJSONReader functions ####
+      GEOSGeoJSONReader_create_r: [
+        # *geojson_reader, *handle
+        :pointer, :pointer
+      ],
+
+      GEOSGeoJSONReader_readGeometry_r: [
+        # *geom, *handle, *geojson_reader, string
+        :pointer, :pointer, :pointer, :string
+      ],
+
+      GEOSGeoJSONReader_destroy_r: [
+        # void, *handle, *geojson_reader
+        :void, :pointer, :pointer
+      ],
+      #### /GeoJSONReader functions ###
+
+      #### GeoJSONWriter functions ####
+      GEOSGeoJSONWriter_create_r: [
+        # *geojson_writer, *handle
+        :pointer, :pointer
+      ],
+
+      GEOSGeoJSONWriter_destroy_r: [
+        # void, *handle, *geojson_writer
+        :void, :pointer, :pointer
+      ],
+
+      GEOSGeoJSONWriter_writeGeometry_r: [
+        # string, *handle, *geojson_writer, :geom, :indent
+        :string, :pointer, :pointer, :pointer, :int
+      ],
+      #### /GeoJSONWriter functions ####
+
       #### Linearref functions ####
       GEOSProject_r: [
         # distance, *handle, *geom_a, *geom_b

data/test/geojson_reader_tests.rb

@@ -0,0 +1,170 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class GeoJSONReaderTests < Minitest::Test
+  include TestHelper
+
+  attr_reader :json_reader
+
+  def setup
+    super
+
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSGeoJSONReader_create_r)
+
+    @json_reader = Geos::GeoJSONReader.new
+
+    @writer.rounding_precision = 3
+  end
+
+  def json_read(*args, **options)
+    json_reader.read(*args, **options)
+  end
+
+  def geojson_tester(expected, json, **options)
+    assert_equal(expected, write(json_read(json, **options)))
+  end
+
+  def test_point
+    geojson_tester(
+      'POINT (-117.000 33.000)',
+      '{"type":"Point","coordinates":[-117.0,33.0]}'
+    )
+  end
+
+  def test_line_string
+    geojson_tester(
+      'LINESTRING (102.000 0.000, 103.000 1.000, 104.000 0.000, 105.000 1.000)',
+      '{"type":"LineString","coordinates":[[102.0,0.0],[103.0,1.0],[104.0,0.0],[105.0,1.0]]}'
+    )
+  end
+
+  def test_polygon
+    geojson_tester(
+      'POLYGON ((30.000 10.000, 40.000 40.000, 20.000 40.000, 10.000 20.000, 30.000 10.000))',
+      '{"type":"Polygon","coordinates":[[[30,10],[40,40],[20,40],[10,20],[30,10]]]}'
+    )
+  end
+
+  def test_polygon_with_inner_ring
+    geojson_tester(
+      'POLYGON ((35.000 10.000, 45.000 45.000, 15.000 40.000, 10.000 20.000, 35.000 10.000), (20.000 30.000, 35.000 35.000, 30.000 20.000, 20.000 30.000))',
+      '{"type":"Polygon","coordinates":[[[35,10],[45,45],[15,40],[10,20],[35,10]],[[20,30],[35,35],[30,20],[20,30]]]}'
+    )
+  end
+
+  def test_multi_point
+    geojson_tester(
+      'MULTIPOINT (10.000 40.000, 40.000 30.000, 20.000 20.000, 30.000 10.000)',
+      '{"type":"MultiPoint","coordinates":[[10, 40], [40, 30], [20, 20], [30, 10]]}'
+    )
+  end
+
+  def test_multi_line_string
+    geojson_tester(
+      'MULTILINESTRING ((10.000 10.000, 20.000 20.000, 10.000 40.000), (40.000 40.000, 30.000 30.000, 40.000 20.000, 30.000 10.000))',
+      '{"type":"MultiLineString","coordinates":[[[10, 10], [20, 20], [10, 40]],[[40, 40], [30, 30], [40, 20], [30, 10]]]}'
+    )
+  end
+
+  def test_multi_polygon
+    geojson_tester(
+      'MULTIPOLYGON (((40.000 40.000, 20.000 45.000, 45.000 30.000, 40.000 40.000)), ((20.000 35.000, 10.000 30.000, 10.000 10.000, 30.000 5.000, 45.000 20.000, 20.000 35.000), (30.000 20.000, 20.000 15.000, 20.000 25.000, 30.000 20.000)))',
+      '{"type": "MultiPolygon", "coordinates": [[[[40, 40], [20, 45], [45, 30], [40, 40]]], [[[20, 35], [10, 30], [10, 10], [30, 5], [45, 20], [20, 35]], [[30, 20], [20, 15], [20, 25], [30, 20]]]]}'
+    )
+  end
+
+  def test_geometry_collection
+    geojson_tester(
+      'GEOMETRYCOLLECTION (POINT (40.000 10.000), LINESTRING (10.000 10.000, 20.000 20.000, 10.000 40.000), POLYGON ((40.000 40.000, 20.000 45.000, 45.000 30.000, 40.000 40.000)))',
+      '{"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [40, 10]},{"type": "LineString","coordinates": [[10, 10], [20, 20], [10, 40]]},{"type": "Polygon","coordinates": [[[40, 40], [20, 45], [45, 30], [40, 40]]]}]}'
+    )
+  end
+
+  def test_feature_collection
+    geojson_tester(
+      'GEOMETRYCOLLECTION (POINT (-117.000 33.000), POINT (-122.000 45.000))',
+      '{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[-117.0,33.0]}},{"type":"Feature","geometry":{"type":"Point","coordinates":[-122.0,45.0]}}]}'
+    )
+  end
+
+  def test_empty_point
+    geojson_tester(
+      'POINT EMPTY',
+      '{"type":"Point","coordinates":[]}'
+    )
+  end
+
+  def test_empty_line_string
+    geojson_tester(
+      'LINESTRING EMPTY',
+      '{"type":"LineString","coordinates":[]}'
+    )
+  end
+
+  def test_empty_polygon
+    geojson_tester(
+      'POLYGON EMPTY',
+      '{"type":"Polygon","coordinates":[]}'
+    )
+  end
+
+  def test_empty_multi_point
+    geojson_tester(
+      'MULTIPOINT EMPTY',
+      '{"type":"MultiPoint","coordinates":[]}'
+    )
+  end
+
+  def test_empty_multi_line_string
+    geojson_tester(
+      'MULTILINESTRING EMPTY',
+      '{"type":"MultiLineString","coordinates":[]}'
+    )
+  end
+
+  def test_empty_multi_polygon
+    geojson_tester(
+      'MULTIPOLYGON EMPTY',
+      '{"type": "MultiPolygon", "coordinates": []}'
+    )
+  end
+
+  def test_empty_geometry_collection
+    geojson_tester(
+      'GEOMETRYCOLLECTION EMPTY',
+      '{"type": "GeometryCollection","geometries": []}'
+    )
+  end
+
+  def test_incomplete_geojson
+    assert_raises(Geos::GeoJSONReader::ParseError) do
+      json_reader.read('{"type":"Point","coordinates":[-117.0]}')
+    end
+
+    assert_raises(Geos::GeoJSONReader::ParseError) do
+      json_reader.read('{"type":"LineString","coordinates":[[1,2],[2]]}')
+    end
+  end
+
+  def test_broken_geojson
+    assert_raises(Geos::GeoJSONReader::ParseError) do
+      json_reader.read('<gml>NOT_GEO_JSON</gml>')
+    end
+  end
+
+  def test_incompatible_type
+    assert_raises(Geos::GeoJSONReader::ParseError) do
+      json_reader.read('{"type":"Line","coordinates":[[1,2],[2,3]]}')
+    end
+  end
+
+  def test_srid_from_options
+    geom = json_reader.read(
+      '{"type":"Point","coordinates":[-117.0,33.0]}',
+      srid: 3857
+    )
+
+    assert_equal(geom.srid, 3857)
+  end
+end

data/test/geojson_writer_tests.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class GeoJSONWriterTests < Minitest::Test
+  include TestHelper
+
+  attr_reader :json_writer
+
+  def setup
+    super
+
+    skip unless ENV['FORCE_TESTS'] || Geos::FFIGeos.respond_to?(:GEOSGeoJSONWriter_create_r)
+
+    @json_writer = Geos::GeoJSONWriter.new
+  end
+
+  def json_write(*args, **options)
+    json_writer.write(*args, **options)
+  end
+
+  def geojson_tester(expected, geom, **options)
+    assert_equal(expected, json_write(read(geom), **options))
+  end
+
+  def test_point
+    geojson_tester('{"type":"Point","coordinates":[-117.0,33.0]}', 'POINT(-117 33)')
+  end
+
+  def test_line_string
+    geojson_tester('{"type":"LineString","coordinates":[[102.0,0.0],[103.0,1.0],[104.0,0.0],[105.0,1.0]]}', 'LINESTRING(102.0 0.0, 103.0 1.0, 104.0 0.0, 105.0 1.0)')
+  end
+
+  def test_polygon
+    geojson_tester('{"type":"Polygon","coordinates":[[[30.0,10.0],[40.0,40.0],[20.0,40.0],[10.0,20.0],[30.0,10.0]]]}', 'POLYGON((30 10, 40 40, 20 40, 10 20, 30 10))')
+  end
+
+  def test_polygon_with_inner_ring
+    geojson_tester('{"type":"Polygon","coordinates":[[[35.0,10.0],[45.0,45.0],[15.0,40.0],[10.0,20.0],[35.0,10.0]],[[20.0,30.0],[35.0,35.0],[30.0,20.0],[20.0,30.0]]]}', 'POLYGON((35 10, 45 45, 15 40, 10 20, 35 10), (20 30, 35 35, 30 20, 20 30))')
+  end
+
+  def test_multi_point
+    geojson_tester('{"type":"MultiPoint","coordinates":[[10.0,40.0],[40.0,30.0],[20.0,20.0],[30.0,10.0]]}', 'MULTIPOINT ((10 40), (40 30), (20 20), (30 10))')
+  end
+
+  def test_multi_line_string
+    geojson_tester('{"type":"MultiLineString","coordinates":[[[10.0,10.0],[20.0,20.0],[10.0,40.0]],[[40.0,40.0],[30.0,30.0],[40.0,20.0],[30.0,10.0]]]}', 'MULTILINESTRING ((10 10, 20 20, 10 40),(40 40, 30 30, 40 20, 30 10))')
+  end
+
+  def test_multi_polygon
+    geojson_tester('{"type":"MultiPolygon","coordinates":[[[[30.0,20.0],[45.0,40.0],[10.0,40.0],[30.0,20.0]]],[[[15.0,5.0],[40.0,10.0],[10.0,20.0],[5.0,10.0],[15.0,5.0]]]]}', 'MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))')
+  end
+
+  def test_geometry_collection
+    geojson_tester('{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[1.0,1.0]},{"type":"Point","coordinates":[2.0,2.0]}]}', 'GEOMETRYCOLLECTION(POINT(1 1),POINT(2 2))')
+  end
+
+  def test_write_with_indentation
+    geojson_tester(<<~JSON.strip, 'LINESTRING(102.0 0.0, 103.0 1.0, 104.0 0.0, 105.0 1.0)', indentation: 2)
+      {
+        "type": "LineString",
+        "coordinates": [
+          [
+            102.0,
+            0.0
+          ],
+          [
+            103.0,
+            1.0
+          ],
+          [
+            104.0,
+            0.0
+          ],
+          [
+            105.0,
+            1.0
+          ]
+        ]
+      }
+    JSON
+  end
+
+  def test_empty_point
+    geojson_tester('{"type":"Point","coordinates":[]}', 'POINT EMPTY')
+  end
+
+  def test_empty_line_string
+    geojson_tester('{"type":"LineString","coordinates":[]}', 'LINESTRING EMPTY')
+  end
+
+  def test_empty_polygon
+    geojson_tester('{"type":"Polygon","coordinates":[[]]}', 'POLYGON EMPTY')
+  end
+
+  def test_empty_geometry_collection
+    geojson_tester('{"type":"GeometryCollection","geometries":[]}', 'GEOMETRYCOLLECTION EMPTY')
+  end
+
+  def test_linear_ring
+    geojson_tester('{"type":"LineString","coordinates":[[0.0,0.0],[1.0,1.0],[1.0,0.0],[0.0,0.0]]}', 'LINEARRING (0 0, 1 1, 1 0, 0 0)')
+  end
+end

data/test/geometry_tests.rb

@@ -1845,6 +1845,24 @@ class GeometryTests < Minitest::Test
     tester['MULTILINESTRING ((10 0, 10 10), (0 0, 10 10), (0 0, 10 0))', 'MULTIPOINT(0 0, 10 0, 10 10, 11 10)', tolerance: 2.0, only_edges: true]
   end
 
+  def test_constrained_delaunay_triangulation
+    skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:constrained_delaunay_triangulation)
+
+    tester = lambda { |expected, geom|
+      geom = read(geom)
+      geom_tri = geom.constrained_delaunay_triangulation
+      geom_tri.normalize!
+
+      assert_equal(write(read(expected).normalize), write(geom_tri))
+    }
+
+    writer.trim = true
+
+    tester['GEOMETRYCOLLECTION EMPTY', 'POLYGON EMPTY']
+    tester['GEOMETRYCOLLECTION EMPTY', 'POINT(0 0)']
+    tester['GEOMETRYCOLLECTION (POLYGON ((10 10, 20 40, 90 10, 10 10)), POLYGON ((90 90, 20 40, 90 10, 90 90)))', 'POLYGON ((10 10, 20 40, 90 90, 90 10, 10 10))']
+  end
+
   def test_voronoi_diagram
     skip unless ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:voronoi_diagram)
 

data/test/prepared_geometry_tests.rb

@@ -70,6 +70,12 @@ class PreparedGeometryTests < Minitest::Test
     relationship_tester(:contains?, true, false, false, false, false, true, false, false)
   end
 
+  def test_contains_properly
+    skip unless ENV['FORCE_TESTS'] || defined?(Geos::PreparedGeometry)
+
+    relationship_tester(:contains_properly?, true, false, false, false, false, false, false, false)
+  end
+
   def test_overlaps
     skip unless ENV['FORCE_TESTS'] || defined?(Geos::PreparedGeometry)
 
@@ -111,4 +117,28 @@ class PreparedGeometryTests < Minitest::Test
       Geos::PreparedGeometry.new('hello world')
     end
   end
+
+  def test_distance
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::PreparedGeometry) && Geos::FFIGeos.respond_to?(:GEOSPreparedDistance_r))
+
+    assert_equal(5.0, read(POINT_A).to_prepared.distance(read(POINT_B)))
+  end
+
+  def test_distance_within
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::PreparedGeometry) && Geos::FFIGeos.respond_to?(:GEOSPreparedDistanceWithin_r))
+
+    assert(read(POINT_A).to_prepared.distance_within?(read(POINT_B), 30.0))
+    refute(read(POINT_A).to_prepared.distance_within?(read(POINT_B), 3.0))
+  end
+
+  def test_nearest_points
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::PreparedGeometry) && Geos::FFIGeos.respond_to?(:GEOSPreparedNearestPoints_r))
+
+    coord_seq = read('POLYGON((1 1, 1 5, 5 5, 5 1, 1 1))').to_prepared.nearest_points(read('POLYGON((8 8, 9 9, 9 10, 8 8))'))
+
+    assert_equal(5.0, coord_seq.x[0])
+    assert_equal(5.0, coord_seq.y[0])
+    assert_equal(8.0, coord_seq.x[1])
+    assert_equal(8.0, coord_seq.y[1])
+  end
 end

data/test/test_helper.rb

@@ -9,6 +9,12 @@ SimpleCov.start do
   add_filter '/.bundle/'
 end
 
+if ENV['CI']
+  require 'simplecov_json_formatter'
+
+  SimpleCov.formatter = SimpleCov::Formatter::JSONFormatter
+end
+
 require 'rubygems'
 require 'minitest/autorun'
 require 'minitest/reporters'