rgeo 0.1.19 → 0.1.20

data/lib/rgeo/active_record/arel_modifications.rb

@@ -58,12 +58,12 @@ module Arel
     
     class Dot
       alias :visit_Arel_Attributes_Geometry :visit_Arel_Attribute
-      alias :visit_RGeo_Features_Geometry :visit_String
+      alias :visit_RGeo_Feature_Geometry :visit_String
     end
     
     class ToSql
       alias :visit_Arel_Attributes_Geometry :visit_Arel_Attributes_Attribute
-      alias :visit_RGeo_Features_Geometry :visit_String
+      alias :visit_RGeo_Feature_Geometry :visit_String
     end
     
     VISITORS['postgis'] = ::Arel::Visitors::PostgreSQL

data/lib/rgeo/active_record/base_modifications.rb

@@ -50,7 +50,7 @@ module ActiveRecord
   # 
   # === ActiveRecord::Base::rgeo_factory_generator
   # 
-  # The value of this attribute is a RGeo::Features::FactoryGenerator
+  # The value of this attribute is a RGeo::Feature::FactoryGenerator
   # that is used to generate the proper factory when loading geometry
   # objects from the database. For example, if the data being loaded
   # has M but not Z coordinates, and an embedded SRID, then this

data/lib/rgeo/active_record/mysql_common.rb

@@ -34,7 +34,7 @@
 ;
 
 
-require 'rgeo/features'
+require 'rgeo/feature'
 require 'rgeo/cartesian'
 require 'rgeo/wkrep'
 require 'rgeo/active_record/common'
@@ -52,7 +52,7 @@ module RGeo
         
         
         def quote(value_, column_=nil)
-          if ::RGeo::Features::Geometry.check_type(value_)
+          if ::RGeo::Feature::Geometry.check_type(value_)
             "GeomFromWKB(0x#{::RGeo::WKRep::WKBGenerator.new(:hex_format => true).generate(value_)},#{value_.srid})"
           else
             super
@@ -104,7 +104,7 @@ module RGeo
         
         
         def klass
-          type == :geometry ? ::RGeo::Features::Geometry : super
+          type == :geometry ? ::RGeo::Feature::Geometry : super
         end
         
         
@@ -122,14 +122,14 @@ module RGeo
         
         def extract_geometric_type(sql_type_)
           case sql_type_
-          when /^geometry$/i then ::RGeo::Features::Geometry
-          when /^point$/i then ::RGeo::Features::Point
-          when /^linestring$/i then ::RGeo::Features::LineString
-          when /^polygon$/i then ::RGeo::Features::Polygon
-          when /^geometrycollection$/i then ::RGeo::Features::GeometryCollection
-          when /^multipoint$/i then ::RGeo::Features::MultiPoint
-          when /^multilinestring$/i then ::RGeo::Features::MultiLineString
-          when /^multipolygon$/i then ::RGeo::Features::MultiPolygon
+          when /^geometry$/i then ::RGeo::Feature::Geometry
+          when /^point$/i then ::RGeo::Feature::Point
+          when /^linestring$/i then ::RGeo::Feature::LineString
+          when /^polygon$/i then ::RGeo::Feature::Polygon
+          when /^geometrycollection$/i then ::RGeo::Feature::GeometryCollection
+          when /^multipoint$/i then ::RGeo::Feature::MultiPoint
+          when /^multilinestring$/i then ::RGeo::Feature::MultiLineString
+          when /^multipolygon$/i then ::RGeo::Feature::MultiPolygon
           else nil
           end
         end
@@ -142,7 +142,7 @@ module RGeo
         
         def self.string_to_geometry(str_, ar_class_)
           case str_
-          when ::RGeo::Features::Geometry
+          when ::RGeo::Feature::Geometry
             str_
           when ::String
             marker_ = str_[4,1]

data/lib/rgeo/all.rb

@@ -38,11 +38,12 @@
 require 'rgeo'
 
 # Implementation files
-require 'rgeo/errors'
-require 'rgeo/features'
-require 'rgeo/impl_helpers'
+require 'rgeo/error'
+require 'rgeo/feature'
+require 'rgeo/impl_helper'
 require 'rgeo/wkrep'
 require 'rgeo/geos'
 require 'rgeo/cartesian'
-require 'rgeo/geography/all'
+require 'rgeo/geography'
 require 'rgeo/geo_json'
+require 'rgeo/shapefile'

data/lib/rgeo/cartesian.rb

@@ -55,9 +55,10 @@ end
 
 
 # Dependency files.
-require 'rgeo/features'
+require 'rgeo/feature'
+require 'rgeo/geos'
 require 'rgeo/wkrep'
-require 'rgeo/impl_helpers'
+require 'rgeo/impl_helper'
 
 # Implementation files.
 require 'rgeo/cartesian/calculations'

data/lib/rgeo/cartesian/bounding_box.rb

@@ -212,7 +212,7 @@ module RGeo
         when BoundingBox
           add(geometry_.min_point)
           add(geometry_.max_point)
-        when Features::Geometry
+        when Feature::Geometry
           if geometry_.factory == @factory
             _add_geometry(geometry_)
           else
@@ -264,7 +264,7 @@ module RGeo
       #   have M. Default is false.
       
       def contains?(rhs_, opts_={})
-        if Features::Geometry === rhs_
+        if Feature::Geometry === rhs_
           contains?(BoundingBox.new(@factory).add(rhs_))
         elsif rhs_.empty?
           true
@@ -284,19 +284,19 @@ module RGeo
       
       def _add_geometry(geometry_)  # :nodoc:
         case geometry_
-        when Features::Point
+        when Feature::Point
           _add_point(geometry_)
-        when Features::LineString
+        when Feature::LineString
           geometry_.points.each{ |p_| _add_point(p_) }
-        when Features::Polygon
+        when Feature::Polygon
           geometry_.exterior_ring.points.each{ |p_| _add_point(p_) }
-        when Features::MultiPoint
+        when Feature::MultiPoint
           geometry_.each{ |p_| _add_point(p_) }
-        when Features::MultiLineString
+        when Feature::MultiLineString
           geometry_.each{ |line_| line_.points.each{ |p_| _add_point(p_) } }
-        when Features::MultiPolygon
+        when Feature::MultiPolygon
           geometry_.each{ |poly_| poly_.exterior_ring.points.each{ |p_| _add_point(p_) } }
-        when Features::GeometryCollection
+        when Feature::GeometryCollection
           geometry_.each{ |g_| _add_geometry(g_) }
         end
       end

data/lib/rgeo/cartesian/factory.rb

@@ -44,7 +44,7 @@ module RGeo
     
     class Factory
       
-      include Features::Factory::Instance
+      include Feature::Factory::Instance
       
       
       # Create a new simple cartesian factory.
@@ -55,6 +55,14 @@ module RGeo
         @srid = opts_[:srid].to_i
         @support_z = opts_[:support_z_coordinate] ? true : false
         @support_m = opts_[:support_m_coordinate] ? true : false
+        @proj4 = opts_[:proj4]
+        if CoordSys::Proj4.supported?
+          if @proj4.kind_of?(::String) || @proj4.kind_of?(::Hash)
+            @proj4 = CoordSys::Proj4.create(@proj4)
+          end
+        else
+          @proj4 = nil
+        end
       end
       
       
@@ -73,7 +81,7 @@ module RGeo
       end
       
       
-      # See ::RGeo::Features::Factory#has_capability?
+      # See ::RGeo::Feature::Factory#has_capability?
       
       def has_capability?(name_)
         case name_
@@ -81,89 +89,98 @@ module RGeo
           @support_z
         when :m_coordinate
           @support_m
+        when :proj4
+          !@proj4.nil?
         else
           nil
         end
       end
       
       
-      # See ::RGeo::Features::Factory#parse_wkt
+      # See ::RGeo::Feature::Factory#parse_wkt
       
       def parse_wkt(str_)
         WKRep::WKTParser.new(:default_factory => self).parse(str_)
       end
       
       
-      # See ::RGeo::Features::Factory#parse_wkb
+      # See ::RGeo::Feature::Factory#parse_wkb
       
       def parse_wkb(str_)
         WKRep::WKBParser.new(:default_factory => self).parse(str_)
       end
       
       
-      # See ::RGeo::Features::Factory#point
+      # See ::RGeo::Feature::Factory#point
       
       def point(x_, y_, *extra_)
         PointImpl.new(self, x_, y_, *extra_) rescue nil
       end
       
       
-      # See ::RGeo::Features::Factory#line_string
+      # See ::RGeo::Feature::Factory#line_string
       
       def line_string(points_)
         LineStringImpl.new(self, points_) rescue nil
       end
       
       
-      # See ::RGeo::Features::Factory#line
+      # See ::RGeo::Feature::Factory#line
       
       def line(start_, end_)
         LineImpl.new(self, start_, end_) rescue nil
       end
       
       
-      # See ::RGeo::Features::Factory#linear_ring
+      # See ::RGeo::Feature::Factory#linear_ring
       
       def linear_ring(points_)
         LinearRingImpl.new(self, points_) rescue nil
       end
       
       
-      # See ::RGeo::Features::Factory#polygon
+      # See ::RGeo::Feature::Factory#polygon
       
       def polygon(outer_ring_, inner_rings_=nil)
         PolygonImpl.new(self, outer_ring_, inner_rings_) rescue nil
       end
       
       
-      # See ::RGeo::Features::Factory#collection
+      # See ::RGeo::Feature::Factory#collection
       
       def collection(elems_)
         GeometryCollectionImpl.new(self, elems_) rescue nil
       end
       
       
-      # See ::RGeo::Features::Factory#multi_point
+      # See ::RGeo::Feature::Factory#multi_point
       
       def multi_point(elems_)
         MultiPointImpl.new(self, elems_) rescue nil
       end
       
       
-      # See ::RGeo::Features::Factory#multi_line_string
+      # See ::RGeo::Feature::Factory#multi_line_string
       
       def multi_line_string(elems_)
         MultiLineStringImpl.new(self, elems_) rescue nil
       end
       
       
-      # See ::RGeo::Features::Factory#multi_polygon
+      # See ::RGeo::Feature::Factory#multi_polygon
       
       def multi_polygon(elems_)
         MultiPolygonImpl.new(self, elems_) rescue nil
       end
       
       
+      # See ::RGeo::Feature::Factory#proj4
+      
+      def proj4
+        @proj4
+      end
+      
+      
     end
     
     

data/lib/rgeo/cartesian/feature_classes.rb

@@ -42,14 +42,14 @@ module RGeo
     class PointImpl  # :nodoc:
       
       
-      include ::RGeo::Features::Point
-      include ::RGeo::ImplHelpers::BasicGeometryMethods
-      include ::RGeo::ImplHelpers::BasicPointMethods
+      include ::RGeo::Feature::Point
+      include ::RGeo::ImplHelper::BasicGeometryMethods
+      include ::RGeo::ImplHelper::BasicPointMethods
       include ::RGeo::Cartesian::GeometryMethods
       
       
       def distance(rhs_)
-        rhs_ = ::RGeo::Features.cast(rhs_, @factory)
+        rhs_ = ::RGeo::Feature.cast(rhs_, @factory)
         case rhs_
         when PointImpl
           dx_ = @x - rhs_.x
@@ -67,9 +67,9 @@ module RGeo
     class LineStringImpl  # :nodoc:
       
       
-      include ::RGeo::Features::LineString
-      include ::RGeo::ImplHelpers::BasicGeometryMethods
-      include ::RGeo::ImplHelpers::BasicLineStringMethods
+      include ::RGeo::Feature::LineString
+      include ::RGeo::ImplHelper::BasicGeometryMethods
+      include ::RGeo::ImplHelper::BasicLineStringMethods
       include ::RGeo::Cartesian::GeometryMethods
       include ::RGeo::Cartesian::LineStringMethods
       
@@ -80,10 +80,10 @@ module RGeo
     class LineImpl  # :nodoc:
       
       
-      include ::RGeo::Features::Line
-      include ::RGeo::ImplHelpers::BasicGeometryMethods
-      include ::RGeo::ImplHelpers::BasicLineStringMethods
-      include ::RGeo::ImplHelpers::BasicLineMethods
+      include ::RGeo::Feature::Line
+      include ::RGeo::ImplHelper::BasicGeometryMethods
+      include ::RGeo::ImplHelper::BasicLineStringMethods
+      include ::RGeo::ImplHelper::BasicLineMethods
       include ::RGeo::Cartesian::GeometryMethods
       include ::RGeo::Cartesian::LineStringMethods
       
@@ -94,10 +94,10 @@ module RGeo
     class LinearRingImpl  # :nodoc:
       
       
-      include ::RGeo::Features::Line
-      include ::RGeo::ImplHelpers::BasicGeometryMethods
-      include ::RGeo::ImplHelpers::BasicLineStringMethods
-      include ::RGeo::ImplHelpers::BasicLinearRingMethods
+      include ::RGeo::Feature::Line
+      include ::RGeo::ImplHelper::BasicGeometryMethods
+      include ::RGeo::ImplHelper::BasicLineStringMethods
+      include ::RGeo::ImplHelper::BasicLinearRingMethods
       include ::RGeo::Cartesian::GeometryMethods
       include ::RGeo::Cartesian::LineStringMethods
       
@@ -108,9 +108,9 @@ module RGeo
     class PolygonImpl  # :nodoc:
       
       
-      include ::RGeo::Features::Polygon
-      include ::RGeo::ImplHelpers::BasicGeometryMethods
-      include ::RGeo::ImplHelpers::BasicPolygonMethods
+      include ::RGeo::Feature::Polygon
+      include ::RGeo::ImplHelper::BasicGeometryMethods
+      include ::RGeo::ImplHelper::BasicPolygonMethods
       include ::RGeo::Cartesian::GeometryMethods
       
       
@@ -120,9 +120,9 @@ module RGeo
     class GeometryCollectionImpl  # :nodoc:
       
       
-      include ::RGeo::Features::GeometryCollection
-      include ::RGeo::ImplHelpers::BasicGeometryMethods
-      include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
+      include ::RGeo::Feature::GeometryCollection
+      include ::RGeo::ImplHelper::BasicGeometryMethods
+      include ::RGeo::ImplHelper::BasicGeometryCollectionMethods
       include ::RGeo::Cartesian::GeometryMethods
       
       
@@ -132,10 +132,10 @@ module RGeo
     class MultiPointImpl  # :nodoc:
       
       
-      include ::RGeo::Features::GeometryCollection
-      include ::RGeo::ImplHelpers::BasicGeometryMethods
-      include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
-      include ::RGeo::ImplHelpers::BasicMultiPointMethods
+      include ::RGeo::Feature::GeometryCollection
+      include ::RGeo::ImplHelper::BasicGeometryMethods
+      include ::RGeo::ImplHelper::BasicGeometryCollectionMethods
+      include ::RGeo::ImplHelper::BasicMultiPointMethods
       include ::RGeo::Cartesian::GeometryMethods
       
       
@@ -145,10 +145,10 @@ module RGeo
     class MultiLineStringImpl  # :nodoc:
       
       
-      include ::RGeo::Features::GeometryCollection
-      include ::RGeo::ImplHelpers::BasicGeometryMethods
-      include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
-      include ::RGeo::ImplHelpers::BasicMultiLineStringMethods
+      include ::RGeo::Feature::GeometryCollection
+      include ::RGeo::ImplHelper::BasicGeometryMethods
+      include ::RGeo::ImplHelper::BasicGeometryCollectionMethods
+      include ::RGeo::ImplHelper::BasicMultiLineStringMethods
       include ::RGeo::Cartesian::GeometryMethods
       
       
@@ -158,10 +158,10 @@ module RGeo
     class MultiPolygonImpl  # :nodoc:
       
       
-      include ::RGeo::Features::GeometryCollection
-      include ::RGeo::ImplHelpers::BasicGeometryMethods
-      include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
-      include ::RGeo::ImplHelpers::BasicMultiPolygonMethods
+      include ::RGeo::Feature::GeometryCollection
+      include ::RGeo::ImplHelper::BasicGeometryMethods
+      include ::RGeo::ImplHelper::BasicGeometryCollectionMethods
+      include ::RGeo::ImplHelper::BasicMultiPolygonMethods
       include ::RGeo::Cartesian::GeometryMethods
       
       

data/lib/rgeo/cartesian/interface.rb

@@ -70,9 +70,9 @@ module RGeo
       # thus always available, but it does not implement many of the more
       # advanced geometric operations. These limitations are:
       # 
-      # * Relational operators such as Features::Geometry#intersects? are
+      # * Relational operators such as Feature::Geometry#intersects? are
       #   not implemented for most types.
-      # * Relational constructors such as Features::Geometry#union are
+      # * Relational constructors such as Feature::Geometry#union are
       #   not implemented for most types.
       # * Buffer and convex hull calculations are not implemented for most
       #   types. Boundaries are available except for GeometryCollection.

data/lib/rgeo/{geography/all.rb → coord_sys.rb}

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 # 
-# All files in the Cartesian module for RGeo
+# GEOS wrapper for RGeo
 # 
 # -----------------------------------------------------------------------------
 # Copyright 2010 Daniel Azuma
@@ -34,7 +34,25 @@
 ;
 
 
-require 'rgeo/geography'
+# Parent file
+require 'rgeo'
 
-require 'rgeo/geography/simple_spherical'
-require 'rgeo/geography/simple_mercator'
+
+module RGeo
+  
+  
+  # Coordinate reference systems.
+  
+  module CoordSys
+  end
+  
+  
+end
+
+
+# Dependency files
+require 'rgeo/feature'
+
+# Implementation files
+require 'rgeo/coord_sys/proj4_c_impl'
+require 'rgeo/coord_sys/proj4'