rgeo 0.1.13 → 0.1.14

data/tests/common/line_string_tests.rb

@@ -44,16 +44,24 @@ module RGeo
       module LineStringTests  # :nodoc:
         
         
-        def test_creation_success
+        def test_creation_points2
           point1_ = @factory.point(0, 0)
           point2_ = @factory.point(0, 1)
-          point3_ = @factory.point(1, 0)
           line1_ = @factory.line_string([point1_, point2_])
           assert_not_nil(line1_)
           assert_equal(::RGeo::Features::LineString, line1_.geometry_type)
           assert_equal(2, line1_.num_points)
           assert_equal(point1_, line1_.point_n(0))
           assert_equal(point2_, line1_.point_n(1))
+          assert_equal(point1_, line1_.start_point)
+          assert_equal(point2_, line1_.end_point)
+        end
+        
+        
+        def test_creation_points3
+          point1_ = @factory.point(0, 0)
+          point2_ = @factory.point(0, 1)
+          point3_ = @factory.point(1, 0)
           line2_ = @factory.line_string([point1_, point2_, point3_])
           assert_not_nil(line2_)
           assert_equal(::RGeo::Features::LineString, line2_.geometry_type)
@@ -61,16 +69,32 @@ module RGeo
           assert_equal(point1_, line2_.point_n(0))
           assert_equal(point2_, line2_.point_n(1))
           assert_equal(point3_, line2_.point_n(2))
+          assert_nil(line2_.point_n(3))
+          assert_equal(point1_, line2_.start_point)
+          assert_equal(point3_, line2_.end_point)
+        end
+        
+        
+        def test_creation_points2_degenerate
+          point1_ = @factory.point(0, 0)
           line3_ = @factory.line_string([point1_, point1_])
           assert_not_nil(line3_)
           assert_equal(::RGeo::Features::LineString, line3_.geometry_type)
           assert_equal(2, line3_.num_points)
           assert_equal(point1_, line3_.point_n(0))
           assert_equal(point1_, line3_.point_n(1))
+          assert_equal(point1_, line3_.start_point)
+          assert_equal(point1_, line3_.end_point)
+        end
+        
+        
+        def test_creation_points_empty
           line4_ = @factory.line_string([])
           assert_not_nil(line4_)
           assert_equal(::RGeo::Features::LineString, line4_.geometry_type)
           assert_equal(0, line4_.num_points)
+          assert_nil(line4_.start_point)
+          assert_nil(line4_.end_point)
         end
         
         

data/tests/common/point_tests.rb

@@ -272,6 +272,32 @@ module RGeo
         end
         
         
+        def test_3d_creation
+          point_ = @zfactory.point(11, 12, 13)
+          assert_equal(11, point_.x)
+          assert_equal(12, point_.y)
+          assert_equal(13, point_.z)
+          point2_ = @zfactory.point(21, 22)
+          assert_equal(21, point2_.x)
+          assert_equal(22, point2_.y)
+          assert_equal(0, point2_.z)
+        end
+        
+        
+        def test_wkt_creation_3d
+          point2_ = @zfactory.parse_wkt('POINT(11 12 13)')
+          assert_equal(11, point2_.x)
+          assert_equal(12, point2_.y)
+          assert_equal(13, point2_.z)
+          point1_ = @zfactory.parse_wkt('POINT(21 22)')
+          assert_equal(21, point1_.x)
+          assert_equal(22, point1_.y)
+          # Z is undefined in this case.
+          # We'd like to define it to be 0, but the GEOS
+          # parser doesn't behave that way.
+        end
+        
+        
       end
       
     end

data/tests/geos/tc_point.rb

@@ -49,6 +49,7 @@ module RGeo
         
         def setup
           @factory = ::RGeo::Geos.factory
+          @zfactory = ::RGeo::Geos.factory(:support_z_coordinate => true)
         end
         
         
@@ -61,26 +62,6 @@ module RGeo
         end
         
         
-        def test_3d_creation
-          point_ = @factory.point3d(11, 12, 13)
-          assert_equal(11, point_.x)
-          assert_equal(12, point_.y)
-          assert_equal(13, point_.z)
-          point2_ = @factory.point(21, 22)
-          assert_nil(point2_.z)
-        end
-        
-        
-        def test_wkt_creation_3d
-          point1_ = @factory.parse_wkt('POINT(21 22)')
-          assert_nil(point1_.z)
-          point2_ = @factory.parse_wkt('POINT(11 12 13)')
-          assert_equal(11, point2_.x)
-          assert_equal(12, point2_.y)
-          assert_equal(13, point2_.z)
-        end
-        
-        
         def test_srid
           point_ = @factory.point(11, 12)
           assert_equal(0, point_.srid)

data/tests/simple_cartesian/tc_point.rb

@@ -49,6 +49,7 @@ module RGeo
         
         def setup
           @factory = ::RGeo::Cartesian.simple_factory(:srid => 1)
+          @zfactory = ::RGeo::Cartesian.simple_factory(:srid => 1, :support_z_coordinate => true)
         end
         
         

data/tests/simple_mercator/tc_point.rb

@@ -49,6 +49,7 @@ module RGeo
         
         def setup
           @factory = ::RGeo::Geography.simple_mercator
+          @zfactory = ::RGeo::Geography.simple_mercator(:support_z_coordinate => true)
         end
         
         

data/tests/simple_spherical/tc_point.rb

@@ -49,6 +49,7 @@ module RGeo
         
         def setup
           @factory = ::RGeo::Geography.simple_spherical
+          @zfactory = ::RGeo::Geography.simple_spherical(:support_z_coordinate => true)
         end
         
         

data/tests/tc_oneoff.rb

@@ -46,8 +46,9 @@ module RGeo
       
       def setup
         @mercator_factory = ::RGeo::Geography.simple_mercator
-        @spherical_factory = ::RGeo::Geography.simple_spherical
-        @geos_factory = ::RGeo::Geos.factory(:srid => 4326)
+        @spherical_factory = ::RGeo::Geography.simple_spherical(:support_z_coordinate => true)
+        @geos_factory = ::RGeo::Geos.factory(:srid => 4326, :support_z_coordinate => true)
+        @cartesian_factory = ::RGeo::Cartesian.simple_factory(:srid => 1, :support_z_coordinate => true)
         @entity_factory = ::RGeo::GeoJSON::EntityFactory.instance
       end
       

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 13
-  version: 0.1.13
+  - 14
+  version: 0.1.14
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -07:00
+date: 2010-11-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,9 +90,13 @@ files:
 - lib/rgeo/impl_helpers/basic_line_string_methods.rb
 - lib/rgeo/impl_helpers/basic_point_methods.rb
 - lib/rgeo/impl_helpers/basic_polygon_methods.rb
-- lib/rgeo/impl_helpers/serialization.rb
 - lib/rgeo/impl_helpers.rb
 - lib/rgeo/version.rb
+- lib/rgeo/wkrep/wkb_generator.rb
+- lib/rgeo/wkrep/wkb_parser.rb
+- lib/rgeo/wkrep/wkt_generator.rb
+- lib/rgeo/wkrep/wkt_parser.rb
+- lib/rgeo/wkrep.rb
 - lib/rgeo.rb
 - History.rdoc
 - README.rdoc

data/lib/rgeo/impl_helpers/serialization.rb

@@ -1,130 +0,0 @@
-# -----------------------------------------------------------------------------
-# 
-# Basic methods used by geometry objects
-# 
-# -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
-
-
-module RGeo
-  
-  module ImplHelpers  # :nodoc:
-    
-    
-    module Serialization  # :nodoc:
-      
-      @helper_factory = false
-      
-      class << self
-        
-        
-        def _helper_factory
-          if @helper_factory == false
-            if Geos.supported?
-              @helper_factory = Geos.factory(:srid => 0)
-            else
-              @helper_factory = nil
-            end
-          end
-          @helper_factory
-        end
-        
-        
-        def parse_wkt(str_, factory_)
-          helper_factory_ = _helper_factory
-          if helper_factory_
-            obj_ = helper_factory_.parse_wkt(str_)
-            obj_ ? Features.cast(obj_, factory_) : nil
-          else
-            default_parse_wkt(str_, factory_)
-          end
-        end
-        
-        
-        def parse_wkb(str_, factory_)
-          helper_factory_ = _helper_factory
-          if helper_factory_
-            obj_ = helper_factory_.parse_wkb(str_)
-            obj_ ? Features.cast(obj_, factory_) : nil
-          else
-            default_parse_wkb(str_, factory_)
-          end
-        end
-        
-        
-        def unparse_wkt(obj_)
-          helper_factory_ = _helper_factory
-          if helper_factory_
-            Features.cast(obj_, helper_factory_).as_text
-          else
-            default_unparse_wkt(obj_)
-          end
-        end
-        
-        
-        def unparse_wkb(obj_)
-          helper_factory_ = _helper_factory
-          if helper_factory_
-            Features.cast(obj_, helper_factory_).as_binary
-          else
-            default_unparse_wkb(obj_)
-          end
-        end
-        
-        
-        def default_parse_wkt(str_, factory_)
-          nil  # TODO
-        end
-        
-        
-        def default_parse_wkb(str_, factory_)
-          nil  # TODO
-        end
-        
-        
-        def default_unparse_wkt(obj_)
-          nil  # TODO
-        end
-        
-        
-        def default_unparse_wkb(obj_)
-          nil  # TODO
-        end
-        
-        
-      end
-      
-    end
-    
-    
-  end
-  
-end