rgeo 1.1.2 → 2.0.0

data/lib/rgeo/geos/interface.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -----------------------------------------------------------------------------
 #
 # GEOS toplevel interface
@@ -29,30 +31,30 @@ module RGeo
       # Returns true if the given feature is a CAPI GEOS feature, or if
       # the given factory is a CAPI GEOS factory.
 
-      def is_capi_geos?(object_)
+      def is_capi_geos?(object)
         CAPI_SUPPORTED &&
-          (CAPIFactory === object_ || CAPIGeometryMethods === object_ ||
-          ZMFactory === object_ && CAPIFactory === object_.z_factory ||
-          ZMGeometryMethods === object_ && CAPIGeometryMethods === object_.z_geometry)
+          (CAPIFactory === object || CAPIGeometryMethods === object ||
+          ZMFactory === object && CAPIFactory === object.z_factory ||
+          ZMGeometryMethods === object && CAPIGeometryMethods === object.z_geometry)
       end
 
       # Returns true if the given feature is an FFI GEOS feature, or if
       # the given factory is an FFI GEOS factory.
 
-      def is_ffi_geos?(object_)
+      def is_ffi_geos?(object)
         FFI_SUPPORTED &&
-          (FFIFactory === object_ || FFIGeometryMethods === object_ ||
-          ZMFactory === object_ && FFIFactory === object_.z_factory ||
-          ZMGeometryMethods === object_ && FFIGeometryMethods === object_.z_geometry)
+          (FFIFactory === object || FFIGeometryMethods === object ||
+          ZMFactory === object && FFIFactory === object.z_factory ||
+          ZMGeometryMethods === object && FFIGeometryMethods === object.z_geometry)
       end
 
       # Returns true if the given feature is a GEOS feature, or if the given
       # factory is a GEOS factory. Does not distinguish between CAPI and FFI.
 
-      def is_geos?(object_)
-        CAPI_SUPPORTED && (CAPIFactory === object_ || CAPIGeometryMethods === object_) ||
-          FFI_SUPPORTED && (FFIFactory === object_ || FFIGeometryMethods === object_) ||
-          ZMFactory === object_ || ZMGeometryMethods === object_
+      def is_geos?(object)
+        CAPI_SUPPORTED && (CAPIFactory === object || CAPIGeometryMethods === object) ||
+          FFI_SUPPORTED && (FFIFactory === object || FFIGeometryMethods === object) ||
+          ZMFactory === object || ZMGeometryMethods === object
       end
 
       # Returns the GEOS library version as a string of the format "x.y.z".
@@ -126,8 +128,8 @@ module RGeo
       #   CoordSys::CS::CoordinateSystem, or as a string in WKT format.
       #   Optional.
       # [<tt>:srs_database</tt>]
-      #   Optional. If provided, the value should be an implementation of
-      #   CoordSys::SRSDatabase::Interface. If both this and an SRID are
+      #   Optional. If provided, the object should respond to #get and
+      #   #clear_cache. If both this and an SRID are
       #   provided, they are used to look up the proj4 and coord_sys
       #   objects from a spatial reference system database.
       # [<tt>:has_z_coordinate</tt>]
@@ -173,15 +175,15 @@ module RGeo
       #   never automatically generates a prepared geometry (unless you
       #   generate one explicitly using the <tt>prepare!</tt> method).
 
-      def factory(opts_ = {})
+      def factory(opts = {})
         if supported?
-          native_interface_ = opts_[:native_interface] || Geos.preferred_native_interface
-          if opts_[:has_z_coordinate] && opts_[:has_m_coordinate]
-            ZMFactory.new(opts_)
-          elsif native_interface_ == :ffi
-            FFIFactory.new(opts_)
+          native_interface = opts[:native_interface] || Geos.preferred_native_interface
+          if opts[:has_z_coordinate] && opts[:has_m_coordinate]
+            ZMFactory.new(opts)
+          elsif native_interface == :ffi
+            FFIFactory.new(opts)
           else
-            CAPIFactory.create(opts_)
+            CAPIFactory.create(opts)
           end
         end
       end
@@ -194,8 +196,8 @@ module RGeo
       # an SRID and it will automatically fetch the appropriate Proj4
       # and CoordSys objects.
 
-      def factory_generator(defaults_ = {})
-        ::Proc.new { |c_| factory(defaults_.merge(c_)) }
+      def factory_generator(defaults = {})
+        proc { |c| factory(defaults.merge(c)) }
       end
     end
   end

data/lib/rgeo/geos/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -----------------------------------------------------------------------------
 #
 # Various Geos-related internal utilities
@@ -8,14 +10,14 @@ module RGeo
   module Geos
     module Utils # :nodoc:
       class << self
-        def ffi_coord_seqs_equal?(cs1_, cs2_, check_z_)
-          len1_ = cs1_.length
-          len2_ = cs2_.length
-          if len1_ == len2_
-            (0...len1_).each do |i_|
-              return false unless cs1_.get_x(i_) == cs2_.get_x(i_) &&
-                cs1_.get_y(i_) == cs2_.get_y(i_) &&
-                (!check_z_ || cs1_.get_z(i_) == cs2_.get_z(i_))
+        def ffi_coord_seqs_equal?(cs1, cs2, check_z)
+          len1 = cs1.length
+          len2 = cs2.length
+          if len1 == len2
+            (0...len1).each do |i|
+              return false unless cs1.get_x(i) == cs2.get_x(i) &&
+                cs1.get_y(i) == cs2.get_y(i) &&
+                (!check_z || cs1.get_z(i) == cs2.get_z(i))
             end
             true
           else
@@ -23,53 +25,59 @@ module RGeo
           end
         end
 
-        def ffi_compute_dimension(geom_)
-          result_ = -1
-          case geom_.type_id
+        def ffi_compute_dimension(geom)
+          result = -1
+          case geom.type_id
           when ::Geos::GeomTypes::GEOS_POINT
-            result_ = 0
+            result = 0
           when ::Geos::GeomTypes::GEOS_MULTIPOINT
-            result_ = 0 unless geom_.empty?
+            result = 0 unless geom.empty?
           when ::Geos::GeomTypes::GEOS_LINESTRING, ::Geos::GeomTypes::GEOS_LINEARRING
-            result_ = 1
+            result = 1
           when ::Geos::GeomTypes::GEOS_MULTILINESTRING
-            result_ = 1 unless geom_.empty?
+            result = 1 unless geom.empty?
           when ::Geos::GeomTypes::GEOS_POLYGON
-            result_ = 2
+            result = 2
           when ::Geos::GeomTypes::GEOS_MULTIPOLYGON
-            result_ = 2 unless geom_.empty?
+            result = 2 unless geom.empty?
           when ::Geos::GeomTypes::GEOS_GEOMETRYCOLLECTION
-            geom_.each do |g_|
-              dim_ = ffi_compute_dimension(g_)
-              result_ = dim_ if result_ < dim_
+            geom.each do |g|
+              dim = ffi_compute_dimension(g)
+              result = dim if result < dim
             end
           end
-          result_
+          result
         end
 
-        def ffi_coord_seq_hash(cs_, hash_ = 0)
-          (0...cs_.length).inject(hash_) do |_h_, i_|
-            [hash_, cs_.get_x(i_), cs_.get_y(i_), cs_.get_z(i_)].hash
+        def ffi_coord_seq_hash(cs, hash = 0)
+          (0...cs.length).inject(hash) do |h, i|
+            [hash, cs.get_x(i), cs.get_y(i), cs.get_z(i)].hash
           end
         end
 
-        def _init
-          if FFI_SUPPORTED
-            @ffi_supports_prepared_level_1 = ::Geos::FFIGeos.respond_to?(:GEOSPreparedContains_r)
-            @ffi_supports_prepared_level_2 = ::Geos::FFIGeos.respond_to?(:GEOSPreparedDisjoint_r)
-            @ffi_supports_set_output_dimension = ::Geos::FFIGeos.respond_to?(:GEOSWKTWriter_setOutputDimension_r)
-            @ffi_supports_unary_union = ::Geos::FFIGeos.respond_to?(:GEOSUnaryUnion_r)
-          end
-          @psych_wkt_generator = WKRep::WKTGenerator.new(convert_case: :upper)
-          @marshal_wkb_generator = WKRep::WKBGenerator.new
+        def ffi_supports_prepared_level_1
+          FFI_SUPPORTED && ::Geos::FFIGeos.respond_to?(:GEOSPreparedContains_r)
+        end
+
+        def ffi_supports_prepared_level_2
+          FFI_SUPPORTED && ::Geos::FFIGeos.respond_to?(:GEOSPreparedDisjoint_r)
+        end
+
+        def ffi_supports_set_output_dimension
+          FFI_SUPPORTED && ::Geos::FFIGeos.respond_to?(:GEOSWKTWriter_setOutputDimension_r)
         end
 
-        attr_reader :ffi_supports_prepared_level_1
-        attr_reader :ffi_supports_prepared_level_2
-        attr_reader :ffi_supports_set_output_dimension
-        attr_reader :ffi_supports_unary_union
-        attr_reader :psych_wkt_generator
-        attr_reader :marshal_wkb_generator
+        def ffi_supports_unary_union
+          FFI_SUPPORTED && ::Geos::FFIGeos.respond_to?(:GEOSUnaryUnion_r)
+        end
+
+        def psych_wkt_generator
+          WKRep::WKTGenerator.new(convert_case: :upper)
+        end
+
+        def marshal_wkb_generator
+          WKRep::WKBGenerator.new
+        end
       end
     end
   end

data/lib/rgeo/geos/zm_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -----------------------------------------------------------------------------
 #
 # GEOS zm factory implementation
@@ -10,6 +12,7 @@ module RGeo
 
     class ZMFactory
       include Feature::Factory::Instance
+      include ImplHelper::Utils
 
       # :stopdoc:
 
@@ -31,66 +34,66 @@ module RGeo
         # Create a new factory. Returns nil if the GEOS implementation is
         # not supported.
 
-        def create(opts_ = {})
-          return nil unless Geos.supported?
-          new(opts_)
+        def create(opts = {})
+          return unless Geos.supported?
+          new(opts)
         end
       end
 
-      def initialize(opts_ = {}) # :nodoc:
-        proj4_ = opts_[:proj4]
-        coord_sys_ = opts_[:coord_sys]
-        srid_ = opts_[:srid]
-        if (!proj4_ || !coord_sys_) && srid_ && (db_ = opts_[:srs_database])
-          entry_ = db_.get(srid_.to_i)
-          if entry_
-            proj4_ ||= entry_.proj4
-            coord_sys_ ||= entry_.coord_sys
+      def initialize(opts = {}) # :nodoc:
+        proj4 = opts[:proj4]
+        coord_sys = opts[:coord_sys]
+        srid = opts[:srid]
+        if (!proj4 || !coord_sys) && srid && (db = opts[:srs_database])
+          entry = db.get(srid.to_i)
+          if entry
+            proj4 ||= entry.proj4
+            coord_sys ||= entry.coord_sys
           end
         end
-        srid_ ||= coord_sys_.authority_code if coord_sys_
-        config_ = {
-          uses_lenient_multi_polygon_assertions: opts_[:lenient_multi_polygon_assertions] ||
-            opts_[:uses_lenient_multi_polygon_assertions],
-          buffer_resolution: opts_[:buffer_resolution], auto_prepare: opts_[:auto_prepare],
-          wkt_generator: opts_[:wkt_generator], wkt_parser: opts_[:wkt_parser],
-          wkb_generator: opts_[:wkb_generator], wkb_parser: opts_[:wkb_parser],
-          srid: srid_.to_i, proj4: proj4_, coord_sys: coord_sys_
+        srid ||= coord_sys.authority_code if coord_sys
+        config = {
+          uses_lenient_multi_polygon_assertions: opts[:lenient_multi_polygon_assertions] ||
+            opts[:uses_lenient_multi_polygon_assertions],
+          buffer_resolution: opts[:buffer_resolution], auto_prepare: opts[:auto_prepare],
+          wkt_generator: opts[:wkt_generator], wkt_parser: opts[:wkt_parser],
+          wkb_generator: opts[:wkb_generator], wkb_parser: opts[:wkb_parser],
+          srid: srid.to_i, proj4: proj4, coord_sys: coord_sys
         }
-        native_interface_ = opts_[:native_interface] || Geos.preferred_native_interface
-        if native_interface_ == :ffi
-          @zfactory = FFIFactory.new(config_.merge(has_z_coordinate: true))
-          @mfactory = FFIFactory.new(config_.merge(has_m_coordinate: true))
+        native_interface = opts[:native_interface] || Geos.preferred_native_interface
+        if native_interface == :ffi
+          @zfactory = FFIFactory.new(config.merge(has_z_coordinate: true))
+          @mfactory = FFIFactory.new(config.merge(has_m_coordinate: true))
         else
-          @zfactory = CAPIFactory.create(config_.merge(has_z_coordinate: true))
-          @mfactory = CAPIFactory.create(config_.merge(has_m_coordinate: true))
+          @zfactory = CAPIFactory.create(config.merge(has_z_coordinate: true))
+          @mfactory = CAPIFactory.create(config.merge(has_m_coordinate: true))
         end
 
-        wkt_generator_ = opts_[:wkt_generator]
-        case wkt_generator_
-        when ::Hash
-          @wkt_generator = WKRep::WKTGenerator.new(wkt_generator_)
+        wkt_generator = opts[:wkt_generator]
+        case wkt_generator
+        when Hash
+          @wkt_generator = WKRep::WKTGenerator.new(wkt_generator)
         else
           @wkt_generator = WKRep::WKTGenerator.new(convert_case: :upper)
         end
-        wkb_generator_ = opts_[:wkb_generator]
-        case wkb_generator_
-        when ::Hash
-          @wkb_generator = WKRep::WKBGenerator.new(wkb_generator_)
+        wkb_generator = opts[:wkb_generator]
+        case wkb_generator
+        when Hash
+          @wkb_generator = WKRep::WKBGenerator.new(wkb_generator)
         else
           @wkb_generator = WKRep::WKBGenerator.new
         end
-        wkt_parser_ = opts_[:wkt_parser]
-        case wkt_parser_
-        when ::Hash
-          @wkt_parser = WKRep::WKTParser.new(self, wkt_parser_)
+        wkt_parser = opts[:wkt_parser]
+        case wkt_parser
+        when Hash
+          @wkt_parser = WKRep::WKTParser.new(self, wkt_parser)
         else
           @wkt_parser = WKRep::WKTParser.new(self)
         end
-        wkb_parser_ = opts_[:wkb_parser]
-        case wkb_parser_
-        when ::Hash
-          @wkb_parser = WKRep::WKBParser.new(self, wkb_parser_)
+        wkb_parser = opts[:wkb_parser]
+        case wkb_parser
+        when Hash
+          @wkb_parser = WKRep::WKBParser.new(self, wkb_parser)
         else
           @wkb_parser = WKRep::WKBParser.new(self)
         end
@@ -99,104 +102,104 @@ module RGeo
       # Marshal support
 
       def marshal_dump # :nodoc:
-        hash_ = {
+        hash = {
           "srid" => @zfactory.srid,
           "bufr" => @zfactory.buffer_resolution,
-          "wktg" => @wkt_generator._properties,
-          "wkbg" => @wkb_generator._properties,
-          "wktp" => @wkt_parser._properties,
-          "wkbp" => @wkb_parser._properties,
+          "wktg" => @wkt_generator.properties,
+          "wkbg" => @wkb_generator.properties,
+          "wktp" => @wkt_parser.properties,
+          "wkbp" => @wkb_parser.properties,
           "lmpa" => @zfactory.lenient_multi_polygon_assertions?,
           "apre" => @zfactory.property(:auto_prepare) == :simple,
           "nffi" => @zfactory.is_a?(FFIFactory)
         }
-        proj4_ = @zfactory.proj4
-        coord_sys_ = @zfactory.coord_sys
-        hash_["proj4"] = proj4_.marshal_dump if proj4_
-        hash_["cs"] = coord_sys_.to_wkt if coord_sys_
-        hash_
+        proj4 = @zfactory.proj4
+        coord_sys = @zfactory.coord_sys
+        hash["proj4"] = proj4.marshal_dump if proj4
+        hash["cs"] = coord_sys.to_wkt if coord_sys
+        hash
       end
 
-      def marshal_load(data_) # :nodoc:
-        if (proj4_data_ = data_["proj4"]) && CoordSys.check!(:proj4)
-          proj4_ = CoordSys::Proj4.allocate
-          proj4_.marshal_load(proj4_data_)
+      def marshal_load(data) # :nodoc:
+        if (proj4_data = data["proj4"]) && CoordSys.check!(:proj4)
+          proj4 = CoordSys::Proj4.allocate
+          proj4.marshal_load(proj4_data)
         else
-          proj4_ = nil
+          proj4 = nil
         end
-        if (coord_sys_data_ = data_["cs"])
-          coord_sys_ = CoordSys::CS.create_from_wkt(coord_sys_data_)
+        if (coord_sys_data = data["cs"])
+          coord_sys = CoordSys::CS.create_from_wkt(coord_sys_data)
         else
-          coord_sys_ = nil
+          coord_sys = nil
         end
         initialize(
-          native_interface: (data_["nffi"] ? :ffi : :capi),
-          has_z_coordinate: data_["hasz"],
-          has_m_coordinate: data_["hasm"],
-          srid: data_["srid"],
-          buffer_resolution: data_["bufr"],
-          wkt_generator: ImplHelper::Utils.symbolize_hash(data_["wktg"]),
-          wkb_generator: ImplHelper::Utils.symbolize_hash(data_["wkbg"]),
-          wkt_parser: ImplHelper::Utils.symbolize_hash(data_["wktp"]),
-          wkb_parser: ImplHelper::Utils.symbolize_hash(data_["wkbp"]),
-          uses_lenient_multi_polygon_assertions: data_["lmpa"],
-          auto_prepare: (data_["apre"] ? :simple : :disabled),
-          proj4: proj4_,
-          coord_sys: coord_sys_
+          native_interface: (data["nffi"] ? :ffi : :capi),
+          has_z_coordinate: data["hasz"],
+          has_m_coordinate: data["hasm"],
+          srid: data["srid"],
+          buffer_resolution: data["bufr"],
+          wkt_generator: symbolize_hash(data["wktg"]),
+          wkb_generator: symbolize_hash(data["wkbg"]),
+          wkt_parser: symbolize_hash(data["wktp"]),
+          wkb_parser: symbolize_hash(data["wkbp"]),
+          uses_lenient_multi_polygon_assertions: data["lmpa"],
+          auto_prepare: (data["apre"] ? :simple : :disabled),
+          proj4: proj4,
+          coord_sys: coord_sys
         )
       end
 
       # Psych support
 
-      def encode_with(coder_) # :nodoc:
-        coder_["srid"] = @zfactory.srid
-        coder_["buffer_resolution"] = @zfactory.buffer_resolution
-        coder_["lenient_multi_polygon_assertions"] = @zfactory.lenient_multi_polygon_assertions?
-        coder_["wkt_generator"] = @wkt_generator._properties
-        coder_["wkb_generator"] = @wkb_generator._properties
-        coder_["wkt_parser"] = @wkt_parser._properties
-        coder_["wkb_parser"] = @wkb_parser._properties
-        coder_["auto_prepare"] = @zfactory.property(:auto_prepare).to_s
-        coder_["native_interface"] = @zfactory.is_a?(FFIFactory) ? "ffi" : "capi"
-        if (proj4_ = @zfactory.proj4)
-          str_ = proj4_.original_str || proj4_.canonical_str
-          coder_["proj4"] = proj4_.radians? ? { "proj4" => str_, "radians" => true } : str_
+      def encode_with(coder) # :nodoc:
+        coder["srid"] = @zfactory.srid
+        coder["buffer_resolution"] = @zfactory.buffer_resolution
+        coder["lenient_multi_polygon_assertions"] = @zfactory.lenient_multi_polygon_assertions?
+        coder["wkt_generator"] = @wkt_generator.properties
+        coder["wkb_generator"] = @wkb_generator.properties
+        coder["wkt_parser"] = @wkt_parser.properties
+        coder["wkb_parser"] = @wkb_parser.properties
+        coder["auto_prepare"] = @zfactory.property(:auto_prepare).to_s
+        coder["native_interface"] = @zfactory.is_a?(FFIFactory) ? "ffi" : "capi"
+        if (proj4 = @zfactory.proj4)
+          str = proj4.original_str || proj4.canonical_str
+          coder["proj4"] = proj4.radians? ? { "proj4" => str, "radians" => true } : str
         end
-        if (coord_sys_ = @zfactory.coord_sys)
-          coder_["coord_sys"] = coord_sys_.to_wkt
+        if (coord_sys = @zfactory.coord_sys)
+          coder["coord_sys"] = coord_sys.to_wkt
         end
       end
 
-      def init_with(coder_) # :nodoc:
-        if (proj4_data_ = coder_["proj4"])
+      def init_with(coder) # :nodoc:
+        if (proj4_data = coder["proj4"])
           CoordSys.check!(:proj4)
-          if proj4_data_.is_a?(::Hash)
-            proj4_ = CoordSys::Proj4.create(proj4_data_["proj4"], radians: proj4_data_["radians"])
+          if proj4_data.is_a?(Hash)
+            proj4 = CoordSys::Proj4.create(proj4_data["proj4"], radians: proj4_data["radians"])
           else
-            proj4_ = CoordSys::Proj4.create(proj4_data_.to_s)
+            proj4 = CoordSys::Proj4.create(proj4_data.to_s)
           end
         else
-          proj4_ = nil
+          proj4 = nil
         end
-        if (coord_sys_data_ = coder_["cs"])
-          coord_sys_ = CoordSys::CS.create_from_wkt(coord_sys_data_.to_s)
+        if (coord_sys_data = coder["cs"])
+          coord_sys = CoordSys::CS.create_from_wkt(coord_sys_data.to_s)
         else
-          coord_sys_ = nil
+          coord_sys = nil
         end
         initialize(
-          native_interface: coder_["native_interface"] == "ffi" ? :ffi : :capi,
-          has_z_coordinate: coder_["has_z_coordinate"],
-          has_m_coordinate: coder_["has_m_coordinate"],
-          srid: coder_["srid"],
-          buffer_resolution: coder_["buffer_resolution"],
-          wkt_generator: ImplHelper::Utils.symbolize_hash(coder_["wkt_generator"]),
-          wkb_generator: ImplHelper::Utils.symbolize_hash(coder_["wkb_generator"]),
-          wkt_parser: ImplHelper::Utils.symbolize_hash(coder_["wkt_parser"]),
-          wkb_parser: ImplHelper::Utils.symbolize_hash(coder_["wkb_parser"]),
-          auto_prepare: coder_["auto_prepare"] == "disabled" ? :disabled : :simple,
-          uses_lenient_multi_polygon_assertions: coder_["lenient_multi_polygon_assertions"],
-          proj4: proj4_,
-          coord_sys: coord_sys_
+          native_interface: coder["native_interface"] == "ffi" ? :ffi : :capi,
+          has_z_coordinate: coder["has_z_coordinate"],
+          has_m_coordinate: coder["has_m_coordinate"],
+          srid: coder["srid"],
+          buffer_resolution: coder["buffer_resolution"],
+          wkt_generator: symbolize_hash(coder["wkt_generator"]),
+          wkb_generator: symbolize_hash(coder["wkb_generator"]),
+          wkt_parser: symbolize_hash(coder["wkt_parser"]),
+          wkb_parser: symbolize_hash(coder["wkb_parser"]),
+          auto_prepare: coder["auto_prepare"] == "disabled" ? :disabled : :simple,
+          uses_lenient_multi_polygon_assertions: coder["lenient_multi_polygon_assertions"],
+          proj4: proj4,
+          coord_sys: coord_sys
         )
       end
 
@@ -233,8 +236,8 @@ module RGeo
 
       # Factory equivalence test.
 
-      def eql?(rhs_)
-        rhs_.is_a?(ZMFactory) && rhs_.z_factory == @zfactory
+      def eql?(rhs)
+        rhs.is_a?(ZMFactory) && rhs.z_factory == @zfactory
       end
       alias == eql?
 
@@ -246,8 +249,8 @@ module RGeo
 
       # See RGeo::Feature::Factory#property
 
-      def property(name_)
-        case name_
+      def property(name)
+        case name
         when :has_z_coordinate, :has_m_coordinate, :is_cartesian
           true
         end
@@ -255,68 +258,68 @@ module RGeo
 
       # See RGeo::Feature::Factory#parse_wkt
 
-      def parse_wkt(str_)
-        @wkt_parser.parse(str_)
+      def parse_wkt(str)
+        @wkt_parser.parse(str)
       end
 
       # See RGeo::Feature::Factory#parse_wkb
 
-      def parse_wkb(str_)
-        @wkb_parser.parse(str_)
+      def parse_wkb(str)
+        @wkb_parser.parse(str)
       end
 
       # See RGeo::Feature::Factory#point
 
-      def point(x_, y_, z_ = 0, m_ = 0)
-        _create_feature(ZMPointImpl, @zfactory.point(x_, y_, z_), @mfactory.point(x_, y_, m_))
+      def point(x, y, z = 0, m = 0)
+        create_feature(ZMPointImpl, @zfactory.point(x, y, z), @mfactory.point(x, y, m))
       end
 
       # See RGeo::Feature::Factory#line_string
 
-      def line_string(points_)
-        _create_feature(ZMLineStringImpl, @zfactory.line_string(points_), @mfactory.line_string(points_))
+      def line_string(points)
+        create_feature(ZMLineStringImpl, @zfactory.line_string(points), @mfactory.line_string(points))
       end
 
       # See RGeo::Feature::Factory#line
 
-      def line(start_, end_)
-        _create_feature(ZMLineImpl, @zfactory.line(start_, end_), @mfactory.line(start_, end_))
+      def line(start, stop)
+        create_feature(ZMLineImpl, @zfactory.line(start, stop), @mfactory.line(start, stop))
       end
 
       # See RGeo::Feature::Factory#linear_ring
 
-      def linear_ring(points_)
-        _create_feature(ZMLinearRingImpl, @zfactory.linear_ring(points_), @mfactory.linear_ring(points_))
+      def linear_ring(points)
+        create_feature(ZMLinearRingImpl, @zfactory.linear_ring(points), @mfactory.linear_ring(points))
       end
 
       # See RGeo::Feature::Factory#polygon
 
-      def polygon(outer_ring_, inner_rings_ = nil)
-        _create_feature(ZMPolygonImpl, @zfactory.polygon(outer_ring_, inner_rings_), @mfactory.polygon(outer_ring_, inner_rings_))
+      def polygon(outer_ring, inner_rings = nil)
+        create_feature(ZMPolygonImpl, @zfactory.polygon(outer_ring, inner_rings), @mfactory.polygon(outer_ring, inner_rings))
       end
 
       # See RGeo::Feature::Factory#collection
 
-      def collection(elems_)
-        _create_feature(ZMGeometryCollectionImpl, @zfactory.collection(elems_), @mfactory.collection(elems_))
+      def collection(elems)
+        create_feature(ZMGeometryCollectionImpl, @zfactory.collection(elems), @mfactory.collection(elems))
       end
 
       # See RGeo::Feature::Factory#multi_point
 
-      def multi_point(elems_)
-        _create_feature(ZMMultiPointImpl, @zfactory.multi_point(elems_), @mfactory.multi_point(elems_))
+      def multi_point(elems)
+        create_feature(ZMMultiPointImpl, @zfactory.multi_point(elems), @mfactory.multi_point(elems))
       end
 
       # See RGeo::Feature::Factory#multi_line_string
 
-      def multi_line_string(elems_)
-        _create_feature(ZMMultiLineStringImpl, @zfactory.multi_line_string(elems_), @mfactory.multi_line_string(elems_))
+      def multi_line_string(elems)
+        create_feature(ZMMultiLineStringImpl, @zfactory.multi_line_string(elems), @mfactory.multi_line_string(elems))
       end
 
       # See RGeo::Feature::Factory#multi_polygon
 
-      def multi_polygon(elems_)
-        _create_feature(ZMMultiPolygonImpl, @zfactory.multi_polygon(elems_), @mfactory.multi_polygon(elems_))
+      def multi_polygon(elems)
+        create_feature(ZMMultiPolygonImpl, @zfactory.multi_polygon(elems), @mfactory.multi_polygon(elems))
       end
 
       # See RGeo::Feature::Factory#proj4
@@ -333,73 +336,56 @@ module RGeo
 
       # See RGeo::Feature::Factory#override_cast
 
-      def override_cast(original_, ntype_, flags_)
-        return nil unless Geos.supported?
-        keep_subtype_ = flags_[:keep_subtype]
-        # force_new_ = flags_[:force_new]
-        project_ = flags_[:project]
-        type_ = original_.geometry_type
-        ntype_ = type_ if keep_subtype_ && type_.include?(ntype_)
-        case original_
+      def override_cast(original, ntype, flags)
+        return unless Geos.supported?
+        keep_subtype = flags[:keep_subtype]
+        project = flags[:project]
+        type = original.geometry_type
+        ntype = type if keep_subtype && type.include?(ntype)
+        case original
         when ZMGeometryMethods
           # Optimization if we're just changing factories, but to
           # another ZM factory.
-          if original_.factory != self && ntype_ == type_ &&
-              (!project_ || original_.factory.proj4 == @proj4)
-            zresult_ = original_.z_geometry.dup
-            zresult_._set_factory(@zfactory)
-            mresult_ = original_.m_geometry.dup
-            mresult_._set_factory(@mfactory)
-            return original_.class.create(self, zresult_, mresult_)
+          if original.factory != self && ntype == type &&
+              (!project || original.factory.proj4 == @proj4)
+            zresult = original.z_geometry.dup
+            zresult.factory = @zfactory
+            mresult = original.m_geometry.dup
+            mresult.factory = @mfactory
+            return original.class.create(self, zresult, mresult)
           end
           # LineString conversion optimization.
-          if (original_.factory != self || ntype_ != type_) &&
-              (!project_ || original_.factory.proj4 == @proj4) &&
-              type_.subtype_of?(Feature::LineString) && ntype_.subtype_of?(Feature::LineString)
-            klass_ = Factory::IMPL_CLASSES[ntype_]
-            zresult_ = klass_._copy_from(@zfactory, original_.z_geometry)
-            mresult_ = klass_._copy_from(@mfactory, original_.m_geometry)
-            return ZMLineStringImpl.create(self, zresult_, mresult_)
+          if (original.factory != self || ntype != type) &&
+              (!project || original.factory.proj4 == @proj4) &&
+              type.subtypeof?(Feature::LineString) && ntype.subtypeof?(Feature::LineString)
+            klass = Factory::IMPL_CLASSES[ntype]
+            zresult = klass._copy_from(@zfactory, original.z_geometry)
+            mresult = klass._copy_from(@mfactory, original.m_geometry)
+            return ZMLineStringImpl.create(self, zresult, mresult)
           end
         end
         false
       end
 
-      def _create_feature(klass_, zgeometry_, mgeometry_) # :nodoc:
-        klass_ ||= TYPE_KLASSES[zgeometry_.geometry_type] || ZMGeometryImpl
-        zgeometry_ && mgeometry_ ? klass_.new(self, zgeometry_, mgeometry_) : nil
+      def create_feature(klass, zgeometry, mgeometry) # :nodoc:
+        klass ||= TYPE_KLASSES[zgeometry.geometry_type] || ZMGeometryImpl
+        zgeometry && mgeometry ? klass.new(self, zgeometry, mgeometry) : nil
       end
 
-      def _marshal_wkb_generator # :nodoc:
-        unless defined?(@marshal_wkb_generator)
-          @marshal_wkb_generator = RGeo::WKRep::WKBGenerator.new(
-            type_format: :wkb12)
-        end
-        @marshal_wkb_generator
+      def marshal_wkb_generator
+        @marshal_wkb_generator ||= RGeo::WKRep::WKBGenerator.new(typeformat: :wkb12)
       end
 
-      def _marshal_wkb_parser # :nodoc:
-        unless defined?(@marshal_wkb_parser)
-          @marshal_wkb_parser = RGeo::WKRep::WKBParser.new(self,
-            support_wkb12: true)
-        end
-        @marshal_wkb_parser
+      def marshal_wkb_parser
+        @marshal_wkb_parser ||= RGeo::WKRep::WKBParser.new(self, support_wkb12: true)
       end
 
-      def _psych_wkt_generator # :nodoc:
-        unless defined?(@psych_wkt_generator)
-          @psych_wkt_generator = RGeo::WKRep::WKTGenerator.new(
-            tag_format: :wkt12)
-        end
-        @psych_wkt_generator
+      def psych_wkt_generator
+        @psych_wkt_generator ||= RGeo::WKRep::WKTGenerator.new(tag_format: :wkt12)
       end
 
-      def _psych_wkt_parser # :nodoc:
-        unless defined?(@psych_wkt_parser)
-          @psych_wkt_parser = RGeo::WKRep::WKTParser.new(self,
-            support_wkt12: true, support_ewkt: true)
-        end
-        @psych_wkt_parser
+      def psych_wkt_parser
+        @psych_wkt_parser ||= RGeo::WKRep::WKTParser.new(self, support_wkt12: true, support_ewkt: true)
       end
     end
   end