laptimer-geometry 0.0.1 → 0.0.2

data/spec/geometry_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Geometry do
+	it "should calculate the distance using the Earth radius Nelson Piquet" do 
+		point1 = {:x => -47.900648, :y => -15.772954} 
+		point2 = {:x => -47.900365, :y => -15.772869}
+		point3 = {:x => -47.90025, :y => -15.772835}
+		Geometry.calculate_spherical_distance(point1, point2).should be_true
+		Geometry.calculate_spherical_distance(point1, point3).should be_true
+	end	
+
+	it "should find the exact distance between 2 points on the earth" do
+		point1 = {:x => -47.900331, :y => -15.77284} 
+		point2 = {:x => -47.897064, :y => -15.77171}
+		distance = Geometry.calculate_spherical_distance(point1, point2)
+		distance.should be_within(0.001).of(0.372) # in Km
+	end
+end

data/spec/line_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require File.expand_path('../../src/geometry', __FILE__)
 
 describe Line do
 	before do
@@ -112,14 +111,6 @@ describe Line do
 		flag_line.intercept_line_segment?(segment1).should be_false
 	end
 
-	it "should calculate the distance using the Earth radius Nelson Piquet" do 
-		point1 = {:x => -47.900648, :y => -15.772954} 
-		point2 = {:x => -47.900365, :y => -15.772869}
-		point3 = {:x => -47.90025, :y => -15.772835}
-		Geometry.calculate_distance(point1, point2).should be_true
-		Geometry.calculate_distance(point1, point3).should be_true
-	end
-
 	it "should find the crossing segment with some real coordinates - Aut. Nelson Piquet" do 
 		flag_line = Line.new({:x => -47.900333, :y => -15.772656, }, {:x => -47.900148, :y => -15.773056})
 		segment1 = Line.new({:x => -47.900648, :y => -15.772954}, {:x =>-47.899923, :y => -15.772683})

data/src/geometry.rb

@@ -1,129 +1,34 @@
 module Geometry
   include Math
   extend Math
+
+  # Earth radius near Equator Line
+  EARTH_RADIUS = 6378
   
-  def distance(point1, point2)
-  	x1 = (point1[:x] > 0) ? point1[:x] : (point1[:x]*-1 )
-  	x2 = (point2[:x] > 0) ? point2[:x] : (point2[:x]*-1 )
-  	y1 = (point1[:y] > 0) ? point1[:y] : (point1[:y]*-1 )
-  	y2 = (point2[:y] > 0) ? point2[:y] : (point2[:y]*-1 )
-    hypot x1 - x2, y1 - y2
+  def euclidean_distance(point1, point2)
+    hypot point1[:x] - point2[:x], point1[:y] - point2[:y]
   end
 
-	def calculate_distance(point1, point2)
-		x1 = point1[:x] * Math::PI / 180
-		x2 = point2[:x] * Math::PI / 180
-		y1 = point1[:y] * Math::PI / 180
-		y2 = point2[:y] * Math::PI / 180
-
-		s = sin(y2)*sin(y1)+(cos(y2)*cos(y1)*cos(x2 - x1))
-		rad_distance = acos(s)
-		degree_distance = rad_distance/(Math::PI/180)
-		earth_radius = 6378
-		distance_km = earth_radius*degree_distance		
-		distance_km
-	end
-
-  module_function :distance
-  module_function :calculate_distance
-end
-
-class Line
-	include Math
-	def initialize(pointA, pointB)
-		@a, @b, @c = nil, nil, nil
-		@gradient = nil
-		@linear = nil
-		@pointA = pointA
-		@pointB = pointB
-		calculate_gradient
-		calculate_linear
-	end	
-
-	def pointA
-		@pointA
-	end
-
-	def pointB
-		@pointB
-	end
-
-	def gradient(ac = nil)
-		if ac.nil?
-			@gradient
-		else
-			@gradient = ac
-		end
-
-		@gradient
-	end
-
-	# m(x2-x1) - y2 + y1 = 0
-	def include?(point) 
-		result = @gradient * (point[:x] - @pointA[:x]) - point[:y] + @pointA[:y]
-		if(result == 0)
-			true
-		else
-			false
-		end
-	end
+  def calculate_spherical_distance(point1, point2)
+    x1 = deg_2_rad(point1[:x])
+    x2 = deg_2_rad(point2[:x])
+    y1 = deg_2_rad(point1[:y])
+    y2 = deg_2_rad(point2[:y])
 
-	def intercept?(line)	
-		(intercept_at(line).nil? == true) ? false : true
-	end
 
-	def intercept_at(line)
-		if @gradient != line.gradient								
-			x = calculate_x_from_two_lines(self, line)
-			y = (@gradient*x.to_f) + @linear
-			
-			new_point = { :x => sprintf('%.6f',x).to_f, :y => sprintf('%.6f',y).to_f}
-			return new_point
-		end
-
-		return nil
-	end
-
-	def linear_touch
-		@linear
-	end
-
-	def intercept_line_segment?(line)
-		
-		# verify the distance
-		if intercept?(line)
-			interception_point = intercept_at(line)
-
-			distance_segment = Geometry.calculate_distance(line.pointA, line.pointB)
-			distance_A_line_segment = Geometry.calculate_distance(line.pointA, interception_point)
-			distance_B_line_segment = Geometry.calculate_distance(line.pointB, interception_point)
-
-			if distance_A_line_segment > distance_segment 
-				return false
-			elsif distance_B_line_segment > distance_segment
-				return false
-			else
-				return true
-			end
-		end
-
-		return false
-	end
-
-	private
-	def calculate_gradient
-		@gradient = (@pointB[:y] - @pointA[:y]) / (@pointB[:x] - @pointA[:x]).to_f
-	end
+    dlon = x2 - x1
+    dlat = y2 - y1
+    a = (sin(dlat/2))**2 + cos(y1) * cos(y2) * (sin(dlon/2))**2 
+    c = 2 * atan2( sqrt(a), sqrt(1-a) ) 
+    d  = 6378 * c
+  end
 
-	def calculate_linear
-		@linear = nil
-		if not @gradient.nil?
-			@linear =  @pointA[:y].to_f - (@gradient * @pointA[:x].to_f )
-		end
-		@linear
-	end
+  def deg_2_rad(deg)
+      rad = deg * Math::PI/180; 
+      rad
+  end
 
-	def calculate_x_from_two_lines(line1, line2)
-		(line2.linear_touch - line1.linear_touch) / (line1.gradient - line2.gradient)
-	end
+  module_function :euclidean_distance
+  module_function :deg_2_rad
+  module_function :calculate_spherical_distance
 end

data/src/line.rb

@@ -0,0 +1,98 @@
+class Line
+  def initialize(pointA, pointB)
+    @a, @b, @c = nil, nil, nil
+    @gradient = nil
+    @linear = nil
+    @pointA = pointA
+    @pointB = pointB
+    calculate_gradient
+    calculate_linear
+  end 
+
+  def pointA
+    @pointA
+  end
+
+  def pointB
+    @pointB
+  end
+
+  def gradient(ac = nil)
+    if ac.nil?
+      @gradient
+    else
+      @gradient = ac
+    end
+
+    @gradient
+  end
+
+  # m(x2-x1) - y2 + y1 = 0
+  def include?(point) 
+    result = @gradient * (point[:x] - @pointA[:x]) - point[:y] + @pointA[:y]
+    if(result == 0)
+      true
+    else
+      false
+    end
+  end
+
+  def intercept?(line)  
+    (intercept_at(line).nil? == true) ? false : true
+  end
+
+  def intercept_at(line)
+    if @gradient != line.gradient               
+      x = calculate_x_from_two_lines(self, line)
+      y = (@gradient*x.to_f) + @linear
+      
+      new_point = { :x => sprintf('%.6f',x).to_f, :y => sprintf('%.6f',y).to_f}
+      return new_point
+    end
+
+    return nil
+  end
+
+  def linear_touch
+    @linear
+  end
+
+  def intercept_line_segment?(line)
+    
+    # verify the distance
+    if intercept?(line)
+      interception_point = intercept_at(line)
+
+      distance_segment = Geometry.calculate_spherical_distance(line.pointA, line.pointB)
+      distance_A_line_segment = Geometry.calculate_spherical_distance(line.pointA, interception_point)
+      distance_B_line_segment = Geometry.calculate_spherical_distance(line.pointB, interception_point)
+
+      if distance_A_line_segment > distance_segment 
+        return false
+      elsif distance_B_line_segment > distance_segment
+        return false
+      else
+        return true
+      end
+    end
+
+    return false
+  end
+
+  private
+  def calculate_gradient
+    @gradient = (@pointB[:y] - @pointA[:y]) / (@pointB[:x] - @pointA[:x]).to_f
+  end
+
+  def calculate_linear
+    @linear = nil
+    if not @gradient.nil?
+      @linear =  @pointA[:y].to_f - (@gradient * @pointA[:x].to_f )
+    end
+    @linear
+  end
+
+  def calculate_x_from_two_lines(line1, line2)
+    (line2.linear_touch - line1.linear_touch) / (line1.gradient - line2.gradient)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: laptimer-geometry
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Eduardo Marques
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-03 00:00:00 Z
+date: 2011-10-14 00:00:00 Z
 dependencies: []
 
-description: "    laptimer-geometry is a gem created to help the coordinates calculations used in a laptimer software.\n"
+description: "    laptimer-geometry is a gem created to help the coordinate calculations used in laptimer software.\n    v0.0.2 \n      - Added a new method to calculate distance between two geographic points\n      - Improved the accuracy of the distance calculation\n"
 email: edhana@gmail.com
 executables: []
 
@@ -28,8 +28,8 @@ extra_rdoc_files: []
 
 files: 
 - src/geometry.rb
-- src/lap_counter.rb
-- spec/lap_counter_spec.rb
+- src/line.rb
+- spec/geometry_spec.rb
 - spec/line_spec.rb
 homepage: http://github.com/edhana/laptimer-geometry
 licenses: []
@@ -65,5 +65,5 @@ signing_key:
 specification_version: 3
 summary: Implementation of basic 2D geometry algorithms, to help with a lap timer system written in Ruby
 test_files: 
-- spec/lap_counter_spec.rb
+- spec/geometry_spec.rb
 - spec/line_spec.rb

data/spec/lap_counter_spec.rb

@@ -1,8 +0,0 @@
-require 'spec_helper'
-require File.expand_path('../../src/lap_counter', __FILE__)
-
-describe LapCounter do
-	it "should find a straight segment witch is valid" do
-		true.should be_true
-	end
-end

data/src/lap_counter.rb

@@ -1,2 +0,0 @@
-class LapCounter
-end