rgeo 0.4.0 → 0.5.0

data/lib/rgeo/geographic/projected_feature_methods.rb

@@ -5,145 +5,114 @@
 # -----------------------------------------------------------------------------
 
 module RGeo
-
   module Geographic
-
-
-    module ProjectedGeometryMethods  # :nodoc:
-
-
+    module ProjectedGeometryMethods # :nodoc:
       def srid
         factory.srid
       end
 
-
       def projection
-        unless defined?(@projection)
-          @projection = factory.project(self)
-        end
+        @projection = factory.project(self) unless defined?(@projection)
         @projection
       end
 
-
       def envelope
         factory.unproject(projection.envelope)
       end
 
-
       def is_empty?
         projection.is_empty?
       end
 
-
       def is_simple?
         projection.is_simple?
       end
 
-
       def boundary
         boundary_ = projection.boundary
         boundary_ ? factory.unproject(boundary_) : nil
       end
 
-
       def equals?(rhs_)
         projection.equals?(Feature.cast(rhs_, factory).projection)
       end
 
-
       def disjoint?(rhs_)
         projection.disjoint?(Feature.cast(rhs_, factory).projection)
       end
 
-
       def intersects?(rhs_)
         projection.intersects?(Feature.cast(rhs_, factory).projection)
       end
 
-
       def touches?(rhs_)
         projection.touches?(Feature.cast(rhs_, factory).projection)
       end
 
-
       def crosses?(rhs_)
         projection.crosses?(Feature.cast(rhs_, factory).projection)
       end
 
-
       def within?(rhs_)
         projection.within?(Feature.cast(rhs_, factory).projection)
       end
 
-
       def contains?(rhs_)
         projection.contains?(Feature.cast(rhs_, factory).projection)
       end
 
-
       def overlaps?(rhs_)
         projection.overlaps?(Feature.cast(rhs_, factory).projection)
       end
 
-
       def relate(rhs_, pattern_)
         projection.relate(Feature.cast(rhs_, factory).projection, pattern_)
       end
 
-
       def distance(rhs_)
         projection.distance(Feature.cast(rhs_, factory).projection)
       end
 
-
       def buffer(distance_)
         factory.unproject(projection.buffer(distance_))
       end
-      
-      
+
+      def buffer_with_style(distance_, endCapStyle_, joinStyle_, mitreLimit_)
+        factory.unproject(projection.buffer_with_style(distance_, endCapStyle_, joinStyle_, mitreLimit_))
+      end
+
       def simplify(tolerance_)
         factory.unproject(projection.simplify(tolerance_))
       end
-      
 
       def convex_hull
         factory.unproject(projection.convex_hull)
       end
 
-
       def intersection(rhs_)
         factory.unproject(projection.intersection(Feature.cast(rhs_, factory).projection))
       end
 
-
       def union(rhs_)
         factory.unproject(projection.union(Feature.cast(rhs_, factory).projection))
       end
 
-
       def difference(rhs_)
         factory.unproject(projection.difference(Feature.cast(rhs_, factory).projection))
       end
 
-
       def sym_difference(rhs_)
         factory.unproject(projection.sym_difference(Feature.cast(rhs_, factory).projection))
       end
-
-
     end
 
-
-    module ProjectedPointMethods  # :nodoc:
-
-
+    module ProjectedPointMethods # :nodoc:
       def _validate_geometry
         @y = 85.0511287 if @y > 85.0511287
         @y = -85.0511287 if @y < -85.0511287
         super
       end
 
-
       def canonical_x
         x_ = @x % 360.0
         x_ -= 360.0 if x_ > 180.0
@@ -152,7 +121,6 @@ module RGeo
       alias_method :canonical_longitude, :canonical_x
       alias_method :canonical_lon, :canonical_x
 
-
       def canonical_point
         if @x >= -180.0 && @x < 180.0
           self
@@ -161,7 +129,6 @@ module RGeo
         end
       end
 
-
       def self.included(klass_)
         klass_.module_eval do
           alias_method :longitude, :x
@@ -170,25 +137,15 @@ module RGeo
           alias_method :lat, :y
         end
       end
-
-
     end
 
-
-    module ProjectedNCurveMethods  # :nodoc:
-
-
+    module ProjectedNCurveMethods # :nodoc:
       def length
         projection.length
       end
-
-
     end
 
-
-    module ProjectedLineStringMethods  # :nodoc:
-
-
+    module ProjectedLineStringMethods # :nodoc:
       def _validate_geometry
         size_ = @points.size
         if size_ > 1
@@ -214,60 +171,38 @@ module RGeo
         end
         super
       end
-
-
     end
 
-
-    module ProjectedNSurfaceMethods  # :nodoc:
-
-
+    module ProjectedNSurfaceMethods # :nodoc:
       def area
         projection.area
       end
 
-
       def centroid
         factory.unproject(projection.centroid)
       end
 
-
       def point_on_surface
         factory.unproject(projection.point_on_surface)
       end
-
-
     end
 
-
-    module ProjectedPolygonMethods  # :nodoc:
-
-
+    module ProjectedPolygonMethods # :nodoc:
       def _validate_geometry
         super
         unless projection
-          raise Error::InvalidGeometry, 'Polygon failed assertions'
+          raise Error::InvalidGeometry, "Polygon failed assertions"
         end
       end
-
-
     end
 
-
-    module ProjectedMultiPolygonMethods  # :nodoc:
-
-
+    module ProjectedMultiPolygonMethods # :nodoc:
       def _validate_geometry
         super
         unless projection
-          raise Error::InvalidGeometry, 'MultiPolygon failed assertions'
+          raise Error::InvalidGeometry, "MultiPolygon failed assertions"
         end
       end
-
-
     end
-
-
   end
-
 end

data/lib/rgeo/geographic/projected_window.rb

@@ -5,10 +5,7 @@
 # -----------------------------------------------------------------------------
 
 module RGeo
-
   module Geographic
-
-
     # This object represents an axis-aligned rectangle in a map projection
     # coordinate system. It is commonly used to specify the viewport for a
     # map visualization, an envelope in a projected coordinate system, or
@@ -16,8 +13,6 @@ module RGeo
     # that has a projection.
 
     class ProjectedWindow
-
-
       # Create a new ProjectedWindow given the Geographic::Factory, and the
       # x and y extents of the rectangle.
       #
@@ -28,7 +23,7 @@ module RGeo
       # Generally, you will not need to call this low-level constructor
       # directly. Instead, use one of the provided class methods.
 
-      def initialize(factory_, x_min_, y_min_, x_max_, y_max_, opts_={})
+      def initialize(factory_, x_min_, y_min_, x_max_, y_max_, opts_ = {})
         @factory = factory_
         limits_ = opts_[:is_limits] ? nil : factory_.projection_limits_window
         wraps_ = factory_.projection_wraps?
@@ -59,65 +54,47 @@ module RGeo
         @y_max = y_max_
       end
 
-
-      def to_s  # :nodoc:
+      def to_s # :nodoc:
         "#<#{self.class}:0x#{object_id.to_s(16)} s=#{@y_min} w=#{@x_min} n=#{@y_max} e=#{@x_max}>"
       end
 
-      def inspect  # :nodoc:
+      def inspect # :nodoc:
         to_s
       end
 
-
-      def eql?(obj_)  # :nodoc:
-        return false unless obj_.kind_of?(ProjectedWindow)
+      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
       end
       alias_method :==, :eql?
 
-      def hash  # :nodoc:
+      def hash # :nodoc:
         @factory.hash + @x_min.hash + @x_max.hash + @y_min.hash + @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).
 
-      def factory
-        @factory
-      end
-
+      attr_reader :factory
 
       # Returns the lower limit in the x (easting) direction.
 
-      def x_min
-        @x_min
-      end
-
+      attr_reader :x_min
 
       # Returns the upper limit in the x (easting) direction.
 
-      def x_max
-        @x_max
-      end
-
+      attr_reader :x_max
 
       # Returns the lower limit in the y (northing) direction.
 
-      def y_min
-        @y_min
-      end
-
+      attr_reader :y_min
 
       # Returns the upper limit in the y (northing) direction.
 
-      def y_max
-        @y_max
-      end
-
+      attr_reader :y_max
 
       # Returns true if the projection wraps along the x axis, and this
       # rectangle crosses that seam.
@@ -126,26 +103,21 @@ module RGeo
         @x_max < @x_min
       end
 
-
       # Returns true if the rectangle has zero area.
 
       def degenerate?
         @x_min == @x_max || @y_min == @y_max
       end
 
-
       # Returns the width of the rectangle.
 
       def x_span
         span_ = @x_max - @x_min
-        if span_ < 0
-          span_ += @factory.projection_limits_window.x_span
-        end
+        span_ += @factory.projection_limits_window.x_span if span_ < 0
         span_
       end
       alias_method :width, :x_span
 
-
       # Returns the height of the rectangle.
 
       def y_span
@@ -153,7 +125,6 @@ module RGeo
       end
       alias_method :height, :y_span
 
-
       # Returns a two-element array containing the x and y coordinates
       # of the center of the rectangle.
 
@@ -169,7 +140,6 @@ module RGeo
         [x_, y_]
       end
 
-
       # Returns the southwest corner of the rectangle in _unprojected_
       # (lat/lng) space, as a Feature::Point object.
 
@@ -177,7 +147,6 @@ module RGeo
         @sw ||= @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.
 
@@ -185,7 +154,6 @@ module RGeo
         @se ||= @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.
 
@@ -193,7 +161,6 @@ module RGeo
         @nw ||= @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.
 
@@ -201,7 +168,6 @@ module RGeo
         @ne ||= @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.
 
@@ -209,7 +175,6 @@ module RGeo
         @center ||= @factory.unproject(@factory.projection_factory.point(*center_xy))
       end
 
-
       # Returns a random point inside the rectangle in _unprojected_
       # (lat/lng) space, as a Feature::Point object.
 
@@ -221,7 +186,6 @@ module RGeo
         @factory.unproject(@factory.projection_factory.point(x_, y_))
       end
 
-
       # Returns true if the rectangle contains the given point, which
       # must be a Feature::Point in _unprojected_ (lat/lng) space.
 
@@ -244,7 +208,6 @@ module RGeo
         end
       end
 
-
       # Returns true if the given window is completely contained within
       # this window.
 
@@ -261,13 +224,12 @@ module RGeo
         end
       end
 
-
       # Returns a new window resulting from scaling this window by the
       # given factors, which must be floating-point values.
       # If y_factor is not explicitly given, it defaults to the same as
       # the x_factor.
 
-      def scaled_by(x_factor_, y_factor_=nil)
+      def scaled_by(x_factor_, y_factor_ = nil)
         y_factor_ ||= x_factor_
         if x_factor_ != 1.0 || y_factor_ != 1.0
           x_, y_ = *center_xy
@@ -280,7 +242,6 @@ module RGeo
       end
       alias_method :*, :scaled_by
 
-
       # Returns a new window resulting from clamping this window to the
       # given minimum and maximum widths and heights, in the projected
       # coordinate system. The center of the resulting window is the
@@ -317,13 +278,12 @@ module RGeo
         end
       end
 
-
       # Returns a new window resulting from adding the given margin to
       # this window. If y_margin is not given, it defaults to the same
       # value as x_margin. Note that the margins may be negative to
       # indicate shrinking of the window.
 
-      def with_margin(x_margin_, y_margin_=nil)
+      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_,
@@ -333,10 +293,7 @@ module RGeo
         end
       end
 
-
       class << self
-
-
         # Creates a new window whose coordinates are the given points,
         # which must be Feature::Point objects in unprojected (lat/lng)
         # space.
@@ -348,14 +305,13 @@ module RGeo
           ProjectedWindow.new(factory_, psw_.x, psw_.y, pne_.x, pne_.y)
         end
 
-
         # Creates a new window that surrounds the given point with the
         # given margin. The point must be a Feature::Point object in
         # unprojected (lat/lng) space, while the margins are numbers in
         # projected space. The y_margin may be given as nil, in which
         # case it is set to the same as the x_margin.
 
-        def surrounding_point(point_, x_margin_=nil, y_margin_=nil)
+        def surrounding_point(point_, x_margin_ = nil, y_margin_ = nil)
           x_margin_ ||= 0.0
           y_margin_ ||= x_margin_
           factory_ = point_.factory
@@ -364,7 +320,6 @@ module RGeo
             projection_.x + x_margin_, projection_.y + y_margin_)
         end
 
-
         # Creates a new window that contains all of the given points.
         # which must be Feature::Point objects in unprojected (lat/lng)
         # space.
@@ -422,14 +377,7 @@ module RGeo
           end
           ProjectedWindow.new(factory_, x_min_, y_min_, x_max_, y_max_)
         end
-
-
       end
-
-
     end
-
-
   end
-
 end