rgeo 0.3.8 → 0.3.9

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 0.3.9 / 2012-04-10
+
+* Implemented LineString#length and MultiLineString#length for simple cartesian and simple spherical factories.
+* Added Cartesian::BoundingBox.create_from_points.
+* Serialization was broken for some 3d geometries when running libgeos 3.2.x (3.3.x was unaffected). Fixed.
+* Fixed an exception when creating adding a geometry to a Cartesian::BoundingBox when a cast is necessary.
+* Added configuration for Travis CI.
+
 === 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)

data/README.rdoc

@@ -122,6 +122,8 @@ Source code is hosted on Github at http://github.com/dazuma/rgeo
 
 Contributions are welcome. Fork the project on Github.
 
+Build status: {<img src="https://secure.travis-ci.org/dazuma/rgeo.png" />}[http://travis-ci.org/dazuma/rgeo]
+
 Report bugs on Github issues at http://github.org/dazuma/rgeo/issues
 
 Support available on the rgeo-users google group at http://groups.google.com/group/rgeo-users
@@ -132,7 +134,9 @@ Contact the author at dazuma at gmail dot com.
 
 RGeo is written by Daniel Azuma (http://www.daniel-azuma.com).
 
-Development is supported by Pirq. (http://www.pirq.com).
+Development is supported by Pirq (http://www.pirq.com).
+
+Continuous integration service provided by Travis-CI (http://travis-ci.org).
 
 RGeo calls the GEOS library to handle most Cartesian geometric
 calculations, and the Proj4 library to handle projections and coordinate

data/Version

@@ -1 +1 @@
-0.3.8
+0.3.9

data/ext/geos_c_impl/extconf.rb

@@ -78,6 +78,7 @@ else
     end
     have_func('GEOSPreparedContains_r', 'geos_c.h')
     have_func('GEOSPreparedDisjoint_r', 'geos_c.h')
+    have_func('GEOSWKTWriter_setOutputDimension_r', 'geos_c.h')
   end
   unless found_geos_
     puts "**** WARNING: Unable to find GEOS headers or GEOS version is too old."

data/ext/geos_c_impl/factory.c

@@ -316,13 +316,32 @@ static VALUE method_factory_write_for_marshal(VALUE self, VALUE obj)
   VALUE result;
   char* str;
   size_t size;
+  char has_3d;
+#ifndef RGEO_GEOS_SUPPORTS_SETOUTPUTDIMENSION
+  RGeo_Globals* globals;
+  VALUE wkb_generator;
+#endif
 
   self_data = RGEO_FACTORY_DATA_PTR(self);
   self_context = self_data->geos_context;
+  has_3d = self_data->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M;
+#ifndef RGEO_GEOS_SUPPORTS_SETOUTPUTDIMENSION
+  if (has_3d) {
+    globals = self_data->globals;
+    wkb_generator = globals->marshal_wkb_generator;
+    if (NIL_P(wkb_generator)) {
+      wkb_generator = rb_funcall(
+        rb_const_get_at(globals->geos_module, rb_intern("Utils")),
+        rb_intern("marshal_wkb_generator"), 0);
+      globals->marshal_wkb_generator = wkb_generator;
+    }
+    return rb_funcall(wkb_generator, globals->id_generate, 1, obj);
+  }
+#endif
   wkb_writer = self_data->marshal_wkb_writer;
   if (!wkb_writer) {
     wkb_writer = GEOSWKBWriter_create_r(self_context);
-    if (self_data->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M) {
+    if (has_3d) {
       GEOSWKBWriter_setOutputDimension_r(self_context, wkb_writer, 3);
     }
     self_data->marshal_wkb_writer = wkb_writer;
@@ -351,13 +370,32 @@ static VALUE method_factory_write_for_psych(VALUE self, VALUE obj)
   VALUE result;
   char* str;
   size_t size;
+  char has_3d;
+#ifndef RGEO_GEOS_SUPPORTS_SETOUTPUTDIMENSION
+  RGeo_Globals* globals;
+  VALUE wkt_generator;
+#endif
 
   self_data = RGEO_FACTORY_DATA_PTR(self);
   self_context = self_data->geos_context;
+  has_3d = self_data->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M;
+#ifndef RGEO_GEOS_SUPPORTS_SETOUTPUTDIMENSION
+  if (has_3d) {
+    globals = self_data->globals;
+    wkt_generator = globals->psych_wkt_generator;
+    if (NIL_P(wkt_generator)) {
+      wkt_generator = rb_funcall(
+        rb_const_get_at(globals->geos_module, rb_intern("Utils")),
+        rb_intern("psych_wkt_generator"), 0);
+      globals->psych_wkt_generator = wkt_generator;
+    }
+    return rb_funcall(wkt_generator, globals->id_generate, 1, obj);
+  }
+#endif
   wkt_writer = self_data->psych_wkt_writer;
   if (!wkt_writer) {
     wkt_writer = GEOSWKTWriter_create_r(self_context);
-    if (self_data->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M) {
+    if (has_3d) {
       GEOSWKTWriter_setOutputDimension_r(self_context, wkt_writer, 3);
     }
     self_data->psych_wkt_writer = wkt_writer;
@@ -561,6 +599,11 @@ RGeo_Globals* rgeo_init_geos_factory()
   globals->id_enum_for = rb_intern("enum_for");
   globals->sym_force_new = ID2SYM(rb_intern("force_new"));
   globals->sym_keep_subtype = ID2SYM(rb_intern("keep_subtype"));
+#ifndef RGEO_GEOS_SUPPORTS_SETOUTPUTDIMENSION
+  globals->psych_wkt_generator = Qnil;
+  globals->marshal_wkb_generator = Qnil;
+#endif
+
 
   // Add C methods to the factory.
   geos_factory_class = rb_const_get_at(globals->geos_module, rb_intern("Factory"));

data/ext/geos_c_impl/factory.h

@@ -80,6 +80,10 @@ typedef struct {
   ID id_enum_for;
   VALUE sym_force_new;
   VALUE sym_keep_subtype;
+#ifndef RGEO_GEOS_SUPPORTS_SETOUTPUTDIMENSION
+  VALUE psych_wkt_generator;
+  VALUE marshal_wkb_generator;
+#endif
 } RGeo_Globals;
 
 

data/ext/geos_c_impl/preface.h

@@ -47,6 +47,9 @@
 #ifdef HAVE_GEOSPREPAREDDISJOINT_R
 #define RGEO_GEOS_SUPPORTS_PREPARED2
 #endif
+#ifdef HAVE_GEOSWKTWWRITER_SETOUTPUTDIMENSION_R
+#define RGEO_GEOS_SUPPORTS_SETOUTPUTDIMENSION
+#endif
 
 #ifdef __cplusplus
 #define RGEO_BEGIN_C extern "C" {

data/lib/rgeo/cartesian/bounding_box.rb

@@ -54,6 +54,20 @@ module RGeo
     class BoundingBox
 
 
+      # Create a bounding box given two corner points.
+      # The bounding box will be given the factory of the first point.
+      # You may also provide the same options available to
+      # BoundingBox.new.
+
+      def self.create_from_points(point1_, point2_, opts_={})
+        factory_ = point1_.factory
+        box_ = new(factory_, opts_)
+        box_._add_geometry(point1_)
+        box_.add(point2_)
+        box_
+      end
+
+
       # Create a new empty bounding box with the given factory.
       #
       # The factory defines the coordinate system for the bounding box,
@@ -216,7 +230,7 @@ module RGeo
           if geometry_.factory == @factory
             _add_geometry(geometry_)
           else
-            _add_geometry(Factory.cast(geometry_, @factory))
+            _add_geometry(Feature.cast(geometry_, @factory))
           end
         end
         self

data/lib/rgeo/cartesian/feature_classes.rb

@@ -152,6 +152,7 @@ module RGeo
       include ::RGeo::ImplHelper::BasicGeometryCollectionMethods
       include ::RGeo::ImplHelper::BasicMultiLineStringMethods
       include ::RGeo::Cartesian::GeometryMethods
+      include ::RGeo::Cartesian::MultiLineStringMethods
 
       Feature::MixinCollection::GLOBAL.for_type(Feature::MultiLineString).include_in_class(self, true)
 

data/lib/rgeo/cartesian/feature_methods.rb

@@ -114,12 +114,24 @@ module RGeo
 
 
       def length
-        @segments.inject(0.0){ |sum_, seg_| sum_ + seg_.length }
+        _segments.inject(0.0){ |sum_, seg_| sum_ + seg_.length }
       end
 
 
     end
 
+
+    module MultiLineStringMethods  # :nodoc:
+
+
+      def length
+        inject(0.0){ |sum_, geom_| sum_ + geom_.length }
+      end
+
+
+    end
+
+
   end
 
 end

data/lib/rgeo/geographic/spherical_feature_classes.rb

@@ -212,6 +212,7 @@ module RGeo
       include ImplHelper::BasicGeometryCollectionMethods
       include ImplHelper::BasicMultiLineStringMethods
       include SphericalGeometryMethods
+      include SphericalMultiLineStringMethods
 
 
       Feature::MixinCollection::GLOBAL.for_type(Feature::MultiLineString).include_in_class(self, true)

data/lib/rgeo/geographic/spherical_feature_methods.rb

@@ -89,6 +89,22 @@ module RGeo
       end
 
 
+      def length
+        _arcs.inject(0.0){ |sum_, arc_| sum_ + arc_.length } * SphericalMath::RADIUS
+      end
+
+
+    end
+
+
+    module SphericalMultiLineStringMethods
+
+
+      def length
+        inject(0.0){ |sum_, geom_| sum_ + geom_.length }
+      end
+
+
     end
 
 

data/lib/rgeo/geographic/spherical_math.rb

@@ -196,6 +196,11 @@ module RGeo
         end
 
 
+        def length
+          @s.dist_to_point(@e)
+        end
+
+
       end
 
 

data/lib/rgeo/geos.rb

@@ -64,6 +64,7 @@ end
 # :stopdoc:
 
 # Implementation files
+require 'rgeo/geos/utils'
 require 'rgeo/geos/factory'
 require 'rgeo/geos/interface'
 begin
@@ -79,7 +80,6 @@ require 'rgeo/geos/zm_impl'
 begin
   require 'ffi-geos'
   ::RGeo::Geos::FFI_SUPPORTED = true
-  ::RGeo::Geos::FFIUtils._init
 rescue ::LoadError
   ::RGeo::Geos::FFI_SUPPORTED = false
 rescue
@@ -96,4 +96,7 @@ elsif ::RGeo::Geos::FFI_SUPPORTED
   ::RGeo::Geos.preferred_native_interface = :ffi
 end
 
+# Init internal utilities
+::RGeo::Geos::Utils._init
+
 # :startdoc:

data/lib/rgeo/geos/ffi_classes.rb

@@ -39,66 +39,6 @@ module RGeo
   module Geos
 
 
-    module FFIUtils  # :nodoc:
-
-      class << self
-
-
-        def coord_seqs_equal?(cs1_, cs2_, check_z_)
-          len1_ = cs1_.length
-          len2_ = cs2_.length
-          if len1_ == len2_
-            (0...len1_).each do |i_|
-              return false unless cs1_.get_x(i_) == cs2_.get_x(i_) &&
-                cs1_.get_y(i_) == cs2_.get_y(i_) &&
-                (!check_z_ || cs1_.get_z(i_) == cs2_.get_z(i_))
-            end
-            true
-          else
-            false
-          end
-        end
-
-
-        def compute_dimension(geom_)
-          result_ = -1
-          case geom_.type_id
-          when ::Geos::GeomTypes::GEOS_POINT
-            result_ = 0
-          when ::Geos::GeomTypes::GEOS_MULTIPOINT
-            result_ = 0 unless geom_.empty?
-          when ::Geos::GeomTypes::GEOS_LINESTRING, ::Geos::GeomTypes::GEOS_LINEARRING
-            result_ = 1
-          when ::Geos::GeomTypes::GEOS_MULTILINESTRING
-            result_ = 1 unless geom_.empty?
-          when ::Geos::GeomTypes::GEOS_POLYGON
-            result_ = 2
-          when ::Geos::GeomTypes::GEOS_MULTIPOLYGON
-            result_ = 2 unless geom_.empty?
-          when ::Geos::GeomTypes::GEOS_GEOMETRYCOLLECTION
-            geom_.each do |g_|
-              dim_ = compute_dimension(g_)
-              result_ = dim_ if result_ < dim_
-            end
-          end
-          result_
-        end
-
-
-        def _init
-          @supports_prepared_level_1 = ::Geos::FFIGeos.respond_to?(:GEOSPreparedContains_r)
-          @supports_prepared_level_2 = ::Geos::FFIGeos.respond_to?(:GEOSPreparedDisjoint_r)
-        end
-
-        attr_reader :supports_prepared_level_1
-        attr_reader :supports_prepared_level_2
-
-
-      end
-
-    end
-
-
     class FFIGeometryImpl  # :nodoc:
 
       include Feature::Instance
@@ -123,7 +63,7 @@ module RGeo
       # Marshal support
 
       def marshal_dump  # :nodoc:
-        [@factory, @factory._write_for_marshal(@fg_geom)]
+        [@factory, @factory._write_for_marshal(self)]
       end
 
       def marshal_load(data_)  # :nodoc:
@@ -139,7 +79,7 @@ module RGeo
 
       def encode_with(coder_)  # :nodoc:
         coder_['factory'] = @factory
-        str_ = @factory._write_for_psych(@fg_geom)
+        str_ = @factory._write_for_psych(self)
         str_ = str_.encode('US-ASCII') if str_.respond_to?(:encode)
         coder_['wkt'] = str_
       end
@@ -174,7 +114,7 @@ module RGeo
 
 
       def dimension
-        FFIUtils.compute_dimension(@fg_geom)
+        Utils.ffi_compute_dimension(@fg_geom)
       end
 
 
@@ -258,7 +198,7 @@ module RGeo
       def disjoint?(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)
         if fg_
-          prep_ = _request_prepared if FFIUtils.supports_prepared_level_2
+          prep_ = _request_prepared if Utils.ffi_supports_prepared_level_2
           prep_ ? prep_.disjoint?(fg_) : @fg_geom.disjoint?(fg_)
         else
           false
@@ -269,7 +209,7 @@ module RGeo
       def intersects?(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)
         if fg_
-          prep_ = _request_prepared if FFIUtils.supports_prepared_level_1
+          prep_ = _request_prepared if Utils.ffi_supports_prepared_level_1
           prep_ ? prep_.intersects?(fg_) : @fg_geom.intersects?(fg_)
         else
           false
@@ -280,7 +220,7 @@ module RGeo
       def touches?(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)
         if fg_
-          prep_ = _request_prepared if FFIUtils.supports_prepared_level_2
+          prep_ = _request_prepared if Utils.ffi_supports_prepared_level_2
           prep_ ? prep_.touches?(fg_) : @fg_geom.touches?(fg_)
         else
           false
@@ -291,7 +231,7 @@ module RGeo
       def crosses?(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)
         if fg_
-          prep_ = _request_prepared if FFIUtils.supports_prepared_level_2
+          prep_ = _request_prepared if Utils.ffi_supports_prepared_level_2
           prep_ ? prep_.crosses?(fg_) : @fg_geom.crosses?(fg_)
         else
           false
@@ -302,7 +242,7 @@ module RGeo
       def within?(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)
         if fg_
-          prep_ = _request_prepared if FFIUtils.supports_prepared_level_2
+          prep_ = _request_prepared if Utils.ffi_supports_prepared_level_2
           prep_ ? prep_.within?(fg_) : @fg_geom.within?(fg_)
         else
           false
@@ -313,7 +253,7 @@ module RGeo
       def contains?(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)
         if fg_
-          prep_ = _request_prepared if FFIUtils.supports_prepared_level_1
+          prep_ = _request_prepared if Utils.ffi_supports_prepared_level_1
           prep_ ? prep_.contains?(fg_) : @fg_geom.contains?(fg_)
         else
           false
@@ -324,7 +264,7 @@ module RGeo
       def overlaps?(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)
         if fg_
-          prep_ = _request_prepared if FFIUtils.supports_prepared_level_2
+          prep_ = _request_prepared if Utils.ffi_supports_prepared_level_2
           prep_ ? prep_.overlaps?(fg_) : @fg_geom.overlaps?(fg_)
         else
           false
@@ -449,7 +389,7 @@ module RGeo
 
       def rep_equals?(rhs_)
         rhs_.class == self.class && rhs_.factory.eql?(@factory) &&
-          FFIUtils.coord_seqs_equal?(rhs_.fg_geom.coord_seq, @fg_geom.coord_seq, @factory._has_3d)
+          Utils.ffi_coord_seqs_equal?(rhs_.fg_geom.coord_seq, @fg_geom.coord_seq, @factory._has_3d)
       end
 
 
@@ -525,7 +465,7 @@ module RGeo
 
       def rep_equals?(rhs_)
         rhs_.class == self.class && rhs_.factory.eql?(@factory) &&
-          FFIUtils.coord_seqs_equal?(rhs_.fg_geom.coord_seq, @fg_geom.coord_seq, @factory._has_3d)
+          Utils.ffi_coord_seqs_equal?(rhs_.fg_geom.coord_seq, @fg_geom.coord_seq, @factory._has_3d)
       end
 
 

data/lib/rgeo/geos/ffi_factory.rb

@@ -599,12 +599,16 @@ module RGeo
       end
 
 
-      def _write_for_marshal(obj_)  # :nodoc:
-        unless defined?(@marshal_wkb_writer)
-          @marshal_wkb_writer = ::Geos::WkbWriter.new
-          @marshal_wkb_writer.output_dimensions = (@_has_3d ? 3 : 2)
+      def _write_for_marshal(geom_)  # :nodoc:
+        if Utils.ffi_supports_set_output_dimension || !@_has_3d
+          unless defined?(@marshal_wkb_writer)
+            @marshal_wkb_writer = ::Geos::WkbWriter.new
+            @marshal_wkb_writer.output_dimensions = 3 if @_has_3d
+          end
+          @marshal_wkb_writer.write(geom_.fg_geom)
+        else
+          Utils.marshal_wkb_generator.generate(geom_)
         end
-        @marshal_wkb_writer.write(obj_)
       end
 
 
@@ -616,12 +620,16 @@ module RGeo
       end
 
 
-      def _write_for_psych(obj_)  # :nodoc:
-        unless defined?(@psych_wkt_writer)
-          @psych_wkt_writer = ::Geos::WktWriter.new
-          @psych_wkt_writer.output_dimensions = (@_has_3d ? 3 : 2)
+      def _write_for_psych(geom_)  # :nodoc:
+        if Utils.ffi_supports_set_output_dimension || !@_has_3d
+          unless defined?(@psych_wkt_writer)
+            @psych_wkt_writer = ::Geos::WktWriter.new
+            @psych_wkt_writer.output_dimensions = 3 if @_has_3d
+          end
+          @psych_wkt_writer.write(geom_.fg_geom)
+        else
+          Utils.psych_wkt_generator.generate(geom_)
         end
-        @psych_wkt_writer.write(obj_)
       end
 
 

data/lib/rgeo/geos/utils.rb

@@ -0,0 +1,112 @@
+# -----------------------------------------------------------------------------
+#
+# Various Geos-related internal utilities
+#
+# -----------------------------------------------------------------------------
+# Copyright 2010-2012 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 Geos
+
+
+    module Utils  # :nodoc:
+
+      class << self
+
+
+        def ffi_coord_seqs_equal?(cs1_, cs2_, check_z_)
+          len1_ = cs1_.length
+          len2_ = cs2_.length
+          if len1_ == len2_
+            (0...len1_).each do |i_|
+              return false unless cs1_.get_x(i_) == cs2_.get_x(i_) &&
+                cs1_.get_y(i_) == cs2_.get_y(i_) &&
+                (!check_z_ || cs1_.get_z(i_) == cs2_.get_z(i_))
+            end
+            true
+          else
+            false
+          end
+        end
+
+
+        def ffi_compute_dimension(geom_)
+          result_ = -1
+          case geom_.type_id
+          when ::Geos::GeomTypes::GEOS_POINT
+            result_ = 0
+          when ::Geos::GeomTypes::GEOS_MULTIPOINT
+            result_ = 0 unless geom_.empty?
+          when ::Geos::GeomTypes::GEOS_LINESTRING, ::Geos::GeomTypes::GEOS_LINEARRING
+            result_ = 1
+          when ::Geos::GeomTypes::GEOS_MULTILINESTRING
+            result_ = 1 unless geom_.empty?
+          when ::Geos::GeomTypes::GEOS_POLYGON
+            result_ = 2
+          when ::Geos::GeomTypes::GEOS_MULTIPOLYGON
+            result_ = 2 unless geom_.empty?
+          when ::Geos::GeomTypes::GEOS_GEOMETRYCOLLECTION
+            geom_.each do |g_|
+              dim_ = ffi_compute_dimension(g_)
+              result_ = dim_ if result_ < dim_
+            end
+          end
+          result_
+        end
+
+
+        def _init
+          if FFI_SUPPORTED
+            @ffi_supports_prepared_level_1 = ::Geos::FFIGeos.respond_to?(:GEOSPreparedContains_r)
+            @ffi_supports_prepared_level_2 = ::Geos::FFIGeos.respond_to?(:GEOSPreparedDisjoint_r)
+            @ffi_supports_set_output_dimension = ::Geos::FFIGeos.respond_to?(:GEOSWKTWriter_setOutputDimension_r)
+          end
+          @psych_wkt_generator = WKRep::WKTGenerator.new(:convert_case => :upper)
+          @marshal_wkb_generator = WKRep::WKBGenerator.new
+        end
+
+        attr_reader :ffi_supports_prepared_level_1
+        attr_reader :ffi_supports_prepared_level_2
+        attr_reader :ffi_supports_set_output_dimension
+        attr_reader :psych_wkt_generator
+        attr_reader :marshal_wkb_generator
+
+
+      end
+
+    end
+
+
+  end
+
+end

data/test/common/multi_line_string_tests.rb

@@ -48,9 +48,9 @@ module RGeo
           @factory = create_factory
           point1_ = @factory.point(0, 0)
           point2_ = @factory.point(1, 0)
-          point3_ = @factory.point(-4, 2)
-          point4_ = @factory.point(-5, 3)
-          point5_ = @factory.point(-3, 5)
+          point3_ = @factory.point(-4, 2)  # (-4, 2)
+          point4_ = @factory.point(-7, 6)  # (-5, 3)
+          point5_ = @factory.point(5, 11)  # (-3, 5)
           @linestring1 = @factory.line_string([point1_, point2_])
           @linestring2 = @factory.line_string([point3_, point4_, point5_])
           @linearring1 = @factory.linear_ring([point5_, point3_, point4_, point5_])
@@ -137,7 +137,7 @@ module RGeo
 
 
         def test_wkt_creation_simple
-          parsed_geom_ = @factory.parse_wkt('MULTILINESTRING((0 0, 1 0), (-4 2, -5 3, -3 5))')
+          parsed_geom_ = @factory.parse_wkt('MULTILINESTRING((0 0, 1 0), (-4 2, -7 6, 5 11))')
           built_geom_ = @factory.multi_line_string([@linestring1, @linestring2])
           assert(built_geom_.eql?(parsed_geom_))
         end
@@ -210,6 +210,14 @@ module RGeo
         end
 
 
+        def test_length
+          geom1_ = @factory.multi_line_string([@linestring1, @linestring2])
+          assert_equal(19, geom1_.length)
+          geom2_ = @factory.multi_line_string([])
+          assert_equal(0, geom2_.length)
+        end
+
+
       end
 
     end

data/test/coord_sys/tc_proj4.rb

@@ -81,7 +81,9 @@ module RGeo
 
 
         def _assert_close_enough(a_, b_)
-          assert_in_delta(a_, b_, ::Math.sqrt(a_*a_+b_*b_)*0.00000001)
+          delta_ = ::Math.sqrt(a_*a_+b_*b_)*0.00000001
+          delta_ = 0.000000000001 if delta_ < 0.000000000001
+          assert_in_delta(a_, b_, delta_)
         end
 
 

data/test/projected_geographic/tc_multi_line_string.rb

@@ -55,6 +55,9 @@ module RGeo
         include ::RGeo::Tests::Common::MultiLineStringTests
 
 
+        undef_method :test_length
+
+
       end
 
     end

data/test/simple_mercator/tc_multi_line_string.rb

@@ -55,6 +55,9 @@ module RGeo
         include ::RGeo::Tests::Common::MultiLineStringTests
 
 
+        undef_method :test_length
+
+
       end
 
     end

data/test/spherical_geographic/tc_multi_line_string.rb

@@ -58,6 +58,7 @@ module RGeo
         undef_method :test_fully_equal
         undef_method :test_geometrically_equal
         undef_method :test_not_equal
+        undef_method :test_length
 
 
       end

data/test/tc_cartesian_bbox.rb

@@ -0,0 +1,121 @@
+# -----------------------------------------------------------------------------
+#
+# Tests for basic GeoJSON usage
+#
+# -----------------------------------------------------------------------------
+# Copyright 2010-2012 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.
+# -----------------------------------------------------------------------------
+;
+
+
+require 'test/unit'
+require 'rgeo'
+
+
+module RGeo
+  module Tests  # :nodoc:
+
+    class TestCartesianBBox < ::Test::Unit::TestCase  # :nodoc:
+
+
+      def setup
+        @factory = ::RGeo::Cartesian.factory
+      end
+
+
+      def test_empty_bbox
+        bbox_ = ::RGeo::Cartesian::BoundingBox.new(@factory)
+        assert_equal(true, bbox_.empty?)
+        assert_equal(false, bbox_.has_z)
+        assert_nil(bbox_.min_x)
+        assert_equal(@factory, bbox_.factory)
+        assert_nil(bbox_.min_point)
+        assert_equal(true, bbox_.to_geometry.is_empty?)
+        assert_equal(true, bbox_.contains?(bbox_))
+        assert_equal(false, bbox_.contains?(@factory.point(1, 1)))
+      end
+
+
+      def test_point_bbox
+        empty_bbox_ = ::RGeo::Cartesian::BoundingBox.new(@factory)
+        bbox_ = ::RGeo::Cartesian::BoundingBox.new(@factory)
+        bbox_.add(@factory.point(1, 1))
+        assert_equal(false, bbox_.empty?)
+        assert_equal(false, bbox_.has_z)
+        assert_equal(1.0, bbox_.min_x)
+        assert_equal(1.0, bbox_.min_y)
+        assert_equal(1.0, bbox_.max_x)
+        assert_equal(1.0, bbox_.max_y)
+        assert_equal(@factory, bbox_.factory)
+        assert_equal(@factory.point(1, 1), bbox_.min_point)
+        assert_equal(@factory.point(1, 1), bbox_.max_point)
+        assert_equal(@factory.point(1, 1), bbox_.to_geometry)
+        assert_equal(true, bbox_.contains?(empty_bbox_))
+        assert_equal(false, empty_bbox_.contains?(bbox_))
+        assert_equal(true, bbox_.contains?(@factory.point(1, 1)))
+        assert_equal(false, bbox_.contains?(@factory.point(2, 1)))
+      end
+
+
+      def test_rect_bbox
+        empty_bbox_ = ::RGeo::Cartesian::BoundingBox.new(@factory)
+        bbox_ = ::RGeo::Cartesian::BoundingBox.new(@factory)
+        bbox_.add(@factory.point(1, 4))
+        bbox_.add(@factory.point(2, 3))
+        assert_equal(false, bbox_.empty?)
+        assert_equal(false, bbox_.has_z)
+        assert_equal(1.0, bbox_.min_x)
+        assert_equal(3.0, bbox_.min_y)
+        assert_equal(2.0, bbox_.max_x)
+        assert_equal(4.0, bbox_.max_y)
+        assert_equal(@factory, bbox_.factory)
+        assert_equal(@factory.point(1, 3), bbox_.min_point)
+        assert_equal(@factory.point(2, 4), bbox_.max_point)
+        assert_equal(1.0, bbox_.to_geometry.area)
+        assert_equal(true, bbox_.contains?(empty_bbox_))
+        assert_equal(false, empty_bbox_.contains?(bbox_))
+        assert_equal(true, bbox_.contains?(@factory.point(1, 3)))
+        assert_equal(false, bbox_.contains?(@factory.point(2, 1)))
+      end
+
+
+      def test_bbox_from_points
+        bbox_ = ::RGeo::Cartesian::BoundingBox.new(@factory)
+        bbox_.add(@factory.point(1, 4))
+        bbox_.add(@factory.point(2, 3))
+        bbox2_ = ::RGeo::Cartesian::BoundingBox.create_from_points(
+          @factory.point(2, 3), @factory.point(1, 4))
+        assert_equal(bbox_, bbox2_)
+      end
+
+
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2012-04-11 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
@@ -80,6 +80,7 @@ files:
 - lib/rgeo/geos/ffi_factory.rb
 - lib/rgeo/geos/impl_additions.rb
 - lib/rgeo/geos/interface.rb
+- lib/rgeo/geos/utils.rb
 - lib/rgeo/geos/zm_factory.rb
 - lib/rgeo/geos/zm_impl.rb
 - lib/rgeo/geos.rb
@@ -188,6 +189,7 @@ files:
 - test/spherical_geographic/tc_point.rb
 - test/spherical_geographic/tc_polygon.rb
 - test/tc_cartesian_analysis.rb
+- test/tc_cartesian_bbox.rb
 - test/tc_mixins.rb
 - test/tc_oneoff.rb
 - test/tc_types.rb
@@ -288,6 +290,7 @@ test_files:
 - test/spherical_geographic/tc_point.rb
 - test/spherical_geographic/tc_polygon.rb
 - test/tc_cartesian_analysis.rb
+- test/tc_cartesian_bbox.rb
 - test/tc_mixins.rb
 - test/tc_oneoff.rb
 - test/tc_types.rb