rgeo 0.2.5 → 0.2.6

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.2.6 / 2011-03-31
+
+* Ring direction analysis crashed if any of the line segments were zero length. Fixed. (Reported by spara.)
+
 === 0.2.5 / 2011-03-21
 
 * Line segment intersection tests in the simple cartesian implementations were failing for a few cases involving collinear segments. Fixed. (Reported by Dimitry Solovyov.)

data/README.rdoc

@@ -70,14 +70,7 @@ Install RGeo as a gem:
  gem install rgeo
 
 Note: By default, the gem installation looks for the GEOS library in the
-following locations:
-
-* /usr/local
-* /usr/local/geos
-* /opt/local
-* /opt/geos
-* /opt
-* /usr
+following locations: <tt>/usr/local</tt>, <tt>/usr/local/geos</tt>, <tt>/opt/local</tt>, <tt>/opt/geos</tt>, <tt>/opt</tt>, <tt>/usr</tt>.
 
 If GEOS has been installed in a different location, you must provide its
 installation prefix directory using the "--with-geos-dir" option. This
@@ -87,16 +80,7 @@ the switches interpreted by the gem command. For example:
  gem install rgeo -- --with-geos-dir=/path/to/my/geos/installation
 
 Similarly, the gem installation looks for the Proj4 library in the
-following locations by default:
-
-* /usr/local
-* /usr/local/proj
-* /usr/local/proj4
-* /opt/local
-* /opt/proj
-* /opt/proj4
-* /opt
-* /usr
+following locations by default: <tt>/usr/local</tt>, <tt>/usr/local/proj</tt>, <tt>/usr/local/proj4</tt>, <tt>/opt/local</tt>, <tt>/opt/proj</tt>, <tt>/opt/proj4</tt>, <tt>/opt</tt>, <tt>/usr</tt>.
 
 If Proj4 is installed in a different location, you must provide its
 installation prefix directory using the "--with-proj-dir" option.
@@ -143,7 +127,7 @@ Geospatial Foundation; more information is available on OSGeo's web site
 
 === License
 
-Copyright 2010 Daniel Azuma
+Copyright 2011 Daniel Azuma
 
 All rights reserved.
 

data/Version

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/rgeo/cartesian/analysis.rb

@@ -69,6 +69,8 @@ module RGeo
             r_ = ::Math.sqrt(x_*x_ + y_*y_)
             if r_ > 0.0
               segs_ << x_/r_ << y_/r_
+            else
+              size_ -= 1
             end
           end
           segs_ << segs_[0] << segs_[1]

data/lib/rgeo/geographic/interface.rb

@@ -123,7 +123,12 @@ module RGeo
           end
         end
         srid_ ||= coord_sys_.authority_code if coord_sys_
-        Geographic::Factory.new('Spherical', :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate], :proj4 => proj4_ || _proj4_4055, :coord_sys => coord_sys_ || _coordsys_4055, :srid => (srid_ || 4055).to_i)
+        Geographic::Factory.new('Spherical',
+          :has_z_coordinate => opts_[:has_z_coordinate],
+          :has_m_coordinate => opts_[:has_m_coordinate],
+          :proj4 => proj4_ || _proj4_4055,
+          :coord_sys => coord_sys_ || _coordsys_4055,
+          :srid => (srid_ || 4055).to_i)
       end
       
       
@@ -181,8 +186,17 @@ module RGeo
       # more details.
       
       def simple_mercator_factory(opts_={})
-        factory_ = Geographic::Factory.new('Projected', :proj4 => _proj4_4326, :coord_sys => _coordsys_4326, :srid => 4326, :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
-        projector_ = Geographic::SimpleMercatorProjector.new(factory_, :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
+        factory_ = Geographic::Factory.new('Projected',
+          :proj4 => _proj4_4326,
+          :coord_sys => _coordsys_4326,
+          :srid => 4326,
+          :has_z_coordinate => opts_[:has_z_coordinate],
+          :has_m_coordinate => opts_[:has_m_coordinate])
+        projector_ = Geographic::SimpleMercatorProjector.new(factory_,
+          :buffer_resolution => opts_[:buffer_resolution],
+          :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions],
+          :has_z_coordinate => opts_[:has_z_coordinate],
+          :has_m_coordinate => opts_[:has_m_coordinate])
         factory_._set_projector(projector_)
         factory_
       end
@@ -314,8 +328,14 @@ module RGeo
           srid_ ||= coord_sys_.authority_code if coord_sys_
           srid_ ||= 4326
           # Now we should have all the coordinate system info.
-          factory_ = Geographic::Factory.new('Projected', :proj4 => proj4_, :coord_sys => coord_sys_, :srid => srid_.to_i, :has_z_coordinate => projection_factory_.property(:has_z_coordinate), :has_m_coordinate => projection_factory_.property(:has_m_coordinate))
-          projector_ = Geographic::Proj4Projector.create_from_existing_factory(factory_, projection_factory_)
+          factory_ = Geographic::Factory.new('Projected',
+            :proj4 => proj4_,
+            :coord_sys => coord_sys_,
+            :srid => srid_.to_i,
+            :has_z_coordinate => projection_factory_.property(:has_z_coordinate),
+            :has_m_coordinate => projection_factory_.property(:has_m_coordinate))
+          projector_ = Geographic::Proj4Projector.create_from_existing_factory(factory_,
+            projection_factory_)
         else
           # Determine projection coordinate system. First check the parameters.
           projection_proj4_ = opts_[:projection_proj4]
@@ -363,8 +383,20 @@ module RGeo
           srid_ ||= coord_sys_.authority_code if coord_sys_
           srid_ ||= 4326
           # Now we should have all the coordinate system info.
-          factory_ = Geographic::Factory.new('Projected', :proj4 => proj4_, :coord_sys => coord_sys_, :srid => srid_.to_i, :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
-          projector_ = Geographic::Proj4Projector.create_from_proj4(factory_, projection_proj4_, :srid => projection_srid_, :coord_sys => projection_coord_sys_, :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :has_z_coordinate => opts_[:has_z_coordinate], :has_m_coordinate => opts_[:has_m_coordinate])
+          factory_ = Geographic::Factory.new('Projected',
+            :proj4 => proj4_,
+            :coord_sys => coord_sys_,
+            :srid => srid_.to_i,
+            :has_z_coordinate => opts_[:has_z_coordinate],
+            :has_m_coordinate => opts_[:has_m_coordinate])
+          projector_ = Geographic::Proj4Projector.create_from_proj4(factory_,
+            projection_proj4_,
+            :srid => projection_srid_,
+            :coord_sys => projection_coord_sys_,
+            :buffer_resolution => opts_[:buffer_resolution],
+            :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions],
+            :has_z_coordinate => opts_[:has_z_coordinate],
+            :has_m_coordinate => opts_[:has_m_coordinate])
         end
         factory_._set_projector(projector_)
         factory_

data/lib/rgeo/geographic/projected_window.rb

@@ -101,7 +101,8 @@ module RGeo
       
       def eql?(obj_)  # :nodoc:
         return false unless obj_.kind_of?(ProjectedWindow)
-        @factory == obj_.factory && @x_min == obj_.x_min && @x_max == obj_.x_max && @y_min = obj_.y_min && @y_max = obj_.y_max
+        @factory == obj_.factory && @x_min == obj_.x_min && @x_max == obj_.x_max &&
+          @y_min = obj_.y_min && @y_max = obj_.y_max
       end
       alias_method :==, :eql?
       
@@ -359,7 +360,8 @@ module RGeo
       def with_margin(x_margin_, y_margin_=nil)
         y_margin_ ||= x_margin_
         if x_margin_ != 0.0 || y_margin_ != 0.0
-          ProjectedWindow.new(@factory, @x_min - x_margin_, @y_min - y_margin_, @x_max + x_margin_, @y_max + y_margin_)
+          ProjectedWindow.new(@factory, @x_min - x_margin_, @y_min - y_margin_,
+            @x_max + x_margin_, @y_max + y_margin_)
         else
           self
         end
@@ -393,7 +395,7 @@ module RGeo
           factory_ = point_.factory
           projection_ = factory_.project(point_)
           ProjectedWindow.new(factory_, projection_.x - x_margin_, projection_.y - y_margin_,
-                              projection_.x + x_margin_, projection_.y + y_margin_)
+            projection_.x + x_margin_, projection_.y + y_margin_)
         end
         
         

metadata

@@ -2,7 +2,7 @@
 name: rgeo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -07:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: []