rgeo 0.3.2 → 0.3.3

data/lib/rgeo/cartesian/bounding_box.rb

@@ -203,7 +203,7 @@ module RGeo
       end
       
       
-      # Adjusts the extents of this bounding box to encomass the given
+      # Adjusts the extents of this bounding box to encompass the given
       # object, which may be a geometry or another bounding box.
       # Returns self.
       

data/lib/rgeo/feature/factory.rb

@@ -55,11 +55,12 @@ module RGeo
     # 
     # Factory is defined as a module and is provided primarily for the
     # sake of documentation. Implementations need not necessarily include
-    # this module itself. Therefore, you should not depend on the
-    # kind_of? method to check type. However, to support testing for
-    # factory-ness, the Factory::Instance submodule is provided. All
-    # factory implementation classes MUST include Factory::Instance, and
-    # you may use it in kind_of?, ===, and case-when constructs.
+    # this module itself. Therefore, you should not depend on the result
+    # of <tt>is_a?(Factory)</tt> to check type. However, to support
+    # testing for factory-ness, the <tt>Factory::Instance</tt> submodule
+    # is provided. All factory implementation classes MUST include
+    # <tt>Factory::Instance</tt>, and you may use it in <tt>is_a?</tt>,
+    # <tt>===</tt>, and case-when constructs.
     
     module Factory
       
@@ -96,7 +97,7 @@ module RGeo
       #   coordinate, and the Point#z method is available.
       # [<tt>:has_m_coordinate</tt>]
       #   Set to true if geometries created by this factory include a M
-      #   coordinate, and the Point#z method is available.
+      #   coordinate, and the Point#m method is available.
       # [<tt>:is_cartesian</tt>]
       #   Set to true if this Factory guarantees that it operates in
       #   Cartesian geometry. If false or nil, no such guarantee is made,

data/lib/rgeo/feature/geometry.rb

@@ -57,9 +57,10 @@ module RGeo
     # 
     # Geometry is defined as a module and is provided primarily for the
     # sake of documentation. Implementations need not necessarily include
-    # this module itself. Therefore, you should not depend on the
-    # kind_of? method to check type. Instead, use the provided check_type
-    # class method (or === operator) defined in the Type module.
+    # this module itself. Therefore, you should not depend on the result
+    # of <tt>is_a?(Geometry)</tt> to check type. Instead, use the
+    # provided check_type class method (or === operator) defined in the
+    # Type module.
     # 
     # Some implementations may support higher dimensional objects or
     # coordinate systems, despite the limits of the SFS.

data/lib/rgeo/geographic/projected_feature_methods.rb

@@ -185,7 +185,7 @@ module RGeo
             if p_x_ < last_x_ - 180.0
               p_x_ += 360.0 while p_x_ < last_x_ - 180.0
             elsif p_x_ > last_x_ + 180.0
-              p_x_ +- 360.0 while p_x_ > last_x_ + 180.0
+              p_x_ -= 360.0 while p_x_ > last_x_ + 180.0
             else
               changed_ = false
             end

data/lib/rgeo/geos/interface.rb

@@ -194,7 +194,7 @@ module RGeo
       #   the default) generates a prepared geometry the second time an
       #   operation that would benefit from it is called. The latter
       #   never automatically generates a prepared geometry (unless you
-      #   generate on explicitly using the <tt>prepare!</tt> method).
+      #   generate one explicitly using the <tt>prepare!</tt> method).
       #   Currently, prepared geometries are supported under CAPI but
       #   not FFI.
       

data/lib/rgeo/wkrep/wkt_parser.rb

@@ -380,7 +380,13 @@ module RGeo
           _expect_token_type(:begin)
           _next_token
           loop do
-            points_ << _parse_point
+            uses_paren_ = @cur_token == :begin
+            _next_token if uses_paren_
+            points_ << _parse_coords
+            if uses_paren_
+              _expect_token_type(:end)
+              _next_token
+            end
             break if @cur_token == :end
             _expect_token_type(:comma)
             _next_token

data/test/wkrep/tc_wkt_parser.rb

@@ -360,6 +360,19 @@ module RGeo
         end
         
         
+        def test_multipoint_without_parens
+          # This syntax isn't strictly allowed by the spec, but apparently
+          # it does get used occasionally, so we do support parsing it.
+          factory_ = ::RGeo::Cartesian.preferred_factory
+          parser_ = ::RGeo::WKRep::WKTParser.new(factory_)
+          obj_ = parser_.parse('MULTIPOINT(1 2, 0 3)')
+          assert_equal(::RGeo::Feature::MultiPoint, obj_.geometry_type)
+          assert_equal(2, obj_.num_geometries)
+          assert_equal(1, obj_[0].x)
+          assert_equal(3, obj_[1].y)
+        end
+        
+        
         def test_multipoint_empty
           factory_ = ::RGeo::Cartesian.preferred_factory
           parser_ = ::RGeo::WKRep::WKTParser.new(factory_)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-12 00:00:00.000000000 Z
+date: 2011-12-19 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
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: virtuoso
-rubygems_version: 1.8.7
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: RGeo is a geospatial data library for Ruby.