rgeo 0.3.9 → 0.3.10

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.3.10 / 2012-04-12
+
+* Implemented subdivision and other analysis features on Cartesian::BoundingBox.
+* Operators +, -, and * were not implemented in the ffi-geos factory. Fixed.
+
 === 0.3.9 / 2012-04-10
 
 * Implemented LineString#length and MultiLineString#length for simple cartesian and simple spherical factories.

data/Version

@@ -1 +1 @@
-0.3.9
+0.3.10

data/lib/rgeo/cartesian/bounding_box.rb

@@ -61,10 +61,18 @@ module RGeo
 
       def self.create_from_points(point1_, point2_, opts_={})
         factory_ = point1_.factory
-        box_ = new(factory_, opts_)
-        box_._add_geometry(point1_)
-        box_.add(point2_)
-        box_
+        new(factory_, opts_)._add_geometry(point1_).add(point2_)
+      end
+
+
+      # Create a bounding box given a geometry to surround.
+      # The bounding box will be given the factory of the geometry.
+      # You may also provide the same options available to
+      # BoundingBox.new.
+
+      def self.create_from_geometry(geom_, opts_={})
+        factory_ = geom_.factory
+        new(factory_, opts_)._add_geometry(geom_)
       end
 
 
@@ -87,9 +95,13 @@ module RGeo
 
       def initialize(factory_, opts_={})
         @factory = factory_
-        @has_z = !opts_[:ignore_z] && factory_.property(:has_z_coordinate) ? true : false
-        @has_m = !opts_[:ignore_m] && factory_.property(:has_m_coordinate) ? true : false
-        @min_x = @max_x = @min_y = @max_y = @min_z = @max_z = @min_m = @max_m = nil
+        if (values_ = opts_[:raw])
+          @has_z, @has_m, @min_x, @max_x, @min_y, @max_y, @min_z, @max_z, @min_m, @max_m = values_
+        else
+          @has_z = !opts_[:ignore_z] && factory_.property(:has_z_coordinate) ? true : false
+          @has_m = !opts_[:ignore_m] && factory_.property(:has_m_coordinate) ? true : false
+          @min_x = @max_x = @min_y = @max_y = @min_z = @max_z = @min_m = @max_m = nil
+        end
       end
 
 
@@ -117,6 +129,25 @@ module RGeo
       end
 
 
+      # Returns true if this bounding box is degenerate. That is,
+      # it is nonempty but contains only a single point because both
+      # the X and Y spans are 0. Infinitesimal boxes are also
+      # always degenerate.
+
+      def infinitesimal?
+        @min_x && @min_x == @max_x && @min_y == @max_y
+      end
+
+
+      # Returns true if this bounding box is degenerate. That is,
+      # it is nonempty but has zero area because either or both
+      # of the X or Y spans are 0.
+
+      def degenerate?
+        @min_x && (@min_x == @max_x || @min_y == @max_y)
+      end
+
+
       # Returns true if this bounding box tracks Z coordinates.
 
       def has_z
@@ -145,6 +176,20 @@ module RGeo
       end
 
 
+      # Returns the midpoint X, or nil if this bounding box is empty.
+
+      def center_x
+        @max_x ? (@max_x + @min_x) * 0.5 : nil
+      end
+
+
+      # Returns the X span, or 0 if this bounding box is empty.
+
+      def x_span
+        @max_x ? @max_x - @min_x : 0
+      end
+
+
       # Returns the minimum Y, or nil if this bounding box is empty.
 
       def min_y
@@ -159,6 +204,20 @@ module RGeo
       end
 
 
+      # Returns the midpoint Y, or nil if this bounding box is empty.
+
+      def center_y
+        @max_y ? (@max_y + @min_y) * 0.5 : nil
+      end
+
+
+      # Returns the Y span, or 0 if this bounding box is empty.
+
+      def y_span
+        @max_y ? @max_y - @min_y : 0
+      end
+
+
       # Returns the minimum Z, or nil if this bounding box is empty.
 
       def min_z
@@ -173,6 +232,20 @@ module RGeo
       end
 
 
+      # Returns the midpoint Z, or nil if this bounding box is empty or has no Z.
+
+      def center_z
+        @max_z ? (@max_z + @min_z) * 0.5 : nil
+      end
+
+
+      # Returns the Z span, 0 if this bounding box is empty, or nil if it has no Z.
+
+      def z_span
+        @has_z ? (@max_z ? @max_z - @min_z : 0) : nil
+      end
+
+
       # Returns the minimum M, or nil if this bounding box is empty.
 
       def min_m
@@ -187,6 +260,20 @@ module RGeo
       end
 
 
+      # Returns the midpoint M, or nil if this bounding box is empty or has no M.
+
+      def center_m
+        @max_m ? (@max_m + @min_m) * 0.5 : nil
+      end
+
+
+      # Returns the M span, 0 if this bounding box is empty, or nil if it has no M.
+
+      def m_span
+        @has_m ? (@max_m ? @max_m - @min_m : 0) : nil
+      end
+
+
       # Returns a point representing the minimum extent in all dimensions,
       # or nil if this bounding box is empty.
 
@@ -237,8 +324,10 @@ module RGeo
       end
 
 
-      # Converts this bounding box to an envelope polygon.
-      # Returns the empty collection if this bounding box is empty.
+      # Converts this bounding box to an envelope, which will be the
+      # empty collection (if the bounding box is empty), a point (if the
+      # bounding box is not empty but both spans are 0), a line (if only
+      # one of the two spans is 0) or a polygon (if neither span is 0).
 
       def to_geometry
         if @min_x
@@ -246,14 +335,14 @@ module RGeo
           extras_ << @min_z if @has_z
           extras_ << @min_m if @has_m
           point_min_ = @factory.point(@min_x, @min_y, *extras_)
-          if @min_x == @max_x && @min_y == @max_y
+          if infinitesimal?
             point_min_
           else
             extras_ = []
             extras_ << @max_z if @has_z
             extras_ << @max_m if @has_m
             point_max_ = @factory.point(@max_x, @max_y, *extras_)
-            if @min_x == @max_x || @min_y == @max_y
+            if degenerate?
               @factory.line(point_min_, point_max_)
             else
               @factory.polygon(@factory.linear_ring([point_min_,
@@ -298,6 +387,60 @@ module RGeo
       end
 
 
+      # Returns this bounding box subdivided, as an array of bounding boxes.
+      # If this bounding box is empty, returns the empty array.
+      # If this bounding box is a point, returns a one-element array
+      # containing the current point.
+      # If the x or y span is 0, bisects the line.
+      # Otherwise, generally returns a 4-1 subdivision in the X-Y plane.
+      # Does not subdivide on Z or M.
+      #
+      # [<tt>:bisect_factor</tt>]
+      #   An optional floating point value that should be greater than 1.0.
+      #   If the ratio between the larger span and the smaller span is
+      #   greater than this factor, the bounding box is divided only in
+      #   half instead of fourths.
+
+      def subdivide(opts_={})
+        return [] if empty?
+        if infinitesimal?
+          return [
+            BoundingBox.new(@factory, :raw => [@has_z, @has_m,
+              @min_x, @max_x, @min_y, @max_y, @min_z, @max_z, @min_m, @max_m])
+          ]
+        end
+        factor_ = opts_[:bisect_factor]
+        factor_ ||= 1 if degenerate?
+        if factor_
+          if x_span > y_span * factor_
+            return [
+              BoundingBox.new(@factory, :raw => [@has_z, @has_m,
+                @min_x, center_x, @min_y, @max_y, @min_z, @max_z, @min_m, @max_m]),
+              BoundingBox.new(@factory, :raw => [@has_z, @has_m,
+                center_x, @max_x, @min_y, @max_y, @min_z, @max_z, @min_m, @max_m])
+            ]
+          elsif y_span > x_span * factor_
+            return [
+              BoundingBox.new(@factory, :raw => [@has_z, @has_m,
+                @min_x, @max_x, @min_y, center_y, @min_z, @max_z, @min_m, @max_m]),
+              BoundingBox.new(@factory, :raw => [@has_z, @has_m,
+                @min_x, @max_x, center_y, @max_y, @min_z, @max_z, @min_m, @max_m])
+            ]
+          end
+        end
+        [
+          BoundingBox.new(@factory, :raw => [@has_z, @has_m,
+            @min_x, center_x, @min_y, center_y, @min_z, @max_z, @min_m, @max_m]),
+          BoundingBox.new(@factory, :raw => [@has_z, @has_m,
+            center_x, @max_x, @min_y, center_y, @min_z, @max_z, @min_m, @max_m]),
+          BoundingBox.new(@factory, :raw => [@has_z, @has_m,
+            @min_x, center_x, center_y, @max_y, @min_z, @max_z, @min_m, @max_m]),
+          BoundingBox.new(@factory, :raw => [@has_z, @has_m,
+            center_x, @max_x, center_y, @max_y, @min_z, @max_z, @min_m, @max_m])
+        ]
+      end
+
+
       def _add_geometry(geometry_)  # :nodoc:
         case geometry_
         when Feature::Point
@@ -315,6 +458,7 @@ module RGeo
         when Feature::GeometryCollection
           geometry_.each{ |g_| _add_geometry(g_) }
         end
+        self
       end
 
 

data/lib/rgeo/geographic/factory.rb

@@ -273,7 +273,7 @@ module RGeo
       # this factory.
 
       def project(geometry_)
-        return nil unless @projector
+        return nil unless @projector && geometry_
         unless geometry_.factory == self
           raise Error::InvalidGeometry, 'Wrong geometry type'
         end
@@ -287,6 +287,7 @@ module RGeo
       # the projection defined by this factory.
 
       def unproject(geometry_)
+        return nil unless geometry_
         unless @projector && @projector.projection_factory == geometry_.factory
           raise Error::InvalidGeometry, 'You can unproject only features that are in the projected coordinate space.'
         end

data/lib/rgeo/geos/ffi_classes.rb

@@ -300,18 +300,24 @@ module RGeo
         fg_ ? @factory.wrap_fg_geom(@fg_geom.intersection(fg_)) : nil
       end
 
+      alias_method :*, :intersection
+
 
       def union(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)
         fg_ ? @factory.wrap_fg_geom(@fg_geom.union(fg_)) : nil
       end
 
+      alias_method :+, :union
+
 
       def difference(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)
         fg_ ? @factory.wrap_fg_geom(@fg_geom.difference(fg_)) : nil
       end
 
+      alias_method :-, :difference
+
 
       def sym_difference(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)

data/test/common/multi_point_tests.rb

@@ -202,6 +202,31 @@ module RGeo
         end
 
 
+        def test_union
+          geom1_ = @factory.multi_point([@point1, @point2])
+          geom2_ = @factory.multi_point([@point1, @point3])
+          geom3_ = @factory.multi_point([@point1, @point2, @point3])
+          assert_equal(geom3_, geom1_.union(geom2_))
+          assert_equal(geom3_, geom1_ + geom2_)
+        end
+
+
+        def test_difference
+          geom1_ = @factory.multi_point([@point1, @point2])
+          geom2_ = @factory.multi_point([@point1, @point3])
+          assert_equal(@point2, geom1_.difference(geom2_))
+          assert_equal(@point2, geom1_ - geom2_)
+        end
+
+
+        def test_intersection
+          geom1_ = @factory.multi_point([@point1, @point2])
+          geom2_ = @factory.multi_point([@point1, @point3])
+          assert_equal(@point1, geom1_.intersection(geom2_))
+          assert_equal(@point1, geom1_ * geom2_)
+        end
+
+
       end
 
     end

data/test/projected_geographic/tc_multi_point.rb

@@ -55,6 +55,12 @@ module RGeo
         include ::RGeo::Tests::Common::MultiPointTests
 
 
+        # These tests suffer from floating point issues
+        undef_method :test_union
+        undef_method :test_difference
+        undef_method :test_intersection
+
+
       end
 
     end

data/test/simple_cartesian/tc_multi_point.rb

@@ -58,6 +58,9 @@ module RGeo
         undef_method :test_fully_equal
         undef_method :test_geometrically_equal
         undef_method :test_not_equal
+        undef_method :test_union
+        undef_method :test_difference
+        undef_method :test_intersection
 
 
       end

data/test/simple_mercator/tc_multi_point.rb

@@ -55,6 +55,12 @@ module RGeo
         include ::RGeo::Tests::Common::MultiPointTests
 
 
+        # These tests suffer from floating point issues
+        undef_method :test_union
+        undef_method :test_difference
+        undef_method :test_intersection
+
+
       end
 
     end

data/test/spherical_geographic/tc_multi_point.rb

@@ -58,6 +58,9 @@ module RGeo
         undef_method :test_fully_equal
         undef_method :test_geometrically_equal
         undef_method :test_not_equal
+        undef_method :test_union
+        undef_method :test_difference
+        undef_method :test_intersection
 
 
       end

data/test/tc_cartesian_bbox.rb

@@ -59,27 +59,35 @@ module RGeo
         assert_equal(true, bbox_.to_geometry.is_empty?)
         assert_equal(true, bbox_.contains?(bbox_))
         assert_equal(false, bbox_.contains?(@factory.point(1, 1)))
+        assert_nil(bbox_.center_x)
+        assert_equal(0, bbox_.x_span)
+        assert_equal(0, bbox_.subdivide.size)
       end
 
 
       def test_point_bbox
         empty_bbox_ = ::RGeo::Cartesian::BoundingBox.new(@factory)
         bbox_ = ::RGeo::Cartesian::BoundingBox.new(@factory)
-        bbox_.add(@factory.point(1, 1))
+        bbox_.add(@factory.point(1, 2))
         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(2.0, bbox_.min_y)
         assert_equal(1.0, bbox_.max_x)
-        assert_equal(1.0, bbox_.max_y)
+        assert_equal(2.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(@factory.point(1, 2), bbox_.min_point)
+        assert_equal(@factory.point(1, 2), bbox_.max_point)
+        assert_equal(@factory.point(1, 2), 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(true, bbox_.contains?(@factory.point(1, 2)))
         assert_equal(false, bbox_.contains?(@factory.point(2, 1)))
+        assert_equal(1, bbox_.center_x)
+        assert_equal(0, bbox_.x_span)
+        assert_equal(2, bbox_.center_y)
+        assert_equal(0, bbox_.y_span)
+        assert_equal([bbox_], bbox_.subdivide)
       end
 
 
@@ -102,6 +110,10 @@ module RGeo
         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)))
+        assert_equal(1.5, bbox_.center_x)
+        assert_equal(1, bbox_.x_span)
+        assert_equal(3.5, bbox_.center_y)
+        assert_equal(1, bbox_.y_span)
       end
 
 
@@ -115,6 +127,40 @@ module RGeo
       end
 
 
+      def test_basic_rect_subdivide
+        bbox_ = ::RGeo::Cartesian::BoundingBox.new(@factory)
+        bbox_.add(@factory.point(1, 2))
+        bbox_.add(@factory.point(5, 4))
+        quads_ = bbox_.subdivide
+        quads_.each{ |q_| assert_equal(2.0, q_.to_geometry.area) }
+        quadsum_ = quads_[0].to_geometry + quads_[1].to_geometry +
+          quads_[2].to_geometry + quads_[3].to_geometry
+        assert_equal(bbox_.to_geometry, quadsum_)
+      end
+
+
+      def test_horiz_line_subdivide
+        bbox_ = ::RGeo::Cartesian::BoundingBox.new(@factory)
+        bbox_.add(@factory.point(1, 2))
+        bbox_.add(@factory.point(5, 2))
+        lines_ = bbox_.subdivide
+        lines_.each{ |line_| assert_equal(2.0, line_.to_geometry.length) }
+        linesum_ = lines_[0].to_geometry + lines_[1].to_geometry
+        assert_equal(bbox_.to_geometry, linesum_)
+      end
+
+
+      def test_vert_line_subdivide
+        bbox_ = ::RGeo::Cartesian::BoundingBox.new(@factory)
+        bbox_.add(@factory.point(1, 2))
+        bbox_.add(@factory.point(1, 6))
+        lines_ = bbox_.subdivide
+        lines_.each{ |line_| assert_equal(2.0, line_.to_geometry.length) }
+        linesum_ = lines_[0].to_geometry + lines_[1].to_geometry
+        assert_equal(bbox_.to_geometry, linesum_)
+      end
+
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-13 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