rgeo 1.0.0 → 1.1.1

data/lib/rgeo/geographic/factory.rb

@@ -89,7 +89,7 @@ module RGeo
           @support_m == rhs_.instance_variable_get(:@support_m) &&
           @proj4 == rhs_.instance_variable_get(:@proj4)
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       # Standard hash code
 
@@ -148,7 +148,7 @@ module RGeo
                   )
         if (projklass_ = data_["prjc"]) && (projfactory_ = data_["prjf"])
           klass_ = begin
-                     ::RGeo::Geographic.const_get(projklass_)
+                     RGeo::Geographic.const_get(projklass_)
                    rescue
                      nil
                    end
@@ -215,7 +215,7 @@ module RGeo
                   )
         if (projklass_ = coder_["projector_class"]) && (projfactory_ = coder_["projection_factory"])
           klass_ = begin
-                     ::RGeo::Geographic.const_get(projklass_)
+                     RGeo::Geographic.const_get(projklass_)
                    rescue
                      nil
                    end
@@ -296,7 +296,7 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#property
+      # See RGeo::Feature::Factory#property
 
       def property(name_)
         case name_
@@ -313,19 +313,19 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#parse_wkt
+      # See RGeo::Feature::Factory#parse_wkt
 
       def parse_wkt(str_)
         @wkt_parser.parse(str_)
       end
 
-      # See ::RGeo::Feature::Factory#parse_wkb
+      # See RGeo::Feature::Factory#parse_wkb
 
       def parse_wkb(str_)
         @wkb_parser.parse(str_)
       end
 
-      # See ::RGeo::Feature::Factory#point
+      # See RGeo::Feature::Factory#point
 
       def point(x_, y_, *extra_)
         @point_class.new(self, x_, y_, *extra_)
@@ -333,7 +333,7 @@ module RGeo
         nil
       end
 
-      # See ::RGeo::Feature::Factory#line_string
+      # See RGeo::Feature::Factory#line_string
 
       def line_string(points_)
         @line_string_class.new(self, points_)
@@ -341,7 +341,7 @@ module RGeo
         nil
       end
 
-      # See ::RGeo::Feature::Factory#line
+      # See RGeo::Feature::Factory#line
 
       def line(start_, end_)
         @line_class.new(self, start_, end_)
@@ -349,7 +349,7 @@ module RGeo
         nil
       end
 
-      # See ::RGeo::Feature::Factory#linear_ring
+      # See RGeo::Feature::Factory#linear_ring
 
       def linear_ring(points_)
         @linear_ring_class.new(self, points_)
@@ -357,7 +357,7 @@ module RGeo
         nil
       end
 
-      # See ::RGeo::Feature::Factory#polygon
+      # See RGeo::Feature::Factory#polygon
 
       def polygon(outer_ring_, inner_rings_ = nil)
         @polygon_class.new(self, outer_ring_, inner_rings_)
@@ -365,7 +365,7 @@ module RGeo
         nil
       end
 
-      # See ::RGeo::Feature::Factory#collection
+      # See RGeo::Feature::Factory#collection
 
       def collection(elems_)
         @geometry_collection_class.new(self, elems_)
@@ -373,7 +373,7 @@ module RGeo
         nil
       end
 
-      # See ::RGeo::Feature::Factory#multi_point
+      # See RGeo::Feature::Factory#multi_point
 
       def multi_point(elems_)
         @multi_point_class.new(self, elems_)
@@ -381,7 +381,7 @@ module RGeo
         nil
       end
 
-      # See ::RGeo::Feature::Factory#multi_line_string
+      # See RGeo::Feature::Factory#multi_line_string
 
       def multi_line_string(elems_)
         @multi_line_string_class.new(self, elems_)
@@ -389,7 +389,7 @@ module RGeo
         nil
       end
 
-      # See ::RGeo::Feature::Factory#multi_polygon
+      # See RGeo::Feature::Factory#multi_polygon
 
       def multi_polygon(elems_)
         @multi_polygon_class.new(self, elems_)
@@ -397,11 +397,11 @@ module RGeo
         nil
       end
 
-      # See ::RGeo::Feature::Factory#proj4
+      # See RGeo::Feature::Factory#proj4
 
       attr_reader :proj4
 
-      # See ::RGeo::Feature::Factory#coord_sys
+      # See RGeo::Feature::Factory#coord_sys
 
       attr_reader :coord_sys
 
@@ -415,7 +415,7 @@ module RGeo
 
       def _marshal_wkb_generator # :nodoc:
         unless defined?(@marshal_wkb_generator)
-          @marshal_wkb_generator = ::RGeo::WKRep::WKBGenerator.new(
+          @marshal_wkb_generator = RGeo::WKRep::WKBGenerator.new(
             type_format: :wkb12)
         end
         @marshal_wkb_generator
@@ -423,7 +423,7 @@ module RGeo
 
       def _marshal_wkb_parser # :nodoc:
         unless defined?(@marshal_wkb_parser)
-          @marshal_wkb_parser = ::RGeo::WKRep::WKBParser.new(self,
+          @marshal_wkb_parser = RGeo::WKRep::WKBParser.new(self,
             support_wkb12: true)
         end
         @marshal_wkb_parser
@@ -431,7 +431,7 @@ module RGeo
 
       def _psych_wkt_generator # :nodoc:
         unless defined?(@psych_wkt_generator)
-          @psych_wkt_generator = ::RGeo::WKRep::WKTGenerator.new(
+          @psych_wkt_generator = RGeo::WKRep::WKTGenerator.new(
             tag_format: :wkt12)
         end
         @psych_wkt_generator
@@ -439,7 +439,7 @@ module RGeo
 
       def _psych_wkt_parser # :nodoc:
         unless defined?(@psych_wkt_parser)
-          @psych_wkt_parser = ::RGeo::WKRep::WKTParser.new(self,
+          @psych_wkt_parser = RGeo::WKRep::WKTParser.new(self,
             support_wkt12: true, support_ewkt: true)
         end
         @psych_wkt_parser

data/lib/rgeo/geographic/projected_feature_methods.rb

@@ -122,8 +122,8 @@ module RGeo
         x_ -= 360.0 if x_ > 180.0
         x_
       end
-      alias_method :canonical_longitude, :canonical_x
-      alias_method :canonical_lon, :canonical_x
+      alias canonical_longitude canonical_x
+      alias canonical_lon canonical_x
 
       def canonical_point
         if @x >= -180.0 && @x < 180.0

data/lib/rgeo/geographic/projected_window.rb

@@ -67,7 +67,7 @@ module RGeo
         @factory == obj_.factory && @x_min == obj_.x_min && @x_max == obj_.x_max &&
           @y_min = obj_.y_min && @y_max = obj_.y_max
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash # :nodoc:
         @factory.hash + @x_min.hash + @x_max.hash + @y_min.hash + @y_max.hash
@@ -116,14 +116,14 @@ module RGeo
         span_ += @factory.projection_limits_window.x_span if span_ < 0
         span_
       end
-      alias_method :width, :x_span
+      alias width x_span
 
       # Returns the height of the rectangle.
 
       def y_span
         @y_max - @y_min
       end
-      alias_method :height, :y_span
+      alias height y_span
 
       # Returns a two-element array containing the x and y coordinates
       # of the center of the rectangle.
@@ -240,7 +240,7 @@ module RGeo
           self
         end
       end
-      alias_method :*, :scaled_by
+      alias * scaled_by
 
       # Returns a new window resulting from clamping this window to the
       # given minimum and maximum widths and heights, in the projected

data/lib/rgeo/geographic/spherical_math.rb

@@ -40,7 +40,7 @@ module RGeo
         def eql?(rhs_)
           rhs_.is_a?(PointXYZ) && @x == rhs_.x && @y == rhs_.y && @z == rhs_.z
         end
-        alias_method :==, :eql?
+        alias == eql?
 
         def latlon
           lat_rad_ = ::Math.asin(@z)
@@ -146,7 +146,7 @@ module RGeo
         def eql?(rhs_)
           rhs_.is_a?(ArcXYZ) && @s == rhs_.s && @e == rhs_.e
         end
-        alias_method :==, :eql?
+        alias == eql?
 
         def degenerate?
           axis_ = axis

data/lib/rgeo/geos.rb

@@ -19,7 +19,7 @@ module RGeo
   # therefore not documented.
   #
   # To use the Geos implementation, first obtain a factory using the
-  # ::RGeo::Geos.factory method. You may then call any of the standard
+  # RGeo::Geos.factory method. You may then call any of the standard
   # factory methods on the resulting object.
 
   module Geos
@@ -36,7 +36,7 @@ module RGeo
     begin
       require "rgeo/geos/geos_c_impl"
     rescue ::LoadError; end
-    CAPI_SUPPORTED = ::RGeo::Geos.const_defined?(:CAPIGeometryMethods)
+    CAPI_SUPPORTED = RGeo::Geos.const_defined?(:CAPIGeometryMethods)
     if CAPI_SUPPORTED
       require "rgeo/geos/capi_feature_classes"
       require "rgeo/geos/capi_factory"

data/lib/rgeo/geos/capi_factory.rb

@@ -6,7 +6,7 @@
 
 module RGeo
   module Geos
-    # This the GEOS CAPI implementation of ::RGeo::Feature::Factory.
+    # This the GEOS CAPI implementation of RGeo::Feature::Factory.
 
     class CAPIFactory
       include Feature::Factory::Instance
@@ -15,7 +15,7 @@ module RGeo
         # Create a new factory. Returns nil if the GEOS CAPI implementation
         # is not supported.
         #
-        # See ::RGeo::Geos.factory for a list of supported options.
+        # See RGeo::Geos.factory for a list of supported options.
 
         def create(opts_ = {})
           # Make sure GEOS is available
@@ -110,7 +110,7 @@ module RGeo
           # Return the result
           result_
         end
-        alias_method :new, :create
+        alias new create
       end
 
       # Standard object inspection output
@@ -126,7 +126,7 @@ module RGeo
           rhs_._buffer_resolution == _buffer_resolution && rhs_._flags == _flags &&
           rhs_.proj4 == _proj4
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       # Standard hash code
 
@@ -259,7 +259,7 @@ module RGeo
         _flags & 0x1 != 0
       end
 
-      # See ::RGeo::Feature::Factory#property
+      # See RGeo::Feature::Factory#property
 
       def property(name_)
         case name_
@@ -278,7 +278,7 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#parse_wkt
+      # See RGeo::Feature::Factory#parse_wkt
 
       def parse_wkt(str_)
         if (wkt_parser_ = _wkt_parser)
@@ -288,7 +288,7 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#parse_wkb
+      # See RGeo::Feature::Factory#parse_wkb
 
       def parse_wkb(str_)
         if (wkb_parser_ = _wkb_parser)
@@ -298,7 +298,7 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#point
+      # See RGeo::Feature::Factory#point
 
       def point(x_, y_, *extra_)
         if extra_.length > (_flags & 6 == 0 ? 0 : 1)
@@ -312,7 +312,7 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#line_string
+      # See RGeo::Feature::Factory#line_string
 
       def line_string(points_)
         points_ = points_.to_a unless points_.is_a?(::Array)
@@ -323,7 +323,7 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#line
+      # See RGeo::Feature::Factory#line
 
       def line(start_, end_)
         CAPILineImpl.create(self, start_, end_)
@@ -331,7 +331,7 @@ module RGeo
         nil
       end
 
-      # See ::RGeo::Feature::Factory#linear_ring
+      # See RGeo::Feature::Factory#linear_ring
 
       def linear_ring(points_)
         points_ = points_.to_a unless points_.is_a?(::Array)
@@ -342,7 +342,7 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#polygon
+      # See RGeo::Feature::Factory#polygon
 
       def polygon(outer_ring_, inner_rings_ = nil)
         inner_rings_ = inner_rings_.to_a unless inner_rings_.is_a?(::Array)
@@ -353,7 +353,7 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#collection
+      # See RGeo::Feature::Factory#collection
 
       def collection(elems_)
         elems_ = elems_.to_a unless elems_.is_a?(::Array)
@@ -364,7 +364,7 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#multi_point
+      # See RGeo::Feature::Factory#multi_point
 
       def multi_point(elems_)
         elems_ = elems_.to_a unless elems_.is_a?(::Array)
@@ -375,7 +375,7 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#multi_line_string
+      # See RGeo::Feature::Factory#multi_line_string
 
       def multi_line_string(elems_)
         elems_ = elems_.to_a unless elems_.is_a?(::Array)
@@ -386,7 +386,7 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#multi_polygon
+      # See RGeo::Feature::Factory#multi_polygon
 
       def multi_polygon(elems_)
         elems_ = elems_.to_a unless elems_.is_a?(::Array)
@@ -397,19 +397,19 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#proj4
+      # See RGeo::Feature::Factory#proj4
 
       def proj4
         _proj4
       end
 
-      # See ::RGeo::Feature::Factory#coord_sys
+      # See RGeo::Feature::Factory#coord_sys
 
       def coord_sys
         _coord_sys
       end
 
-      # See ::RGeo::Feature::Factory#override_cast
+      # See RGeo::Feature::Factory#override_cast
 
       def override_cast(original_, ntype_, flags_)
         return nil unless Geos.supported?

data/lib/rgeo/geos/capi_feature_classes.rb

@@ -45,7 +45,7 @@ module RGeo
         str_.force_encoding("US-ASCII") if str_.respond_to?(:force_encoding)
         str_
       end
-      alias_method :to_s, :as_text
+      alias to_s as_text
     end
 
     module CAPIGeometryCollectionMethods # :nodoc:

data/lib/rgeo/geos/ffi_factory.rb

@@ -6,7 +6,7 @@
 
 module RGeo
   module Geos
-    # This the FFI-GEOS implementation of ::RGeo::Feature::Factory.
+    # This the FFI-GEOS implementation of RGeo::Feature::Factory.
 
     class FFIFactory
       include Feature::Factory::Instance
@@ -14,7 +14,7 @@ module RGeo
       # Create a new factory. Returns nil if the FFI-GEOS implementation
       # is not supported.
       #
-      # See ::RGeo::Geos.factory for a list of supported options.
+      # See RGeo::Geos.factory for a list of supported options.
 
       def initialize(opts_ = {})
         # Main flags
@@ -126,7 +126,7 @@ module RGeo
           @buffer_resolution == rhs_.property(:buffer_resolution) &&
           @proj4.eql?(rhs_.proj4)
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       # Standard hash code
 
@@ -249,7 +249,7 @@ module RGeo
         @uses_lenient_multi_polygon_assertions
       end
 
-      # See ::RGeo::Feature::Factory#property
+      # See RGeo::Feature::Factory#property
 
       def property(name_)
         case name_
@@ -274,7 +274,7 @@ module RGeo
         _wrap_fg_geom(fg_geom_, nil)
       end
 
-      # See ::RGeo::Feature::Factory#parse_wkt
+      # See RGeo::Feature::Factory#parse_wkt
 
       def parse_wkt(str_)
         if @wkt_reader
@@ -284,7 +284,7 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#parse_wkb
+      # See RGeo::Feature::Factory#parse_wkb
 
       def parse_wkb(str_)
         if @wkb_reader
@@ -294,7 +294,7 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#point
+      # See RGeo::Feature::Factory#point
 
       def point(x_, y_, z_ = 0)
         cs_ = ::Geos::CoordinateSequence.new(1, 3)
@@ -304,7 +304,7 @@ module RGeo
         FFIPointImpl.new(self, ::Geos::Utils.create_point(cs_), nil)
       end
 
-      # See ::RGeo::Feature::Factory#line_string
+      # See RGeo::Feature::Factory#line_string
 
       def line_string(points_)
         points_ = points_.to_a unless points_.is_a?(::Array)
@@ -312,7 +312,7 @@ module RGeo
         return nil if size_ == 1
         cs_ = ::Geos::CoordinateSequence.new(size_, 3)
         points_.each_with_index do |p_, i_|
-          return nil unless ::RGeo::Feature::Point.check_type(p_)
+          return nil unless RGeo::Feature::Point.check_type(p_)
           cs_.set_x(i_, p_.x)
           cs_.set_y(i_, p_.y)
           if @has_z
@@ -324,11 +324,11 @@ module RGeo
         FFILineStringImpl.new(self, ::Geos::Utils.create_line_string(cs_), nil)
       end
 
-      # See ::RGeo::Feature::Factory#line
+      # See RGeo::Feature::Factory#line
 
       def line(start_, end_)
-        return nil unless ::RGeo::Feature::Point.check_type(start_) &&
-          ::RGeo::Feature::Point.check_type(end_)
+        return nil unless RGeo::Feature::Point.check_type(start_) &&
+          RGeo::Feature::Point.check_type(end_)
         cs_ = ::Geos::CoordinateSequence.new(2, 3)
         cs_.set_x(0, start_.x)
         cs_.set_x(1, end_.x)
@@ -344,7 +344,7 @@ module RGeo
         FFILineImpl.new(self, ::Geos::Utils.create_line_string(cs_), nil)
       end
 
-      # See ::RGeo::Feature::Factory#linear_ring
+      # See RGeo::Feature::Factory#linear_ring
 
       def linear_ring(points_)
         points_ = points_.to_a unless points_.is_a?(::Array)
@@ -352,14 +352,14 @@ module RGeo
         fg_geom_ ? FFILinearRingImpl.new(self, fg_geom_, nil) : nil
       end
 
-      # See ::RGeo::Feature::Factory#polygon
+      # See RGeo::Feature::Factory#polygon
 
       def polygon(outer_ring_, inner_rings_ = nil)
         inner_rings_ = inner_rings_.to_a unless inner_rings_.is_a?(::Array)
-        return nil unless ::RGeo::Feature::LineString.check_type(outer_ring_)
+        return nil unless RGeo::Feature::LineString.check_type(outer_ring_)
         outer_ring_ = _create_fg_linear_ring(outer_ring_.points)
         inner_rings_ = inner_rings_.map do |r_|
-          return nil unless ::RGeo::Feature::LineString.check_type(r_)
+          return nil unless RGeo::Feature::LineString.check_type(r_)
           _create_fg_linear_ring(r_.points)
         end
         inner_rings_.compact!
@@ -367,7 +367,7 @@ module RGeo
         fg_geom_ ? FFIPolygonImpl.new(self, fg_geom_, nil) : nil
       end
 
-      # See ::RGeo::Feature::Factory#collection
+      # See RGeo::Feature::Factory#collection
 
       def collection(elems_)
         elems_ = elems_.to_a unless elems_.is_a?(::Array)
@@ -375,7 +375,7 @@ module RGeo
         fg_geoms_ = []
         elems_.each do |elem_|
           k_ = elem_._klasses if elem_.factory.is_a?(FFIFactory)
-          elem_ = ::RGeo::Feature.cast(elem_, self, :force_new, :keep_subtype)
+          elem_ = RGeo::Feature.cast(elem_, self, :force_new, :keep_subtype)
           if elem_
             klasses_ << (k_ || elem_.class)
             fg_geoms_ << elem_._detach_fg_geom
@@ -386,12 +386,12 @@ module RGeo
         fg_geom_ ? FFIGeometryCollectionImpl.new(self, fg_geom_, klasses_) : nil
       end
 
-      # See ::RGeo::Feature::Factory#multi_point
+      # See RGeo::Feature::Factory#multi_point
 
       def multi_point(elems_)
         elems_ = elems_.to_a unless elems_.is_a?(::Array)
         elems_ = elems_.map do |elem_|
-          elem_ = ::RGeo::Feature.cast(elem_, self, ::RGeo::Feature::Point,
+          elem_ = RGeo::Feature.cast(elem_, self, RGeo::Feature::Point,
             :force_new, :keep_subtype)
           return nil unless elem_
           elem_._detach_fg_geom
@@ -402,13 +402,13 @@ module RGeo
         fg_geom_ ? FFIMultiPointImpl.new(self, fg_geom_, klasses_) : nil
       end
 
-      # See ::RGeo::Feature::Factory#multi_line_string
+      # See RGeo::Feature::Factory#multi_line_string
 
       def multi_line_string(elems_)
         elems_ = elems_.to_a unless elems_.is_a?(::Array)
         klasses_ = []
         elems_ = elems_.map do |elem_|
-          elem_ = ::RGeo::Feature.cast(elem_, self, ::RGeo::Feature::LineString,
+          elem_ = RGeo::Feature.cast(elem_, self, RGeo::Feature::LineString,
             :force_new, :keep_subtype)
           return nil unless elem_
           klasses_ << elem_.class
@@ -419,12 +419,12 @@ module RGeo
         fg_geom_ ? FFIMultiLineStringImpl.new(self, fg_geom_, klasses_) : nil
       end
 
-      # See ::RGeo::Feature::Factory#multi_polygon
+      # See RGeo::Feature::Factory#multi_polygon
 
       def multi_polygon(elems_)
         elems_ = elems_.to_a unless elems_.is_a?(::Array)
         elems_ = elems_.map do |elem_|
-          elem_ = ::RGeo::Feature.cast(elem_, self, ::RGeo::Feature::Polygon,
+          elem_ = RGeo::Feature.cast(elem_, self, RGeo::Feature::Polygon,
             :force_new, :keep_subtype)
           return nil unless elem_
           elem_._detach_fg_geom
@@ -445,15 +445,15 @@ module RGeo
         fg_geom_ ? FFIMultiPolygonImpl.new(self, fg_geom_, klasses_) : nil
       end
 
-      # See ::RGeo::Feature::Factory#proj4
+      # See RGeo::Feature::Factory#proj4
 
       attr_reader :proj4
 
-      # See ::RGeo::Feature::Factory#coord_sys
+      # See RGeo::Feature::Factory#coord_sys
 
       attr_reader :coord_sys
 
-      # See ::RGeo::Feature::Factory#override_cast
+      # See RGeo::Feature::Factory#override_cast
 
       def override_cast(_original_, _ntype_, _flags_)
         false
@@ -523,7 +523,7 @@ module RGeo
         end
         cs_ = ::Geos::CoordinateSequence.new(size_, 3)
         points_.each_with_index do |p_, i_|
-          return nil unless ::RGeo::Feature::Point.check_type(p_)
+          return nil unless RGeo::Feature::Point.check_type(p_)
           cs_.set_x(i_, p_.x)
           cs_.set_y(i_, p_.y)
           if @has_z