georuby 1.9.8 → 1.9.9

data/README.rdoc

@@ -30,15 +30,26 @@ They can be in 2D, 3DZ, 3DM, and 4D.
 
 On top of this an Envelope class is available, to contain the bounding box of a geometry.
 
+
 == Installation
 
 To install the latest version, just type:
 
-      gem install georuby
+    gem install georuby
+
 
 Or include on your projects`s Gemfile:
 
-      gem 'georuby'
+    gem 'georuby'
+
+
+Optional, require if you need support to:
+
+    require 'geo_ruby/shp4r/shp'
+    require 'geo_ruby/gpx4r/gpx'
+    require 'geo_ruby/geojson'
+    require 'geo_ruby/georss'
+    require 'geo_ruby/kml'
 
 
 == Use

data/lib/geo_ruby.rb

@@ -8,6 +8,7 @@ require 'geo_ruby/simple_features/geometry'
 require 'geo_ruby/simple_features/point'
 require 'geo_ruby/simple_features/line_string'
 require 'geo_ruby/simple_features/linear_ring'
+require 'geo_ruby/simple_features/circle'
 require 'geo_ruby/simple_features/polygon'
 require 'geo_ruby/simple_features/multi_point'
 require 'geo_ruby/simple_features/multi_line_string'
@@ -17,8 +18,8 @@ require 'geo_ruby/simple_features/envelope'
 require 'geo_ruby/simple_features/geometry_factory'
 
 # Require if you need
-require 'geo_ruby/shp4r/shp'
-require 'geo_ruby/gpx4r/gpx'
-require 'geo_ruby/geojson'
-require 'geo_ruby/georss'
-require 'geo_ruby/kml'
+# require 'geo_ruby/shp4r/shp'
+# require 'geo_ruby/gpx4r/gpx'
+# require 'geo_ruby/geojson'
+# require 'geo_ruby/georss'
+# require 'geo_ruby/kml'

data/lib/geo_ruby/simple_features/circle.rb

@@ -0,0 +1,57 @@
+module GeoRuby
+  module SimpleFeatures
+    #Represents a point. It is in 3D if the Z coordinate is not +nil+.
+    class Circle < Geometry
+      attr_accessor :radius, :center
+      alias :r :radius
+
+      def initialize(srid = DEFAULT_SRID, with_z = false, with_m = false)
+        super(srid, with_z, with_m)
+      end
+
+      def bounding_box
+        [Point.from_x_y(@center.x - @r, @center.y - @r),
+         Point.from_x_y(@center.x + @r, @center.y + @r)]
+      end
+
+      def m_range
+        raise NotImplementedError
+      end
+
+      def ==(other)
+        return false unless other.is_a?(Circle)
+        @center == other.center and @radius == other.radius
+      end
+
+      def to_json(options = {})
+        {:type => 'Circle',
+         :coordinates => @center.to_coordinates,
+         :radius => @radius}.to_json(options)
+      end
+      alias :as_geojson :to_json
+
+      def contains_point?(point)
+        dist = Mongoid::Spacial.distance(@center.to_coordinates,
+                  point.to_coordinates, :spherical => true, :unit => :m)
+        dist <= @radius
+      end
+
+      class << self
+        def from_x_y_r(x, y, r, srid = DEFAULT_SRID)
+          circle = new(srid)
+          circle.center = Point.from_x_y(x, y, srid)
+          circle.radius = r
+          circle
+        end
+
+        def from_coordinates(center, r, srid = DEFAULT_SRID)
+          circle = new(srid)
+          circle.center = Point.from_coordinates(center)
+          circle.radius = r
+          circle
+        end
+      end
+
+    end
+  end
+end

data/lib/geo_ruby/simple_features/geometry_collection.rb

@@ -18,7 +18,7 @@ module GeoRuby
 
       #Bounding box in 2D/3D. Returns an array of 2 points
       def bounding_box
-        max_x, min_x, max_y, min_y = -Float::MAX, Float::MAX, -Float::MAX, Float::MAX, -Float::MAX, Float::MAX
+        max_x, min_x, max_y, min_y = -Float::MAX, Float::MAX, -Float::MAX, Float::MAX
         if with_z
           max_z, min_z = -Float::MAX, Float::MAX
           each do |geometry|

data/lib/geo_ruby/simple_features/point.rb

@@ -117,6 +117,7 @@ module GeoRuby
 
         dot = a * c + b * d
         len = c * c + d * d
+        return 0.0 if len.zero?
         res = dot / len
 
         xx, yy = if res < 0
@@ -307,7 +308,7 @@ module GeoRuby
         as_json(options).to_json(options)
       end
       alias :as_geojson :to_json
-    
+
       #creates a point from an array of coordinates
       def self.from_coordinates(coords,srid=DEFAULT_SRID,with_z=false,with_m=false)
         if ! (with_z or with_m)
@@ -322,26 +323,26 @@ module GeoRuby
       end
 
       #creates a point from the X and Y coordinates
-      def self.from_x_y(x,y,srid=DEFAULT_SRID)
+      def self.from_x_y(x, y, srid=DEFAULT_SRID)
         point= new(srid)
         point.set_x_y(x,y)
       end
 
       #creates a point from the X, Y and Z coordinates
-      def self.from_x_y_z(x,y,z,srid=DEFAULT_SRID)
+      def self.from_x_y_z(x, y, z, srid=DEFAULT_SRID)
         point= new(srid,true)
         point.set_x_y_z(x,y,z)
       end
 
       #creates a point from the X, Y and M coordinates
-      def self.from_x_y_m(x,y,m,srid=DEFAULT_SRID)
+      def self.from_x_y_m(x, y, m, srid=DEFAULT_SRID)
         point= new(srid,false,true)
         point.m=m
         point.set_x_y(x,y)
       end
 
       #creates a point from the X, Y, Z and M coordinates
-      def self.from_x_y_z_m(x,y,z,m,srid=DEFAULT_SRID)
+      def self.from_x_y_z_m(x, y, z, m, srid=DEFAULT_SRID)
         point= new(srid,true,true)
         point.m=m
         point.set_x_y_z(x,y,z)
@@ -349,7 +350,7 @@ module GeoRuby
 
       #creates a point using polar coordinates
       #r and theta(degrees)
-      def self.from_r_t(r,t,srid=DEFAULT_SRID)
+      def self.from_r_t(r, t, srid=DEFAULT_SRID)
         t *= DEG2RAD
         x = r * Math.cos(t)
         y = r * Math.sin(t)
@@ -358,7 +359,7 @@ module GeoRuby
       end
 
       #creates a point using coordinates like 22`34 23.45N
-      def self.from_latlong(lat,lon,srid=DEFAULT_SRID)
+      def self.from_latlong(lat, lon, srid=DEFAULT_SRID)
         p = [lat,lon].map do |l|
           sig, deg, min, sec, cen = l.scan(/(-)?(\d{1,2})\D*(\d{2})\D*(\d{2})(\D*(\d{1,3}))?/).flatten
           sig = true if l =~ /W|S/
@@ -372,7 +373,9 @@ module GeoRuby
       #aliasing the constructors in case you want to use lat/lon instead of y/x
       class << self
         alias :xy               :from_x_y
+        alias :from_xy          :from_x_y
         alias :xyz              :from_x_y_z
+        alias :from_xyz         :from_x_y_z
         alias :from_lon_lat_z   :from_x_y_z
         alias :from_lon_lat     :from_x_y
         alias :from_lon_lat_z   :from_x_y_z

data/lib/geo_ruby/version.rb

@@ -1,3 +1,3 @@
 module GeoRuby
-  VERSION = '1.9.8'
+  VERSION = '1.9.9'
 end

data/spec/geo_ruby/simple_features/circle_spec.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Circle do
+
+  it "should instantiate" do
+    Circle.new.should be_kind_of Geometry
+  end
+
+
+  describe "Instance" do
+    let(:circle) { Circle.new(4326) }
+  end
+
+
+end

data/spec/geo_ruby/simple_features/point_spec.rb

@@ -2,21 +2,19 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Point do
-  before(:each) do
-    @point = Point.new(4326)
-  end
+  let(:point) { Point.new(4326) }
 
   it "should instantiatember" do
-    violated unless @point
-    @point.should be_instance_of(Point)
+    violated unless point
+    point.should be_instance_of(Point)
   end
 
   it "should have a nice matcher" do
-    @point.should be_a_point
+    point.should be_a_point
   end
 
   it "should have a very nice matcher" do
-    @point.should be_a_point(0.0, 0.0)
+    point.should be_a_point(0.0, 0.0)
   end
 
   it "should have a very nice matcher" do
@@ -34,25 +32,25 @@ describe Point do
   end
 
   it "should have binary_geometry_type 2" do
-    @point.binary_geometry_type.should eql(1)
+    point.binary_geometry_type.should eql(1)
   end
 
   it "should have the correct srid" do
-    @point.srid.should eql(4326)
+    point.srid.should eql(4326)
   end
 
   it "should not have z or m" do
-    @point.with_z.should be_false
-    @point.should_not be_with_z
-    @point.with_m.should be_false
-    @point.should_not be_with_m
+    point.with_z.should be_false
+    point.should_not be_with_z
+    point.with_m.should be_false
+    point.should_not be_with_m
   end
 
   it "should set params to 0.0" do
-    @point.x.should eql(0.0)
-    @point.y.should eql(0.0)
-    @point.z.should eql(0.0)
-    @point.m.should eql(0.0)
+    point.x.should eql(0.0)
+    point.y.should eql(0.0)
+    point.z.should eql(0.0)
+    point.m.should eql(0.0)
   end
 
   it "should compare ok" do
@@ -86,6 +84,13 @@ describe Point do
       point.z.should eql(0.0)
     end
 
+    it "should instantiate a 2d easily" do
+      point = Point.xy(10,20,123)
+      point.x.should eql(10)
+      point.y.should eql(20)
+      point.srid.should eql(123)
+    end
+
     it "should instantiate a 3d point" do
       point = Point.from_x_y_z(-10,-20,-30)
       point.x.should eql(-10)
@@ -203,101 +208,99 @@ describe Point do
 
   describe " > Distance & Bearing" do
 
-    before(:each) do
-      @p1 = Point.from_x_y(1,1)
-      @p2 = Point.from_x_y(2,2)
-    end
+    let(:p1) { Point.from_x_y(1,1) }
+    let(:p2) { Point.from_x_y(2,2) }
 
     it "and a 3th grade child should calculate euclidian distance" do
-      @p1.euclidian_distance(@p2).
+      p1.euclidian_distance(p2).
         should be_within(0.00000001).of(1.4142135623731)
     end
 
     it "should calculate spherical distance" do
-      @p1.spherical_distance(@p2).
+      p1.spherical_distance(p2).
         should be_within(0.00000001).of(157225.358003181)
     end
 
     it "should calculate ellipsoidal distance" do
-      @p1.ellipsoidal_distance(@p2).
+      p1.ellipsoidal_distance(p2).
         should be_within(0.00000001).of(156876.149400742)
     end
 
     describe "Orthogonal Distance" do
-      before do
-        @line = LineString.from_coordinates([[0,0],[1,3]], 4326)
-        @line2 = LineString.from_coordinates([[1,1],[1,2]], 4326)
-      end
+      let(:line) { LineString.from_coordinates([[0,0],[1,3]], 4326) }
+      let(:line2) { LineString.from_coordinates([[1,1],[1,2]], 4326) }
 
       it "should calcula orthogonal distance from a line (90 deg)" do
-        @p1.orthogonal_distance(@line).should be_within(0.001).of(1.414)
+        p1.orthogonal_distance(line).should be_within(0.001).of(1.414)
       end
 
       it "should calcula orthogonal distance very close..." do
-        @p1.orthogonal_distance(@line2).should be_zero
+        p1.orthogonal_distance(line2).should be_zero
       end
 
       it "should calcula orthogonal distance from a line (90 deg)" do
-        @p2.orthogonal_distance(@line).should be_within(0.001).of(2.828)
+        p2.orthogonal_distance(line).should be_within(0.001).of(2.828)
       end
 
       it "should calcula orthogonal distance from a line (0 deg)" do
-        @p2.orthogonal_distance(@line2).should be_within(0.1).of(1.0)
+        p2.orthogonal_distance(line2).should be_within(0.1).of(1.0)
       end
 
       it "should calcula orthogonal distance from a line (0 deg)" do
-        @p2.orthogonal_distance(@line2).should be_within(0.1).of(1.0)
+        p2.orthogonal_distance(line2).should be_within(0.1).of(1.0)
       end
 
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
-      @p1.bearing_to(@p2).should be_within(0.01).of(45.0)
+      p1.bearing_to(p2).should be_within(0.01).of(45.0)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
       p3 = Point.from_x_y(1,-1)
-      @p1.bearing_to(p3).should be_within(0.01).of(180.0)
+      p1.bearing_to(p3).should be_within(0.01).of(180.0)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
       p3 = Point.from_x_y(-1,-1)
-      @p1.bearing_to(p3).should be_within(0.01).of(225.0)
+      p1.bearing_to(p3).should be_within(0.01).of(225.0)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
       p3 = Point.from_x_y(-1,1)
-      @p1.bearing_to(p3).should be_within(0.01).of(270.0)
+      p1.bearing_to(p3).should be_within(0.01).of(270.0)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
       p3 = Point.from_x_y(2,-1)
-      @p1.bearing_to(p3).should be_within(0.0001).of(153.4349488)
+      p1.bearing_to(p3).should be_within(0.0001).of(153.4349488)
     end
 
     it "should calculate a clone point bearing to 0" do
-      @p1.bearing_to(@p1).should eql(0)
+      p1.bearing_to(p1).should eql(0)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
-      @p1.bearing_text(@p2).should eql(:ne)
+      p1.bearing_text(p2).should eql(:ne)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
       p3 = Point.from_x_y(-1,1)
-      @p1.bearing_text(p3).should eql(:w)
+      p1.bearing_text(p3).should eql(:w)
     end
 
   end
 
   describe "> Export Formats" do
 
-    before(:each) do
-      @point = Point.from_x_y( -11.2431, 32.3141 )
+    let(:point) { Point.from_x_y( -11.2431, 32.3141 ) }
+
+    it "should print out as array" do
+
     end
 
     it "should print nicely" do
-      @point.text_representation.should eql("-11.2431 32.3141")
+      point.text_representation.should eql("-11.2431 32.3141")
     end
 
     it "should printoout as binary" do
@@ -319,36 +322,36 @@ describe Point do
     end
 
     it "should have a nice bounding box" do
-      @point.should have(2).bounding_box
-      @point.bounding_box.each do |point|
-        point.x.should eql(@point.x)
-        point.y.should eql(@point.y)
+      point.should have(2).bounding_box
+      point.bounding_box.each do |point|
+        point.x.should eql(point.x)
+        point.y.should eql(point.y)
       end
     end
 
     it "should print as kml too" do
-      @point.kml_representation.should eql("<Point>\n<coordinates>-11.2431,32.3141</coordinates>\n</Point>\n")
+      point.kml_representation.should eql("<Point>\n<coordinates>-11.2431,32.3141</coordinates>\n</Point>\n")
     end
 
     it "should print as georss" do
-      @point.georss_simple_representation(:georss_ns => 'hey').should eql("<hey:point>32.3141 -11.2431</hey:point>\n")
+      point.georss_simple_representation(:georss_ns => 'hey').should eql("<hey:point>32.3141 -11.2431</hey:point>\n")
     end
 
     it "should print r (polar coords)" do
-      @point.r.should be_within(0.000001).of(34.214154)
+      point.r.should be_within(0.000001).of(34.214154)
     end
 
     it "should print theta as degrees" do
-      @point.theta_deg.should be_within(0.0001).of(289.184406352127)
+      point.theta_deg.should be_within(0.0001).of(289.184406352127)
     end
 
     it "should print theta as radians" do
-      @point.theta_rad.should be_within(0.0001).of(5.04722003626982)
+      point.theta_rad.should be_within(0.0001).of(5.04722003626982)
     end
 
     it "should output as polar" do
-      @point.as_polar.should be_instance_of(Array)
-      @point.should have(2).as_polar #.length.should eql(2)
+      point.as_polar.should be_instance_of(Array)
+      point.should have(2).as_polar #.length.should eql(2)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: georuby
 version: !ruby/object:Gem::Version
-  version: 1.9.8
+  version: 1.9.9
   prerelease: 
 platform: ruby
 authors:
@@ -12,8 +12,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: dbf
   requirement: !ruby/object:Gem::Requirement
@@ -21,7 +37,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +61,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -37,7 +69,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +77,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.3.0
 description: GeoRuby provides geometric data types from the OGC 'Simple Features'
   specification.
 email: x@nofxx.com
@@ -62,6 +94,7 @@ files:
 - lib/geo_ruby/simple_features/point.rb
 - lib/geo_ruby/simple_features/multi_point.rb
 - lib/geo_ruby/simple_features/line_string.rb
+- lib/geo_ruby/simple_features/circle.rb
 - lib/geo_ruby/simple_features/multi_polygon.rb
 - lib/geo_ruby/simple_features/ewkt_parser.rb
 - lib/geo_ruby/simple_features/helper.rb
@@ -70,7 +103,6 @@ files:
 - lib/geo_ruby/simple_features/geometry_collection.rb
 - lib/geo_ruby/simple_features/multi_line_string.rb
 - lib/geo_ruby/simple_features/linear_ring.rb
-- lib/geo_ruby/simple_features/curve.rb
 - lib/geo_ruby/simple_features/polygon.rb
 - lib/geo_ruby/simple_features/geometry.rb
 - lib/geo_ruby/simple_features/ewkb_parser.rb
@@ -114,6 +146,7 @@ files:
 - spec/geo_ruby/simple_features/geometry_collection_spec.rb
 - spec/geo_ruby/simple_features/envelope_spec.rb
 - spec/geo_ruby/simple_features/geometry_factory_spec.rb
+- spec/geo_ruby/simple_features/circle_spec.rb
 - spec/geo_ruby/simple_features/multi_polygon_spec.rb
 - spec/geo_ruby/simple_features/polygon_spec.rb
 - spec/geo_ruby/simple_features/point_spec.rb
@@ -138,13 +171,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3326906326237505079
+      hash: 2815257623280011863
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2815257623280011863
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/geo_ruby/simple_features/curve.rb

@@ -1,10 +0,0 @@
-module GeoRuby
-  module SimpleFeatures
-    #Represents a point. It is in 3D if the Z coordinate is not +nil+.
-    class Curve < Geometry
-
-
-    end
-  end
-end
-