rgeo 3.0.0.pre.rc.3 → 3.0.0

data/lib/rgeo/impl_helper/basic_line_string_methods.rb

@@ -19,9 +19,7 @@ module RGeo
         # LineStrings in general need to check that there's not one point
         # GEOS doesn't allow instantiation of single point LineStrings so
         # we should handle it.
-        if @points.size == 1
-          raise Error::InvalidGeometry, "LineString Cannot Have 1 Point"
-        end
+        raise Error::InvalidGeometry, "LineString Cannot Have 1 Point" if @points.size == 1
         init_geometry
       end
 
@@ -29,8 +27,8 @@ module RGeo
         @points.size
       end
 
-      def point_n(n)
-        n < 0 ? nil : @points[n]
+      def point_n(idx)
+        idx < 0 ? nil : @points[idx]
       end
 
       def points
@@ -64,10 +62,9 @@ module RGeo
       end
 
       def closed?
-        unless defined?(@closed)
-          @closed = @points.size > 2 && @points.first == @points.last
-        end
-        @closed
+        return @closed if defined?(@closed)
+
+        @closed = @points.size > 2 && @points.first == @points.last
       end
 
       def ring?
@@ -111,15 +108,15 @@ module RGeo
       def point_intersect_segment?(point, start_point, end_point)
         return false unless point_collinear?(point, start_point, end_point)
 
-        if start_point.x != end_point.x
-          between_coordinate?(point.x, start_point.x, end_point.x)
-        else
+        if start_point.x == end_point.x
           between_coordinate?(point.y, start_point.y, end_point.y)
+        else
+          between_coordinate?(point.x, start_point.x, end_point.x)
         end
       end
 
-      def point_collinear?(a, b, c)
-        (b.x - a.x) * (c.y - a.y) == (c.x - a.x) * (b.y - a.y)
+      def point_collinear?(pt1, pt2, pt3)
+        (pt2.x - pt1.x) * (pt3.y - pt1.y) == (pt3.x - pt1.x) * (pt2.y - pt1.y)
       end
 
       def between_coordinate?(coord, start_coord, end_coord)
@@ -137,9 +134,7 @@ module RGeo
       def initialize(factory, start, stop)
         self.factory = factory
         cstart = Feature.cast(start, factory, Feature::Point)
-        unless cstart
-          raise Error::InvalidGeometry, "Could not cast start: #{start}"
-        end
+        raise Error::InvalidGeometry, "Could not cast start: #{start}" unless cstart
         cstop = Feature.cast(stop, factory, Feature::Point)
         raise Error::InvalidGeometry, "Could not cast end: #{stop}" unless cstop
         @points = [cstart, cstop]
@@ -158,9 +153,7 @@ module RGeo
     module BasicLinearRingMethods # :nodoc:
       def initialize(factory, points)
         super
-        unless @points.size >= 4 || @points.size == 0
-          raise Error::InvalidGeometry, "LinearRings must have 0 or >= 4 points"
-        end
+        raise Error::InvalidGeometry, "LinearRings must have 0 or >= 4 points" if @points.size.between?(1, 3)
       end
 
       def geometry_type
@@ -176,10 +169,11 @@ module RGeo
       # Close ring if necessary.
       def init_geometry
         super
-        if @points.size > 0
-          @points << @points.first if @points.first != @points.last
-          @points = @points.chunk { |x| x }.map(&:first)
-        end
+
+        return if @points.empty?
+
+        @points << @points.first if @points.first != @points.last
+        @points = @points.chunk { |x| x }.map(&:first)
       end
     end
   end

data/lib/rgeo/impl_helper/basic_point_methods.rb

@@ -15,9 +15,7 @@ module RGeo
         @y = y.to_f
         @z = factory.property(:has_z_coordinate) ? extra.shift.to_f : nil
         @m = factory.property(:has_m_coordinate) ? extra.shift.to_f : nil
-        if extra.size > 0
-          raise ArgumentError, "Too many arguments for point initializer"
-        end
+        raise ArgumentError, "Too many arguments for point initializer" unless extra.empty?
         init_geometry
       end
 

data/lib/rgeo/impl_helper/basic_polygon_methods.rb

@@ -12,14 +12,10 @@ module RGeo
       def initialize(factory, exterior_ring, interior_rings)
         self.factory = factory
         @exterior_ring = Feature.cast(exterior_ring, factory, Feature::LinearRing)
-        unless @exterior_ring
-          raise Error::InvalidGeometry, "Failed to cast exterior ring #{exterior_ring}"
-        end
+        raise Error::InvalidGeometry, "Failed to cast exterior ring #{exterior_ring}" unless @exterior_ring
         @interior_rings = (interior_rings || []).map do |elem|
           elem = Feature.cast(elem, factory, Feature::LinearRing)
-          unless elem
-            raise Error::InvalidGeometry, "Could not cast interior ring #{elem}"
-          end
+          raise Error::InvalidGeometry, "Could not cast interior ring #{elem}" unless elem
           elem
         end
         init_geometry
@@ -33,8 +29,8 @@ module RGeo
         @interior_rings.size
       end
 
-      def interior_ring_n(n)
-        n < 0 ? nil : @interior_rings[n]
+      def interior_ring_n(idx)
+        idx < 0 ? nil : @interior_rings[idx]
       end
 
       def interior_rings
@@ -61,11 +57,14 @@ module RGeo
       end
 
       def rep_equals?(rhs)
-        if rhs.is_a?(self.class) && rhs.factory.eql?(@factory) && @exterior_ring.rep_equals?(rhs.exterior_ring) && @interior_rings.size == rhs.num_interior_rings
-          rhs.interior_rings.each_with_index { |r, i| return false unless @interior_rings[i].rep_equals?(r) }
-        else
-          false
-        end
+        proper_match = rhs.is_a?(self.class) &&
+          rhs.factory.eql?(@factory) &&
+          @exterior_ring.rep_equals?(rhs.exterior_ring) &&
+          @interior_rings.size == rhs.num_interior_rings
+
+        return false unless proper_match
+
+        rhs.interior_rings.each_with_index { |r, i| return false unless @interior_rings[i].rep_equals?(r) }
       end
 
       def hash
@@ -80,7 +79,8 @@ module RGeo
         if Feature::Point === rhs
           contains_point?(rhs)
         else
-          raise(Error::UnsupportedOperation,
+          raise(
+            Error::UnsupportedOperation,
             "Method Polygon#contains? is only defined for Point"
           )
         end
@@ -90,7 +90,7 @@ module RGeo
 
       def contains_point?(point)
         ring_encloses_point?(@exterior_ring, point) &&
-          !@interior_rings.any? do |exclusion|
+          @interior_rings.none? do |exclusion|
             ring_encloses_point?(exclusion, point, on_border_return: true)
           end
       end
@@ -114,7 +114,6 @@ module RGeo
         encloses_point
       end
 
-
       def copy_state_from(obj)
         super
         @exterior_ring = obj.exterior_ring

data/lib/rgeo/impl_helper/utils.rb

@@ -18,20 +18,14 @@ module RGeo
       # multiple times with different values and others pass the data
       # to a CAPI or FFI.
       def self.setup_coord_sys(srid, coord_sys, coord_sys_class)
-        unless coord_sys_class.is_a?(Class)
-          coord_sys_class = CoordSys::CONFIG.default_coord_sys_class
-        end
+        coord_sys_class = CoordSys::CONFIG.default_coord_sys_class unless coord_sys_class.is_a?(Class)
 
-        if coord_sys.is_a?(String)
-          coord_sys = coord_sys_class.create_from_wkt(coord_sys)
-        end
+        coord_sys = coord_sys_class.create_from_wkt(coord_sys) if coord_sys.is_a?(String)
 
         srid ||= coord_sys.authority_code if coord_sys
         srid = srid.to_i
         # Create a coord sys based on the SRID if one was not given
-        if coord_sys.nil? && srid != 0
-          coord_sys = coord_sys_class.create(srid)
-        end
+        coord_sys = coord_sys_class.create(srid) if coord_sys.nil? && srid != 0
 
         { coord_sys: coord_sys, srid: srid }
       end

data/lib/rgeo/impl_helper/valid_op.rb

@@ -181,12 +181,12 @@ module RGeo
 
       # Checks that the given point has valid coordinates.
       #
-      # @param pt [RGeo::Feature::Point]
+      # @param point [RGeo::Feature::Point]
       #
       # @return [String] invalid_reason
-      def check_invalid_coordinate(pt)
-        x = pt.x
-        y = pt.y
+      def check_invalid_coordinate(point)
+        x = point.x
+        y = point.y
         return if x.finite? && y.finite? && x.real? && y.real?
 
         Error::INVALID_COORDINATE
@@ -265,9 +265,7 @@ module RGeo
 
         poly.interior_rings.each do |interior|
           test_pt = interior.start_point
-          unless shell.contains?(test_pt) || poly.exterior_ring.contains?(test_pt)
-            return Error::HOLE_OUTSIDE_SHELL
-          end
+          return Error::HOLE_OUTSIDE_SHELL unless shell.contains?(test_pt) || poly.exterior_ring.contains?(test_pt)
         end
 
         nil
@@ -322,27 +320,25 @@ module RGeo
 
       # Checks that polygons do not intersect in a multipolygon.
       #
-      # @param mp [RGeo::Feature::MultiPolygon]
+      # @param mpoly [RGeo::Feature::MultiPolygon]
       #
       # @return [String] invalid_reason
-      def check_consistent_area_mp(mp)
-        mp.geometries.combination(2) do |p1, p2|
-          if p1.exterior_ring.crosses?(p2.exterior_ring)
-            return Error::SELF_INTERSECTION
-          end
+      def check_consistent_area_mp(mpoly)
+        mpoly.geometries.combination(2) do |p1, p2|
+          return Error::SELF_INTERSECTION if p1.exterior_ring.crosses?(p2.exterior_ring)
         end
         nil
       end
 
       # Checks that individual polygons within a multipolygon are not nested.
       #
-      # @param mp [RGeo::Feature::MultiPolygon]
+      # @param mpoly [RGeo::Feature::MultiPolygon]
       #
       # @return [String] invalid_reason
-      def check_shells_not_nested(mp)
+      def check_shells_not_nested(mpoly)
         # Since we've passed the consistent area test, we can just check
         # that one point lies in the other.
-        mp.geometries.combination(2) do |p1, p2|
+        mpoly.geometries.combination(2) do |p1, p2|
           if p1.contains?(p2.exterior_ring.start_point) || p2.contains?(p1.exterior_ring.start_point)
             return Error::NESTED_SHELLS
           end

data/lib/rgeo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RGeo
-  VERSION = "3.0.0-rc.3"
+  VERSION = "3.0.0"
 end

data/lib/rgeo/wkrep/wkb_generator.rb

@@ -39,7 +39,6 @@ module RGeo
     # [<tt>:little_endian</tt>]
     #   If true, output little endian (NDR) byte order. If false, output
     #   big endian (XDR), or network byte order. Default is false.
-
     class WKBGenerator
       # :stopdoc:
       TYPE_CODES = {
@@ -107,7 +106,7 @@ module RGeo
           has_m = false
         end
         result = Result.new(has_z, has_m)
-        generate_feature(obj, result, true)
+        generate_feature(obj, result, toplevel: true)
         result.emit(@hex_format)
       end
 
@@ -126,7 +125,7 @@ module RGeo
 
         def emit(hex_format)
           str = @buffer.join
-          hex_format ? str.unpack("H*")[0] : str
+          hex_format ? str.unpack1("H*") : str
         end
 
         def z?
@@ -139,79 +138,75 @@ module RGeo
       end
       private_constant :Result
 
-      def emit_byte(value, rv)
-        rv << [value].pack("C")
+      def emit_byte(value, rval)
+        rval << [value].pack("C")
       end
 
-      def emit_integer(value, rv)
-        rv << [value].pack(@little_endian ? "V" : "N")
+      def emit_integer(value, rval)
+        rval << [value].pack(@little_endian ? "V" : "N")
       end
 
-      def emit_doubles(array, rv)
-        rv << array.pack(@little_endian ? "E*" : "G*")
+      def emit_doubles(array, rval)
+        rval << array.pack(@little_endian ? "E*" : "G*")
       end
 
-      def emit_line_string_coords(obj, rv)
+      def emit_line_string_coords(obj, rval)
         array = []
-        obj.points.each { |pt| point_coords(pt, rv, array) }
-        emit_integer(obj.num_points, rv)
-        emit_doubles(array, rv)
+        obj.points.each { |pt| point_coords(pt, rval, array) }
+        emit_integer(obj.num_points, rval)
+        emit_doubles(array, rval)
       end
 
-      def point_coords(obj, rv, array = [])
+      def point_coords(obj, rval, array = [])
         array << obj.x
         array << obj.y
-        array << obj.z if rv.z?
-        array << obj.m if rv.m?
+        array << obj.z if rval.z?
+        array << obj.m if rval.m?
         array
       end
 
-      def generate_feature(obj, rv, toplevel = false)
-        emit_byte(@little_endian ? 1 : 0, rv)
+      def generate_feature(obj, rval, toplevel: false)
+        emit_byte(@little_endian ? 1 : 0, rval)
         type = obj.geometry_type
         type_code = TYPE_CODES[type]
-        unless type_code
-          raise Error::ParseError, "Unrecognized Geometry Type: #{type}"
-        end
+        raise Error::ParseError, "Unrecognized Geometry Type: #{type}" unless type_code
         emit_srid = false
-        if @type_format == :ewkb
-          type_code |= 0x80000000 if rv.z?
-          type_code |= 0x40000000 if rv.m?
+        case @type_format
+        when :ewkb
+          type_code |= 0x80000000 if rval.z?
+          type_code |= 0x40000000 if rval.m?
           if @emit_ewkb_srid && toplevel
             type_code |= 0x20000000
             emit_srid = true
           end
-        elsif @type_format == :wkb12
-          type_code += 1000 if rv.z?
-          type_code += 2000 if rv.m?
+        when :wkb12
+          type_code += 1000 if rval.z?
+          type_code += 2000 if rval.m?
         end
-        emit_integer(type_code, rv)
-        emit_integer(obj.srid, rv) if emit_srid
+        emit_integer(type_code, rval)
+        emit_integer(obj.srid, rval) if emit_srid
+        type_is_collection = [
+          Feature::GeometryCollection,
+          Feature::MultiPoint,
+          Feature::MultiLineString,
+          Feature::MultiPolygon
+        ].include?(type)
         if type == Feature::Point
-          emit_doubles(point_coords(obj, rv), rv)
+          emit_doubles(point_coords(obj, rval), rval)
         elsif type.subtype_of?(Feature::LineString)
-          emit_line_string_coords(obj, rv)
+          emit_line_string_coords(obj, rval)
         elsif type == Feature::Polygon
           exterior_ring = obj.exterior_ring
           if exterior_ring.empty?
-            emit_integer(0, rv)
+            emit_integer(0, rval)
           else
-            emit_integer(1 + obj.num_interior_rings, rv)
-            emit_line_string_coords(exterior_ring, rv)
-            obj.interior_rings.each { |r| emit_line_string_coords(r, rv) }
+            emit_integer(1 + obj.num_interior_rings, rval)
+            emit_line_string_coords(exterior_ring, rval)
+            obj.interior_rings.each { |r| emit_line_string_coords(r, rval) }
           end
-        elsif type == Feature::GeometryCollection
-          emit_integer(obj.num_geometries, rv)
-          obj.each { |g| generate_feature(g, rv) }
-        elsif type == Feature::MultiPoint
-          emit_integer(obj.num_geometries, rv)
-          obj.each { |g| generate_feature(g, rv) }
-        elsif type == Feature::MultiLineString
-          emit_integer(obj.num_geometries, rv)
-          obj.each { |g| generate_feature(g, rv) }
-        elsif type == Feature::MultiPolygon
-          emit_integer(obj.num_geometries, rv)
-          obj.each { |g| generate_feature(g, rv) }
+        elsif type_is_collection
+          emit_integer(obj.num_geometries, rval)
+          obj.each { |g| generate_feature(g, rval) }
         end
       end
     end

data/lib/rgeo/wkrep/wkb_parser.rb

@@ -42,7 +42,6 @@ module RGeo
     # [<tt>:default_srid</tt>]
     #   A SRID to pass to the factory generator if no SRID is present in
     #   the input. Defaults to nil (i.e. don't specify a SRID).
-
     class WKBParser
       # Create and configure a WKB parser. See the WKBParser
       # documentation for the options that can be passed.
@@ -118,9 +117,7 @@ module RGeo
             obj = parse_object(false)
             unless @ignore_extra_bytes
               bytes = bytes_remaining
-              if bytes > 0
-                raise Error::ParseError, "Found #{bytes} extra bytes at the end of the stream."
-              end
+              raise Error::ParseError, "Found #{bytes} extra bytes at the end of the stream." if bytes > 0
             end
           ensure
             @data = nil
@@ -133,7 +130,7 @@ module RGeo
       private
 
       def parse_object(contained)
-        endian_value = get_byte
+        endian_value = byte
         case endian_value
         when 0
           little_endian = false
@@ -161,14 +158,20 @@ module RGeo
           if contained != true && contained != type_code
             raise Error::ParseError, "Enclosed type=#{type_code} is different from container constraint #{contained}"
           end
+
           if has_z != @cur_has_z
             raise Error::ParseError, "Enclosed hasZ=#{has_z} is different from toplevel hasZ=#{@cur_has_z}"
           end
+
           if has_m != @cur_has_m
             raise Error::ParseError, "Enclosed hasM=#{has_m} is different from toplevel hasM=#{@cur_has_m}"
           end
+
           if srid && srid != @cur_srid
-            raise Error::ParseError, "Enclosed SRID #{srid} is different from toplevel srid #{@cur_srid || '(unspecified)'}"
+            raise(
+              Error::ParseError,
+              "Enclosed SRID #{srid} is different from toplevel srid #{@cur_srid || '(unspecified)'}"
+            )
           end
         else
           @cur_has_z = has_z
@@ -176,9 +179,11 @@ module RGeo
           @cur_dims = 2 + (@cur_has_z ? 1 : 0) + (@cur_has_m ? 1 : 0)
           @cur_srid = srid
           @cur_factory = @factory_generator.call(srid: @cur_srid, has_z_coordinate: has_z, has_m_coordinate: has_m)
+
           if @cur_has_z && !@cur_factory.property(:has_z_coordinate)
             raise Error::ParseError, "Data has Z coordinates but the factory doesn't have Z coordinates"
           end
+
           if @cur_has_m && !@cur_factory.property(:has_m_coordinate)
             raise Error::ParseError, "Data has M coordinates but the factory doesn't have M coordinates"
           end
@@ -222,29 +227,23 @@ module RGeo
         @len - @pos
       end
 
-      def get_byte
-        if @pos + 1 > @len
-          raise Error::ParseError, "Not enough bytes left to fulfill 1 byte"
-        end
+      def byte
+        raise Error::ParseError, "Not enough bytes left to fulfill 1 byte" if @pos + 1 > @len
         str = @data[@pos, 1]
         @pos += 1
-        str.unpack("C").first
+        str.unpack1("C")
       end
 
       def get_integer(little_endian)
-        if @pos + 4 > @len
-          raise Error::ParseError, "Not enough bytes left to fulfill 1 integer"
-        end
+        raise Error::ParseError, "Not enough bytes left to fulfill 1 integer" if @pos + 4 > @len
         str = @data[@pos, 4]
         @pos += 4
-        str.unpack(little_endian ? "V" : "N").first
+        str.unpack1(little_endian ? "V" : "N")
       end
 
       def get_doubles(little_endian, count)
         len = 8 * count
-        if @pos + len > @len
-          raise Error::ParseError, "Not enough bytes left to fulfill #{count} doubles"
-        end
+        raise Error::ParseError, "Not enough bytes left to fulfill #{count} doubles" if @pos + len > @len
         str = @data[@pos, len]
         @pos += len
         str.unpack("#{little_endian ? 'E' : 'G'}*")

data/lib/rgeo/wkrep/wkt_generator.rb

@@ -45,15 +45,16 @@ module RGeo
     #   letters to lower case; or nil, indicating no case changes from
     #   the default (which is not specified exactly, but is chosen by the
     #   generator to emphasize readability.) Default is nil.
-
     class WKTGenerator
       # Create and configure a WKT generator. See the WKTGenerator
       # documentation for the options that can be passed.
 
       def initialize(opts = {})
         @tag_format = opts[:tag_format] || opts[:type_format] || :wkt11
-        @emit_ewkt_srid = @tag_format == :ewkt ?
-          (opts[:emit_ewkt_srid] ? true : false) : nil
+        @emit_ewkt_srid =
+          if @tag_format == :ewkt
+            (opts[:emit_ewkt_srid] ? true : false)
+          end
         @square_brackets = opts[:square_brackets] ? true : false
         @convert_case = opts[:convert_case]
       end
@@ -99,10 +100,11 @@ module RGeo
           support_z = factory.property(:has_z_coordinate)
           support_m = factory.property(:has_m_coordinate)
         end
-        str = generate_feature(obj, support_z, support_m, true)
-        if @convert_case == :upper
+        str = generate_feature(obj, support_z, support_m, toplevel: true)
+        case @convert_case
+        when :upper
           str.upcase
-        elsif @convert_case == :lower
+        when :lower
           str.downcase
         else
           str
@@ -111,20 +113,22 @@ module RGeo
 
       private
 
-      def generate_feature(obj, support_z, support_m, toplevel = false)
+      def generate_feature(obj, support_z, support_m, toplevel: false)
         type = obj.geometry_type
         type = Feature::LineString if type.subtype_of?(Feature::LineString)
         tag = type.type_name.dup
-        if @tag_format == :ewkt
+        case @tag_format
+        when :ewkt
           tag << "M" if support_m && !support_z
           tag = "SRID=#{obj.srid};#{tag}" if toplevel && @emit_ewkt_srid
-        elsif @tag_format == :wkt12
+        when :wkt12
           if support_z
-            if support_m
-              tag << " ZM"
-            else
-              tag << " Z"
-            end
+            tag <<
+              if support_m
+                " ZM"
+              else
+                " Z"
+              end
           elsif support_m
             tag << " M"
           end
@@ -163,7 +167,8 @@ module RGeo
         if obj.empty?
           "EMPTY"
         else
-          "#{@begin_bracket}#{obj.points.map { |p| generate_coords(p, support_z, support_m) }.join(', ')}#{@end_bracket}"
+          points = obj.points.map { |p| generate_coords(p, support_z, support_m) }
+          "#{@begin_bracket}#{points.join(', ')}#{@end_bracket}"
         end
       end
 
@@ -171,7 +176,9 @@ module RGeo
         if obj.empty?
           "EMPTY"
         else
-          "#{@begin_bracket}#{([generate_line_string(obj.exterior_ring, support_z, support_m)] + obj.interior_rings.map { |r| generate_line_string(r, support_z, support_m) }).join(', ')}#{@end_bracket}"
+          lines = [generate_line_string(obj.exterior_ring, support_z, support_m)]
+          lines += obj.interior_rings.map { |r| generate_line_string(r, support_z, support_m) }
+          "#{@begin_bracket}#{lines.join(', ')}#{@end_bracket}"
         end
       end