rgeo 0.1.18 → 0.1.19

data/lib/rgeo/cartesian/interface.rb

@@ -42,12 +42,12 @@ module RGeo
       
       
       # Creates and returns a cartesian factory of the preferred
-      # implementation.
+      # Cartesian implementation.
       # 
       # The actual implementation returned depends on which ruby
       # interpreter is running and what libraries are available.
       # RGeo will try to provide a fully-functional and performant
-      # implementation if possible. If not, the simple cartesian
+      # implementation if possible. If not, the simple Cartesian
       # implementation will be returned.
       # 
       # The given options are passed to the factory's constructor.
@@ -64,8 +64,25 @@ module RGeo
       alias_method :factory, :preferred_factory
       
       
-      # Returns a factory for the simple cartesian implementation.
-      # This implementation is always available.
+      # Returns a factory for the simple Cartesian implementation. This
+      # implementation provides all SFS 1.1 types, and also allows Z and
+      # M coordinates. It does not depend on external libraries, and is
+      # 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
+      #   not implemented for most types.
+      # * Relational constructors such as Features::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.
+      # * Length calculations are available, but areas are not. Distances
+      #   are available only between points.
+      # * Equality and simplicity evaluation are implemented for some but
+      #   not all types.
+      # * Assertions for polygons and multipolygons are not implemented.
+      # 
+      # Unimplemented operations will return nil if invoked.
       # 
       # Options include:
       # 

data/lib/rgeo/features/geometry.rb

@@ -115,21 +115,6 @@ module RGeo
       end
       
       
-      # Cast this geometry to the given type (which must be one of the
-      # type modules in the Features module) and return the resulting
-      # object. Returns nil if the cast fails because the types are not
-      # compatible or the object does not satisfy the assertions for the
-      # new type.
-      # 
-      # Generally, this is only useful for casting general classes to
-      # subclasses; e.g. a GeometryCollection to a MultiPoint, or a
-      # LineString to a LinearRing.
-      
-      def cast(type_)
-        raise Errors::MethodUnimplemented
-      end
-      
-      
       # Returns true if this geometric object is objectively equivalent
       # to the given object.
       

data/lib/rgeo/geography/interface.rb

@@ -44,13 +44,32 @@ module RGeo
       # Geographic features provided by this factory perform calculations
       # assuming a spherical earth. In other words, geodesics are treated
       # as great circle arcs, and size and geometric calculations are
-      # treated accordingly. Distance and area calculations report results
-      # in meters. This makes this implementation ideal for everyday
+      # treated accordingly. Distance calculations report results in
+      # meters. This makes this implementation ideal for everyday
       # calculations on the globe where accuracy within about 0.5 percent
       # is sufficient.
       # 
-      # Currently, this implementation is incomplete. Basic input/output
-      # and a few geodesic functions are implemented, but many return nil.
+      # === Limitations
+      # 
+      # This implementation does not implement many of the more advanced
+      # geometric operations. In particular:
+      # 
+      # * Relational operators such as Features::Geometry#intersects? are
+      #   not implemented for most types.
+      # * Relational constructors such as Features::Geometry#union are
+      #   not implemented for most types.
+      # * Buffer, convex hull, and envelope calculations are not
+      #   implemented for most types. Boundaries are available except for
+      #   GeometryCollection.
+      # * Length calculations are available, but areas are not. Distances
+      #   are available only between points.
+      # * Equality and simplicity evaluation are implemented for some but
+      #   not all types.
+      # * Assertions for polygons and multipolygons are not implemented.
+      # 
+      # Unimplemented operations will return nil if invoked.
+      # 
+      # === SRID for simple_spherical
       # 
       # Simple_spherical features report SRID=4326, indicating EPSG 4326
       # (i.e. the WGS84 spheroid and the lat/lon system commonly used by
@@ -72,7 +91,10 @@ module RGeo
       # than those generated by, e.g., PostGIS (unless you direct PostGIS
       # to use spherical geodesics).
       # 
-      # Options include:
+      # === Options
+      # 
+      # You may use the following options when creating a simple_spherical
+      # factory:
       # 
       # <tt>:lenient_multi_polygon_assertions</tt>::
       #   If set to true, assertion checking on MultiPolygon is disabled.
@@ -119,6 +141,8 @@ module RGeo
       # Distance and area computations return results in meters, whereas
       # all coordinates are represented in degrees latitude and longitude.
       # 
+      # === About the coordinate system
+      # 
       # This is not a true projected spatial reference: point coordinates
       # are still represented in degrees latitude and longitude. However,
       # computations are done in the projected spatial reference. (That
@@ -149,7 +173,10 @@ module RGeo
       # visualization APIs, so we've decided to fudge on this in the
       # interest of being true to our expected application use cases.
       # 
-      # Options include:
+      # === Options
+      # 
+      # You may use the following options when creating a simple_mercator
+      # factory:
       # 
       # <tt>:lenient_multi_polygon_assertions</tt>::
       #   If set to true, assertion checking on MultiPolygon is disabled.

data/lib/rgeo/geography/simple_mercator/feature_classes.rb

@@ -46,8 +46,8 @@ module RGeo
         
         include ::RGeo::Features::Point
         include ::RGeo::ImplHelpers::BasicGeometryMethods
-        include ::RGeo::Geography::SimpleMercator::GeometryMethods
         include ::RGeo::ImplHelpers::BasicPointMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryMethods
         
         
         def _validate_geometry
@@ -70,17 +70,30 @@ module RGeo
         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
-            x_ = @x % 360.0
-            x_ -= 360.0 if x_ >= 180.0
-            PointImpl.new(@factory, x_, @y)
+            PointImpl.new(@factory, canonical_x, @y)
           end
         end
         
         
+        alias_method :longitude, :x
+        alias_method :lon, :x
+        alias_method :latitude, :y
+        alias_method :lat, :y
+        
+        
       end
       
       
@@ -89,10 +102,10 @@ module RGeo
         
         include ::RGeo::Features::LineString
         include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::ImplHelpers::BasicLineStringMethods
         include ::RGeo::Geography::SimpleMercator::GeometryMethods
         include ::RGeo::Geography::SimpleMercator::NCurveMethods
         include ::RGeo::Geography::SimpleMercator::CurveMethods
-        include ::RGeo::ImplHelpers::BasicLineStringMethods
         include ::RGeo::Geography::SimpleMercator::LineStringMethods
         
         
@@ -109,12 +122,12 @@ module RGeo
         
         include ::RGeo::Features::Line
         include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::ImplHelpers::BasicLineStringMethods
+        include ::RGeo::ImplHelpers::BasicLinearRingMethods
         include ::RGeo::Geography::SimpleMercator::GeometryMethods
         include ::RGeo::Geography::SimpleMercator::NCurveMethods
         include ::RGeo::Geography::SimpleMercator::CurveMethods
-        include ::RGeo::ImplHelpers::BasicLineStringMethods
         include ::RGeo::Geography::SimpleMercator::LineStringMethods
-        include ::RGeo::ImplHelpers::BasicLinearRingMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -130,12 +143,12 @@ module RGeo
         
         include ::RGeo::Features::Line
         include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::ImplHelpers::BasicLineStringMethods
+        include ::RGeo::ImplHelpers::BasicLineMethods
         include ::RGeo::Geography::SimpleMercator::GeometryMethods
         include ::RGeo::Geography::SimpleMercator::NCurveMethods
         include ::RGeo::Geography::SimpleMercator::CurveMethods
-        include ::RGeo::ImplHelpers::BasicLineStringMethods
         include ::RGeo::Geography::SimpleMercator::LineStringMethods
-        include ::RGeo::ImplHelpers::BasicLineMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -151,10 +164,10 @@ module RGeo
         
         include ::RGeo::Features::Polygon
         include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::ImplHelpers::BasicPolygonMethods
         include ::RGeo::Geography::SimpleMercator::GeometryMethods
         include ::RGeo::Geography::SimpleMercator::NSurfaceMethods
         include ::RGeo::Geography::SimpleMercator::SurfaceMethods
-        include ::RGeo::ImplHelpers::BasicPolygonMethods
         
         
         def _validate_geometry
@@ -179,8 +192,8 @@ module RGeo
         
         include ::RGeo::Features::GeometryCollection
         include ::RGeo::ImplHelpers::BasicGeometryMethods
-        include ::RGeo::Geography::SimpleMercator::GeometryMethods
         include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryMethods
         include ::RGeo::Geography::SimpleMercator::GeometryCollectionMethods
         
         
@@ -197,10 +210,10 @@ module RGeo
         
         include ::RGeo::Features::GeometryCollection
         include ::RGeo::ImplHelpers::BasicGeometryMethods
-        include ::RGeo::Geography::SimpleMercator::GeometryMethods
         include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
-        include ::RGeo::Geography::SimpleMercator::GeometryCollectionMethods
         include ::RGeo::ImplHelpers::BasicMultiPointMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryCollectionMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -216,11 +229,11 @@ module RGeo
         
         include ::RGeo::Features::GeometryCollection
         include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
+        include ::RGeo::ImplHelpers::BasicMultiLineStringMethods
         include ::RGeo::Geography::SimpleMercator::GeometryMethods
         include ::RGeo::Geography::SimpleMercator::NCurveMethods
-        include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
         include ::RGeo::Geography::SimpleMercator::GeometryCollectionMethods
-        include ::RGeo::ImplHelpers::BasicMultiLineStringMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -236,11 +249,11 @@ module RGeo
         
         include ::RGeo::Features::GeometryCollection
         include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
+        include ::RGeo::ImplHelpers::BasicMultiPolygonMethods
         include ::RGeo::Geography::SimpleMercator::GeometryMethods
         include ::RGeo::Geography::SimpleMercator::NSurfaceMethods
-        include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
         include ::RGeo::Geography::SimpleMercator::GeometryCollectionMethods
-        include ::RGeo::ImplHelpers::BasicMultiPolygonMethods
         
         
         def _validate_geometry

data/lib/rgeo/geography/simple_mercator/feature_methods.rb

@@ -144,7 +144,7 @@ module RGeo
         end
         
         
-        def convex_hull()
+        def convex_hull
           factory.unproject(projection.convex_hull)
         end
         

data/lib/rgeo/geography/simple_spherical/feature_classes.rb

@@ -46,8 +46,8 @@ module RGeo
         
         include ::RGeo::Features::Point
         include ::RGeo::ImplHelpers::BasicGeometryMethods
-        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         include ::RGeo::ImplHelpers::BasicPointMethods
+        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         
         
         def _validate_geometry
@@ -75,6 +75,33 @@ module RGeo
         end
         
         
+        def equals?(rhs_)
+          return false unless rhs_.is_a?(self.class) && rhs_.factory == self.factory
+          case rhs_
+          when Features::Point
+            if @y == 90
+              rhs_.y == 90
+            elsif @y == -90
+              rhs_.y == -90
+            else
+              rhs_.x == @x && rhs_.y == @y
+            end
+          when Features::LineString
+            rhs_.num_points > 0 && rhs_.points.all?{ |elem_| equals?(elem_) }
+          when Features::GeometryCollection
+            rhs_.num_geometries > 0 && rhs_.all?{ |elem_| equals?(elem_) }
+          else
+            false
+          end
+        end
+        
+        
+        alias_method :longitude, :x
+        alias_method :lon, :x
+        alias_method :latitude, :y
+        alias_method :lat, :y
+        
+        
       end
       
       
@@ -83,8 +110,8 @@ module RGeo
         
         include ::RGeo::Features::LineString
         include ::RGeo::ImplHelpers::BasicGeometryMethods
-        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         include ::RGeo::ImplHelpers::BasicLineStringMethods
+        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         include ::RGeo::Geography::SimpleSpherical::LineStringMethods
         
         
@@ -96,10 +123,10 @@ module RGeo
         
         include ::RGeo::Features::Line
         include ::RGeo::ImplHelpers::BasicGeometryMethods
-        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         include ::RGeo::ImplHelpers::BasicLineStringMethods
-        include ::RGeo::Geography::SimpleSpherical::LineStringMethods
         include ::RGeo::ImplHelpers::BasicLineMethods
+        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
+        include ::RGeo::Geography::SimpleSpherical::LineStringMethods
         
         
       end
@@ -110,10 +137,10 @@ module RGeo
         
         include ::RGeo::Features::Line
         include ::RGeo::ImplHelpers::BasicGeometryMethods
-        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         include ::RGeo::ImplHelpers::BasicLineStringMethods
-        include ::RGeo::Geography::SimpleSpherical::LineStringMethods
         include ::RGeo::ImplHelpers::BasicLinearRingMethods
+        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
+        include ::RGeo::Geography::SimpleSpherical::LineStringMethods
         
         
       end
@@ -124,8 +151,8 @@ module RGeo
         
         include ::RGeo::Features::Polygon
         include ::RGeo::ImplHelpers::BasicGeometryMethods
-        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         include ::RGeo::ImplHelpers::BasicPolygonMethods
+        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         
         
       end
@@ -136,8 +163,8 @@ module RGeo
         
         include ::RGeo::Features::GeometryCollection
         include ::RGeo::ImplHelpers::BasicGeometryMethods
-        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
+        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         
         
       end
@@ -148,9 +175,9 @@ module RGeo
         
         include ::RGeo::Features::GeometryCollection
         include ::RGeo::ImplHelpers::BasicGeometryMethods
-        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
         include ::RGeo::ImplHelpers::BasicMultiPointMethods
+        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         
         
       end
@@ -161,9 +188,9 @@ module RGeo
         
         include ::RGeo::Features::GeometryCollection
         include ::RGeo::ImplHelpers::BasicGeometryMethods
-        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
         include ::RGeo::ImplHelpers::BasicMultiLineStringMethods
+        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         
         
       end
@@ -174,9 +201,9 @@ module RGeo
         
         include ::RGeo::Features::GeometryCollection
         include ::RGeo::ImplHelpers::BasicGeometryMethods
-        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
         include ::RGeo::ImplHelpers::BasicMultiPolygonMethods
+        include ::RGeo::Geography::SimpleSpherical::GeometryMethods
         
         
       end

data/lib/rgeo/geos.rb

@@ -73,3 +73,5 @@ require 'rgeo/geos/factory'
 require 'rgeo/geos/interface'
 require 'rgeo/geos/geos_c_impl'
 require 'rgeo/geos/impl_additions'
+require 'rgeo/geos/zm_factory'
+require 'rgeo/geos/zm_impl'

data/lib/rgeo/geos/factory.rb

@@ -43,6 +43,7 @@ module RGeo
     
     class Factory
       
+      
       include Features::Factory::Instance
       
       
@@ -65,7 +66,8 @@ module RGeo
           end
           buffer_resolution_ = opts_[:buffer_resolution].to_i
           buffer_resolution_ = 1 if buffer_resolution_ < 1
-          _create(flags_, opts_[:srid].to_i, buffer_resolution_)
+          result_ = _create(flags_, opts_[:srid].to_i, buffer_resolution_)
+          result_
         end
         alias_method :new, :create
         
@@ -73,6 +75,19 @@ module RGeo
       end
       
       
+      def inspect  # :nodoc:
+        "#<#{self.class}:0x#{object_id.to_s(16)} srid=#{_srid} bufres=#{_buffer_resolution} flags=#{_flags}>"
+      end
+      
+      
+      # Factory equivalence test.
+      
+      def eql?(rhs_)
+        rhs_.is_a?(Factory) && rhs_.srid == _srid && rhs_._buffer_resolution == _buffer_resolution && rhs_._flags == _flags
+      end
+      alias_method :==, :eql?
+      
+      
       # Returns the SRID of geometries created by this factory.
       
       def srid
@@ -95,14 +110,6 @@ module RGeo
       end
       
       
-      # Factory equivalence test.
-      
-      def eql?(rhs_)
-        rhs_.is_a?(Factory) && rhs_.srid == _srid && rhs_._buffer_resolution == _buffer_resolution && rhs_._flags == _flags
-      end
-      alias_method :==, :eql?
-      
-      
       # See ::RGeo::Features::Factory#has_capability?
       
       def has_capability?(name_)
@@ -211,24 +218,33 @@ module RGeo
         return nil unless Geos.supported?
         keep_subtype_ = flags_[:keep_subtype]
         force_new_ = flags_[:force_new]
-        if GeometryImpl === original_
-          type_ = original_.geometry_type
-          ntype_ = type_ if keep_subtype_ && type_.include?(ntype_)
-          if original_.factory != self && ntype_ == type_
+        type_ = original_.geometry_type
+        ntype_ = type_ if keep_subtype_ && type_.include?(ntype_)
+        case original_
+        when GeometryImpl
+          # Optimization if we're just changing factories, but the
+          # factories are zm-compatible.
+          if original_.factory != self && ntype_ == type_ &&
+              original_.factory._flags & 0x6 == _flags & 0x6
+          then
             result_ = original_.dup
             result_._set_factory(self)
             return result_
           end
+          # LineString conversion optimization.
           if (original_.factory != self || ntype_ != type_) &&
-              (type_ == Features::LineString || type_.include?(Features::LineString))
+              original_.factory._flags & 0x6 == _flags & 0x6 &&
+              type_.subtype_of?(Features::LineString) && ntype_.subtype_of?(Features::LineString)
           then
-            if ntype_ == Features::LineString
-              return LineStringImpl._copy_from(self, original_)
-            elsif ntype_ == Features::Line
-              return LineImpl._copy_from(self, original_)
-            elsif ntype_ == Features::LinearRing
-              return LinearRingImpl._copy_from(self, original_)
-            end
+            return IMPL_CLASSES[ntype_]._copy_from(self, original_)
+          end
+        when ZMGeometryImpl
+          # 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_)
+          elsif _flags & 0x6 == 0x4 && self == original_.factory.m_factory
+            return Features.cast(original_.m_geometry, ntype_, flags_)
           end
         end
         false