rgeo 0.3.13 → 0.3.14

data/lib/rgeo/geographic/factory.rb

@@ -127,6 +127,11 @@ module RGeo
       alias_method :==, :eql?
 
 
+      def hash
+        @hash ||= [@impl_prefix, @support_z, @support_m, @proj4].hash
+      end
+
+
       # Marshal support
 
       def marshal_dump  # :nodoc:

data/lib/rgeo/geographic/projected_feature_classes.rb

@@ -46,37 +46,7 @@ module RGeo
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicPointMethods
       include ProjectedGeometryMethods
-
-
-      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
-        x_
-      end
-      alias_method :canonical_longitude, :canonical_x
-      alias_method :canonical_lon, :canonical_x
-
-
-      def canonical_point
-        if @x >= -180.0 && @x < 180.0
-          self
-        else
-          PointImpl.new(@factory, canonical_x, @y)
-        end
-      end
-
-
-      alias_method :longitude, :x
-      alias_method :lon, :x
-      alias_method :latitude, :y
-      alias_method :lat, :y
+      include ProjectedPointMethods
 
 
       Feature::MixinCollection::GLOBAL.for_type(Feature::Point).include_in_class(self, true)
@@ -146,14 +116,7 @@ module RGeo
       include ImplHelper::BasicPolygonMethods
       include ProjectedGeometryMethods
       include ProjectedNSurfaceMethods
-
-
-      def _validate_geometry
-        super
-        unless projection
-          raise Error::InvalidGeometry, 'Polygon failed assertions'
-        end
-      end
+      include ProjectedPolygonMethods
 
 
       Feature::MixinCollection::GLOBAL.for_type(Feature::Polygon).include_in_class(self, true)
@@ -219,14 +182,7 @@ module RGeo
       include ImplHelper::BasicMultiPolygonMethods
       include ProjectedGeometryMethods
       include ProjectedNSurfaceMethods
-
-
-      def _validate_geometry
-        super
-        unless projection
-          raise Error::InvalidGeometry, 'MultiPolygon failed assertions'
-        end
-      end
+      include ProjectedMultiPolygonMethods
 
 
       Feature::MixinCollection::GLOBAL.for_type(Feature::MultiPolygon).include_in_class(self, true)

data/lib/rgeo/geographic/projected_feature_methods.rb

@@ -159,6 +159,47 @@ module RGeo
     end
 
 
+    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
+        x_
+      end
+      alias_method :canonical_longitude, :canonical_x
+      alias_method :canonical_lon, :canonical_x
+
+
+      def canonical_point
+        if @x >= -180.0 && @x < 180.0
+          self
+        else
+          PointImpl.new(@factory, canonical_x, @y)
+        end
+      end
+
+
+      def self.included(klass_)
+        klass_.module_eval do
+          alias_method :longitude, :x
+          alias_method :lon, :x
+          alias_method :latitude, :y
+          alias_method :lat, :y
+        end
+      end
+
+
+    end
+
+
     module ProjectedNCurveMethods  # :nodoc:
 
 
@@ -224,6 +265,34 @@ module RGeo
     end
 
 
+    module ProjectedPolygonMethods  # :nodoc:
+
+
+      def _validate_geometry
+        super
+        unless projection
+          raise Error::InvalidGeometry, 'Polygon failed assertions'
+        end
+      end
+
+
+    end
+
+
+    module ProjectedMultiPolygonMethods  # :nodoc:
+
+
+      def _validate_geometry
+        super
+        unless projection
+          raise Error::InvalidGeometry, 'MultiPolygon failed assertions'
+        end
+      end
+
+
+    end
+
+
   end
 
 end

data/lib/rgeo/geographic/spherical_feature_classes.rb

@@ -46,80 +46,7 @@ module RGeo
       include ImplHelper::BasicGeometryMethods
       include ImplHelper::BasicPointMethods
       include SphericalGeometryMethods
-
-
-      def _validate_geometry
-        if @x < -180.0 || @x >= 180.0
-          @x = @x % 360.0
-          @x -= 360.0 if @x >= 180.0
-        end
-        @y = 90.0 if @y > 90.0
-        @y = -90.0 if @y < -90.0
-        super
-      end
-
-
-      def _xyz
-        @xyz ||= SphericalMath::PointXYZ.from_latlon(@y, @x)
-      end
-
-
-      def distance(rhs_)
-        rhs_ = Feature.cast(rhs_, @factory)
-        case rhs_
-        when SphericalPointImpl
-          _xyz.dist_to_point(rhs_._xyz) * SphericalMath::RADIUS
-        else
-          super
-        end
-      end
-
-
-      def equals?(rhs_)
-        return false unless rhs_.is_a?(self.class) && rhs_.factory == self.factory
-        case rhs_
-        when Feature::Point
-          if @y == 90
-            rhs_.y == 90
-          elsif @y == -90
-            rhs_.y == -90
-          else
-            rhs_.x == @x && rhs_.y == @y
-          end
-        when Feature::LineString
-          rhs_.num_points > 0 && rhs_.points.all?{ |elem_| equals?(elem_) }
-        when Feature::GeometryCollection
-          rhs_.num_geometries > 0 && rhs_.all?{ |elem_| equals?(elem_) }
-        else
-          false
-        end
-      end
-
-
-      def buffer(distance_)
-        radius_ = distance_ / SphericalMath::RADIUS
-        radius_ = 1.5 if radius_ > 1.5
-        cos_ = ::Math.cos(radius_)
-        sin_ = ::Math.sin(radius_)
-        point_count_ = factory.property(:buffer_resolution) * 4
-        p0_ = _xyz
-        p1_ = p0_.create_perpendicular
-        p2_ = p1_ % p0_
-        angle_ = ::Math::PI * 2.0 / point_count_
-        points_ = (0...point_count_).map do |i_|
-          r_ = angle_ * i_
-          pi_ = SphericalMath::PointXYZ.weighted_combination(p1_, ::Math.cos(r_), p2_, ::Math.sin(r_))
-          p_ = SphericalMath::PointXYZ.weighted_combination(p0_, cos_, pi_, sin_)
-          factory.point(*p_.lonlat)
-        end
-        factory.polygon(factory.linear_ring(points_))
-      end
-
-
-      alias_method :longitude, :x
-      alias_method :lon, :x
-      alias_method :latitude, :y
-      alias_method :lat, :y
+      include SphericalPointMethods
 
 
       Feature::MixinCollection::GLOBAL.for_type(Feature::Point).include_in_class(self, true)

data/lib/rgeo/geographic/spherical_feature_methods.rb

@@ -50,6 +50,90 @@ module RGeo
     end
 
 
+    module SphericalPointMethods   # :nodoc:
+
+
+      def _validate_geometry
+        if @x < -180.0 || @x >= 180.0
+          @x = @x % 360.0
+          @x -= 360.0 if @x >= 180.0
+        end
+        @y = 90.0 if @y > 90.0
+        @y = -90.0 if @y < -90.0
+        super
+      end
+
+
+      def _xyz
+        @xyz ||= SphericalMath::PointXYZ.from_latlon(@y, @x)
+      end
+
+
+      def distance(rhs_)
+        rhs_ = Feature.cast(rhs_, @factory)
+        case rhs_
+        when SphericalPointImpl
+          _xyz.dist_to_point(rhs_._xyz) * SphericalMath::RADIUS
+        else
+          super
+        end
+      end
+
+
+      def equals?(rhs_)
+        return false unless rhs_.is_a?(self.class) && rhs_.factory == self.factory
+        case rhs_
+        when Feature::Point
+          if @y == 90
+            rhs_.y == 90
+          elsif @y == -90
+            rhs_.y == -90
+          else
+            rhs_.x == @x && rhs_.y == @y
+          end
+        when Feature::LineString
+          rhs_.num_points > 0 && rhs_.points.all?{ |elem_| equals?(elem_) }
+        when Feature::GeometryCollection
+          rhs_.num_geometries > 0 && rhs_.all?{ |elem_| equals?(elem_) }
+        else
+          false
+        end
+      end
+
+
+      def buffer(distance_)
+        radius_ = distance_ / SphericalMath::RADIUS
+        radius_ = 1.5 if radius_ > 1.5
+        cos_ = ::Math.cos(radius_)
+        sin_ = ::Math.sin(radius_)
+        point_count_ = factory.property(:buffer_resolution) * 4
+        p0_ = _xyz
+        p1_ = p0_.create_perpendicular
+        p2_ = p1_ % p0_
+        angle_ = ::Math::PI * 2.0 / point_count_
+        points_ = (0...point_count_).map do |i_|
+          r_ = angle_ * i_
+          pi_ = SphericalMath::PointXYZ.weighted_combination(p1_, ::Math.cos(r_), p2_, ::Math.sin(r_))
+          p_ = SphericalMath::PointXYZ.weighted_combination(p0_, cos_, pi_, sin_)
+          factory.point(*p_.lonlat)
+        end
+        factory.polygon(factory.linear_ring(points_))
+      end
+
+
+      def self.included(klass_)
+        klass_.module_eval do
+          alias_method :longitude, :x
+          alias_method :lon, :x
+          alias_method :latitude, :y
+          alias_method :lat, :y
+        end
+      end
+
+
+    end
+
+
     module SphericalLineStringMethods  # :nodoc:
 
 

data/lib/rgeo/geographic/spherical_math.rb

@@ -59,9 +59,9 @@ module RGeo
 
         def initialize(x_, y_, z_)
           r_ = ::Math.sqrt(x_ * x_ + y_ * y_ + z_ * z_)
-          @x = x_ / r_
-          @y = y_ / r_
-          @z = z_ / r_
+          @x = (x_ / r_).to_f
+          @y = (y_ / r_).to_f
+          @z = (z_ / r_).to_f
           raise "Not a number" if @x.nan? || @y.nan? || @z.nan?
         end
 

data/lib/rgeo/geos.rb

@@ -65,30 +65,38 @@ end
 
 # Implementation files
 require 'rgeo/geos/utils'
-require 'rgeo/geos/factory'
 require 'rgeo/geos/interface'
 begin
   require 'rgeo/geos/geos_c_impl'
 rescue ::LoadError; end
-require 'rgeo/geos/impl_additions'
+::RGeo::Geos::CAPI_SUPPORTED = ::RGeo::Geos.const_defined?(:CAPIGeometryMethods)
+if ::RGeo::Geos::CAPI_SUPPORTED
+  require 'rgeo/geos/capi_feature_classes'
+  require 'rgeo/geos/capi_factory'
+end
+require 'rgeo/geos/ffi_feature_methods'
+require 'rgeo/geos/ffi_feature_classes'
 require 'rgeo/geos/ffi_factory'
-require 'rgeo/geos/ffi_classes'
+require 'rgeo/geos/zm_feature_methods'
+require 'rgeo/geos/zm_feature_classes'
 require 'rgeo/geos/zm_factory'
-require 'rgeo/geos/zm_impl'
 
 # Determine ffi support.
 begin
   require 'ffi-geos'
+  # An additional check to make sure FFI loaded okay. This can fail on
+  # some versions of ffi-geos and some versions of Rubinius.
+  raise 'Problem loading FFI' unless ::FFI::AutoPointer
   ::RGeo::Geos::FFI_SUPPORTED = true
-rescue ::LoadError
+  ::RGeo::Geos::FFI_SUPPORT_EXCEPTION = nil
+rescue ::LoadError => ex_
   ::RGeo::Geos::FFI_SUPPORTED = false
-rescue
+  ::RGeo::Geos::FFI_SUPPORT_EXCEPTION = ex_
+rescue => ex_
   ::RGeo::Geos::FFI_SUPPORTED = false
+  ::RGeo::Geos::FFI_SUPPORT_EXCEPTION = ex_
 end
 
-# Determine capi support.
-::RGeo::Geos::CAPI_SUPPORTED = ::RGeo::Geos::Factory.respond_to?(:_create) ? true : false
-
 # Determine preferred native interface
 if ::RGeo::Geos::CAPI_SUPPORTED
   ::RGeo::Geos.preferred_native_interface = :capi

data/lib/rgeo/geos/{factory.rb → capi_factory.rb}

@@ -41,7 +41,7 @@ module RGeo
 
     # This the GEOS CAPI implementation of ::RGeo::Feature::Factory.
 
-    class Factory
+    class CAPIFactory
 
 
       include Feature::Factory::Instance
@@ -158,13 +158,18 @@ module RGeo
       # Factory equivalence test.
 
       def eql?(rhs_)
-        rhs_.is_a?(Factory) && rhs_.srid == _srid &&
+        rhs_.is_a?(CAPIFactory) && rhs_.srid == _srid &&
           rhs_._buffer_resolution == _buffer_resolution && rhs_._flags == _flags &&
           rhs_.proj4 == _proj4
       end
       alias_method :==, :eql?
 
 
+      def hash
+        @hash ||= [_srid, _buffer_resolution, _flags, _proj4].hash
+      end
+
+
       # Marshal support
 
       def marshal_dump  # :nodoc:
@@ -201,7 +206,7 @@ module RGeo
         else
           coord_sys_ = nil
         end
-        initialize_copy(Factory.create(
+        initialize_copy(CAPIFactory.create(
           :has_z_coordinate => data_['hasz'],
           :has_m_coordinate => data_['hasm'],
           :srid => data_['srid'],
@@ -255,7 +260,7 @@ module RGeo
         else
           coord_sys_ = nil
         end
-        initialize_copy(Factory.create(
+        initialize_copy(CAPIFactory.create(
           :has_z_coordinate => coder_['has_z_coordinate'],
           :has_m_coordinate => coder_['has_m_coordinate'],
           :srid => coder_['srid'],
@@ -344,7 +349,7 @@ module RGeo
         if extra_.length > (_flags & 6 == 0 ? 0 : 1)
           nil
         else
-          PointImpl.create(self, x_, y_, extra_[0].to_f) rescue nil
+          CAPIPointImpl.create(self, x_, y_, extra_[0].to_f) rescue nil
         end
       end
 
@@ -353,14 +358,14 @@ module RGeo
 
       def line_string(points_)
         points_ = points_.to_a unless points_.kind_of?(::Array)
-        LineStringImpl.create(self, points_) rescue nil
+        CAPILineStringImpl.create(self, points_) rescue nil
       end
 
 
       # See ::RGeo::Feature::Factory#line
 
       def line(start_, end_)
-        LineImpl.create(self, start_, end_) rescue nil
+        CAPILineImpl.create(self, start_, end_) rescue nil
       end
 
 
@@ -368,7 +373,7 @@ module RGeo
 
       def linear_ring(points_)
         points_ = points_.to_a unless points_.kind_of?(::Array)
-        LinearRingImpl.create(self, points_) rescue nil
+        CAPILinearRingImpl.create(self, points_) rescue nil
       end
 
 
@@ -376,7 +381,7 @@ module RGeo
 
       def polygon(outer_ring_, inner_rings_=nil)
         inner_rings_ = inner_rings_.to_a unless inner_rings_.kind_of?(::Array)
-        PolygonImpl.create(self, outer_ring_, inner_rings_) rescue nil
+        CAPIPolygonImpl.create(self, outer_ring_, inner_rings_) rescue nil
       end
 
 
@@ -384,7 +389,7 @@ module RGeo
 
       def collection(elems_)
         elems_ = elems_.to_a unless elems_.kind_of?(::Array)
-        GeometryCollectionImpl.create(self, elems_) rescue nil
+        CAPIGeometryCollectionImpl.create(self, elems_) rescue nil
       end
 
 
@@ -392,7 +397,7 @@ module RGeo
 
       def multi_point(elems_)
         elems_ = elems_.to_a unless elems_.kind_of?(::Array)
-        MultiPointImpl.create(self, elems_) rescue nil
+        CAPIMultiPointImpl.create(self, elems_) rescue nil
       end
 
 
@@ -400,7 +405,7 @@ module RGeo
 
       def multi_line_string(elems_)
         elems_ = elems_.to_a unless elems_.kind_of?(::Array)
-        MultiLineStringImpl.create(self, elems_) rescue nil
+        CAPIMultiLineStringImpl.create(self, elems_) rescue nil
       end
 
 
@@ -408,7 +413,7 @@ module RGeo
 
       def multi_polygon(elems_)
         elems_ = elems_.to_a unless elems_.kind_of?(::Array)
-        MultiPolygonImpl.create(self, elems_) rescue nil
+        CAPIMultiPolygonImpl.create(self, elems_) rescue nil
       end
 
 
@@ -436,7 +441,7 @@ module RGeo
         type_ = original_.geometry_type
         ntype_ = type_ if keep_subtype_ && type_.include?(ntype_)
         case original_
-        when GeometryImpl
+        when CAPIGeometryMethods
           # Optimization if we're just changing factories, but the
           # factories are zm-compatible and proj4-compatible.
           if original_.factory != self && ntype_ == type_ &&
@@ -455,7 +460,7 @@ module RGeo
           then
             return IMPL_CLASSES[ntype_]._copy_from(self, original_)
           end
-        when ZMGeometryImpl
+        when ZMGeometryMethods
           # Optimization for just removing a coordinate from an otherwise
           # compatible factory
           if _flags & 0x6 == 0x2 && self == original_.factory.z_factory
@@ -468,6 +473,22 @@ module RGeo
       end
 
 
+      # :stopdoc:
+
+      IMPL_CLASSES = {
+        Feature::Point => CAPIPointImpl,
+        Feature::LineString => CAPILineStringImpl,
+        Feature::LinearRing => CAPILinearRingImpl,
+        Feature::Line => CAPILineImpl,
+        Feature::GeometryCollection => CAPIGeometryCollectionImpl,
+        Feature::MultiPoint => CAPIMultiPointImpl,
+        Feature::MultiLineString => CAPIMultiLineStringImpl,
+        Feature::MultiPolygon => CAPIMultiPolygonImpl,
+      }.freeze
+
+      # :startdoc:
+
+
     end