teich-hrmparser 0.4.0 → 0.4.1

data/CHANGELOG.txt

@@ -1,3 +1,8 @@
+0.4.1 - May 9th, 2009
+	Added GPX support.  
+	NOTE: all workouts do NOT account for stopped time.  
+		duration is simply last time - first time.  Will be fixed in future version.
+		
 0.4.0 - May 8th, 2009
 	Added initial support for Suunto T6.  Just grabs HRs for now.
 

data/VERSION.yml

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

data/lib/hrmparser/importer/gpx.rb

@@ -0,0 +1,42 @@
+module Importer
+	class GPX
+		def initialize(opts = {:data => nil, :time_zone => "UTC"})
+			@data = opts[:data]
+		end
+
+		def restore
+			workout = HRMParser::Workout.new(:duration => 0)
+			@xml = Hpricot::XML(@data)
+			ttime = (@xml/:time).first.innerHTML
+			workout.time = Time.parse(ttime)
+
+			trackpoints = []
+			distance = 0
+			(@xml/:trk).each do |trk|
+				(trk/:trkpt).each do |trkpt|
+			        trackpoint = HRMParser::TrackPoint.new
+					trackpoint.altitude = (trkpt/:ele).innerHTML.to_f
+					trackpoint.time = Time.parse((trkpt/:time).innerHTML)
+					
+					trackpoint.lat = (trkpt.attributes)["lat"].to_f
+					trackpoint.lng = (trkpt.attributes)["lon"].to_f
+					
+					distance += trackpoint.calc_distance(trackpoints.last, trackpoint)
+					trackpoint.distance = distance
+					
+					trackpoint.speed = trackpoint.calc_speed(trackpoints.last, trackpoint)
+					
+					trackpoints << trackpoint
+				end
+			end
+			
+			workout.duration = trackpoints.last.time - trackpoints.first.time
+			workout.trackpoints = trackpoints
+			workout.calc_average_speed! 
+	        workout.calc_altitude_gain!
+			workout.distance = trackpoints.last.distance
+			return workout
+		end
+	end
+
+end

data/lib/hrmparser/importer.rb

@@ -1,6 +1,7 @@
 require 'importer/garmin'
 require 'importer/polar'
 require 'importer/suunto'
+require 'importer/gpx'
 
 module Importer
 	def Importer.file_type(name)
@@ -11,6 +12,8 @@ module Importer
 			return "POLAR_HRM"
 		when /\.sdf$/i
 			return "SUUNTO"
+		when /\.gpx$/i
+			return "GPX"
 		end
 	end
 

data/lib/hrmparser/trackpoint.rb

@@ -1,15 +1,48 @@
 module HRMParser
-  class TrackPoint
-    attr_accessor :lat, :lng, :altitude, :speed, :hr, :distance, :time, :cadence
-    def initialize(opts = {:lat => nil, :lng => nil, :altitude => nil, :speed => nil, :hr => nil, :distance => nil, :cadence => nil, :time => Time.now})
-      @lat = opts[:lat]
-      @lng = opts[:lng]
-      @altitude = opts[:altitude]
-      @speed = opts[:speed]
-      @hr = opts[:hr]
-      @distance = opts[:distance]
-      @time = opts[:time]
-      @cadence = opts[:cadence]    
-    end
-  end
-end
+	class TrackPoint
+		
+		RAD_PER_DEG = 0.017453293  #  PI/180  
+		
+		attr_accessor :lat, :lng, :altitude, :speed, :hr, :distance, :time, :cadence
+		def initialize(opts = {:lat => nil, :lng => nil, :altitude => nil, :speed => nil, :hr => nil, :distance => nil, :cadence => nil, :time => Time.now})
+			@lat = opts[:lat]
+			@lng = opts[:lng]
+			@altitude = opts[:altitude]
+			@speed = opts[:speed]
+			@hr = opts[:hr]
+			@distance = opts[:distance]
+			@time = opts[:time]
+			@cadence = opts[:cadence]    
+		end
+
+		def calc_distance(pointA, pointB)
+			return 0 if pointA.nil? || pointA.lat.nil?
+			
+			dlng = pointB.lng - pointA.lng  
+			dlat = pointB.lat - pointA.lat  
+
+			dlat_rad = dlat * RAD_PER_DEG  
+			dlng_rad = dlng * RAD_PER_DEG   
+
+			lat1_rad = pointA.lat * RAD_PER_DEG  
+			lng1_rad = pointA.lng * RAD_PER_DEG  
+
+			lat2_rad = pointB.lat * RAD_PER_DEG  
+			lng2_rad = pointB.lng * RAD_PER_DEG
+			
+			a = (Math.sin(dlat_rad/2))**2 + Math.cos(lat1_rad) * Math.cos(lat2_rad) * (Math.sin(dlng_rad/2))**2  
+			c = 2 * Math.atan2( Math.sqrt(a), Math.sqrt(1-a))
+			
+			return 6371000 * c
+		end
+		
+		def calc_speed(pointA, pointB)
+			return 0 if pointA.nil? || pointA.lat.nil?
+			time_delta = pointB.time - pointA.time
+			distance_delta = pointB.distance - pointA.distance
+			return distance_delta / time_delta
+		end
+	end
+end
+
+

data/spec/hrmparser_spec.rb

@@ -52,112 +52,133 @@ module HRMParser
 			end
 		end
 
-		context "Parse garmin file" do
-			it "finds workout start time on a short workout" do
-				filename = "spec/samples/indoor-garmin-405.TCX"
-				data = File.read(filename)
-				importer = Importer::Garmin.new(:data => data)
-				workout = importer.restore
-				workout.time.should == Time.parse("Fri Aug 22 01:04:55 UTC 2008")
-			end
-			it "finds the duration on a short workout" do
-				filename = "spec/samples/indoor-garmin-405.TCX"
-				data = File.read(filename)
-				importer = Importer::Garmin.new(:data => data)
-				workout = importer.restore
-				workout.duration.should be_close(755, 1)
-			end
-			it "indoor workout has no trackpoints" do
-				filename = "spec/samples/indoor-garmin-405.TCX"
-				data = File.read(filename)
-				importer = Importer::Garmin.new(:data => data)
-				workout = importer.restore
-				workout.distance.should be_nil
-				workout.average_hr.should be_nil
-				workout.average_speed.should be_nil
-				workout.altitude_gain.should be_nil
-				workout.trackpoints.should == {}
-			end
-		
-			# Parsing the full XML is just slow.  Commenting out for now.
-			it "gets workout level settings for outdoor workout" do
-				filename = "spec/samples/outdoor-garmin-405.TCX"
+		context "Parse a GPS file" do
+			it "finds the duration, time" do
+				filename = "spec/samples/gps-with-suunto.gpx"
 				data = File.read(filename)
-				importer = Importer::Garmin.new(:data => data)
+				importer = Importer::GPX.new(:data => data)
 				workout = importer.restore
-				workout.distance.should be_close(11740, 5)
-				workout.average_hr.should be_close(149.7, 0.5)
-				workout.average_speed.should be_close(1.5, 0.2)
-				workout.altitude_gain.should be_close(583, 1.0)
+				workout.time.should == Time.parse("Fri May 08 00:58:35 UTC 2009")
+				
+				# Duration is actualy less, but we don't account for stopped time right now
+				workout.duration.should be_close(6382,1)
 			end
-		
-			it "gets workout level settings for weird distance workout" do
-				filename = "spec/samples/garmin-405-dies-distance.TCX"
+			it "calculates the distance and speed" do
+				filename = "spec/samples/gps-with-suunto.gpx"
 				data = File.read(filename)
-				importer = Importer::Garmin.new(:data => data)
+				importer = Importer::GPX.new(:data => data)
 				workout = importer.restore
-				workout.distance.should be_close(9426, 1)
-				workout.average_hr.should == nil
 				workout.average_speed.should be_close(6.7, 0.2)
-				workout.altitude_gain.should be_close(40, 1.0)
-			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
-		end
-		
-		context "Parse polar RS200 file" do
-			it "finds the duration and time" do
-				filename ="spec/samples/polarRS200.hrm"
-				data = File.read(filename)
-				importer = Importer::Polar.new(:data => data, :time_zone => "UTC")
-				workout = importer.restore
-				workout.duration.should be_close(3569,1)
-				workout.time.should == Time.parse("Thu Apr 16 12:01:55 UTC 2009")
-			end
-			it "calculates the average heartrate" do
-				filename ="spec/samples/polarRS200.hrm"          
-				data = File.read(filename)
-				importer = Importer::Polar.new(:data => data, :time_zone => "UTC")
-				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 => "UTC")
-				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
+				workout.distance.should be_close(26427, 1)
 			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 => "-0700")
-				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" do
-				filename = "spec/samples/suunto-t6-RR-stops.sdf"
-				data = File.read(filename)
-				importer = Importer::Suunto.new(:data => data, :time_zone => "-0700")
-				workout = importer.restore
-				workout.average_hr.should be_close(152,1)
-				workout.average_speed.should == nil
+		context "Parse garmin file" do
+				it "finds workout start time on a short workout" do
+					filename = "spec/samples/indoor-garmin-405.TCX"
+					data = File.read(filename)
+					importer = Importer::Garmin.new(:data => data)
+					workout = importer.restore
+					workout.time.should == Time.parse("Fri Aug 22 01:04:55 UTC 2008")
+				end
+				it "finds the duration on a short workout" do
+					filename = "spec/samples/indoor-garmin-405.TCX"
+					data = File.read(filename)
+					importer = Importer::Garmin.new(:data => data)
+					workout = importer.restore
+					workout.duration.should be_close(755, 1)
+				end
+				it "indoor workout has no trackpoints" do
+					filename = "spec/samples/indoor-garmin-405.TCX"
+					data = File.read(filename)
+					importer = Importer::Garmin.new(:data => data)
+					workout = importer.restore
+					workout.distance.should be_nil
+					workout.average_hr.should be_nil
+					workout.average_speed.should be_nil
+					workout.altitude_gain.should be_nil
+					workout.trackpoints.should == {}
+				end
+			
+				# Parsing the full XML is just slow.  Commenting out for now.
+				it "gets workout level settings for outdoor workout" do
+					filename = "spec/samples/outdoor-garmin-405.TCX"
+					data = File.read(filename)
+					importer = Importer::Garmin.new(:data => data)
+					workout = importer.restore
+					workout.distance.should be_close(11740, 5)
+					workout.average_hr.should be_close(149.7, 0.5)
+					workout.average_speed.should be_close(1.5, 0.2)
+					workout.altitude_gain.should be_close(583, 1.0)
+				end
+			
+				it "gets workout level settings for weird distance workout" do
+					filename = "spec/samples/garmin-405-dies-distance.TCX"
+					data = File.read(filename)
+					importer = Importer::Garmin.new(:data => data)
+					workout = importer.restore
+					workout.distance.should be_close(9426, 1)
+					workout.average_hr.should == nil
+					workout.average_speed.should be_close(6.7, 0.2)
+					workout.altitude_gain.should be_close(40, 1.0)
+				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
+			end
+			
+			context "Parse polar RS200 file" do
+				it "finds the duration and time" do
+					filename ="spec/samples/polarRS200.hrm"
+					data = File.read(filename)
+					importer = Importer::Polar.new(:data => data, :time_zone => "UTC")
+					workout = importer.restore
+					workout.duration.should be_close(3569,1)
+					workout.time.should == Time.parse("Thu Apr 16 12:01:55 UTC 2009")
+				end
+				it "calculates the average heartrate" do
+					filename ="spec/samples/polarRS200.hrm"          
+					data = File.read(filename)
+					importer = Importer::Polar.new(:data => data, :time_zone => "UTC")
+					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 => "UTC")
+					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 => "-0700")
+					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" do
+					filename = "spec/samples/suunto-t6-RR-stops.sdf"
+					data = File.read(filename)
+					importer = Importer::Suunto.new(:data => data, :time_zone => "-0700")
+					workout = importer.restore
+					workout.average_hr.should be_close(152,1)
+					workout.average_speed.should == nil
+				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.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Oren Teich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-08 00:00:00 -07:00
+date: 2009-05-09 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ files:
 - lib/hrmparser/arraymath.rb
 - lib/hrmparser/importer.rb
 - lib/hrmparser/importer/garmin.rb
+- lib/hrmparser/importer/gpx.rb
 - lib/hrmparser/importer/polar.rb
 - lib/hrmparser/importer/suunto.rb
 - lib/hrmparser/trackpoint.rb