vincenty 1.0.1 → 1.0.2

data/Manifest.txt

@@ -14,3 +14,5 @@ test/ts_angle.rb
 test/ts_latitude.rb
 test/ts_longitude.rb
 test/ts_vincenty.rb
+test/ts_coordinate.rb
+test/ts_track_and_distance.rb

data/README.txt

@@ -33,8 +33,18 @@
 
 == SYNOPSIS:
 
-  FIX (code sample of usage)
-
+  flindersPeak = Vincenty.new("-37°57′3.72030″", "144°25′29.52440″" )
+  buninyong = Vincenty.new("-37° 39' 10.15610''", "143° 55' 35.38390''")
+  track_and_bearing = flindersPeak.distanceAndAngle( buninyong )
+  puts track_and_bearing
+
+  #or the reverse
+  destination = flindersPeak.destination(TrackAndDistance.new("306° 52' 5.37\"", 54972.271))
+  puts destination
+  
+  #Angles is the parent class of Latitude and Longitude
+  Angle.new("-37°01′.125").strf( "The angle is %d°%2m′%2.5s″%N" ) -> "The angle is 37°01′07.50000″S"
+  
 == REQUIREMENTS:
 
 * require 'rubygems'

data/Rakefile

@@ -11,5 +11,6 @@ Hoe.new('vincenty', Vincenty::VERSION) do |s|
   #s.url = "http://rubyforge.org/projects/vincenty/" 
   #s.summary = "Vincenty Algorithm for Distance, Bearing between Map Coordinates." 
   #s.description = s.paragraphs_of('README.txt', 1..4).join("\n\n")
+  s.remote_rdoc_dir = '' # Release to root
 end
 

data/lib/coordinate.rb

@@ -12,6 +12,7 @@ class Coordinate
     @altitude = altitude.to_f
   end
   
+  #Should add a format string to this.
   #Returns: Latitude longitude and altitude as a single string.
   def to_s
     "#{@latitude.to_s }  #{@longitude.to_s} #{@altitude}m"

data/lib/track_and_distance.rb

@@ -11,9 +11,16 @@ class TrackAndDistance
       @distance = distance
     end
     
+    #format string fmt is currently just for the bearing angle.
+    #Need to change this to include the distance is single format string.
     #Returns: Bearing angle and distance in a string.
-    def to_s
-      "#{@bearing.to_d.round(4)} #{distance.round(4)}m"
+    def to_s(fmt = nil)
+      if(fmt)
+        #needs work to include distance as well as angle fmt.
+        "#{@bearing.strf(fmt)} #{distance.round(4)}m"
+      else
+        "#{@bearing.strf} #{distance.round(4)}m"
+      end
     end
 
     def to_ary

data/lib/vincenty.rb

@@ -12,7 +12,7 @@ require 'track_and_distance.rb'
 require 'coordinate.rb'
 
 class Vincenty < Coordinate
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
   #Great Circle formulae  http://en.wikipedia.org/wiki/Great-circle_distance
   #Reference calculation for testing, assumes the earth is a sphere, which it isn't. 
   #This gives us an approximation to verify Vincenty algorithm.

data/test/ts_all.rb

@@ -1,4 +1,6 @@
 require 'ts_angle.rb'
 require 'ts_vincenty.rb'
-require 'latitude.rb'
-require 'longitude.rb'
+require 'ts_latitude.rb'
+require 'ts_longitude.rb'
+require 'ts_coordinate.rb'
+require 'ts_track_and_distance.rb'

data/test/ts_angle.rb

@@ -24,6 +24,7 @@ class TestAngle< Test::Unit::TestCase
   
   def test_strf
     a = Angle.new("S37°01′7.5″")
+    assert_equal("-37°01′07.5000″", a.strf) #default format of strf
     assert_equal("37°01′07.50000″S", a.strf( "%d°%2m′%2.5s″%N" ))
     assert_equal("37°01′07.50000″W", a.strf("%d°%2m′%2.5s″%E" ))
     assert_equal("-37°01′07.5000″", a.strf("%d°%2m′%2.4s″" ))

data/test/ts_coordinate.rb

@@ -0,0 +1,18 @@
+require 'test/unit'
+require 'vincenty.rb'
+
+class TestAngle< Test::Unit::TestCase
+  #test Coordinate
+  def test_coordinate
+    c = Coordinate.new(-36.9923293459124, 174.485341187381,13.5)
+    ca = c.to_ary
+    assert_equal(-36.9923293459124, ca[0].to_d)
+    assert_equal(174.485341187381, ca[1].to_d)
+    assert_equal(13.5, ca[2])
+    ch = c.to_hash
+    assert_equal(-36.9923293459124, ch[:latitude].to_d)
+    assert_equal(174.485341187381, ch[:longitude].to_d)
+    assert_equal(13.5, ch[:altitude])
+    assert_equal("36°59′32.3856″S  174°29′07.2283″E 13.5m", c.to_s)
+  end
+end

data/test/ts_track_and_distance.rb

@@ -0,0 +1,16 @@
+require 'test/unit'
+require 'vincenty.rb'
+
+class TestAngle< Test::Unit::TestCase
+  #test TrackAndDistance
+  def test_track_and_distance
+    assert_equal("140°14′10.0000″ 12.0m", TrackAndDistance.new(Angle.new("320,14,10").reverse, 12.0).to_s)
+    assert_equal("215°03′00.0000″ 19.73m", TrackAndDistance.new("215,3,0", 19.73 ).to_s)
+    a = TrackAndDistance.new("215,3,0", 19.73 ).to_ary
+    assert_equal("215°03′00.0000″", a[0].strf)
+    assert_equal("19.73", a[1].to_s)
+    a = TrackAndDistance.new("215,3,0", 19.73 ).to_hash
+    assert_equal("215°03′00.0000″", a[:bearing].strf)
+    assert_equal("19.73", a[:distance].to_s)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vincenty
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Rob Burrowes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-03 00:00:00 +13:00
+date: 2009-03-06 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,8 @@ files:
 - test/ts_latitude.rb
 - test/ts_longitude.rb
 - test/ts_vincenty.rb
+- test/ts_coordinate.rb
+- test/ts_track_and_distance.rb
 has_rdoc: true
 homepage: "\"http://rubyforge.org/projects/vincenty/\""
 post_install_message: