rgeo 0.1.19 → 0.1.20

data/lib/rgeo/{impl_helpers → impl_helper}/basic_geometry_collection_methods.rb

@@ -36,7 +36,7 @@
 
 module RGeo
   
-  module ImplHelpers  # :nodoc:
+  module ImplHelper  # :nodoc:
     
     
     module BasicGeometryCollectionMethods  # :nodoc:
@@ -45,9 +45,9 @@ module RGeo
       def initialize(factory_, elements_)
         _set_factory(factory_)
         @elements = elements_.map do |elem_|
-          elem_ = Features.cast(elem_, factory_)
+          elem_ = Feature.cast(elem_, factory_)
           unless elem_
-            raise Errors::InvalidGeometry, "Could not cast #{elem_}"
+            raise Error::InvalidGeometry, "Could not cast #{elem_}"
           end
           elem_
         end
@@ -92,7 +92,7 @@ module RGeo
       
       
       def geometry_type
-        Features::GeometryCollection
+        Feature::GeometryCollection
       end
       
       
@@ -110,9 +110,9 @@ module RGeo
       def initialize(factory_, elements_)
         _set_factory(factory_)
         @elements = elements_.map do |elem_|
-          elem_ = Features.cast(elem_, factory_, Features::LineString, :keep_subtype)
+          elem_ = Feature.cast(elem_, factory_, Feature::LineString, :keep_subtype)
           unless elem_
-            raise Errors::InvalidGeometry, "Could not cast #{elem_}"
+            raise Error::InvalidGeometry, "Could not cast #{elem_}"
           end
           elem_
         end
@@ -121,7 +121,7 @@ module RGeo
       
       
       def geometry_type
-        Features::MultiLineString
+        Feature::MultiLineString
       end
       
       
@@ -166,9 +166,9 @@ module RGeo
       def initialize(factory_, elements_)
         _set_factory(factory_)
         @elements = elements_.map do |elem_|
-          elem_ = Features.cast(elem_, factory_, Features::Point, :keep_subtype)
+          elem_ = Feature.cast(elem_, factory_, Feature::Point, :keep_subtype)
           unless elem_
-            raise Errors::InvalidGeometry, "Could not cast #{elem_}"
+            raise Error::InvalidGeometry, "Could not cast #{elem_}"
           end
           elem_
         end
@@ -177,7 +177,7 @@ module RGeo
       
       
       def geometry_type
-        Features::MultiPoint
+        Feature::MultiPoint
       end
       
       
@@ -195,9 +195,9 @@ module RGeo
       def initialize(factory_, elements_)
         _set_factory(factory_)
         @elements = elements_.map do |elem_|
-          elem_ = Features.cast(elem_, factory_, Features::Polygon, :keep_subtype)
+          elem_ = Feature.cast(elem_, factory_, Feature::Polygon, :keep_subtype)
           unless elem_
-            raise Errors::InvalidGeometry, "Could not cast #{elem_}"
+            raise Error::InvalidGeometry, "Could not cast #{elem_}"
           end
           elem_
         end
@@ -206,7 +206,7 @@ module RGeo
       
       
       def geometry_type
-        Features::MultiPolygon
+        Feature::MultiPolygon
       end
       
       

data/lib/rgeo/{impl_helpers → impl_helper}/basic_geometry_methods.rb

@@ -36,12 +36,12 @@
 
 module RGeo
   
-  module ImplHelpers  # :nodoc:
+  module ImplHelper  # :nodoc:
     
     
     module BasicGeometryMethods  # :nodoc:
       
-      include ::RGeo::Features::Type::Instance
+      include ::RGeo::Feature::Type::Instance
       
       
       def inspect  # :nodoc:

data/lib/rgeo/{impl_helpers → impl_helper}/basic_line_string_methods.rb

@@ -36,7 +36,7 @@
 
 module RGeo
   
-  module ImplHelpers  # :nodoc:
+  module ImplHelper  # :nodoc:
     
     
     module BasicLineStringMethods  # :nodoc:
@@ -45,9 +45,9 @@ module RGeo
       def initialize(factory_, points_)
         _set_factory(factory_)
         @points = points_.map do |elem_|
-          elem_ = Features.cast(elem_, factory_, Features::Point)
+          elem_ = Feature.cast(elem_, factory_, Feature::Point)
           unless elem_
-            raise Errors::InvalidGeometry, "Could not cast #{elem_}"
+            raise Error::InvalidGeometry, "Could not cast #{elem_}"
           end
           elem_
         end
@@ -57,7 +57,7 @@ module RGeo
       
       def _validate_geometry
         if @points.size == 1
-          raise Errors::InvalidGeometry, 'LineString cannot have 1 point'
+          raise Error::InvalidGeometry, 'LineString cannot have 1 point'
         end
       end
       
@@ -92,7 +92,7 @@ module RGeo
       
       
       def geometry_type
-        Features::LineString
+        Feature::LineString
       end
       
       
@@ -141,13 +141,13 @@ module RGeo
       
       def initialize(factory_, start_, end_)
         _set_factory(factory_)
-        cstart_ = Features.cast(start_, factory_, Features::Point)
+        cstart_ = Feature.cast(start_, factory_, Feature::Point)
         unless cstart_
-          raise Errors::InvalidGeometry, "Could not cast start: #{start_}"
+          raise Error::InvalidGeometry, "Could not cast start: #{start_}"
         end
-        cend_ = Features.cast(end_, factory_, Features::Point)
+        cend_ = Feature.cast(end_, factory_, Feature::Point)
         unless cend_
-          raise Errors::InvalidGeometry, "Could not cast end: #{end_}"
+          raise Error::InvalidGeometry, "Could not cast end: #{end_}"
         end
         @points = [cstart_, cend_]
         _validate_geometry
@@ -157,13 +157,13 @@ module RGeo
       def _validate_geometry  # :nodoc:
         super
         if @points.size > 2
-          raise Errors::InvalidGeometry, 'Line must have 0 or 2 points'
+          raise Error::InvalidGeometry, 'Line must have 0 or 2 points'
         end
       end
       
       
       def geometry_type
-        Features::Line
+        Feature::Line
       end
       
       
@@ -178,14 +178,14 @@ module RGeo
         if @points.size > 0
           @points << @points.first if @points.first != @points.last
           if !is_ring?
-            raise Errors::InvalidGeometry, 'LinearRing failed ring test'
+            raise Error::InvalidGeometry, 'LinearRing failed ring test'
           end
         end
       end
       
       
       def geometry_type
-        Features::LinearRing
+        Feature::LinearRing
       end
       
       

data/lib/rgeo/{impl_helpers → impl_helper}/basic_point_methods.rb

@@ -36,7 +36,7 @@
 
 module RGeo
   
-  module ImplHelpers  # :nodoc:
+  module ImplHelper  # :nodoc:
     
     
     module BasicPointMethods  # :nodoc:
@@ -86,7 +86,7 @@ module RGeo
       
       
       def geometry_type
-        Features::Point
+        Feature::Point
       end
       
       
@@ -118,11 +118,11 @@ module RGeo
       def equals?(rhs_)
         return false unless rhs_.is_a?(self.class) && rhs_.factory == self.factory
         case rhs_
-        when Features::Point
+        when Feature::Point
           rhs_.x == @x && rhs_.y == @y
-        when Features::LineString
+        when Feature::LineString
           rhs_.num_points > 0 && rhs_.points.all?{ |elem_| equals?(elem_) }
-        when Features::GeometryCollection
+        when Feature::GeometryCollection
           rhs_.num_geometries > 0 && rhs_.all?{ |elem_| equals?(elem_) }
         else
           false

data/lib/rgeo/{impl_helpers → impl_helper}/basic_polygon_methods.rb

@@ -36,7 +36,7 @@
 
 module RGeo
   
-  module ImplHelpers  # :nodoc:
+  module ImplHelper  # :nodoc:
     
     
     module BasicPolygonMethods  # :nodoc:
@@ -44,14 +44,14 @@ module RGeo
       
       def initialize(factory_, exterior_ring_, interior_rings_)
         _set_factory(factory_)
-        @exterior_ring = Features.cast(exterior_ring_, factory_, Features::LinearRing)
+        @exterior_ring = Feature.cast(exterior_ring_, factory_, Feature::LinearRing)
         unless @exterior_ring
-          raise Errors::InvalidGeometry, "Failed to cast exterior ring #{exterior_ring_}"
+          raise Error::InvalidGeometry, "Failed to cast exterior ring #{exterior_ring_}"
         end
         @interior_rings = (interior_rings_ || []).map do |elem_|
-          elem_ = Features.cast(elem_, factory_, Features::LinearRing)
+          elem_ = Feature.cast(elem_, factory_, Feature::LinearRing)
           unless elem_
-            raise Errors::InvalidGeometry, "Could not cast interior ring #{elem_}"
+            raise Error::InvalidGeometry, "Could not cast interior ring #{elem_}"
           end
           elem_
         end
@@ -94,7 +94,7 @@ module RGeo
       
       
       def geometry_type
-        Features::Polygon
+        Feature::Polygon
       end
       
       

data/lib/rgeo/{impl_helpers → impl_helper}/math.rb

@@ -36,7 +36,7 @@
 
 module RGeo
   
-  module ImplHelpers  # :nodoc:
+  module ImplHelper  # :nodoc:
     
     module Math  # :nodoc:
       

data/lib/rgeo/shapefile.rb

@@ -54,7 +54,7 @@ end
 
 
 # Dependency files
-require 'rgeo/features'
+require 'rgeo/feature'
 
 # Implementation files
 require 'rgeo/shapefile/reader'

data/lib/rgeo/shapefile/reader.rb

@@ -163,7 +163,7 @@ module RGeo
       #   srid and dimension settings in the input. The factory generator
       #   should understand the configuration options
       #   <tt>:support_z_coordinate</tt> and <tt>:support_m_coordinate</tt>.
-      #   See RGeo::Features::FactoryGenerator for more information.
+      #   See RGeo::Feature::FactoryGenerator for more information.
       #   If no generator is provided, the <tt>:default_factory</tt> is
       #   used.
       # <tt>:srid</tt>::
@@ -611,7 +611,7 @@ module RGeo
         unless @assume_inner_follows_outer
           geos_factory_ = Geos.factory
           unless geos_factory_
-            raise Errors::RGeoError, "GEOS is not available, but is required for correct interpretation of polygons in shapefiles."
+            raise Error::RGeoError, "GEOS is not available, but is required for correct interpretation of polygons in shapefiles."
           end
         end
         
@@ -763,7 +763,7 @@ module RGeo
         unless @assume_inner_follows_outer
           geos_factory_ = Geos.factory
           unless geos_factory_
-            raise Errors::RGeoError, "GEOS is not available, but is required for correct interpretation of polygons in shapefiles."
+            raise Error::RGeoError, "GEOS is not available, but is required for correct interpretation of polygons in shapefiles."
           end
         end
         

data/lib/rgeo/wkrep.rb

@@ -70,7 +70,7 @@ end
 
 
 # Dependency files
-require 'rgeo/features'
+require 'rgeo/feature'
 
 # Implementation files
 require 'rgeo/wkrep/wkt_parser'

data/lib/rgeo/wkrep/wkb_generator.rb

@@ -76,15 +76,15 @@ module RGeo
       
       # :stopdoc:
       TYPE_CODES = {
-        Features::Point => 1,
-        Features::LineString => 2,
-        Features::LinearRing => 2,
-        Features::Line => 2,
-        Features::Polygon => 3,
-        Features::MultiPoint => 4,
-        Features::MultiLineString => 5,
-        Features::MultiPolygon => 6,
-        Features::GeometryCollection => 7,
+        Feature::Point => 1,
+        Feature::LineString => 2,
+        Feature::LinearRing => 2,
+        Feature::Line => 2,
+        Feature::Polygon => 3,
+        Feature::MultiPoint => 4,
+        Feature::MultiLineString => 5,
+        Feature::MultiPolygon => 6,
+        Feature::GeometryCollection => 7,
       }
       # :startdoc:
       
@@ -170,7 +170,7 @@ module RGeo
         type_ = obj_.geometry_type
         type_code_ = TYPE_CODES[type_]
         unless type_code_
-          raise Errors::ParseError, "Unrecognized Geometry Type: #{type_}"
+          raise Error::ParseError, "Unrecognized Geometry Type: #{type_}"
         end
         emit_srid_ = false
         if @type_format == :ewkb
@@ -186,11 +186,11 @@ module RGeo
         end
         _emit_integer(type_code_)
         _emit_integer(obj_.srid) if emit_srid_
-        if type_ == Features::Point
+        if type_ == Feature::Point
           _emit_doubles(_point_coords(obj_))
-        elsif type_.subtype_of?(Features::LineString)
+        elsif type_.subtype_of?(Feature::LineString)
           _emit_line_string_coords(obj_)
-        elsif type_ == Features::Polygon
+        elsif type_ == Feature::Polygon
           exterior_ring_ = obj_.exterior_ring
           if exterior_ring_.is_empty?
             _emit_integer(0)
@@ -199,16 +199,16 @@ module RGeo
             _emit_line_string_coords(exterior_ring_)
             obj_.interior_rings.each{ |r_| _emit_line_string_coords(r_) }
           end
-        elsif type_ == Features::GeometryCollection
+        elsif type_ == Feature::GeometryCollection
           _emit_integer(obj_.num_geometries)
           obj_.each{ |g_| _generate_feature(g_) }
-        elsif type_ == Features::MultiPoint
+        elsif type_ == Feature::MultiPoint
           _emit_integer(obj_.num_geometries)
           obj_.each{ |g_| _generate_feature(g_) }
-        elsif type_ == Features::MultiLineString
+        elsif type_ == Feature::MultiLineString
           _emit_integer(obj_.num_geometries)
           obj_.each{ |g_| _generate_feature(g_) }
-        elsif type_ == Features::MultiPolygon
+        elsif type_ == Feature::MultiPolygon
           _emit_integer(obj_.num_geometries)
           obj_.each{ |g_| _generate_feature(g_) }
         end

data/lib/rgeo/wkrep/wkb_parser.rb

@@ -61,7 +61,7 @@ module RGeo
     #   srid and dimension settings in the input. The factory generator
     #   should understand the configuration options <tt>:srid</tt>,
     #   <tt>:support_z_coordinate</tt>, and <tt>:support_m_coordinate</tt>.
-    #   See RGeo::Features::FactoryGenerator for more information.
+    #   See RGeo::Feature::FactoryGenerator for more information.
     #   If no generator is provided, the <tt>:default_factory</tt> is
     #   used.
     # <tt>:support_ewkb</tt>::
@@ -174,7 +174,7 @@ module RGeo
           unless @ignore_extra_bytes
             bytes_ = _bytes_remaining
             if bytes_ > 0
-              raise Errors::ParseError, "Found #{bytes_} extra bytes at the end of the stream."
+              raise Error::ParseError, "Found #{bytes_} extra bytes at the end of the stream."
             end
           end
         ensure
@@ -203,16 +203,16 @@ module RGeo
         end
         if contained_
           if contained_ != true && contained_ != type_code_
-            raise Errors::ParseError, "Enclosed type=#{type_code_} is different from container constraint #{contained_}"
+            raise Error::ParseError, "Enclosed type=#{type_code_} is different from container constraint #{contained_}"
           end
           if has_z_ != @cur_has_z
-            raise Errors::ParseError, "Enclosed hasZ=#{has_z_} is different from toplevel hasZ=#{@cur_has_z}"
+            raise Error::ParseError, "Enclosed hasZ=#{has_z_} is different from toplevel hasZ=#{@cur_has_z}"
           end
           if has_m_ != @cur_has_m
-            raise Errors::ParseError, "Enclosed hasM=#{has_m_} is different from toplevel hasM=#{@cur_has_m}"
+            raise Error::ParseError, "Enclosed hasM=#{has_m_} is different from toplevel hasM=#{@cur_has_m}"
           end
           if srid_ && srid_ != @cur_srid
-            raise Errors::ParseError, "Enclosed SRID #{srid_} is different from toplevel srid #{@cur_srid || '(unspecified)'}"
+            raise Error::ParseError, "Enclosed SRID #{srid_} is different from toplevel srid #{@cur_srid || '(unspecified)'}"
           end
         else
           @cur_has_z = has_z_
@@ -223,10 +223,10 @@ module RGeo
             @cur_factory = @factory_generator.call(:srid => @cur_srid, :support_z_coordinate => has_z_, :support_m_coordinate => has_m_)
           end
           if @cur_has_z && !@cur_factory.has_capability?(:z_coordinate)
-            raise Errors::ParseError, "Data has Z coordinates but the factory doesn't have z_coordinate capability"
+            raise Error::ParseError, "Data has Z coordinates but the factory doesn't have z_coordinate capability"
           end
           if @cur_has_m && !@cur_factory.has_capability?(:m_coordinate)
-            raise Errors::ParseError, "Data has M coordinates but the factory doesn't have m_coordinate capability"
+            raise Error::ParseError, "Data has M coordinates but the factory doesn't have m_coordinate capability"
           end
         end
         case type_code_
@@ -248,7 +248,7 @@ module RGeo
         when 7
           @cur_factory.collection((1.._get_integer(little_endian_)).map{ _parse_object(true) })
         else
-          raise Errors::ParseError, "Unknown type value: #{type_code_}."
+          raise Error::ParseError, "Unknown type value: #{type_code_}."
         end
       end
       
@@ -279,7 +279,7 @@ module RGeo
       
       def _get_byte  # :nodoc:
         if @_pos + 1 > @_len
-          raise Errors::ParseError, "Not enough bytes left to fulfill 1 byte"
+          raise Error::ParseError, "Not enough bytes left to fulfill 1 byte"
         end
         str_ = @_data[@_pos, 1]
         @_pos += 1
@@ -289,7 +289,7 @@ module RGeo
       
       def _get_integer(little_endian_)  # :nodoc:
         if @_pos + 4 > @_len
-          raise Errors::ParseError, "Not enough bytes left to fulfill 1 integer"
+          raise Error::ParseError, "Not enough bytes left to fulfill 1 integer"
         end
         str_ = @_data[@_pos, 4]
         @_pos += 4
@@ -300,7 +300,7 @@ module RGeo
       def _get_doubles(little_endian_, count_)  # :nodoc:
         len_ = 8 * count_
         if @_pos + len_ > @_len
-          raise Errors::ParseError, "Not enough bytes left to fulfill #{count_} doubles"
+          raise Error::ParseError, "Not enough bytes left to fulfill #{count_} doubles"
         end
         str_ = @_data[@_pos, len_]
         @_pos += len_