rgeo 0.3.7 → 0.3.8

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.3.8 / 2012-03-23
+
+* When using the spherical factory, some negative longitudes might get perturbed slightly due to floating point errors. Fixed. (Reported by Pete Deffendol)
+* Fixed a bunch of warnings, and turned on warnings during testing.
+
 === 0.3.7 / 2012-03-12
 
 * Marshal and YAML serialization now fully implemented for geometries.

data/Version

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/rgeo/cartesian/feature_methods.rb

@@ -78,7 +78,7 @@ module RGeo
 
 
       def _segments
-        unless @segments
+        unless defined?(@segments)
           @segments = (0..num_points-2).map do |i_|
             Segment.new(point_n(i_), point_n(i_+1))
           end

data/lib/rgeo/feature/types.rb

@@ -101,7 +101,7 @@ module RGeo
       # Iterates over the known immediate subtypes of this type.
 
       def each_immediate_subtype(&block_)
-        @subtypes.each(&block_) if @subtypes
+        @subtypes.each(&block_) if defined?(@subtypes) && @subtypes
       end
 
 

data/lib/rgeo/geographic/spherical_feature_classes.rb

@@ -49,8 +49,10 @@ module RGeo
 
 
       def _validate_geometry
-        @x = @x % 360.0
-        @x -= 360.0 if @x >= 180.0
+        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

data/lib/rgeo/geographic/spherical_feature_methods.rb

@@ -54,7 +54,7 @@ module RGeo
 
 
       def _arcs
-        unless @arcs
+        unless defined?(@arcs)
           @arcs = (0..num_points-2).map do |i_|
             SphericalMath::ArcXYZ.new(point_n(i_)._xyz, point_n(i_+1)._xyz)
           end

data/lib/rgeo/geos/factory.rb

@@ -431,7 +431,7 @@ module RGeo
       def override_cast(original_, ntype_, flags_)
         return nil unless Geos.supported?
         keep_subtype_ = flags_[:keep_subtype]
-        force_new_ = flags_[:force_new]
+        #force_new_ = flags_[:force_new]
         project_ = flags_[:project]
         type_ = original_.geometry_type
         ntype_ = type_ if keep_subtype_ && type_.include?(ntype_)

data/lib/rgeo/geos/ffi_factory.rb

@@ -465,7 +465,6 @@ module RGeo
 
       def multi_point(elems_)
         elems_ = elems_.to_a unless elems_.kind_of?(::Array)
-        fg_geoms_ = []
         elems_.map! do |elem_|
           elem_ = ::RGeo::Feature.cast(elem_, self, ::RGeo::Feature::Point,
             :force_new, :keep_subtype)

data/lib/rgeo/geos/zm_factory.rb

@@ -378,7 +378,7 @@ module RGeo
       def override_cast(original_, ntype_, flags_)
         return nil unless Geos.supported?
         keep_subtype_ = flags_[:keep_subtype]
-        force_new_ = flags_[:force_new]
+        #force_new_ = flags_[:force_new]
         project_ = flags_[:project]
         type_ = original_.geometry_type
         ntype_ = type_ if keep_subtype_ && type_.include?(ntype_)

data/lib/rgeo/geos/zm_impl.rb

@@ -231,7 +231,6 @@ module RGeo
       end
 
       def marshal_load(data_)  # :nodoc:
-        obj_ = data_[0]._marshal_wkb_parser.parse(data_[1])
         _copy_state_from(data_[0]._marshal_wkb_parser.parse(data_[1]))
       end
 

data/lib/rgeo/impl_helper/basic_geometry_collection_methods.rb

@@ -76,7 +76,7 @@ module RGeo
 
 
       def dimension
-        unless @dimension
+        unless defined?(@dimension)
           @dimension = -1
           @elements.each do |elem_|
             dim_ = elem_.dimension

data/lib/rgeo/impl_helper/basic_geometry_methods.rb

@@ -87,7 +87,6 @@ module RGeo
       end
 
       def marshal_load(data_)  # :nodoc:
-        obj_ = data_[0]._marshal_wkb_parser.parse(data_[1])
         _copy_state_from(data_[0]._marshal_wkb_parser.parse(data_[1]))
       end
 

data/lib/rgeo/wkrep/wkb_generator.rb

@@ -94,7 +94,8 @@ module RGeo
 
       def initialize(opts_={})
         @type_format = opts_[:type_format] || :wkb11
-        @emit_ewkb_srid = opts_[:emit_ewkb_srid] ? true : false if @type_format == :ewkb
+        @emit_ewkb_srid = @type_format == :ewkb ?
+          (opts_[:emit_ewkb_srid] ? true : false) : nil
         @hex_format = opts_[:hex_format] ? true : false
         @little_endian = opts_[:little_endian] ? true : false
       end

data/lib/rgeo/wkrep/wkt_generator.rb

@@ -85,7 +85,8 @@ module RGeo
 
       def initialize(opts_={})
         @tag_format = opts_[:tag_format] || opts_[:type_format] || :wkt11
-        @emit_ewkt_srid = opts_[:emit_ewkt_srid] ? true : false if @tag_format == :ewkt
+        @emit_ewkt_srid = @tag_format == :ewkt ?
+          (opts_[:emit_ewkt_srid] ? true : false) : nil
         @square_brackets = opts_[:square_brackets] ? true : false
         @convert_case = opts_[:convert_case]
       end

data/lib/rgeo/wkrep/wkt_parser.rb

@@ -228,7 +228,7 @@ module RGeo
           expect_m_ = zm_[-1,1] == 'm' ? true : false
           if @cur_expect_m.nil?
             @cur_expect_m = expect_m_
-          else expect_m_ != @cur_expect_m
+          elsif expect_m_ != @cur_expect_m
             raise Error::ParseError, "Surrounding collection has M but contained geometry doesn't."
           end
           if creating_expectation_

data/test/spherical_geographic/tc_point.rb

@@ -80,6 +80,15 @@ module RGeo
         end
 
 
+        def test_floating_point_perturbation
+          # A naive way of wrapping longitudes to [-180,180] might cause
+          # perturbation due to floating point errors. Make sure this
+          # doesn't happen.
+          point_ = @factory.point(-98.747534, 38.057583)
+          assert_equal(-98.747534, point_.x)
+        end
+
+
         undef_method :test_disjoint
         undef_method :test_intersects
         undef_method :test_touches

data/test/wkrep/tc_wkb_parser.rb

@@ -136,7 +136,7 @@ module RGeo
           factory_ = ::RGeo::Cartesian.preferred_factory(:has_z_coordinate => true)
           parser_ = ::RGeo::WKRep::WKBParser.new(factory_)
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('00000003e93ff000000000000040000000000000004008000000000000')
+            parser_.parse('00000003e93ff000000000000040000000000000004008000000000000')
           end
         end
 
@@ -145,7 +145,7 @@ module RGeo
           factory_ = ::RGeo::Cartesian.preferred_factory(:has_z_coordinate => true)
           parser_ = ::RGeo::WKRep::WKBParser.new(factory_, :support_wkb12 => true)
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('00000003e93ff00000000000004000000000000000')
+            parser_.parse('00000003e93ff00000000000004000000000000000')
           end
         end
 
@@ -273,7 +273,7 @@ module RGeo
           factory_ = ::RGeo::Cartesian.preferred_factory(:has_z_coordinate => true)
           parser_ = ::RGeo::WKRep::WKBParser.new(factory_, :support_ewkb => true)
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('00800000040000000200800000013ff000000000000040000000000000004014000000000000000000000140080000000000004010000000000000')
+            parser_.parse('00800000040000000200800000013ff000000000000040000000000000004014000000000000000000000140080000000000004010000000000000')
           end
         end
 
@@ -299,7 +299,7 @@ module RGeo
         def test_multilinestring_wrong_element_type
           parser_ = ::RGeo::WKRep::WKBParser.new
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('0000000005000000020000000002000000033ff00000000000004000000000000000400800000000000040100000000000004014000000000000401800000000000000000000013ff00000000000004000000000000000')
+            parser_.parse('0000000005000000020000000002000000033ff00000000000004000000000000000400800000000000040100000000000004014000000000000401800000000000000000000013ff00000000000004000000000000000')
           end
         end
 

data/test/wkrep/tc_wkt_parser.rb

@@ -124,7 +124,7 @@ module RGeo
           factory_ = ::RGeo::Cartesian.preferred_factory
           parser_ = ::RGeo::WKRep::WKTParser.new(factory_)
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('POINT(1 2 3)')
+            parser_.parse('POINT(1 2 3)')
           end
         end
 
@@ -143,7 +143,7 @@ module RGeo
           factory_ = ::RGeo::Cartesian.preferred_factory
           parser_ = ::RGeo::WKRep::WKTParser.new(factory_, :support_wkt12 => true)
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('POINT Z(1 2 3)')
+            parser_.parse('POINT Z(1 2 3)')
           end
         end
 
@@ -172,7 +172,7 @@ module RGeo
           factory_ = ::RGeo::Cartesian.preferred_factory(:has_m_coordinate => true)
           parser_ = ::RGeo::WKRep::WKTParser.new(factory_, :support_wkt12 => true)
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('POINT M(1 2 3 4)')
+            parser_.parse('POINT M(1 2 3 4)')
           end
         end
 
@@ -191,7 +191,7 @@ module RGeo
           factory_ = ::RGeo::Cartesian.preferred_factory(:has_z_coordinate => true, :has_m_coordinate => true)
           parser_ = ::RGeo::WKRep::WKTParser.new(factory_, :support_wkt12 => true)
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('POINT ZM(1 2 3)')
+            parser_.parse('POINT ZM(1 2 3)')
           end
         end
 
@@ -230,7 +230,7 @@ module RGeo
           factory_ = ::RGeo::Cartesian.preferred_factory(:has_m_coordinate => true)
           parser_ = ::RGeo::WKRep::WKTParser.new(factory_, :support_ewkt => true)
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('POINTM(1 2 3 4)')
+            parser_.parse('POINTM(1 2 3 4)')
           end
         end
 
@@ -239,7 +239,7 @@ module RGeo
           factory_ = ::RGeo::Cartesian.preferred_factory(:has_z_coordinate => true)
           parser_ = ::RGeo::WKRep::WKTParser.new(factory_, :strict_wkt11 => true)
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('POINT(1 2 3)')
+            parser_.parse('POINT(1 2 3)')
           end
         end
 
@@ -247,7 +247,7 @@ module RGeo
         def test_point_non_ewkt_with_srid
           parser_ = ::RGeo::WKRep::WKTParser.new(::RGeo::Cartesian.method(:preferred_factory))
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('SRID=1000;POINT(1 2)')
+            parser_.parse('SRID=1000;POINT(1 2)')
           end
         end
 
@@ -278,7 +278,7 @@ module RGeo
           factory_ = ::RGeo::Cartesian.preferred_factory(:has_z_coordinate => true)
           parser_ = ::RGeo::WKRep::WKTParser.new(factory_)
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('LINESTRING(1 2 3, 4 5,7 8 9)')
+            parser_.parse('LINESTRING(1 2 3, 4 5,7 8 9)')
           end
         end
 
@@ -461,7 +461,7 @@ module RGeo
           factory_ = ::RGeo::Cartesian.preferred_factory(:has_z_coordinate => true)
           parser_ = ::RGeo::WKRep::WKTParser.new(factory_)
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('GEOMETRYCOLLECTION(POINT(-1 -2),LINESTRING(1 2 0, 3 4 0, 5 6 0))')
+            parser_.parse('GEOMETRYCOLLECTION(POINT(-1 -2),LINESTRING(1 2 0, 3 4 0, 5 6 0))')
           end
         end
 
@@ -470,7 +470,7 @@ module RGeo
           factory_ = ::RGeo::Cartesian.preferred_factory(:has_z_coordinate => true, :has_m_coordinate => true)
           parser_ = ::RGeo::WKRep::WKTParser.new(factory_, :support_wkt12 => true)
           assert_raise(::RGeo::Error::ParseError) do
-            obj_ = parser_.parse('GEOMETRYCOLLECTION Z(POINT Z(-1 -2 0),LINESTRING M(1 2 0, 3 4 0, 5 6 0))')
+            parser_.parse('GEOMETRYCOLLECTION Z(POINT Z(-1 -2 0),LINESTRING M(1 2 0, 3 4 0, 5 6 0))')
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000 Z
+date: 2012-03-23 00:00:00.000000000 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
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: virtuoso
-rubygems_version: 1.8.17
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: RGeo is a geospatial data library for Ruby.