rgeo 0.1.19 → 0.1.20

data/lib/rgeo/geography/{simple_spherical/calculations.rb → spherical_math.rb}

@@ -38,15 +38,15 @@ module RGeo
   
   module Geography
     
-    module SimpleSpherical  # :nodoc:
+    module SphericalMath  # :nodoc:
       
       
-      RADIUS = 6371007.2
+      RADIUS = 6378137.0
       
       
-      # Represents a point on the sphere in (x,y,z) coordinates instead
-      # of lat-lon. This form is often faster, more convenient, and more
-      # numerically stable for certain computations.
+      # Represents a point on the unit sphere in (x,y,z) coordinates
+      # instead of lat-lon. This form is often faster, more convenient,
+      # and more numerically stable for certain computations.
       # 
       # The coordinate system is a right-handed system where the z-axis
       # goes through the north pole, the x-axis goes through the prime
@@ -85,7 +85,7 @@ module RGeo
         def latlon
           lat_rad_ = ::Math.asin(@z)
           lon_rad_ = ::Math.atan2(@y, @x) rescue 0.0
-          rpd_ = ::RGeo::ImplHelpers::Math::RADIANS_PER_DEGREE
+          rpd_ = ImplHelper::Math::RADIANS_PER_DEGREE
           [lat_rad_ / rpd_, lon_rad_ / rpd_]
         end
         
@@ -120,7 +120,7 @@ module RGeo
         
         
         def self.from_latlon(lat_, lon_)
-          rpd_ = ::RGeo::ImplHelpers::Math::RADIANS_PER_DEGREE
+          rpd_ = ImplHelper::Math::RADIANS_PER_DEGREE
           lat_rad_ = rpd_ * lat_
           lon_rad_ = rpd_ * lon_
           z_ = ::Math.sin(lat_rad_)

data/lib/rgeo/geos.rb

@@ -66,7 +66,7 @@ end
 
 
 # Dependency files
-require 'rgeo/features'
+require 'rgeo/feature'
 
 # Implementation files
 require 'rgeo/geos/factory'

data/lib/rgeo/geos/factory.rb

@@ -39,12 +39,12 @@ module RGeo
   module Geos
     
     
-    # This the GEOS implementation of ::RGeo::Features::Factory.
+    # This the GEOS implementation of ::RGeo::Feature::Factory.
     
     class Factory
       
       
-      include Features::Factory::Instance
+      include Feature::Factory::Instance
       
       
       class << self
@@ -62,11 +62,20 @@ module RGeo
           flags_ |= 2 if opts_[:support_z_coordinate]
           flags_ |= 4 if opts_[:support_m_coordinate]
           if flags_ & 6 == 6
-            raise Errors::UnsupportedCapability, "GEOS cannot support both Z and M coordinates at the same time."
+            raise Error::UnsupportedCapability, "GEOS cannot support both Z and M coordinates at the same time."
           end
           buffer_resolution_ = opts_[:buffer_resolution].to_i
           buffer_resolution_ = 1 if buffer_resolution_ < 1
+          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
           result_ = _create(flags_, opts_[:srid].to_i, buffer_resolution_)
+          result_.instance_variable_set(:@proj4, proj4_)
           result_
         end
         alias_method :new, :create
@@ -110,7 +119,7 @@ module RGeo
       end
       
       
-      # See ::RGeo::Features::Factory#has_capability?
+      # See ::RGeo::Feature::Factory#has_capability?
       
       def has_capability?(name_)
         case name_
@@ -118,27 +127,29 @@ module RGeo
           _flags & 0x2 != 0
         when :m_coordinate
           _flags & 0x4 != 0
+        when :proj4
+          !@proj4.nil?
         else
           nil
         end
       end
       
       
-      # See ::RGeo::Features::Factory#parse_wkt
+      # See ::RGeo::Feature::Factory#parse_wkt
       
       def parse_wkt(str_)
         _parse_wkt_impl(str_)
       end
       
       
-      # See ::RGeo::Features::Factory#parse_wkb
+      # See ::RGeo::Feature::Factory#parse_wkb
       
       def parse_wkb(str_)
         _parse_wkb_impl(str_)
       end
       
       
-      # See ::RGeo::Features::Factory#point
+      # See ::RGeo::Feature::Factory#point
       
       def point(x_, y_, *extra_)
         if extra_.length > (_flags & 6 == 0 ? 0 : 1)
@@ -149,7 +160,7 @@ module RGeo
       end
       
       
-      # See ::RGeo::Features::Factory#line_string
+      # See ::RGeo::Feature::Factory#line_string
       
       def line_string(points_)
         points_ = points_.to_a unless points_.kind_of?(::Array)
@@ -157,14 +168,14 @@ module RGeo
       end
       
       
-      # See ::RGeo::Features::Factory#line
+      # See ::RGeo::Feature::Factory#line
       
       def line(start_, end_)
         LineImpl.create(self, start_, end_) rescue nil
       end
       
       
-      # See ::RGeo::Features::Factory#linear_ring
+      # See ::RGeo::Feature::Factory#linear_ring
       
       def linear_ring(points_)
         points_ = points_.to_a unless points_.kind_of?(::Array)
@@ -172,7 +183,7 @@ module RGeo
       end
       
       
-      # See ::RGeo::Features::Factory#polygon
+      # See ::RGeo::Feature::Factory#polygon
       
       def polygon(outer_ring_, inner_rings_=nil)
         inner_rings_ = inner_rings_.to_a unless inner_rings_.kind_of?(::Array)
@@ -180,7 +191,7 @@ module RGeo
       end
       
       
-      # See ::RGeo::Features::Factory#collection
+      # See ::RGeo::Feature::Factory#collection
       
       def collection(elems_)
         elems_ = elems_.to_a unless elems_.kind_of?(::Array)
@@ -188,7 +199,7 @@ module RGeo
       end
       
       
-      # See ::RGeo::Features::Factory#multi_point
+      # See ::RGeo::Feature::Factory#multi_point
       
       def multi_point(elems_)
         elems_ = elems_.to_a unless elems_.kind_of?(::Array)
@@ -196,7 +207,7 @@ module RGeo
       end
       
       
-      # See ::RGeo::Features::Factory#multi_line_string
+      # See ::RGeo::Feature::Factory#multi_line_string
       
       def multi_line_string(elems_)
         elems_ = elems_.to_a unless elems_.kind_of?(::Array)
@@ -204,7 +215,7 @@ module RGeo
       end
       
       
-      # See ::RGeo::Features::Factory#multi_polygon
+      # See ::RGeo::Feature::Factory#multi_polygon
       
       def multi_polygon(elems_)
         elems_ = elems_.to_a unless elems_.kind_of?(::Array)
@@ -212,7 +223,7 @@ module RGeo
       end
       
       
-      # See ::RGeo::Features::Factory#override_cast
+      # See ::RGeo::Feature::Factory#override_cast
       
       def override_cast(original_, ntype_, flags_)
         return nil unless Geos.supported?
@@ -234,7 +245,7 @@ module RGeo
           # LineString conversion optimization.
           if (original_.factory != self || ntype_ != type_) &&
               original_.factory._flags & 0x6 == _flags & 0x6 &&
-              type_.subtype_of?(Features::LineString) && ntype_.subtype_of?(Features::LineString)
+              type_.subtype_of?(Feature::LineString) && ntype_.subtype_of?(Feature::LineString)
           then
             return IMPL_CLASSES[ntype_]._copy_from(self, original_)
           end
@@ -242,15 +253,22 @@ module RGeo
           # Optimization for just removing a coordinate from an otherwise
           # compatible factory
           if _flags & 0x6 == 0x2 && self == original_.factory.z_factory
-            return Features.cast(original_.z_geometry, ntype_, flags_)
+            return Feature.cast(original_.z_geometry, ntype_, flags_)
           elsif _flags & 0x6 == 0x4 && self == original_.factory.m_factory
-            return Features.cast(original_.m_geometry, ntype_, flags_)
+            return Feature.cast(original_.m_geometry, ntype_, flags_)
           end
         end
         false
       end
       
       
+      # See ::RGeo::Feature::Factory#proj4
+      
+      def proj4
+        @proj4
+      end
+      
+      
     end
     
     

data/lib/rgeo/geos/impl_additions.rb

@@ -23,8 +23,7 @@
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
@@ -41,7 +40,7 @@ module RGeo
     
     class GeometryImpl  # :nodoc:
       
-      include ::RGeo::Features::Type::Instance
+      include ::RGeo::Feature::Type::Instance
       
       def inspect
         "#<#{self.class}:0x#{object_id.to_s(16)} #{as_text.inspect}>"
@@ -55,14 +54,14 @@ module RGeo
       
       # :stopdoc:
       IMPL_CLASSES = {
-        Features::Point => PointImpl,
-        Features::LineString => LineStringImpl,
-        Features::LinearRing => LinearRingImpl,
-        Features::Line => LineImpl,
-        Features::GeometryCollection => GeometryCollectionImpl,
-        Features::MultiPoint => MultiPointImpl,
-        Features::MultiLineString => MultiLineStringImpl,
-        Features::MultiPolygon => MultiPolygonImpl,
+        Feature::Point => PointImpl,
+        Feature::LineString => LineStringImpl,
+        Feature::LinearRing => LinearRingImpl,
+        Feature::Line => LineImpl,
+        Feature::GeometryCollection => GeometryCollectionImpl,
+        Feature::MultiPoint => MultiPointImpl,
+        Feature::MultiLineString => MultiLineStringImpl,
+        Feature::MultiPolygon => MultiPolygonImpl,
       }
       # :startdoc:
       

data/lib/rgeo/geos/interface.rb

@@ -75,7 +75,7 @@ module RGeo
       #   If set to true, assertion checking on MultiPolygon is disabled.
       #   This may speed up creation of MultiPolygon objects, at the
       #   expense of not doing the proper checking for OGC MultiPolygon
-      #   compliance. See RGeo::Features::MultiPolygon for details on
+      #   compliance. See RGeo::Feature::MultiPolygon for details on
       #   the MultiPolygon assertions. Default is false.
       # <tt>:buffer_resolution</tt>::
       #   The resolution of buffers around geometries created by this

data/lib/rgeo/geos/zm_factory.rb

@@ -43,7 +43,7 @@ module RGeo
     
     class ZMFactory
       
-      include Features::Factory::Instance
+      include Feature::Factory::Instance
       
       
       class << self
@@ -111,7 +111,7 @@ module RGeo
       alias_method :==, :eql?
       
       
-      # See ::RGeo::Features::Factory#has_capability?
+      # See ::RGeo::Feature::Factory#has_capability?
       
       def has_capability?(name_)
         case name_
@@ -123,84 +123,84 @@ module RGeo
       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_, z_=0, m_=0)
         ZMPointImpl.create(self, @zfactory.point(x_, y_, z_), @mfactory.point(x_, y_, m_))
       end
       
       
-      # See ::RGeo::Features::Factory#line_string
+      # See ::RGeo::Feature::Factory#line_string
       
       def line_string(points_)
         ZMLineStringImpl.create(self, @zfactory.line_string(points_), @mfactory.line_string(points_))
       end
       
       
-      # See ::RGeo::Features::Factory#line
+      # See ::RGeo::Feature::Factory#line
       
       def line(start_, end_)
         ZMLineStringImpl.create(self, @zfactory.line(start_, end_), @mfactory.line(start_, end_))
       end
       
       
-      # See ::RGeo::Features::Factory#linear_ring
+      # See ::RGeo::Feature::Factory#linear_ring
       
       def linear_ring(points_)
         ZMLineStringImpl.create(self, @zfactory.linear_ring(points_), @mfactory.linear_ring(points_))
       end
       
       
-      # See ::RGeo::Features::Factory#polygon
+      # See ::RGeo::Feature::Factory#polygon
       
       def polygon(outer_ring_, inner_rings_=nil)
         ZMPolygonImpl.create(self, @zfactory.polygon(outer_ring_, inner_rings_), @mfactory.polygon(outer_ring_, inner_rings_))
       end
       
       
-      # See ::RGeo::Features::Factory#collection
+      # See ::RGeo::Feature::Factory#collection
       
       def collection(elems_)
         ZMGeometryCollectionImpl.create(self, @zfactory.collection(elems_), @mfactory.collection(elems_))
       end
       
       
-      # See ::RGeo::Features::Factory#multi_point
+      # See ::RGeo::Feature::Factory#multi_point
       
       def multi_point(elems_)
         ZMGeometryCollectionImpl.create(self, @zfactory.multi_point(elems_), @mfactory.multi_point(elems_))
       end
       
       
-      # See ::RGeo::Features::Factory#multi_line_string
+      # See ::RGeo::Feature::Factory#multi_line_string
       
       def multi_line_string(elems_)
         ZMMultiLineStringImpl.create(self, @zfactory.multi_line_string(elems_), @mfactory.multi_line_string(elems_))
       end
       
       
-      # See ::RGeo::Features::Factory#multi_polygon
+      # See ::RGeo::Feature::Factory#multi_polygon
       
       def multi_polygon(elems_)
         ZMMultiPolygonImpl.create(self, @zfactory.multi_polygon(elems_), @mfactory.multi_polygon(elems_))
       end
       
       
-      # See ::RGeo::Features::Factory#override_cast
+      # See ::RGeo::Feature::Factory#override_cast
       
       def override_cast(original_, ntype_, flags_)
         return nil unless Geos.supported?
@@ -221,7 +221,7 @@ module RGeo
           end
           # LineString conversion optimization.
           if (original_.factory != self || ntype_ != type_) &&
-              type_.subtype_of?(Features::LineString) && ntype_.subtype_of?(Features:LineString)
+              type_.subtype_of?(Feature::LineString) && ntype_.subtype_of?(Feature::LineString)
           then
             klass_ = Factory::IMPL_CLASSES[ntype_]
             zresult_ = klass_._copy_from(@zfactory, original_.z_geometry)

data/lib/rgeo/geos/zm_impl.rb

@@ -41,7 +41,7 @@ module RGeo
     
     class ZMGeometryImpl  # :nodoc:
       
-      include Features::Type::Instance
+      include Feature::Type::Instance
       
       
       def initialize(factory_, zgeometry_, mgeometry_)
@@ -406,15 +406,15 @@ module RGeo
     class ZMGeometryImpl  # :nodoc:
       
       TYPE_KLASSES = {
-        Features::Point => ZMPointImpl,
-        Features::LineString => ZMLineStringImpl,
-        Features::Line => ZMLineStringImpl,
-        Features::LinearRing => ZMLineStringImpl,
-        Features::Polygon => ZMPolygonImpl,
-        Features::GeometryCollection => ZMGeometryCollectionImpl,
-        Features::MultiPoint => ZMGeometryCollectionImpl,
-        Features::MultiLineString => ZMMultiLineStringImpl,
-        Features::MultiPolygon => ZMMultiPolygonImpl,
+        Feature::Point => ZMPointImpl,
+        Feature::LineString => ZMLineStringImpl,
+        Feature::Line => ZMLineStringImpl,
+        Feature::LinearRing => ZMLineStringImpl,
+        Feature::Polygon => ZMPolygonImpl,
+        Feature::GeometryCollection => ZMGeometryCollectionImpl,
+        Feature::MultiPoint => ZMGeometryCollectionImpl,
+        Feature::MultiLineString => ZMMultiLineStringImpl,
+        Feature::MultiPolygon => ZMMultiPolygonImpl,
       }
       
       

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

@@ -41,7 +41,7 @@ require 'rgeo'
 module RGeo
   
   
-  module ImplHelpers  # :nodoc:
+  module ImplHelper  # :nodoc:
   end
   
   
@@ -49,12 +49,12 @@ end
 
 
 # Dependency files
-require 'rgeo/features'
+require 'rgeo/feature'
 
 # Implementation files
-require 'rgeo/impl_helpers/math'
-require 'rgeo/impl_helpers/basic_geometry_methods'
-require 'rgeo/impl_helpers/basic_geometry_collection_methods'
-require 'rgeo/impl_helpers/basic_point_methods'
-require 'rgeo/impl_helpers/basic_line_string_methods'
-require 'rgeo/impl_helpers/basic_polygon_methods'
+require 'rgeo/impl_helper/math'
+require 'rgeo/impl_helper/basic_geometry_methods'
+require 'rgeo/impl_helper/basic_geometry_collection_methods'
+require 'rgeo/impl_helper/basic_point_methods'
+require 'rgeo/impl_helper/basic_line_string_methods'
+require 'rgeo/impl_helper/basic_polygon_methods'