rgeo 0.4.0 → 0.5.0

data/lib/rgeo/feature/factory_generator.rb

@@ -5,10 +5,7 @@
 # -----------------------------------------------------------------------------
 
 module RGeo
-
   module Feature
-
-
     # A FactoryGenerator is a callable object (usually a Proc) that
     # takes a configuration as a hash and returns a factory. These are
     # often used, e.g., by parsers to determine what factory the parsed
@@ -34,8 +31,6 @@ module RGeo
     # factory generator.
 
     module FactoryGenerator
-
-
       # Generate a factory given a configuration as a hash.
       #
       # If the generator does not recognize or does not support a given
@@ -77,32 +72,25 @@ module RGeo
       # [<tt>:has_m_coordinate</tt>]
       #   Support M coordinates. Default is usually false.
 
-      def call(config_={})
+      def call(_config_ = {})
         nil
       end
 
-
       # Return a new FactoryGenerator that always returns the given
       # factory.
 
       def self.single(factory_)
-        ::Proc.new{ |c_| factory_ }
+        ::Proc.new { |_c_| factory_ }
       end
 
-
       # Return a new FactoryGenerator that calls the given delegate, but
       # modifies the configuration passed to it. You can provide defaults
       # for configuration values not explicitly specified, and you can
       # force certain values to override the given configuration.
 
-      def self.decorate(delegate_, default_config_={}, force_config_={})
-        ::Proc.new{ |c_| delegate_.call(default_config_.merge(c_).merge(force_config_)) }
+      def self.decorate(delegate_, default_config_ = {}, force_config_ = {})
+        ::Proc.new { |c_| delegate_.call(default_config_.merge(c_).merge(force_config_)) }
       end
-
-
     end
-
-
   end
-
 end

data/lib/rgeo/feature/geometry.rb

@@ -5,10 +5,7 @@
 # -----------------------------------------------------------------------------
 
 module RGeo
-
   module Feature
-
-
     # == SFS 1.1 Description
     #
     # Geometry is the root class of the hierarchy. Geometry is an abstract
@@ -81,10 +78,8 @@ module RGeo
     # of equivalence.
 
     module Geometry
-
       extend Type
 
-
       # Returns a factory for creating features related to this one.
       # This does not necessarily need to be the same factory that created
       # this object, but it should create objects that are "compatible"
@@ -96,7 +91,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method Geometry#factory not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # The inherent dimension of this geometric object, which must be less
@@ -112,7 +106,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method Geometry#dimension not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns the instantiable subtype of Geometry of which this
@@ -130,7 +123,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method Geometry#geometry_type not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns the Spatial Reference System ID for this geometric object.
@@ -146,7 +138,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method Geometry#srid not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # The minimum bounding box for this Geometry, returned as a Geometry.
@@ -161,7 +152,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method Geometry#envelope not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Exports this geometric object to a specific Well-known Text
@@ -175,7 +165,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method Geometry#as_text not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Exports this geometric object to a specific Well-known Binary
@@ -189,7 +178,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method Geometry#as_binary not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns true if this geometric object is the empty Geometry. If true,
@@ -205,7 +193,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method Geometry#is_empty? not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns true if this geometric object has no anomalous geometric
@@ -223,7 +210,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method Geometry#is_simple? not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns the closure of the combinatorial boundary of this geometric
@@ -239,7 +225,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method Geometry#boundary not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns true if this geometric object is "spatially equal" to
@@ -255,11 +240,10 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def equals?(another_geometry_)
+      def equals?(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#equals? not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns true if this geometric object is "spatially disjoint" from
@@ -275,11 +259,10 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def disjoint?(another_geometry_)
+      def disjoint?(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#disjoint? not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns true if this geometric object "spatially intersects"
@@ -295,11 +278,10 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def intersects?(another_geometry_)
+      def intersects?(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#intersects? not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns true if this geometric object "spatially touches"
@@ -315,11 +297,10 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def touches?(another_geometry_)
+      def touches?(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#touches? not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns true if this geometric object "spatially crosses"
@@ -335,11 +316,10 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def crosses?(another_geometry_)
+      def crosses?(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#crosses? not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns true if this geometric object is "spatially within"
@@ -355,11 +335,10 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def within?(another_geometry_)
+      def within?(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#within? not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns true if this geometric object "spatially contains"
@@ -375,11 +354,10 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def contains?(another_geometry_)
+      def contains?(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#contains? not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns true if this geometric object "spatially overlaps"
@@ -395,11 +373,10 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def overlaps?(another_geometry_)
+      def overlaps?(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#overlaps? not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns true if this geometric object is spatially related to
@@ -422,18 +399,16 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def relate?(another_geometry_, intersection_pattern_matrix_)
+      def relate?(_another_geometry_, _intersection_pattern_matrix_)
         raise Error::UnsupportedOperation, "Method Geometry#relate not defined."
       end
 
-
       # Deprecated alias of Geometry#relate?
 
       def relate(another_geometry_, intersection_pattern_matrix_)
         relate?(another_geometry_, intersection_pattern_matrix_)
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns the shortest distance between any two Points in the two
@@ -449,11 +424,10 @@ module RGeo
       # this geometry, strictly speaking, the result of measuring the
       # distance between objects from different factories is undefined.
 
-      def distance(another_geometry_)
+      def distance(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#distance not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns a geometric object that represents all Points whose distance
@@ -465,11 +439,10 @@ module RGeo
       #
       # Returns an object that supports the Geometry interface.
 
-      def buffer(distance_)
+      def buffer(_distance_)
         raise Error::UnsupportedOperation, "Method Geometry#buffer not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns a geometric object that represents the convex hull of this
@@ -483,7 +456,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method Geometry#convex_hull not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns a geometric object that represents the Point set
@@ -498,11 +470,10 @@ module RGeo
       # this geometry, strictly speaking, the result of performing
       # operations on objects from different factories is undefined.
 
-      def intersection(another_geometry_)
+      def intersection(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#intersection not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns a geometric object that represents the Point set
@@ -517,11 +488,10 @@ module RGeo
       # this geometry, strictly speaking, the result of performing
       # operations on objects from different factories is undefined.
 
-      def union(another_geometry_)
+      def union(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#union not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns a geometric object that represents the Point set
@@ -536,11 +506,10 @@ module RGeo
       # this geometry, strictly speaking, the result of performing
       # operations on objects from different factories is undefined.
 
-      def difference(another_geometry_)
+      def difference(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#difference not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns a geometric object that represents the Point set symmetric
@@ -555,11 +524,10 @@ module RGeo
       # this geometry, strictly speaking, the result of performing
       # operations on objects from different factories is undefined.
 
-      def sym_difference(another_geometry_)
+      def sym_difference(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#sym_difference not defined."
       end
 
-
       # Returns true if this geometric object is representationally
       # equivalent to the given object.
       #
@@ -568,11 +536,10 @@ module RGeo
       # this geometry, strictly speaking, the result of comparing objects
       # from different factories is undefined.
 
-      def rep_equals?(another_geometry_)
+      def rep_equals?(_another_geometry_)
         raise Error::UnsupportedOperation, "Method Geometry#rep_equals? not defined."
       end
 
-
       # This method should behave almost the same as the rep_equals?
       # method, with two key differences.
       #
@@ -589,7 +556,7 @@ module RGeo
       # objective equivalence.
 
       def eql?(rhs_)
-        if rhs_.kind_of?(::RGeo::Feature::Instance)
+        if rhs_.is_a?(::RGeo::Feature::Instance)
           begin
             rep_equals?(rhs_)
           rescue Error::UnsupportedOperation
@@ -600,7 +567,6 @@ module RGeo
         end
       end
 
-
       # This operator should behave almost the same as the equals? method,
       # with two key differences.
       #
@@ -616,7 +582,7 @@ module RGeo
       # objective equivalence.
 
       def ==(rhs_)
-        if rhs_.kind_of?(::RGeo::Feature::Instance)
+        if rhs_.is_a?(::RGeo::Feature::Instance)
           begin
             equals?(rhs_)
           rescue Error::UnsupportedOperation
@@ -627,7 +593,6 @@ module RGeo
         end
       end
 
-
       # If the given rhs is a geometry object, this operator must behave
       # the same as the difference method. The behavior for other rhs
       # types is not specified; an implementation may choose to provide
@@ -637,7 +602,6 @@ module RGeo
         difference(rhs_)
       end
 
-
       # If the given rhs is a geometry object, this operator must behave
       # the same as the union method. The behavior for other rhs types
       # is not specified; an implementation may choose to provide
@@ -647,7 +611,6 @@ module RGeo
         union(rhs_)
       end
 
-
       # If the given rhs is a geometry object, this operator must behave
       # the same as the intersection method. The behavior for other rhs
       # types is not specified; an implementation may choose to provide
@@ -656,11 +619,6 @@ module RGeo
       def *(rhs_)
         intersection(rhs_)
       end
-
-
     end
-
-
   end
-
 end

data/lib/rgeo/feature/geometry_collection.rb

@@ -5,10 +5,7 @@
 # -----------------------------------------------------------------------------
 
 module RGeo
-
   module Feature
-
-
     # == SFS 1.1 Description
     #
     # A GeometryCollection is a geometric object that is a collection of 1
@@ -31,13 +28,11 @@ module RGeo
     # class method (or === operator) defined in the Type module.
 
     module GeometryCollection
-
       include Geometry
       extend Type
 
       include ::Enumerable
 
-
       # === SFS 1.1 Description
       #
       # Returns the number of geometries in this GeometryCollection.
@@ -50,7 +45,6 @@ module RGeo
         raise Error::UnsupportedOperation, "Method GeometryCollection#num_geometries not defined."
       end
 
-
       # === SFS 1.1 Description
       #
       # Returns the Nth geometry in this GeometryCollection.
@@ -62,18 +56,16 @@ module RGeo
       # Also note that this method is different from GeometryCollection#[]
       # in that it does not support negative indexes.
 
-      def geometry_n(n_)
+      def geometry_n(_n_)
         raise Error::UnsupportedOperation, "Method GeometryCollection#geometry_n not defined."
       end
 
-
       # Alias of the num_geometries method.
 
       def size
         num_geometries
       end
 
-
       # Returns the Nth geometry in this GeometryCollection, or nil if the
       # given N is out of range. N is zero-based.
       #
@@ -84,11 +76,10 @@ module RGeo
       # the same way Ruby's array indexing works. Hence, geometry_n(-1)
       # returns nil, where [-1] returns the last element of the collection.
 
-      def [](n_)
+      def [](_n_)
         raise Error::UnsupportedOperation, "Method GeometryCollection#[] not defined."
       end
 
-
       # Iterates over the geometries of this GeometryCollection.
       #
       # This is not a standard SFS method, but is provided so that a
@@ -96,14 +87,9 @@ module RGeo
       # Note that all GeometryCollection implementations must also
       # include the Enumerable mixin.
 
-      def each(&block_)
+      def each(&_block_)
         raise Error::UnsupportedOperation, "Method GeometryCollection#each not defined."
       end
-
-
     end
-
-
   end
-
 end