ffi-geos 0.0.1.beta1 → 0.0.1.beta2

data/README.rdoc

@@ -43,7 +43,13 @@ Ruby bindings along with the following enhancements and additions:
   have been enhanced to take options Hashes allowing you to set per-write
   settings.
 
-== New Methods and Additions
+* Geos::BufferParams class that allows for more extensive Geos::Geometry#buffer
+  options.
+
+* Geos::PreparedGeometry class and Geos::Geometry#to_prepared method to
+  allow for prepared geometries and more efficient relationship testing.
+
+== New Methods and Additions (not exhaustive)
 
 === Geos
 
@@ -73,8 +79,6 @@ Ruby bindings along with the following enhancements and additions:
 
 === Geos::Geometry
 
-* Geos::Geometry#buffer_with_style
-
 * Geos::Geometry#num_coordinates
 
 * Geos::Geometry#union_cascaded. Geos::Geometry#union can also be called
@@ -118,8 +122,6 @@ Ruby bindings along with the following enhancements and additions:
 
 * Geos::LineString#point_n
 
-* Geos::LineString#buffer_single_sided
-
 * Geos::LineString#closed?
 
 === Geos::WktWriter

data/VERSION

@@ -1 +1 @@
-0.0.1.beta1
+0.0.1.beta2

data/ffi-geos.gemspec

@@ -0,0 +1,85 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ffi-geos}
+  s.version = "0.0.1.beta2"
+
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["J Smith"]
+  s.date = %q{2011-05-11}
+  s.description = %q{An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).}
+  s.email = %q{dark.panda@gmail.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "MIT-LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "ffi-geos.gemspec",
+    "lib/buffer_params.rb",
+    "lib/coordinate_sequence.rb",
+    "lib/ffi-geos.rb",
+    "lib/geometry.rb",
+    "lib/geometry_collection.rb",
+    "lib/line_string.rb",
+    "lib/linear_ring.rb",
+    "lib/multi_line_string.rb",
+    "lib/multi_point.rb",
+    "lib/multi_polygon.rb",
+    "lib/point.rb",
+    "lib/polygon.rb",
+    "lib/prepared_geometry.rb",
+    "lib/strtree.rb",
+    "lib/tools.rb",
+    "lib/utils.rb",
+    "lib/wkb_reader.rb",
+    "lib/wkb_writer.rb",
+    "lib/wkt_reader.rb",
+    "lib/wkt_writer.rb",
+    "test/coordinate_sequence_tests.rb",
+    "test/geometry_tests.rb",
+    "test/misc_tests.rb",
+    "test/point_tests.rb",
+    "test/prepared_geometry_tests.rb",
+    "test/strtree_tests.rb",
+    "test/test_helper.rb",
+    "test/utils_tests.rb",
+    "test/wkb_reader_tests.rb",
+    "test/wkb_writer_tests.rb",
+    "test/wkt_reader_tests.rb",
+    "test/wkt_writer_tests.rb"
+  ]
+  s.homepage = %q{http://github.com/dark-panda/ffi-geos}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.7.2}
+  s.summary = %q{An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).}
+  s.test_files = [
+    "test/coordinate_sequence_tests.rb",
+    "test/geometry_tests.rb",
+    "test/misc_tests.rb",
+    "test/point_tests.rb",
+    "test/prepared_geometry_tests.rb",
+    "test/strtree_tests.rb",
+    "test/test_helper.rb",
+    "test/utils_tests.rb",
+    "test/wkb_reader_tests.rb",
+    "test/wkb_writer_tests.rb",
+    "test/wkt_reader_tests.rb",
+    "test/wkt_writer_tests.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/lib/buffer_params.rb

@@ -0,0 +1,81 @@
+
+module Geos
+  class BufferParams
+    include Geos::Tools
+
+    attr_reader :ptr, :params
+
+    VALID_PARAMETERS = [
+      :quad_segs, :endcap, :join, :mitre_limit, :single_sided
+    ].freeze
+
+    # The defaults for the params according to GEOS are as found in
+    # Geos::Constants::BUFFER_PARAMS_DEFAULTS. Note that when setting the
+    # :quad_segs value that you should set it before setting other values like
+    # :join and :mitre_limit, as GEOS contains logic concerning how the
+    # :quad_segs value affects these parameters and vice versa. For details,
+    # refer to src/operation/buffer/BufferParameters.cpp and the
+    # BufferParameters::setQuadrantSegments(int) method in the GEOS source
+    # code for details.
+    def initialize(params = {})
+      params = Geos::Constants::BUFFER_PARAM_DEFAULTS.merge(params)
+
+      ptr = FFIGeos.GEOSBufferParams_create_r(Geos.current_handle)
+      @ptr = FFI::AutoPointer.new(
+        ptr,
+        self.class.method(:release)
+      )
+
+      @params = {}
+      VALID_PARAMETERS.each do |param|
+        self.send("#{param}=", params[param])
+      end
+    end
+
+    def self.release(ptr) #:nodoc:
+      FFIGeos.GEOSBufferParams_destroy_r(Geos.current_handle, ptr)
+    end
+
+    def endcap=(value)
+      check_enum_value(Geos::BufferCapStyles, value)
+
+      if bool_result(FFIGeos.GEOSBufferParams_setEndCapStyle_r(Geos.current_handle, ptr, value))
+        @params[:endcap] = symbol_for_enum(Geos::BufferCapStyles, value)
+      end
+    end
+
+    def join=(value)
+      check_enum_value(Geos::BufferJoinStyles, value)
+
+      if bool_result(FFIGeos.GEOSBufferParams_setJoinStyle_r(Geos.current_handle, ptr, value))
+        @params[:join] = symbol_for_enum(Geos::BufferJoinStyles, value)
+      end
+    end
+
+    def mitre_limit=(value)
+      if bool_result(FFIGeos.GEOSBufferParams_setMitreLimit_r(Geos.current_handle, ptr, value))
+        @params[:mitre_limit] = value
+      end
+    end
+
+    def quad_segs=(value)
+      if bool_result(FFIGeos.GEOSBufferParams_setQuadrantSegments_r(Geos.current_handle, ptr, value))
+        @params[:quad_segs] = value
+      end
+    end
+
+    def single_sided=(value)
+      if bool_result(FFIGeos.GEOSBufferParams_setSingleSided_r(Geos.current_handle, ptr, value ? 1 : 0))
+        @params[:single_sided] = value
+      end
+    end
+
+    VALID_PARAMETERS.each do |param|
+      self.class_eval(<<-EOF, __FILE__, __LINE__ + 1)
+        def #{param}
+          @params[:#{param}]
+        end
+      EOF
+    end
+  end
+end

data/lib/ffi-geos.rb

@@ -37,6 +37,8 @@ module Geos
     File.join(GEOS_BASE, 'point')
   autoload :STRtree,
     File.join(GEOS_BASE, 'strtree')
+  autoload :BufferParams,
+    File.join(GEOS_BASE, 'buffer_params')
   autoload :Tools,
     File.join(GEOS_BASE, 'tools')
   autoload :Utils,
@@ -110,15 +112,31 @@ module Geos
       :monovalent_endpoint, 4
     ])
 
+    Geos::GeometryTypes = enum(:geometry_type, [
+      :point, 0,
+      :line_string, 1,
+      :linear_ring, 2,
+      :polygon, 3,
+      :multi_point, 4,
+      :multi_line_string, 5,
+      :multi_polygon, 6,
+      :geometry_collection, 7
+    ])
+
     FFI_LAYOUT = {
       #### Utility functions ####
       :initGEOS_r => [
         :pointer,
+
+        # notice callback
         callback([ :string, :string ], :void),
+
+        # error callback
         callback([ :string, :string ], :void)
       ],
 
       :finishGEOS_r => [
+        # void, *handle
         :void, :pointer
       ],
 
@@ -131,538 +149,715 @@ module Geos
       ],
 
       :GEOSPolygonize_r => [
+        # *geom, *handle, **geoms, ngeoms
         :pointer, :pointer, :pointer, :uint
       ],
 
       :GEOSPolygonizer_getCutEdges_r => [
+        # *geom, *handle, **geoms, ngeoms
         :pointer, :pointer, :pointer, :uint
       ],
 
       :GEOSPolygonize_full_r => [
+        # *geom, *handle, *geom, **cuts, **dangles, **invalid
         :pointer, :pointer, :pointer, :pointer, :pointer, :pointer
       ],
 
       :GEOSGeom_createPoint_r => [
+        # *geom, *handle, *coord_seq
         :pointer, :pointer, :pointer
       ],
 
       :GEOSGeom_createEmptyPoint_r => [
+        # *geom, *handle
         :pointer, :pointer
       ],
 
       :GEOSGeom_createEmptyLineString_r => [
+        # *geom, *handle
         :pointer, :pointer
       ],
 
       :GEOSGeom_createLinearRing_r => [
+        # *geom, *handle, *coord_seq
         :pointer, :pointer, :pointer
       ],
 
       :GEOSGeom_createLineString_r => [
+        # *geom, *handle, *coord_seq
         :pointer, :pointer, :pointer
       ],
 
       :GEOSGeom_createPolygon_r => [
+        # *geom, *handle, *geom, **holes, nholes
         :pointer, :pointer, :pointer, :pointer, :uint
       ],
 
       :GEOSGeom_createEmptyPolygon_r => [
+        # *geom, *handle
         :pointer, :pointer
       ],
 
       :GEOSGeom_createCollection_r => [
-        :pointer, :pointer, :int, :pointer, :uint
+        # *geom, *handle, type, **geoms, ngeoms
+        :pointer, :pointer, :geometry_type, :pointer, :uint
       ],
 
       :GEOSGeom_createEmptyCollection_r => [
-        :pointer, :pointer, :int
+        # *geom, *handle, type
+        :pointer, :pointer, :geometry_type
       ],
       #### /Utility functions ####
 
       #### CoordinateSequence functions ####
       :GEOSCoordSeq_create_r => [
+        # *coord_seq, *handle, size, dims
         :pointer, :pointer, :uint, :uint
       ],
 
       :GEOSCoordSeq_destroy_r => [
+        # void, *handle, *coord_seq
         :void, :pointer, :pointer
       ],
 
       :GEOSCoordSeq_clone_r => [
+        # *coord_seq, *handle, *coord_seq
         :pointer, :pointer, :pointer
       ],
 
       :GEOSCoordSeq_setX_r => [
+        # 0 on exception, *handle, *coord_seq, idx, val
         :int, :pointer, :pointer, :uint, :double
       ],
 
       :GEOSCoordSeq_setY_r => [
+        # 0 on exception, *handle, *coord_seq, idx, val
         :int, :pointer, :pointer, :uint, :double
       ],
 
       :GEOSCoordSeq_setZ_r => [
+        # 0 on exception, *handle, *coord_seq, idx, val
         :int, :pointer, :pointer, :uint, :double
       ],
 
       :GEOSCoordSeq_setOrdinate_r => [
+        # 0 on exception, *handle, *coord_seq, idx, dim, val
         :int, :pointer, :pointer, :uint, :uint, :double
       ],
 
       :GEOSCoordSeq_getX_r => [
+        # 0 on exception, *handle, *coord_seq, idx, (double *) val
         :int, :pointer, :pointer, :uint, :pointer
       ],
 
       :GEOSCoordSeq_getY_r => [
+        # 0 on exception, *handle, *coord_seq, idx, (double *) val
         :int, :pointer, :pointer, :uint, :pointer
       ],
 
       :GEOSCoordSeq_getZ_r => [
+        # 0 on exception, *handle, *coord_seq, idx, (double *) val
         :int, :pointer, :pointer, :uint, :pointer
       ],
 
       :GEOSCoordSeq_getOrdinate_r => [
+        # 0 on exception, *handle, *coord_seq, idx, dim, (double *) val
         :int, :pointer, :pointer, :uint, :uint, :pointer
       ],
 
       :GEOSCoordSeq_getSize_r => [
+        # 0 on exception, *handle, *coord_seq, (uint *) size
         :int, :pointer, :pointer, :pointer
       ],
 
-      :GEOSNormalize_r => [
-        :int, :pointer, :pointer
-      ],
-
       :GEOSCoordSeq_getDimensions_r => [
+        # 0 on exception, *handle, *coord_seq, (uint *) size
         :int, :pointer, :pointer, :pointer
       ],
       #### /CoordinateSequence functions ####
 
       #### Geometry functions ####
       :GEOSGeom_destroy_r => [
+        # void, *handle, *geom
         :void, :pointer, :pointer
       ],
 
       :GEOSGeom_clone_r => [
+        # *geom, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
       :GEOSGeomTypeId_r => [
+        # type, *handle, *geom
         :int, :pointer, :pointer
       ],
 
       :GEOSGeomType_r => [
+        # type, *handle, *geom
         :string, :pointer, :pointer
       ],
 
       :GEOSGetSRID_r => [
+        # srid, *handle, *geom
         :int, :pointer, :pointer
       ],
 
       :GEOSSetSRID_r => [
+        # void, *handle, *geom, srid
         :void, :pointer, :pointer, :int
       ],
 
       :GEOSGeom_getDimensions_r => [
+        # dims, *handle, *geom
         :int, :pointer, :pointer
       ],
 
       :GEOSGetNumGeometries_r => [
+        # ngeoms, *handle, *geom
         :int, :pointer, :pointer
       ],
 
       :GEOSGetNumCoordinates_r => [
+        # numcoords, *handle, *geom
         :int, :pointer, :pointer
       ],
 
       :GEOSGeom_getCoordSeq_r => [
+        # *coord_seq, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
       :GEOSIntersection_r => [
+        # *geom, *handle, *geom_a, *geom_b
         :pointer, :pointer, :pointer, :pointer
       ],
 
+      :GEOSBufferWithParams_r => [
+        # *geom, *handle, *geom, *oarams, width
+        :pointer, :pointer, :pointer, :pointer, :double
+      ],
+
       :GEOSBuffer_r => [
+        # *geom, *handle, *geom, width, quad_segs
         :pointer, :pointer, :pointer, :double, :int
       ],
 
       :GEOSBufferWithStyle_r => [
+        # *geom, *handle, *geom, width, quad_segs, buffer_cap_style, buffer_join_style, mitre_limit
         :pointer, :pointer, :pointer, :double, :int, :buffer_cap_style, :buffer_join_style, :double
       ],
 
+      # Deprecated in GEOS 3.3.0.
       :GEOSSingleSidedBuffer_r => [
+        # *geom, *handle, *geom, width, quad_segs, buffer_join_style, mitre_limit, is_left
         :pointer, :pointer, :pointer, :double, :int, :buffer_join_style, :double, :int
       ],
 
+      :GEOSOffsetCurve_r => [
+        # *geom, *handle, *geom, width, quad_segs, buffer_join_style, mitre_limit
+        :pointer, :pointer, :pointer, :double, :int, :buffer_join_style, :double
+      ],
+
       :GEOSConvexHull_r => [
+        # *geom, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
       :GEOSDifference_r => [
+        # *geom, *handle, *geom_a, *geom_b
         :pointer, :pointer, :pointer, :pointer
       ],
 
       :GEOSSymDifference_r => [
+        # *geom, *handle, *geom_a, *geom_b
         :pointer, :pointer, :pointer, :pointer
       ],
 
       :GEOSBoundary_r => [
+        # *geom, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
       :GEOSUnion_r => [
+        # *geom, *handle, *geom_a, *geom_b
         :pointer, :pointer, :pointer, :pointer
       ],
 
       :GEOSUnaryUnion_r => [
+        # *geom, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
+      # Deprecated in GEOS 3.3.0. Use GEOSUnaryUnion_r instead.
       :GEOSUnionCascaded_r => [
+        # *geom, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
       :GEOSPointOnSurface_r => [
+        # *geom, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
       :GEOSGetCentroid_r => [
+        # *geom, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
       :GEOSEnvelope_r => [
+        # *geom, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
       :GEOSLineMerge_r => [
+        # *geom, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
       :GEOSSimplify_r => [
+        # *geom, *handle, *geom, tolerance
         :pointer, :pointer, :pointer, :double
       ],
 
       :GEOSTopologyPreserveSimplify_r => [
+        # *geom, *handle, *geom, tolerance
         :pointer, :pointer, :pointer, :double
       ],
 
       :GEOSGeom_extractUniquePoints_r => [
+        # *geom, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
       :GEOSSharedPaths_r => [
+        # *geom, *handle, *geom_a, *geom_b
         :pointer, :pointer, :pointer, :pointer
       ],
 
       :GEOSSnap_r => [
+        # *geom, *handle, *geom_a, *geom_b, tolerance
         :pointer, :pointer, :pointer, :pointer, :double
       ],
 
       :GEOSRelate_r => [
+        # string, *handle, *geom_a, *geom_b
         :string, :pointer, :pointer, :pointer
       ],
 
       :GEOSRelatePatternMatch_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, pattern_a, pattern_b
         :char, :pointer, :string, :string
       ],
 
       :GEOSRelatePattern_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom_a, *geom_b, pattern
         :char, :pointer, :pointer, :pointer, :string
       ],
 
       :GEOSRelateBoundaryNodeRule_r => [
+        # string, *handle, *geom_a, *geom_b, bnr
         :string, :pointer, :pointer, :pointer, :relate_boundary_node_rule
       ],
 
       :GEOSDisjoint_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom_a, *geom_b
         :char, :pointer, :pointer, :pointer
       ],
 
       :GEOSTouches_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom_a, *geom_b
         :char, :pointer, :pointer, :pointer
       ],
 
       :GEOSIntersects_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom_a, *geom_b
         :char, :pointer, :pointer, :pointer
       ],
 
       :GEOSCrosses_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom_a, *geom_b
         :char, :pointer, :pointer, :pointer
       ],
 
       :GEOSWithin_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom_a, *geom_b
         :char, :pointer, :pointer, :pointer
       ],
 
       :GEOSContains_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom_a, *geom_b
         :char, :pointer, :pointer, :pointer
       ],
 
       :GEOSOverlaps_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom_a, *geom_b
         :char, :pointer, :pointer, :pointer
       ],
 
       :GEOSCovers_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom_a, *geom_b
         :char, :pointer, :pointer, :pointer
       ],
 
       :GEOSCoveredBy_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom_a, *geom_b
         :char, :pointer, :pointer, :pointer
       ],
 
       :GEOSEquals_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom_a, *geom_b
         :char, :pointer, :pointer, :pointer
       ],
 
       :GEOSEqualsExact_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom_a, *geom_b
         :char, :pointer, :pointer, :pointer, :double
       ],
 
       :GEOSisEmpty_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom
         :char, :pointer, :pointer
       ],
 
       :GEOSisValid_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom
         :char, :pointer, :pointer
       ],
 
       :GEOSisValidReason_r => [
+        # reason, *handle, *geom
         :string, :pointer, :pointer
       ],
 
       :GEOSisValidDetail_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom, flags, (string**) reasons, **geoms
         :char, :pointer, :pointer, :int, :pointer, :pointer
       ],
 
       :GEOSisSimple_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom
         :char, :pointer, :pointer
       ],
 
       :GEOSisRing_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom
         :char, :pointer, :pointer
       ],
 
       :GEOSHasZ_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom
         :char, :pointer, :pointer
       ],
 
       :GEOSisClosed_r => [
+        # (2 on exception, 1 on true, 2 on false), *handle, *geom
         :char, :pointer, :pointer
       ],
 
       :GEOSArea_r => [
+        # (0 on exception, 1 otherwise), *handle, *geom, (double *) area
         :int, :pointer, :pointer, :pointer
       ],
 
       :GEOSLength_r => [
+        # (0 on exception, 1 otherwise), *handle, *geom, (double *) length
         :int, :pointer, :pointer, :pointer
       ],
 
       :GEOSDistance_r => [
+        # (0 on exception, 1 otherwise), *handle, *geom_a, *geom_b, (double *) distance
         :int, :pointer, :pointer, :pointer, :pointer
       ],
 
       :GEOSHausdorffDistance_r => [
+        # (0 on exception, 1 otherwise), *handle, *geom_a, *geom_b, (double *) distance
         :int, :pointer, :pointer, :pointer, :pointer
       ],
 
+      :GEOSHausdorffDistanceDensify_r => [
+        # (0 on exception, 1 otherwise), *handle, *geom_a, *geom_b, densifyFrac, (double *) distance
+        :int, :pointer, :pointer, :pointer, :double, :pointer
+      ],
+
       :GEOSGetGeometryN_r => [
+        # *geom, *handle, *geom, n
         :pointer, :pointer, :pointer, :int
       ],
 
       :GEOSGetNumInteriorRings_r => [
+        # rings, *handle, *geom
+        :int, :pointer, :pointer
+      ],
+
+      :GEOSNormalize_r => [
+        # -1 on exception, *handle, *geom
         :int, :pointer, :pointer
       ],
 
       :GEOSGetInteriorRingN_r => [
+        # *geom, *handle, *geom, n
         :pointer, :pointer, :pointer, :int
       ],
 
       :GEOSGetExteriorRing_r => [
+        # *geom, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
       :GEOSGeomGetNumPoints_r => [
+        # numpoints, *handle, *geom
         :int, :pointer, :pointer
       ],
 
       :GEOSGeomGetX_r => [
+        # -1 on exception, *handle, *geom, *point
         :int, :pointer, :pointer, :pointer
       ],
 
       :GEOSGeomGetY_r => [
+        # -1 on exception, *handle, *geom, *point
         :int, :pointer, :pointer, :pointer
       ],
 
       :GEOSGeomGetPointN_r => [
+        # *point, *handle, *geom, n
         :pointer, :pointer, :pointer, :int
       ],
 
       :GEOSGeomGetStartPoint_r => [
+        # *point, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
       :GEOSGeomGetEndPoint_r => [
+        # *point, *handle, *geom
         :pointer, :pointer, :pointer
       ],
       #### /Geometry functions ####
 
       #### STRtree functions ####
       :GEOSSTRtree_create_r => [
+        # *tree, *handle, node_capacity
         :pointer, :pointer, :size_t
       ],
 
       :GEOSSTRtree_insert_r => [
+        # void, *handle, *tree, *geom, *void
         :void, :pointer, :pointer, :pointer, :pointer
       ],
 
       :GEOSSTRtree_query_r => [
+        # void, *handle, *tree, *geom, void query_callback((void *) item, (void *) user_data), (void *) user_data
         :void, :pointer, :pointer, :pointer, callback([ :pointer, :pointer ], :void), :pointer
       ],
 
       :GEOSSTRtree_iterate_r => [
+        # void, *handle, *tree, void query_callback((void *) item, (void *) user_data), (void *) user_data
         :void, :pointer, :pointer, callback([ :pointer, :pointer ], :void), :pointer
       ],
 
       :GEOSSTRtree_remove_r => [
+        # bool, *handle, *tree, *geom, (void *) item
         :char, :pointer, :pointer, :pointer, :pointer
       ],
 
       :GEOSSTRtree_destroy_r => [
+        # void, *handle, *tree
         :void, :pointer, :pointer
       ],
       #### /STRtree functions ####
 
       #### PreparedGeometry functions ####
       :GEOSPrepare_r => [
+        # *prepared, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
       :GEOSPreparedGeom_destroy_r => [
+        # void, *handle, *geom
         :void, :pointer, :pointer
       ],
 
       :GEOSPreparedContains_r => [
+        # (2 on exception, 1 on true, 0 on false), *handle, *prepared, *geom
         :char, :pointer, :pointer, :pointer
       ],
 
       :GEOSPreparedContainsProperly_r => [
+        # (2 on exception, 1 on true, 0 on false), *handle, *prepared, *geom
+        :char, :pointer, :pointer, :pointer
+      ],
+
+      :GEOSPreparedCoveredBy_r => [
+        # (2 on exception, 1 on true, 0 on false), *handle, *prepared, *geom
         :char, :pointer, :pointer, :pointer
       ],
 
       :GEOSPreparedCovers_r => [
+        # (2 on exception, 1 on true, 0 on false), *handle, *prepared, *geom
+        :char, :pointer, :pointer, :pointer
+      ],
+
+      :GEOSPreparedCrosses_r => [
+        # (2 on exception, 1 on true, 0 on false), *handle, *prepared, *geom
+        :char, :pointer, :pointer, :pointer
+      ],
+
+      :GEOSPreparedDisjoint_r => [
+        # (2 on exception, 1 on true, 0 on false), *handle, *prepared, *geom
         :char, :pointer, :pointer, :pointer
       ],
 
       :GEOSPreparedIntersects_r => [
+        # (2 on exception, 1 on true, 0 on false), *handle, *prepared, *geom
+        :char, :pointer, :pointer, :pointer
+      ],
+
+      :GEOSPreparedOverlaps_r => [
+        # (2 on exception, 1 on true, 0 on false), *handle, *prepared, *geom
+        :char, :pointer, :pointer, :pointer
+      ],
+
+      :GEOSPreparedTouches_r => [
+        # (2 on exception, 1 on true, 0 on false), *handle, *prepared, *geom
+        :char, :pointer, :pointer, :pointer
+      ],
+
+      :GEOSPreparedWithin_r => [
+        # (2 on exception, 1 on true, 0 on false), *handle, *prepared, *geom
         :char, :pointer, :pointer, :pointer
       ],
       #### /PreparedGeometry functions ####
 
       #### WktReader functions ####
       :GEOSWKTReader_create_r => [
+        # *wktr, *handle
         :pointer, :pointer
       ],
 
       :GEOSWKTReader_read_r => [
+        # *geom, *handle, *wktr, string
         :pointer, :pointer, :pointer, :string
       ],
 
       :GEOSWKTReader_destroy_r => [
+        # void, *handle, *wktr
         :void, :pointer, :pointer
       ],
       #### /WktReader functions ###
 
       #### WktWriter functions ####
       :GEOSWKTWriter_create_r => [
+        # *wktw, *handle
         :pointer, :pointer
       ],
 
       :GEOSWKTWriter_write_r => [
+        # string, *handle, *wktw, *geom
         :string, :pointer, :pointer, :pointer
       ],
 
       :GEOSWKTWriter_destroy_r => [
+        # void, *handle, *wktw
         :void, :pointer, :pointer
       ],
 
       :GEOSWKTWriter_setTrim_r => [
+        # void, *handle, *wktw, bool
         :void, :pointer, :pointer, :char
       ],
 
       :GEOSWKTWriter_setRoundingPrecision_r => [
+        # void, *handle, *wktw, precision
         :void, :pointer, :pointer, :int
       ],
 
       :GEOSWKTWriter_setOutputDimension_r => [
+        # void, *handle, *wktw, dimensions
         :void, :pointer, :pointer, :int
       ],
 
       :GEOSWKTWriter_getOutputDimension_r => [
+        # dimensions, *handle, *wktw
         :int, :pointer, :pointer
       ],
 
       :GEOSWKTWriter_setOld3D_r => [
+        # void, *handle, *wktw, bool
         :void, :pointer, :pointer, :int
       ],
       #### /WktWriter functions ####
 
       #### WkbReader functions ####
       :GEOSWKBReader_create_r => [
+        # *wkbr, *handle
         :pointer, :pointer
       ],
 
       :GEOSWKBReader_destroy_r => [
+        # void, *handle, *wkbr
         :void, :pointer, :pointer
       ],
 
       :GEOSWKBReader_read_r => [
+        # *geom, *handle, *wkbr, (unsigned char *) string, size_t
         :pointer, :pointer, :pointer, :pointer, :size_t
       ],
 
       :GEOSWKBReader_readHEX_r => [
+        # *geom, *handle, *wkbr, string, size_t
         :pointer, :pointer, :pointer, :string, :size_t
       ],
       #### /WkbReader functions ####
 
       #### WkbWriter functions ####
       :GEOSWKBWriter_create_r => [
+        # *wkbw, *handle
         :pointer, :pointer
       ],
 
       :GEOSWKBWriter_destroy_r => [
+        # void, *handle, *wkbw
         :void, :pointer, :pointer
       ],
 
       :GEOSWKBWriter_write_r => [
+        # (unsigned char *) string, *handle, *wkbw, *geom, *size_t
         :pointer, :pointer, :pointer, :pointer, :pointer
       ],
 
       :GEOSWKBWriter_writeHEX_r => [
+        # (unsigned char *) string, *handle, *wkbw, *geom, *size_t
         :pointer, :pointer, :pointer, :pointer, :pointer
       ],
 
       :GEOSWKBWriter_setOutputDimension_r => [
+        # void, *handle, *wkbw, dimensions
         :void, :pointer, :pointer, :int
       ],
 
       :GEOSWKBWriter_getOutputDimension_r => [
+        # dimensions, *handle, *wkbw
         :int, :pointer, :pointer
       ],
 
       :GEOSWKBWriter_getByteOrder_r => [
+        # byte_order, *handle, *wkbw
         :byte_order, :pointer, :pointer
       ],
 
       :GEOSWKBWriter_setByteOrder_r => [
+        # void, *handle, *wkbw, byte_order
         :void, :pointer, :pointer, :byte_order
       ],
 
       :GEOSWKBWriter_getIncludeSRID_r => [
+        # bool, *handle, *geom
         :char, :pointer, :pointer
       ],
 
       :GEOSWKBWriter_setIncludeSRID_r => [
+        # void, *handle, *geom, bool
         :void, :pointer, :pointer, :char
       ],
       #### /WkbWriter functions ####
@@ -670,24 +865,69 @@ module Geos
 
       #### Linearref functions ####
       :GEOSProject_r => [
+        # distance, *handle, *geom_a, *geom_b
         :double, :pointer, :pointer, :pointer
       ],
 
       :GEOSProjectNormalized_r => [
+        # distance, *handle, *geom_a, *geom_b
         :double, :pointer, :pointer, :pointer
       ],
 
       :GEOSInterpolate_r => [
+        # *geom, *handle, *geom, distance
         :pointer, :pointer, :pointer, :double
       ],
 
       :GEOSInterpolateNormalized_r => [
+        # *geom, *handle, *geom, distance
         :pointer, :pointer, :pointer, :double
       ],
       #### /Linearref functions ####
 
+      #### BufferParams functions ####
+      :GEOSBufferParams_create_r => [
+        # GEOSBufferParams*, *handle
+        :pointer, :pointer
+      ],
+
+      :GEOSBufferParams_destroy_r => [
+        # void, *handle, *params
+        :void, :pointer, :pointer
+      ],
+
+      :GEOSBufferParams_setEndCapStyle_r => [
+        # 0 on exception, *handle, *params, style
+        :int, :pointer, :pointer, :buffer_cap_style
+      ],
+
+      :GEOSBufferParams_setJoinStyle_r => [
+        # 0 on exception, *handle, *params, style
+        :int, :pointer, :pointer, :buffer_join_style
+      ],
+
+      :GEOSBufferParams_setMitreLimit_r => [
+        # 0 on exception, *handle, *params, mitre_limit
+        :int, :pointer, :pointer, :double
+      ],
+
+      :GEOSBufferParams_setQuadrantSegments_r => [
+        # 0 on exception, *handle, *params, quad_segs
+        :int, :pointer, :pointer, :int
+      ],
+
+      :GEOSBufferParams_setSingleSided_r => [
+        # 0 on exception, *handle, *params, bool
+        :int, :pointer, :pointer, :int
+      ],
+      #### /BufferParams functions ####
+
       #### Algorithms ####
+      # -1 if reaching P takes a counter-clockwise (left) turn
+      # 1 if reaching P takes a clockwise (right) turn
+      # 0 if P is collinear with A-B
       :GEOSOrientationIndex_r => [
+        # int, *handle, Ax, Ay, Bx, By, Px, Py
         :int, :pointer, :double, :double, :double, :double, :double, :double
       ]
       #### /Algorithms ####
@@ -751,6 +991,7 @@ module Geos
       create_multi_line_string
       create_multi_polygon
       create_geometry_collection
+      create_collection
 
       create_empty_point
       create_empty_line_string
@@ -759,6 +1000,7 @@ module Geos
       create_empty_multi_line_string
       create_empty_multi_polygon
       create_empty_geometry_collection
+      create_empty_collection
     }.each do |m|
       self.class_eval <<-EOF
         def #{m}(*args)
@@ -768,25 +1010,26 @@ module Geos
     end
   end
 
+  # For backwards compatibility with older native GEOS bindings.
   module GeomTypes
-    GEOS_POINT = 0
-    GEOS_LINESTRING = 1
-    GEOS_LINEARRING = 2
-    GEOS_POLYGON = 3
-    GEOS_MULTIPOINT = 4
-    GEOS_MULTILINESTRING = 5
-    GEOS_MULTIPOLYGON = 6
-    GEOS_GEOMETRYCOLLECTION = 7
+    GEOS_POINT = Geos::GeometryTypes[:point]
+    GEOS_LINESTRING = Geos::GeometryTypes[:line_string]
+    GEOS_LINEARRING = Geos::GeometryTypes[:linear_ring]
+    GEOS_POLYGON = Geos::GeometryTypes[:polygon]
+    GEOS_MULTIPOINT = Geos::GeometryTypes[:multi_point]
+    GEOS_MULTILINESTRING = Geos::GeometryTypes[:multi_line_string]
+    GEOS_MULTIPOLYGON = Geos::GeometryTypes[:multi_polygon]
+    GEOS_GEOMETRYCOLLECTION = Geos::GeometryTypes[:geometry_collection]
   end
 
   module VersionConstants
-    VERSION = File.read(File.join(GEOS_BASE, %w{ .. VERSION })) rescue nil
+    VERSION = File.read(File.join(GEOS_BASE, %w{ .. VERSION })).strip
     GEOS_JTS_PORT = Geos.jts_port
     GEOS_VERSION,
-      GEOS_VERSION_MAJOR, GEOS_VERSION_MINOR, GEOS_VERISON_PATCH,
+      GEOS_VERSION_MAJOR, GEOS_VERSION_MINOR, GEOS_VERISON_PATCH, GEOS_VERSION_PRERELEASE,
       GEOS_CAPI_VERSION,
       GEOS_CAPI_VERSION_MAJOR, GEOS_CAPI_VERSION_MINOR, GEOS_CAPI_VERSION_PATCH =
-        if versions = Geos.version.scan(/^((\d+)\.(\d+)\.(\d+))-CAPI-((\d+)\.(\d+)\.(\d+))$/)
+        if !(versions = Geos.version.scan(/^((\d+)\.(\d+)\.(\d+)((?:rc|beta|alpha)\d+)?)-CAPI-((\d+)\.(\d+)\.(\d+))$/)).empty?
           versions = versions[0]
           [
             versions[0],
@@ -794,17 +1037,27 @@ module Geos
             versions[2].to_i,
             versions[3].to_i,
             versions[4],
-            versions[5].to_i,
+            versions[5],
             versions[6].to_i,
-            versions[7].to_i
+            versions[7].to_i,
+            versions[8].to_i
           ]
         else
-          []
+          [ '0.0.0', 0, 0, 0, nil, '0.0.0', 0, 0, 0 ]
         end
     GEOS_CAPI_FIRST_INTERFACE = GEOS_CAPI_VERSION_MAJOR.to_i
     GEOS_CAPI_LAST_INTERFACE = GEOS_CAPI_VERSION_MAJOR.to_i + GEOS_CAPI_VERSION_MINOR.to_i
   end
 
+  module Constants
+    BUFFER_PARAM_DEFAULTS = {
+      :quad_segs => 8,
+      :endcap => :round,
+      :join => :round,
+      :mitre_limit => 5.0
+    }.freeze
+  end
+
   include GeomTypes
   include VersionConstants
 end