teich-hrmparser 0.4.8 → 0.4.9

data/CHANGELOG.txt

@@ -1,3 +1,6 @@
+0.4.9 - June 10, 2009
+	Support TCX with only LAT and LNG
+
 0.4.8 - May 23, 2009
 	Fixed importing when TCX LAP duration are totally completely incredibly insanely wrong
 	

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 8
+:patch: 9
 :major: 0
 :minor: 4

data/hrmparser.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hrmparser}
-  s.version = "0.4.8"
+  s.version = "0.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oren Teich"]
-  s.date = %q{2009-05-24}
+  s.date = %q{2009-06-10}
   s.description = %q{Parses Polar and Garmin HRM files.}
   s.email = %q{oren@teich.net}
   s.extra_rdoc_files = [

data/lib/hrmparser/importer/garmin.rb

@@ -23,6 +23,8 @@ module Importer
 			distance_one = nil
 			time_one = nil
 
+      totaldistance = 0
+      
 			(@xml/:Trackpoint).each do |t| 
 				found = true
 				trackpoint = HRMParser::TrackPoint.new
@@ -38,31 +40,37 @@ module Importer
 				trackpoint.distance = dis != "" ? dis.to_f : nil
 
 				(t/:Position).each do |p|
-					trackpoint.lat = (p/:LatitudeDegrees).innerHTML
-					trackpoint.lng = (p/:LongitudeDegrees).innerHTML
+					trackpoint.lat = (p/:LatitudeDegrees).innerHTML.to_f
+					trackpoint.lng = (p/:LongitudeDegrees).innerHTML.to_f
 				end
 
-				trackpoints << trackpoint
+        if trackpoint.distance.nil? && !trackpoint.lat.nil?
+          totaldistance += trackpoint.calc_distance(trackpoints.last, trackpoint)
+				  trackpoint.distance = totaldistance
+        end
+        trackpoint.speed = trackpoint.calc_speed(trackpoints.last, trackpoint)
+        
+        trackpoints << trackpoint
 
 
 				## CALCULATE SPEED.  ICK.
-				if distance_one.nil?
-					distance_one = trackpoint.distance
-					time_one = trackpoint.time
-				else
-					distance_two = trackpoint.distance
-					next if distance_two.nil?
-					time_two = trackpoint.time
-					time_delta = time_two - time_one
-					distance_delta = distance_two - distance_one
-					if (distance_delta > 0 && time_delta > 0)
-						trackpoint.speed = distance_delta / time_delta  
-						distance_one = distance_two
-						time_one = time_two
-					else 
-						trackpoint.speed = nil
-					end      
-				end
+			  # if distance_one.nil?
+			 #         distance_one = trackpoint.distance
+			 #         time_one = trackpoint.time
+			 #       else
+			 #         distance_two = trackpoint.distance
+			 #         next if distance_two.nil?
+			 #         time_two = trackpoint.time
+			 #         time_delta = time_two - time_one
+			 #         distance_delta = distance_two - distance_one
+			 #         if (distance_delta > 0 && time_delta > 0)
+			 #           trackpoint.speed = distance_delta / time_delta  
+			 #           distance_one = distance_two
+			 #           time_one = time_two
+			 #         else 
+			 #           trackpoint.speed = nil
+			 #         end      
+			 #       end
 			end 
 
 			if found

data/lib/hrmparser/trackpoint.rb

@@ -17,7 +17,7 @@ module HRMParser
 		end
 
 		def calc_distance(pointA, pointB)
-			return 0 if pointA.nil? || pointA.lat.nil?
+			return 0 if pointA.nil? || pointA.lat.nil? || pointB.nil? || pointB.lat.nil?
 
 			dlng = pointB.lng - pointA.lng  
 			dlat = pointB.lat - pointA.lat  
@@ -38,8 +38,9 @@ module HRMParser
 		end
 
 		def calc_speed(pointA, pointB)
-			return 0 if pointA.nil? || pointA.lat.nil?
+			return nil if pointA.nil? || pointA.lat.nil? || pointB.nil? || pointB.lat.nil?
 			time_delta = pointB.time - pointA.time
+			return nil if time_delta == 0
 			distance_delta = pointB.distance - pointA.distance
 			return distance_delta / time_delta
 		end

data/spec/hrmparser_spec.rb

@@ -36,7 +36,7 @@ module HRMParser
         workout.average_hr.should == nil
       end
     end
-
+    
     context "Identifies files" do
       it "identify file as garmin" do
         type = Importer.file_type("spec/samples/small-garmin.TCX")
@@ -59,7 +59,7 @@ module HRMParser
         importer = Importer::GPX.new(:data => data)
         workout = importer.restore
         workout.time.should == Time.parse("Thu May 07 21:32:31 UTC 2009")
-
+    
         # Duration is actualy less, but we don't account for stopped time right now
         workout.duration.should be_close(6382,1)
       end
@@ -108,6 +108,16 @@ module HRMParser
         workout.altitude_gain.should be_nil
         workout.trackpoints.should == {}
       end
+      it "parses files with only LAT and LNG" do
+        filename = "spec/samples/garmin-only-lat-lng.tcx"
+        data = File.read(filename)
+        importer = Importer::Garmin.new(:data => data)
+        workout = importer.restore
+        workout.distance.should be_close(172052, 1)
+        workout.average_hr.should be_nil
+        workout.average_speed.should be_close(5.93, 0.1)
+        workout.altitude_gain.should be_close(372, 10)
+      end
 
       # Parsing the full XML is just slow.  Commenting out for now.
       it "gets workout level settings for outdoor workout" do
@@ -133,84 +143,82 @@ module HRMParser
       end
 
       it "doesn't have any 0 in latitude" do
-        filename = "spec/samples/garmin-405-with-0-0.TCX"
-        data = File.read(filename)
-        importer = Importer::Garmin.new(:data => data)
-        workout = importer.restore
-        workout.trackpoints.map {|tp| tp.lat.should_not == 0.0}
-        workout.trackpoints.map {|tp| tp.lat.should_not == "undefined"}
-      end
-      
-      it "handles files with INSANE duration" do
-        filename = "spec/samples/insane-duration.TCX"
-        data = File.read(filename)
-        importer = Importer::Garmin.new(:data => data)
-        workout = importer.restore
-        workout.duration.should be_close(4996, 0.2)
-      end
+           filename = "spec/samples/garmin-405-with-0-0.TCX"
+           data = File.read(filename)
+           importer = Importer::Garmin.new(:data => data)
+           workout = importer.restore
+           workout.trackpoints.map {|tp| tp.lat.should_not == 0.0}
+           workout.trackpoints.map {|tp| tp.lat.should_not == "undefined"}
+         end
+         
+         it "handles files with INSANE duration" do
+           filename = "spec/samples/insane-duration.TCX"
+           data = File.read(filename)
+           importer = Importer::Garmin.new(:data => data)
+           workout = importer.restore
+           workout.duration.should be_close(4996, 0.2)
+         end
     end
 
     context "Parse polar RS400 file" do
-      it "finds the duration and time" do
-        filename ="spec/samples/polarRS400.hrm"
-        data = File.read(filename)
-        importer = Importer::Polar.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
-        workout = importer.restore
-        workout.duration.should be_close(3569,1)
-        workout.time.should == Time.parse("Thu Apr 16 12:01:55 -0700 2009")
-      end
-      it "calculates the average heartrate" do
-        filename ="spec/samples/polarRS400.hrm"          
-        data = File.read(filename)
-        importer = Importer::Polar.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
-        workout = importer.restore
-        workout.average_hr.should be_close(145, 1)
-      end
-    end
-
-    context "Parse a Polar RR file" do
-      it "calculates the heart rate from RR" do
-        filename ="spec/samples/polarRS800-RR.hrm"         
-        data = File.read(filename)
-        importer = Importer::Polar.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
-        workout = importer.restore
-        workout.trackpoints.each {|tp| tp.hr.should < 220 && tp.hr.should > 30}
-        workout.average_hr.should be_close(115, 1)
-        workout.average_speed.should == nil
-      end
-    end
-
-    context "Parse a Suunto T6C RR file" do
-      it "finds the duration and time" do
-        filename = "spec/samples/suunto-t6-RR-stops.sdf"
-        data = File.read(filename)
-        importer = Importer::Suunto.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
-        workout = importer.restore
-        workout.duration.should be_close(4781,1)
-        workout.time.should == Time.parse("Thu May 07 14:16:07 -0700 2009")
+        it "finds the duration and time" do
+          filename ="spec/samples/polarRS400.hrm"
+          data = File.read(filename)
+          importer = Importer::Polar.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
+          workout = importer.restore
+          workout.duration.should be_close(3569,1)
+          workout.time.should == Time.parse("Thu Apr 16 12:01:55 -0700 2009")
+        end
+        it "calculates the average heartrate" do
+          filename ="spec/samples/polarRS400.hrm"          
+          data = File.read(filename)
+          importer = Importer::Polar.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
+          workout = importer.restore
+          workout.average_hr.should be_close(145, 1)
+        end
       end
-      it "calculates the average HR & altitude" do
-        filename = "spec/samples/suunto-t6-RR-stops.sdf"
-        data = File.read(filename)
-        importer = Importer::Suunto.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
-        workout = importer.restore
-        workout.average_hr.should be_close(152,1)
-        workout.average_speed.should == nil
-        workout.trackpoints.each { |tp| tp.speed.should == nil }
-        workout.altitude_gain.should be_close(115, 10)
+      
+      context "Parse a Polar RR file" do
+        it "calculates the heart rate from RR" do
+          filename ="spec/samples/polarRS800-RR.hrm"         
+          data = File.read(filename)
+          importer = Importer::Polar.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
+          workout = importer.restore
+          workout.trackpoints.each {|tp| tp.hr.should < 220 && tp.hr.should > 30}
+          workout.average_hr.should be_close(115, 1)
+          workout.average_speed.should == nil
+        end
       end
-      it "calculates the speed and distance" do
-        filename = "spec/samples/suunto-with-cadence-speed-distance.sdf"
-        data = File.read(filename)
-        importer = Importer::Suunto.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
-        workout = importer.restore
-        workout.average_hr.should be_close(131,1)
-        workout.average_speed.should be_close(9.3, 0.1)
-        workout.altitude_gain.should be_close(75, 15)
-        workout.distance.should == 124597
+      
+      context "Parse a Suunto T6C RR file" do
+        it "finds the duration and time" do
+          filename = "spec/samples/suunto-t6-RR-stops.sdf"
+          data = File.read(filename)
+          importer = Importer::Suunto.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
+          workout = importer.restore
+          workout.duration.should be_close(4781,1)
+          workout.time.should == Time.parse("Thu May 07 14:16:07 -0700 2009")
+        end
+        it "calculates the average HR & altitude" do
+          filename = "spec/samples/suunto-t6-RR-stops.sdf"
+          data = File.read(filename)
+          importer = Importer::Suunto.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
+          workout = importer.restore
+          workout.average_hr.should be_close(152,1)
+          workout.average_speed.should == nil
+          workout.trackpoints.each { |tp| tp.speed.should == nil }
+          workout.altitude_gain.should be_close(115, 10)
+        end
+        it "calculates the speed and distance" do
+          filename = "spec/samples/suunto-with-cadence-speed-distance.sdf"
+          data = File.read(filename)
+          importer = Importer::Suunto.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
+          workout = importer.restore
+          workout.average_hr.should be_close(131,1)
+          workout.average_speed.should be_close(9.3, 0.1)
+          workout.altitude_gain.should be_close(75, 15)
+          workout.distance.should == 124597
+        end
       end
-
-
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: teich-hrmparser
 version: !ruby/object:Gem::Version 
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors: 
 - Oren Teich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-24 00:00:00 -07:00
+date: 2009-06-10 00:00:00 -07:00
 default_executable: 
 dependencies: []