rgeo 0.3.0 → 0.3.1

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.3.1 / 2011-05-24
+
+* Running a == operator comparison between a geometry and a non-geometry caused an exception for some implementations. Fixed. (Reported by Daniel Hackney.)
+* Clarified the specifications for operators on geometry objects.
+
 === 0.3.0 / 2011-05-23
 
 * RGeo can now use GEOS via the ffi-geos gem, in addition to RGeo's built-in C integration. The ffi-geos integration is experimental right now, since ffi-geos is still in early beta. In particular, I do not recommend using it in JRuby yet (as of JRuby 1.6.1), because an apparent JRuby bug (JRUBY-5813) causes intermittent segfaults. However, once the issue is resolved (soon, I hope, since I've already submitted a patch to the JRuby team), we should have GEOS functional on JRuby.

data/README.rdoc

@@ -93,6 +93,7 @@ installation prefix directory using the "--with-proj-dir" option.
 The RGeo suite of tools is evolving rapidly. The current to-do list for
 the core library includes:
 
+* YAML and Marshal serialization support.
 * Better JRuby support.
 * Ellipsoidal geography implementation, possibly utilizing geographiclib.
 * Windows build support.

data/Version

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/rgeo/feature/geometry.rb

@@ -578,28 +578,41 @@ module RGeo
       end
       
       
-      # Alias of the equals? method.
+      # This operator should behave almost the same as the equals? method.
+      # The difference is that the == operator is required to handle rhs
+      # values that are not geometry objects (returning false in such cases)
+      # in order to fulfill the standard Ruby contract for the == operator,
+      # whereas the equals? method may assume that any rhs is a geometry.
       
       def ==(rhs_)
-        equals?(rhs_)
+        rhs_.kind_of?(::RGeo::Feature::Instance) ? equals?(rhs_) : false
       end
       
       
-      # Alias of the difference method.
+      # If the given rhs is a geometry object, this operator must behave
+      # the same as the difference method. The behavior for other rhs
+      # types is not specified; an implementation may choose to provide
+      # additional capabilities as appropriate.
       
       def -(rhs_)
         difference(rhs_)
       end
       
       
-      # Alias of the union method.
+      # If the given rhs is a geometry object, this operator must behave
+      # the same as the union method. The behavior for other rhs types
+      # is not specified; an implementation may choose to provide
+      # additional capabilities as appropriate.
       
       def +(rhs_)
         union(rhs_)
       end
       
       
-      # Alias of the intersection method.
+      # If the given rhs is a geometry object, this operator must behave
+      # the same as the intersection method. The behavior for other rhs
+      # types is not specified; an implementation may choose to provide
+      # additional capabilities as appropriate.
       
       def *(rhs_)
         intersection(rhs_)

data/lib/rgeo/geos/ffi_classes.rb

@@ -181,11 +181,17 @@ module RGeo
       
       
       def equals?(rhs_)
+        return false unless rhs_.kind_of?(::RGeo::Feature::Instance)
         fg_ = factory._convert_to_fg_geometry(rhs_)
+        if !fg_
+          false
         # GEOS has a bug where empty geometries are not spatially equal
         # to each other. Work around this case first.
-        return true if fg_.empty? && @fg_geom.empty?
-        fg_ ? @fg_geom.eql?(fg_) : false
+        elsif fg_.empty? && @fg_geom.empty?
+          true
+        else
+          @fg_geom.eql?(fg_)
+        end
       end
       alias_method :==, :equals?
       

data/lib/rgeo/wkrep/wkt_generator.rb

@@ -63,9 +63,10 @@ module RGeo
     #   Z is present); or <tt>:wkt12</tt>, indicating SFS 1.2 WKT
     #   tags that indicate the presence of Z and M in a separate token.
     #   Default is <tt>:wkt11</tt>.
+    #   This option can also be specified as <tt>:type_format</tt>.
     # [<tt>:emit_ewkt_srid</tt>]
     #   If true, embed the SRID of the toplevel geometry. Available only
-    #   if <tt>:type_format</tt> is <tt>:ewkt</tt>. Default is false.
+    #   if <tt>:tag_format</tt> is <tt>:ewkt</tt>. Default is false.
     # [<tt>:square_brackets</tt>]
     #   If true, uses square brackets rather than parentheses.
     #   Default is false.
@@ -83,7 +84,7 @@ module RGeo
       # documentation for the options that can be passed.
       
       def initialize(opts_={})
-        @tag_format = opts_[:tag_format] || :wkt11
+        @tag_format = opts_[:tag_format] || opts_[:type_format] || :wkt11
         @emit_ewkt_srid = opts_[:emit_ewkt_srid] ? true : false if @tag_format == :ewkt
         @square_brackets = opts_[:square_brackets] ? true : false
         @convert_case = opts_[:convert_case]
@@ -94,6 +95,7 @@ module RGeo
       def tag_format
         @tag_format
       end
+      alias_method :type_format, :tag_format
       
       # Returns whether SRID is embedded. See WKTGenerator for details.
       def emit_ewkt_srid?

data/test/common/point_tests.rb

@@ -157,6 +157,8 @@ module RGeo
           assert(!point1_.equals?(point3_))
           assert(point1_ != point3_)
           assert(!point1_.eql?(point3_))
+          assert(point1_ != 'hello')
+          assert(!point1_.eql?('hello'))
         end
         
         

metadata

@@ -2,7 +2,7 @@
 name: rgeo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 Z
+date: 2011-05-24 00:00:00 Z
 dependencies: []
 
 description: RGeo is a geospatial data library for Ruby. It provides an implementation of the Open Geospatial Consortium's Simple Features Specification, used by most standard spatial/geographic data storage systems such as PostGIS. A number of add-on modules are also available to help with writing location-based applications using Ruby-based frameworks such as Ruby On Rails.