rgeo 3.0.0.pre.rc.2 → 3.0.0

data/lib/rgeo/geographic/projected_feature_methods.rb

@@ -42,20 +42,10 @@ module RGeo
         projection.empty?
       end
 
-      def is_empty?
-        warn "The is_empty? method is deprecated, please use the empty? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
-        empty?
-      end
-
       def simple?
         projection.simple?
       end
 
-      def is_simple?
-        warn "The is_simple? method is deprecated, please use the simple? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
-        simple?
-      end
-
       def valid?
         projection.valid?
       end
@@ -229,9 +219,7 @@ module RGeo
       # Ensure projection is available.
       def init_geometry
         super
-        unless projection
-          raise Error::InvalidGeometry, "Polygon failed assertions"
-        end
+        raise Error::InvalidGeometry, "Polygon failed assertions" unless projection
       end
     end
 
@@ -241,9 +229,7 @@ module RGeo
       # Ensure projection is available.
       def init_geometry
         super
-        unless projection
-          raise Error::InvalidGeometry, "MultiPolygon failed assertions"
-        end
+        raise Error::InvalidGeometry, "MultiPolygon failed assertions" unless projection
       end
     end
   end

data/lib/rgeo/geographic/projected_window.rb

@@ -13,7 +13,6 @@ module RGeo
     # map visualization, an envelope in a projected coordinate system, or
     # a spatial constraint. It must be attached to a Geographic::Factory
     # that has a projection.
-
     class ProjectedWindow
       # Create a new ProjectedWindow given the Geographic::Factory, and the
       # x and y extents of the rectangle.
@@ -64,38 +63,33 @@ module RGeo
         to_s
       end
 
-      def eql?(obj_) # :nodoc:
-        return false unless obj_.is_a?(ProjectedWindow)
-        @factory == obj_.factory && @x_min == obj_.x_min && @x_max == obj_.x_max &&
-          @y_min = obj_.y_min && @y_max = obj_.y_max
+      def eql?(other) # :nodoc:
+        return false unless other.is_a?(ProjectedWindow)
+        @factory == other.factory && @x_min == other.x_min && @x_max == other.x_max &&
+          @y_min = other.y_min && @y_max = other.y_max
       end
       alias == eql?
 
       def hash # :nodoc:
-        @factory.hash + @x_min.hash + @x_max.hash + @y_min.hash + @y_max.hash
+        [@factory, @x_min, @x_max, @y_min, @y_max].hash
       end
 
       # Returns the Geographic::Factory associated with this window.
       # Note that this factory is the overall geography factory, not the
       # projected factory (which can be obtained by calling
       # Geographic::Factory#projection_factory on this factory).
-
       attr_reader :factory
 
       # Returns the lower limit in the x (easting) direction.
-
       attr_reader :x_min
 
       # Returns the upper limit in the x (easting) direction.
-
       attr_reader :x_max
 
       # Returns the lower limit in the y (northing) direction.
-
       attr_reader :y_min
 
       # Returns the upper limit in the y (northing) direction.
-
       attr_reader :y_max
 
       # Returns true if the projection wraps along the x axis, and this
@@ -146,35 +140,45 @@ module RGeo
       # (lat/lng) space, as a Feature::Point object.
 
       def sw_point
-        @sw ||= @factory.unproject(@factory.projection_factory.point(@x_min, @y_min))
+        return @sw_point if defined?(@sw_point)
+
+        @sw_point = @factory.unproject(@factory.projection_factory.point(@x_min, @y_min))
       end
 
       # Returns the southeast corner of the rectangle in _unprojected_
       # (lat/lng) space, as a Feature::Point object.
 
       def se_point
-        @se ||= @factory.unproject(@factory.projection_factory.point(@x_max, @y_min))
+        return @se_point if defined?(@se_point)
+
+        @se_point = @factory.unproject(@factory.projection_factory.point(@x_max, @y_min))
       end
 
       # Returns the northwest corner of the rectangle in _unprojected_
       # (lat/lng) space, as a Feature::Point object.
 
       def nw_point
-        @nw ||= @factory.unproject(@factory.projection_factory.point(@x_min, @y_max))
+        return @nw_point if defined?(@nw_point)
+
+        @nw_point = @factory.unproject(@factory.projection_factory.point(@x_min, @y_max))
       end
 
       # Returns the northeast corner of the rectangle in _unprojected_
       # (lat/lng) space, as a Feature::Point object.
 
       def ne_point
-        @ne ||= @factory.unproject(@factory.projection_factory.point(@x_max, @y_max))
+        return @ne_point if defined?(@ne_point)
+
+        @ne_point = @factory.unproject(@factory.projection_factory.point(@x_max, @y_max))
       end
 
       # Returns the center of the rectangle in _unprojected_
       # (lat/lng) space, as a Feature::Point object.
 
       def center_point
-        @center ||= @factory.unproject(@factory.projection_factory.point(*center_xy))
+        return @center_point if defined?(@center_point)
+
+        @center_point = @factory.unproject(@factory.projection_factory.point(*center_xy))
       end
 
       # Returns a random point inside the rectangle in _unprojected_
@@ -233,7 +237,7 @@ module RGeo
 
       def scaled_by(x_factor_, y_factor_ = nil)
         y_factor_ ||= x_factor_
-        if x_factor_ != 1.0 || y_factor_ != 1.0
+        if x_factor_ != 1 || y_factor_ != 1
           x_, y_ = *center_xy
           xr_ = x_span * 0.5 * x_factor_
           yr_ = y_span * 0.5 * y_factor_
@@ -287,9 +291,14 @@ module RGeo
 
       def with_margin(x_margin_, y_margin_ = nil)
         y_margin_ ||= x_margin_
-        if x_margin_ != 0.0 || y_margin_ != 0.0
-          ProjectedWindow.new(@factory, @x_min - x_margin_, @y_min - y_margin_,
-            @x_max + x_margin_, @y_max + y_margin_)
+        if x_margin_ != 0 || y_margin_ != 0
+          ProjectedWindow.new(
+            @factory,
+            @x_min - x_margin_,
+            @y_min - y_margin_,
+            @x_max + x_margin_,
+            @y_max + y_margin_
+          )
         else
           self
         end
@@ -318,8 +327,13 @@ module RGeo
           y_margin_ ||= x_margin_
           factory_ = point_.factory
           projection_ = factory_.project(point_)
-          ProjectedWindow.new(factory_, projection_.x - x_margin_, projection_.y - y_margin_,
-            projection_.x + x_margin_, projection_.y + y_margin_)
+          ProjectedWindow.new(
+            factory_,
+            projection_.x - x_margin_,
+            projection_.y - y_margin_,
+            projection_.x + x_margin_,
+            projection_.y + y_margin_
+          )
         end
 
         # Creates a new window that contains all of the given points.

data/lib/rgeo/geographic/{proj4_projector.rb → projector.rb}

@@ -8,7 +8,7 @@
 
 module RGeo
   module Geographic
-    class Proj4Projector # :nodoc:
+    class Projector # :nodoc:
       def initialize(geography_factory, projection_factory)
         @geography_factory = geography_factory
         @projection_factory = projection_factory
@@ -42,11 +42,11 @@ module RGeo
           new(geography_factory, projection_factory)
         end
 
-        def create_from_proj4(geography_factory, proj4, opts = {})
+        def create_from_opts(geography_factory, opts = {})
           projection_factory =
             Cartesian.preferred_factory(
-              proj4: proj4,
               coord_sys: opts[:coord_sys], srid: opts[:srid],
+              coord_sys_class: opts[:coord_sys_class],
               buffer_resolution: opts[:buffer_resolution],
               has_z_coordinate: opts[:has_z_coordinate],
               has_m_coordinate: opts[:has_m_coordinate],

data/lib/rgeo/geographic/simple_mercator_projector.rb

@@ -14,7 +14,6 @@ module RGeo
       def initialize(geography_factory, opts = {})
         @geography_factory = geography_factory
         @projection_factory = Cartesian.preferred_factory(srid: 3857,
-                                                          proj4: SimpleMercatorProjector._proj4_3857,
                                                           coord_sys: SimpleMercatorProjector._coordsys_3857,
                                                           buffer_resolution: opts[:buffer_resolution],
                                                           has_z_coordinate: opts[:has_z_coordinate],
@@ -33,8 +32,10 @@ module RGeo
         when Feature::Point
           rpd_ = ImplHelper::Math::RADIANS_PER_DEGREE
           radius = EQUATORIAL_RADIUS
-          @projection_factory.point(geometry.x * rpd_ * radius,
-            Math.log(Math.tan(Math::PI / 4.0 + geometry.y * rpd_ / 2.0)) * radius)
+          @projection_factory.point(
+            geometry.x * rpd_ * radius,
+            Math.log(Math.tan(Math::PI / 4.0 + geometry.y * rpd_ / 2.0)) * radius
+          )
         when Feature::Line
           @projection_factory.line(project(geometry.start_point), project(geometry.end_point))
         when Feature::LinearRing
@@ -60,8 +61,10 @@ module RGeo
         when Feature::Point
           dpr = ImplHelper::Math::DEGREES_PER_RADIAN
           radius = EQUATORIAL_RADIUS
-          @geography_factory.point(geometry.x / radius * dpr,
-            (2.0 * Math.atan(Math.exp(geometry.y / radius)) - Math::PI / 2.0) * dpr)
+          @geography_factory.point(
+            geometry.x / radius * dpr,
+            (2.0 * Math.atan(Math.exp(geometry.y / radius)) - Math::PI / 2.0) * dpr
+          )
         when Feature::Line
           @geography_factory.line(unproject(geometry.start_point), unproject(geometry.end_point))
         when Feature::LinearRing
@@ -69,8 +72,10 @@ module RGeo
         when Feature::LineString
           @geography_factory.line_string(geometry.points.map { |p| unproject(p) })
         when Feature::Polygon
-          @geography_factory.polygon(unproject(geometry.exterior_ring),
-            geometry.interior_rings.map { |p| unproject(p) })
+          @geography_factory.polygon(
+            unproject(geometry.exterior_ring),
+            geometry.interior_rings.map { |p| unproject(p) }
+          )
         when Feature::MultiPoint
           @geography_factory.multi_point(geometry.map { |p| unproject(p) })
         when Feature::MultiLineString
@@ -87,24 +92,22 @@ module RGeo
       end
 
       def limits_window
-        @limits_window ||= ProjectedWindow.new(@geography_factory,
-          -20_037_508.342789, -20_037_508.342789, 20_037_508.342789, 20_037_508.342789,
-          is_limits: true)
-      end
+        return @limits_window if defined?(@limits_window)
 
-      def self._proj4_3857 # :nodoc:
-        return unless CoordSys.supported?(:proj4)
-        unless defined?(@proj4_3857)
-          @proj4_3857 = CoordSys::Proj4.create("+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +a=6378137 +b=6378137 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs")
-        end
-        @proj4_3857
+        @limits_window = ProjectedWindow.new(
+          @geography_factory,
+          -20_037_508.342789,
+          -20_037_508.342789,
+          20_037_508.342789,
+          20_037_508.342789,
+          is_limits: true
+        )
       end
 
       def self._coordsys_3857 # :nodoc:
-        unless defined?(@coordsys_3857)
-          @coordsys_3857 = CoordSys::CS.create_from_wkt('PROJCS["Popular Visualisation CRS / Mercator",GEOGCS["Popular Visualisation CRS",DATUM["Popular_Visualisation_Datum",SPHEROID["Popular Visualisation Sphere",6378137,0,AUTHORITY["EPSG","7059"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6055"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4055"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],AUTHORITY["EPSG","3785"],AXIS["X",EAST],AXIS["Y",NORTH]]')
-        end
-        @coordsys_3857
+        return @coordsys_3857 if defined?(@coordsys_3857)
+
+        @coordsys_3857 = CoordSys::CONFIG.default_coord_sys_class.create(3857)
       end
     end
   end

data/lib/rgeo/geographic/spherical_feature_methods.rb

@@ -49,9 +49,10 @@ module RGeo
         return false unless rhs.is_a?(self.class) && rhs.factory == factory
         case rhs
         when Feature::Point
-          if @y == 90
+          case @y
+          when 90
             rhs.y == 90
-          elsif @y == -90
+          when -90
             rhs.y == -90
           else
             rhs.x == @x && rhs.y == @y
@@ -137,11 +138,6 @@ module RGeo
         true
       end
 
-      def is_simple?
-        warn "The is_simple? method is deprecated, please use the simple? counterpart, will be removed in v3" unless ENV["RGEO_SILENCE_DEPRECATION"]
-        simple?
-      end
-
       def length
         arcs.inject(0.0) { |sum, arc| sum + arc.length } * SphericalMath::RADIUS
       end
@@ -198,7 +194,11 @@ module RGeo
             next unless arc.intersects_arc?(rhs_arc)
 
             # check that endpoints aren't the intersection point
-            is_endpoint = arc.contains_point?(rhs_arc.s) || arc.contains_point?(rhs_arc.e) || rhs_arc.contains_point?(arc.s) || rhs_arc.contains_point?(arc.e)
+            is_endpoint = arc.contains_point?(rhs_arc.s) ||
+              arc.contains_point?(rhs_arc.e) ||
+              rhs_arc.contains_point?(arc.s) ||
+              rhs_arc.contains_point?(arc.e)
+
             return true unless is_endpoint
           end
         end

data/lib/rgeo/geographic/spherical_math.rb

@@ -23,6 +23,8 @@ module RGeo
       # of rotation.
 
       class PointXYZ # :nodoc:
+        attr_reader :x, :y, :z
+
         def initialize(x, y, z)
           r = Math.sqrt(x * x + y * y + z * z)
           @x = (x / r).to_f
@@ -35,12 +37,8 @@ module RGeo
           "(#{@x}, #{@y}, #{@z})"
         end
 
-        attr_reader :x
-        attr_reader :y
-        attr_reader :z
-
-        def eql?(rhs)
-          rhs.is_a?(PointXYZ) && @x == rhs.x && @y == rhs.y && @z == rhs.z
+        def eql?(other)
+          other.is_a?(PointXYZ) && @x == other.x && @y == other.y && @z == other.z
         end
         alias == eql?
 
@@ -58,17 +56,17 @@ module RGeo
           [lon_rad / rpd, lat_rad / rpd]
         end
 
-        def *(rhs)
-          val = @x * rhs.x + @y * rhs.y + @z * rhs.z
+        def *(other)
+          val = @x * other.x + @y * other.y + @z * other.z
           val = 1.0 if val > 1.0
           val = -1.0 if val < -1.0
           val
         end
 
-        def %(rhs)
-          rx = rhs.x
-          ry = rhs.y
-          rz = rhs.z
+        def %(other)
+          rx = other.x
+          ry = other.y
+          rz = other.z
           begin
             PointXYZ.new(@y * rz - @z * ry, @z * rx - @x * rz, @x * ry - @y * rx)
           rescue StandardError
@@ -113,8 +111,8 @@ module RGeo
           new(x, y, z)
         end
 
-        def self.weighted_combination(p1, w1, p2, w2)
-          new(p1.x * w1 + p2.x * w2, p1.y * w1 + p2.y * w2, p1.z * w1 + p2.z * w2)
+        def self.weighted_combination(pt1, wt1, pt2, wt2)
+          new(pt1.x * wt1 + pt2.x * wt2, pt1.y * wt1 + pt2.y * wt2, pt1.z * wt1 + pt2.z * wt2)
         end
 
         P1 = new(1, 0, 0)
@@ -124,21 +122,20 @@ module RGeo
       # Represents a finite arc on the sphere.
 
       class ArcXYZ # :nodoc:
+        attr_reader :s, :e
+
         def initialize(start, stop)
           @s = start
           @e = stop
           @axis = false
         end
 
-        attr_reader :s
-        attr_reader :e
-
         def to_s
           "#{@s} - #{@e}"
         end
 
-        def eql?(rhs)
-          rhs.is_a?(ArcXYZ) && @s == rhs.s && @e == rhs.e
+        def eql?(other)
+          other.is_a?(ArcXYZ) && @s == other.s && @e == other.e
         end
         alias == eql?
 
@@ -156,7 +153,7 @@ module RGeo
           my_axis = axis
           s_axis = ArcXYZ.new(@s, obj).axis
           e_axis = ArcXYZ.new(obj, @e).axis
-          !s_axis || !e_axis || obj * my_axis == 0.0 && s_axis * my_axis > 0 && e_axis * my_axis > 0
+          !s_axis || !e_axis || obj * my_axis == 0 && s_axis * my_axis > 0 && e_axis * my_axis > 0
         end
 
         def intersects_arc?(obj)

data/lib/rgeo/geographic.rb

@@ -24,7 +24,7 @@ require_relative "geographic/interface"
 require_relative "geographic/spherical_math"
 require_relative "geographic/spherical_feature_methods"
 require_relative "geographic/spherical_feature_classes"
-require_relative "geographic/proj4_projector"
+require_relative "geographic/projector"
 require_relative "geographic/simple_mercator_projector"
 require_relative "geographic/projected_feature_methods"
 require_relative "geographic/projected_feature_classes"