ffi-geos 1.2.2 → 2.3.0

data/lib/ffi-geos.rb

@@ -50,38 +50,36 @@ module Geos
 
   module FFIGeos
     def self.search_paths
-      @search_paths ||= begin
+      @search_paths ||= \
         if ENV['GEOS_LIBRARY_PATH']
-          [ ENV['GEOS_LIBRARY_PATH'] ]
+          [ENV['GEOS_LIBRARY_PATH']]
         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}-linux-gnu' ]
+          ['/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}', '/usr/lib/{x86_64,i386,aarch64}-linux-gnu']
         end
-      end
     end
 
     def self.find_lib(lib)
       if ENV['GEOS_LIBRARY_PATH'] && File.file?(ENV['GEOS_LIBRARY_PATH'])
         ENV['GEOS_LIBRARY_PATH']
       else
-        Dir.glob(search_paths.map { |path|
+        Dir.glob(search_paths.map do |path|
           File.expand_path(File.join(path, "#{lib}.#{FFI::Platform::LIBSUFFIX}{,.?}"))
-        }).first
+        end).first
       end
     end
 
     def self.geos_library_path
-      @geos_library_path ||= begin
+      @geos_library_path ||= \
         # On MingW the libraries have version numbers
         find_lib('{lib,}geos_c{,-?}')
-      end
     end
 
     # For backwards compatibility with older ffi-geos versions where this
     # used to return an Array.
     def self.geos_library_paths
-      [ geos_library_path ]
+      [geos_library_path]
     end
 
     extend ::FFI::Library
@@ -150,10 +148,10 @@ module Geos
         :pointer,
 
         # notice callback
-        callback([ :string, :string ], :void),
+        callback([:string, :string], :void),
 
         # error callback
-        callback([ :string, :string ], :void)
+        callback([:string, :string], :void)
       ],
 
       finishGEOS_r: [
@@ -163,16 +161,16 @@ module Geos
       # / deprecated in GEOS 3.5.0+
 
       # GEOS 3.5.0+
-      GEOS_init_r: [ :pointer ],
+      GEOS_init_r: [:pointer],
 
       GEOSContext_setNoticeMessageHandler_r: [
         # void, *handle, callback, *void
-        :void, :pointer, callback([ :string, :string ], :void), :pointer
+        :void, :pointer, callback([:string, :string], :void), :pointer
       ],
 
       GEOSContext_setErrorMessageHandler_r: [
         # void, *handle, callback, *void
-        :void, :pointer, callback([ :string, :string ], :void), :pointer
+        :void, :pointer, callback([:string, :string], :void), :pointer
       ],
 
       GEOS_finish_r: [
@@ -207,6 +205,21 @@ module Geos
         :pointer, :pointer, :pointer, :uint
       ],
 
+      GEOSPolygonize_valid_r: [
+        # *geom, *handle, **geoms, ngeoms
+        :pointer, :pointer, :pointer, :uint
+      ],
+
+      GEOSBuildArea_r: [
+        # *geom, *handle, *geom
+        :pointer, :pointer, :pointer
+      ],
+
+      GEOSMakeValid_r: [
+        # *geom, *handle, *geom
+        :pointer, :pointer, :pointer
+      ],
+
       GEOSPolygonizer_getCutEdges_r: [
         # *geom, *handle, **geoms, ngeoms
         :pointer, :pointer, :pointer, :uint
@@ -328,6 +341,11 @@ module Geos
         # 0 on exception, *handle, *coord_seq, (uint *) size
         :int, :pointer, :pointer, :pointer
       ],
+
+      GEOSCoordSeq_isCCW_r: [
+        # 0 on exception, *handle, *coord_seq, (char *) value
+        :int, :pointer, :pointer, :pointer
+      ],
       #### /CoordinateSequence functions ####
 
       #### Geometry functions ####
@@ -386,6 +404,11 @@ module Geos
         :pointer, :pointer, :pointer, :pointer
       ],
 
+      GEOSIntersectionPrec_r: [
+        # *geom, *handle, *geom_a, *geom_b, precision
+        :pointer, :pointer, :pointer, :pointer, :double
+      ],
+
       GEOSBufferWithParams_r: [
         # *geom, *handle, *geom, *params, width
         :pointer, :pointer, :pointer, :pointer, :double
@@ -422,11 +445,21 @@ module Geos
         :pointer, :pointer, :pointer, :pointer
       ],
 
+      GEOSDifferencePrec_r: [
+        # *geom, *handle, *geom_a, *geom_b, precision
+        :pointer, :pointer, :pointer, :pointer, :double
+      ],
+
       GEOSSymDifference_r: [
         # *geom, *handle, *geom_a, *geom_b
         :pointer, :pointer, :pointer, :pointer
       ],
 
+      GEOSSymDifferencePrec_r: [
+        # *geom, *handle, *geom_a, *geom_b, precision
+        :pointer, :pointer, :pointer, :pointer, :double
+      ],
+
       GEOSBoundary_r: [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
@@ -437,11 +470,26 @@ module Geos
         :pointer, :pointer, :pointer, :pointer
       ],
 
+      GEOSUnionPrec_r: [
+        # *geom, *handle, *geom_a, *geom_b, precision
+        :pointer, :pointer, :pointer, :pointer, :double
+      ],
+
+      GEOSCoverageUnion_r: [
+        # *geom, *handle, *geom
+        :pointer, :pointer, :pointer
+      ],
+
       GEOSUnaryUnion_r: [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
       ],
 
+      GEOSUnaryUnionPrec_r: [
+        # *geom, *handle, *geom, precision
+        :pointer, :pointer, :pointer, :double
+      ],
+
       GEOSNode_r: [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
@@ -468,6 +516,11 @@ module Geos
         :pointer, :pointer, :pointer
       ],
 
+      GEOSMinimumBoundingCircle_r: [
+        # *geom, *handle, *geom, *double radius, **geom center
+        :pointer, :pointer, :pointer, :pointer, :pointer
+      ],
+
       GEOSEnvelope_r: [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
@@ -478,6 +531,26 @@ module Geos
         :pointer, :pointer, :pointer
       ],
 
+      GEOSGeom_getXMin_r: [
+        # 0 on exception, *handle, (double *) value
+        :int, :pointer, :pointer, :pointer
+      ],
+
+      GEOSGeom_getXMax_r: [
+        # 0 on exception, *handle, (double *) value
+        :int, :pointer, :pointer, :pointer
+      ],
+
+      GEOSGeom_getYMin_r: [
+        # 0 on exception, *handle, (double *) value
+        :int, :pointer, :pointer, :pointer
+      ],
+
+      GEOSGeom_getYMax_r: [
+        # 0 on exception, *handle, (double *) value
+        :int, :pointer, :pointer, :pointer
+      ],
+
       GEOSSimplify_r: [
         # *geom, *handle, *geom, tolerance
         :pointer, :pointer, :pointer, :double
@@ -643,6 +716,11 @@ module Geos
         :int, :pointer, :pointer, :pointer, :pointer
       ],
 
+      GEOSDistanceIndexed_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
@@ -743,6 +821,16 @@ module Geos
         :pointer, :pointer, :pointer
       ],
 
+      GEOSMaximumInscribedCircle_r: [
+        # *geom, *handle, *geom, tolerance
+        :pointer, :pointer, :pointer, :double
+      ],
+
+      GEOSLargestEmptyCircle_r: [
+        # *geom, *handle, *geom, *geom, tolerance
+        :pointer, :pointer, :pointer, :pointer, :double
+      ],
+
       GEOSMinimumWidth_r: [
         # *geom, *handle, *geom
         :pointer, :pointer, :pointer
@@ -777,12 +865,12 @@ module Geos
 
       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
+        :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
+        :void, :pointer, :pointer, callback([:pointer, :pointer], :void), :pointer
       ],
 
       GEOSSTRtree_remove_r: [
@@ -797,7 +885,7 @@ module Geos
 
       GEOSSTRtree_nearest_generic_r: [
         # *void, *handle, *tree, *item, *item_envelope, int distance_callback(*item_1, *item_2, *double, void *user_data), *user_data
-        :pointer, :pointer, :pointer, :pointer, :pointer, callback([ :pointer, :pointer, :pointer, :pointer ], :int), :pointer
+        :pointer, :pointer, :pointer, :pointer, :pointer, callback([:pointer, :pointer, :pointer, :pointer], :int), :pointer
       ],
       #### /STRtree functions ####
 
@@ -1105,13 +1193,11 @@ module Geos
       def notice_handler=(method_or_block)
         @notice_handler = method_or_block
         FFIGeos.GEOSContext_setNoticeMessageHandler_r(@ptr, @notice_handler, nil)
-        @notice_handler
       end
 
       def error_handler=(method_or_block)
         @error_handler = method_or_block
         FFIGeos.GEOSContext_setErrorMessageHandler_r(@ptr, @error_handler, nil)
-        @error_handler
       end
 
       def notice_handler(&block)
@@ -1148,13 +1234,9 @@ module Geos
         FFIGeos.finishGEOS_r(ptr)
       end
 
-      def notice_handler
-        @notice_handler
-      end
+      attr_reader :notice_handler
 
-      def error_handler
-        @error_handler
-      end
+      attr_reader :error_handler
     end
 
     private
@@ -1170,7 +1252,7 @@ module Geos
 
   class << self
     def version
-      @version ||= FFIGeos.GEOSversion
+      @version ||= FFIGeos.GEOSversion.strip
     end
 
     def jts_port
@@ -1281,30 +1363,34 @@ module Geos
       GEOS_CAPI_VERSION,
       GEOS_CAPI_VERSION_MAJOR, GEOS_CAPI_VERSION_MINOR, GEOS_CAPI_VERSION_PATCH,
       GEOS_SVN_REVISION =
-        if !(versions = Geos.version.scan(/^
-          ((\d+)\.(\d+)\.(\d+)((?:dev|rc|beta|alpha)\d*)?)
-          -CAPI-
-          ((\d+)\.(\d+)\.(\d+))
-          (?:\s+r?(\h+))?
-        $/x)).empty?
-          versions = versions[0]
-          [
-            versions[0],
-            versions[1].to_i,
-            versions[2].to_i,
-            versions[3].to_i,
-            versions[4],
-            versions[5],
-            versions[6].to_i,
-            versions[7].to_i,
-            versions[8].to_i,
-            (versions[9].to_i if versions[9])
-          ]
-        else
-          [ '0.0.0', 0, 0, 0, nil, '0.0.0', 0, 0, 0 ]
-        end
+      if (versions = Geos.version.scan(/^
+        ((\d+)\.(\d+)\.(\d+)((?:dev|rc|beta|alpha)\d*)?)
+        -CAPI-
+        ((\d+)\.(\d+)\.(\d+))
+        (?:\s+r?(\h+))?
+      $/x)).empty?
+        ['0.0.0', 0, 0, 0, nil, '0.0.0', 0, 0, 0]
+      else
+        versions = versions[0]
+        [
+          versions[0],
+          versions[1].to_i,
+          versions[2].to_i,
+          versions[3].to_i,
+          versions[4],
+          versions[5],
+          versions[6].to_i,
+          versions[7].to_i,
+          versions[8].to_i,
+          versions[9]&.to_i
+        ]
+      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
+
+    GEOS_NICE_VERSION = [GEOS_VERSION_MAJOR, GEOS_VERSION_MINOR, GEOS_VERSION_PATCH].collect { |version|
+      version.to_s.rjust(2, '0')
+    }.join
   end
 
   module Constants

data/sonar-project.properties

@@ -0,0 +1,16 @@
+sonar.projectKey=dark-panda_ffi-geos
+sonar.organization=dark-panda
+
+# This is the name and version displayed in the SonarCloud UI.
+sonar.projectName=ffi-geos
+sonar.projectVersion=1.0
+
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+sonar.sources=lib, test
+
+# Encoding of the source code. Default is default system encoding
+sonar.sourceEncoding=UTF-8
+
+# Additional reports
+sonar.ruby.rubocop.reportPaths=rubocop-report.json
+sonar.ruby.coverage.reportPaths=coverage/coverage.json