postrunner 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee79192eef591186d2dcbf992af1d193a60aee49b9ae9d90d6a880d4758c623c
-  data.tar.gz: 7fefaf239fe43c71be7183b7773f909415126669f514e608b6c6f16fef9682f3
+  metadata.gz: b6df1b75dc7669dd99287084a3bc96c4528b2273b37d8203a75b12d9e26b0a2b
+  data.tar.gz: c2cf4a588aebb579e208f62b2c2c9d1ce76798ac482b4f1b0838bb92554691d1
 SHA512:
-  metadata.gz: 65900650e3e1751f4f92994f4473c18d0131615ff60f72c1683ee7ed05c40abd6d060ba6eca2cfa4134c7507effb90edc4785901e5a8d006c0ed05fa64b6d23d
-  data.tar.gz: 5de44344671bf391611e2636e4cebd0fc6e7a5f5636444ca2fc828c1d699e17086dfe7ea1a80aa89a0a593b279ca17fe0f5c26583af7fa21763ab7130f7f73ba
+  metadata.gz: d02b2921d8f7aedf63dc07ebf8d21765e3ab6e4e36872586eb5fffbca8d265e65a64c6564ba8a88406de39e4f9d534d93cd903563a9f28f3e44d5ddeaf9ce8d7
+  data.tar.gz: 8c6d305975888ef68fda07e2793d78da8d79c2d5aa114efa5b5cc86b4e97ff1d2882765772db3e26a99f33343278e29aa8bb4f208f4caf5601989ba4ec37f758

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu]
+        ruby: [2.4, 2.5, 2.6, 2.7, 3.0, head]
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+
+    - name: Test with RSpec
+      run: bundle exec rspec

data/README.md

@@ -48,23 +48,47 @@ typing.
 
 ## Usage
 
+### Mounting the watch
+
+Watches that expose their data as FAT file system. Typically after connecting
+your garmin watch, they are mount automatically if you have installed the
+udev package.
+
+For watches that expose their data via MTP (Media Transfer Procotol). For
+Debian buster running `sudo apt install jmtpfs mtp-tools` will install the
+needed packages.
+
+`mkdir /tmp/forerunner; jmtpfs  /tmp/forerunner`
+
+This has been tested with a Garmin Forerunner 945.
+
+For more information about MTP under Windows have a look at the
+[Garmin FAQ](https://support.garmin.com/?faq=Itl8M6ARrh4gBQMHFqdqK8)
+
 ### Importing FIT files
 
 To get started you need to connect your device to your computer and
-mount it as a disk drive. Only devices that expose their data as FAT file
+mount it as a disk drive. Only devices that expose their data as FAT or MTP file
 system are supported. Older devices use proprietary drivers and are
 not supported by PostRunner. Once the device is mounted find out the
 full path to the directory that contains your FIT files. You can then
 import all files on the device.
 
+* for USB-FAT
 ```
 $ postrunner import /run/media/$USER/GARMIN/GARMIN/ACTIVITY/
 ```
-    
-The above command assumes that your device is mounted as
-/run/media/$USER. Please replace $USER with your login name and the
-path with the path to your device. Files that have been imported
-previously will not be imported again. 
+The above command assumes that your device is mounted as /run/media/$USER.
+Please replace $USER with your login name and the path with the path to
+your device.
+
+* for MTP (assuming you mounted it as described above)
+```
+$ postrunner import /tmp/forerunner/Primary/GARMIN/Activity
+```
+
+* Note
+Files that have been imported previously will not be imported again.
 
 ### Viewing FIT file data on the console
 

data/Rakefile

@@ -1,24 +1,9 @@
-$:.unshift File.join(File.dirname(__FILE__))
-
-# Add the lib directory to the search path if it isn't included already
-lib = File.expand_path('../lib', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
+#!/usr/bin/env ruby
+require_relative 'lib/postrunner/version'
+require 'rake'
+require 'rspec'
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require 'rake/clean'
-require 'yard'
-YARD::Rake::YardocTask.new
-
-Dir.glob( 'tasks/*.rake').each do |fn|
-  begin 
-    load fn;
-  rescue LoadError
-    puts "#{fn.split('/')[1]} tasks unavailable: #{$!}"
-  end
-end
-
-task :default  => :spec
-task :test => :spec
+require 'rspec/core/rake_task'
 
-desc 'Run all unit and spec tests'
+RSpec::Core::RakeTask.new(:spec)
+ 

data/lib/postrunner/Activity.rb

@@ -65,6 +65,37 @@ module PostRunner
       'hiking' => 'Hiking',
       'multisport' => 'Multisport',
       'paddling' => 'Paddling',
+      'training' => 'Training',
+      'flying' => 'Flying',
+      'e_biking' => 'E-Biking',
+      'motorcycling' => 'Motor Cycling',
+      'boating' => 'Boating',
+      'driving' => 'Driving',
+      'golf' => 'Golf',
+      'hang_gliding' => 'Hang Gliding',
+      'horseback_riding' => 'Horseback Riding',
+      'hunting' => 'Hunting',
+      'fishing' => 'Fishing',
+      'inline_skating' => 'Inline Skating',
+      'rock_climbing' => 'Rock Climbing',
+      'sailing' => 'Sailing',
+      'ice_skating' => 'Ice Skating',
+      'sky_diving' => 'Sky Diving',
+      'snowshoeing' => 'Snowshoeing',
+      'snowmobiling' => 'Snowmobiling',
+      'stand_up_paddleboarding' => 'Stand Up Paddleboarding',
+      'surfing' => 'Surfing',
+      'wakeboarding' => 'Wakeboarding',
+      'water_skiing' => 'Water Skiing',
+      'kayaking' => 'Kayaking',
+      'rafting' => 'Rafting',
+      'windsurfing' => 'Windsurfing',
+      'kitesurfing' => 'Kitesurfing',
+      'tactical' => 'Tactical',
+      'jumpmaster' => 'Jumpmaster',
+      'boxing' => 'Boxing',
+      'floor_climbing' => 'Floor Climbing',
+      'diving' => 'Diving',
       'all' => 'All'
     }
     ActivitySubTypes = {
@@ -95,7 +126,43 @@ module PostRunner
       'challenge' => 'Challenge',
       'indoor_skiing' => 'Indoor Skiing',
       'cardio_training' => 'Cardio Training',
+      'e_bike_fitness' => 'E Bike Fittness',
+      'bmx' => 'BMX',
+      'casual_walking' => 'Casual Walking',
+      'speed_walking' => 'Speed Walking',
+      'bike_to_run_transition' => 'Bike to Run Transition',
+      'run_to_bike_transition' => 'Run to Bike Transition',
+      'swim_to_bike_transition' => 'Swim to Bike Transition',
+      'atv' => 'ATV',
+      'motocross' => 'Motocross',
+      'backcountry' => 'Backcountry',
+      'resort' => 'Resort',
+      'rc_drone' => 'RC Drone',
+      'wingsuit' => 'Wingsuite',
+      'whitewater' => 'Whitemaster',
+      'skate_skiing' => 'Skate Skiing',
+      'yoga' => 'Yoga',
+      'pilates' => 'Pilates',
+      'indoor_running' => 'Indoor Running',
+      'gravel_cycling' => 'Gravel Cycling',
+      'e_bike_mountain' => 'E-Bike Mountain',
+      'commuting' => 'Commuting',
+      'mixed_surface' => 'Mixed Surface',
+      'navigate' => 'Navigate',
+      'track_me' => 'Track Me',
+      'map' => 'Map',
+      'single_gas_diving' => 'Single Gas Diving',
+      'multi_gas_diving' => 'Multi Gas Diving',
+      'gauge_diving' => 'Gauge Diving',
+      'apnea_diving' => 'Apnea Diving',
+      'apnea_hunting' => 'Apnea Hunting',
       'virtual_activity' => 'Virtual Activity',
+      'obstacle' => 'Obstacle',
+      'breathing' => 'Breating',
+      'sail_race' => 'Sail Race',
+      'ultra' => 'Ultra',
+      'indoor_climbing' => 'Indoor Climbing',
+      'bouldering' => 'Bouldering',
       'all' => 'All'
     }
 

data/lib/postrunner/ActivitySummary.rb

@@ -77,7 +77,9 @@ module PostRunner
       t.body
       t.row([ 'Type:', @type ])
       t.row([ 'Sub Type:', @sub_type ])
-      t.row([ 'Start Time:', session.start_time])
+      t.row([ 'Start Time:', session.start_time.localtime])
+      t.row([ 'Elapsed Time:', secsToHMS(session.total_elapsed_time) ])
+      t.row([ 'Moving Time:', secsToHMS(session.total_timer_time) ])
       t.row([ 'Distance:',
               local_value(session, 'total_distance', '%.2f %s',
                           { :metric => 'km', :statute => 'mi'}) ])
@@ -86,26 +88,11 @@ module PostRunner
                 local_value(@fit_activity, 'total_gps_distance', '%.2f %s',
                             { :metric => 'km', :statute => 'mi'}) ])
       end
-      t.row([ 'Time:', secsToHMS(session.total_timer_time) ])
-      t.row([ 'Elapsed Time:', secsToHMS(session.total_elapsed_time) ])
       t.row([ 'Avg. Speed:',
               local_value(session, 'avg_speed', '%.1f %s',
                           { :metric => 'km/h', :statute => 'mph' }) ])
       if @activity.sport == 'running' || @activity.sport == 'multisport'
         t.row([ 'Avg. Pace:', pace(session, 'avg_speed') ])
-      end
-      t.row([ 'Total Ascent:',
-              local_value(session, 'total_ascent', '%.0f %s',
-                          { :metric => 'm', :statute => 'ft' }) ])
-      t.row([ 'Total Descent:',
-              local_value(session, 'total_descent', '%.0f %s',
-                          { :metric => 'm', :statute => 'ft' }) ])
-      t.row([ 'Calories:', "#{session.total_calories} kCal" ])
-      t.row([ 'Avg. HR:', session.avg_heart_rate ?
-              "#{session.avg_heart_rate} bpm" : '-' ])
-      t.row([ 'Max. HR:', session.max_heart_rate ?
-              "#{session.max_heart_rate} bpm" : '-' ])
-      if @activity.sport == 'running' || @activity.sport == 'multisport'
         t.row([ 'Avg. Run Cadence:',
                 session.avg_running_cadence ?
                 "#{(2 * session.avg_running_cadence).round} spm" : '-' ])
@@ -131,6 +118,21 @@ module PostRunner
                 session.avg_cadence ?
                 "#{(2 * session.avg_cadence).round} rpm" : '-' ])
       end
+      t.row([ 'Total Ascent:',
+              local_value(session, 'total_ascent', '%.0f %s',
+                          { :metric => 'm', :statute => 'ft' }) ])
+      t.row([ 'Total Descent:',
+              local_value(session, 'total_descent', '%.0f %s',
+                          { :metric => 'm', :statute => 'ft' }) ])
+      t.row([ 'Calories:', "#{session.total_calories} kCal" ])
+
+      if (est_sweat_loss = session.est_sweat_loss)
+        t.row([ 'Est. Sweat Loss:', "#{est_sweat_loss} ml" ])
+      end
+      t.row([ 'Avg. HR:', session.avg_heart_rate ?
+              "#{session.avg_heart_rate} bpm" : '-' ])
+      t.row([ 'Max. HR:', session.max_heart_rate ?
+              "#{session.max_heart_rate} bpm" : '-' ])
 
       if @fit_activity.physiological_metrics &&
          (physiological_metrics = @fit_activity.physiological_metrics.last)

data/lib/postrunner/ActivityView.rb

@@ -53,7 +53,8 @@ module PostRunner
     def generate_html(doc)
       doc.unique(:activityview_style) {
         doc.head {
-          [ 'jquery/jquery-2.1.1.min.js', 'flot/jquery.flot.js',
+          [ 'jquery/jquery-3.5.1.min.js', 'flot/jquery.flot.js',
+            #'flot/jquery.flot.time.js' ].each do |js|
             'flot/jquery.flot.time.js' ].each do |js|
             doc.script({ 'language' => 'javascript',
                          'type' => 'text/javascript', 'src' => js })

data/lib/postrunner/ChartView.rb

@@ -30,7 +30,7 @@ module PostRunner
           :unit => select_unit('min/km'),
           :graph => :line_graph,
           :colors => '#0A7BEE',
-          :show => @sport == 'running' || @sport == 'multisport',
+          :show => @sport == 'running' || @sport == 'multisport'
         },
         {
           :id => 'speed',
@@ -40,9 +40,17 @@ module PostRunner
           :colors => '#0A7BEE',
           :show => @sport != 'running'
         },
+        {
+          :id => 'Power_18FB2CF01A4B430DAD66988C847421F4',
+          :label => 'Power',
+          :unit => select_unit('Watts'),
+          :graph => :line_graph,
+          :colors => '#FFAC2E',
+          :show => @sport == 'running' || @sport == 'multisport'
+        },
         {
           :id => 'altitude',
-          :label => 'Elevation',
+          :label => 'Altitude',
           :unit => select_unit('m'),
           :graph => :line_graph,
           :colors => '#5AAA44',
@@ -127,6 +135,22 @@ module PostRunner
                        [ '#FF5558', nil ] ],
           :show => @sport == 'running' || @sport == 'multisport'
         },
+        {
+          :id => 'Form_Power_18FB2CF01A4B430DAD66988C847421F4',
+          :label => 'Form Power',
+          :unit => select_unit('Watts'),
+          :graph => :line_graph,
+          :colors => '#CBBB58',
+          :show => @sport == 'running' || @sport == 'multisport'
+        },
+        {
+          :id => 'Leg_Spring_Stiffness_18FB2CF01A4B430DAD66988C847421F4',
+          :label => 'Leg Spring Stiffness',
+          :unit => select_unit('kN/m'),
+          :graph => :line_graph,
+          :colors => '#358C88',
+          :show => @sport == 'running' || @sport == 'multisport'
+        },
         {
           :id => 'stance_time',
           :label => 'Ground Contact Time',
@@ -157,6 +181,14 @@ module PostRunner
           :colors => '#A88BBB',
           :show => @sport == 'cycling'
         },
+        {
+          :id => "Air_Power_18FB2CF01A4B430DAD66988C847421F4",
+          :label => 'Air Power',
+          :unit => select_unit('Watts'),
+          :graph => :line_graph,
+          :colors => '#919498',
+          :show => @sport == 'running' || @sport == 'multisport'
+        },
         {
           :id => 'temperature',
           :label => 'Temperature',
@@ -229,7 +261,7 @@ EOT
     end
 
     def java_script
-      s = "$(function() {\n"
+      s = "$(document).ready(function() {\n"
 
       s << tooltip_div
       @charts.each do |chart|

data/lib/postrunner/DailyMonitoringView.rb

@@ -44,7 +44,7 @@ module PostRunner
     def generate_html(doc)
       doc.unique(:dailymonitoringview_style) {
         doc.head {
-          [ 'jquery/jquery-2.1.1.min.js', 'flot/jquery.flot.js',
+          [ 'jquery/jquery-3.5.1.min.js', 'flot/jquery.flot.js',
             'flot/jquery.flot.time.js' ].each do |js|
             doc.script({ 'language' => 'javascript',
                          'type' => 'text/javascript', 'src' => js })

data/lib/postrunner/DeviceList.rb

@@ -126,6 +126,19 @@ module PostRunner
           t.new_row
         end
 
+        if (ant_id = device.ant_id)
+          t.cell('ANT ID:')
+          t.cell(ant_id)
+          t.new_row
+        end
+
+        if ant_id && (sensor_settings = find_settings_by_ant_id(ant_id)) &&
+            (calibration_factor = sensor_settings.calibration_factor)
+          t.cell('Calibration Factor')
+          t.cell('%.1f' % calibration_factor)
+          t.new_row
+        end
+
         if (rx_ok = device.rx_packets_ok) && (rx_err = device.rx_packets_err)
           t.cell('Packet Errors:')
           t.cell('%d%%' % ((rx_err.to_f / (rx_ok + rx_err)) * 100).to_i)
@@ -148,6 +161,14 @@ module PostRunner
       tables
     end
 
+    private
+
+    def find_settings_by_ant_id(ant_id)
+      @fit_activity.sensor_settings.find do |sensor|
+        sensor.ant_id == ant_id
+      end
+    end
+
   end
 
 end

data/lib/postrunner/EventList.rb

@@ -75,7 +75,7 @@ module PostRunner
       case event.event
       when 'timer'
         name = "Timer (#{event.event_type.gsub(/_/, ' ')})"
-        value = event.timer_trigger
+        value = '-'
       when 'course_point'
         name = 'Course Point'
         value = event.message_index
@@ -121,12 +121,19 @@ module PostRunner
       when 'comm_timeout'
         name 'Communication timeout'
         value = event.comm_timeout
+      when 'off_course'
+        name = 'Off Course'
+        value = '-'
       when 'recovery_hr'
         name = 'Recovery heart rate'
         value = "#{event.recovery_hr} bpm"
       when 'recovery_time'
         name = 'Recovery time'
-        value = "#{secsToDHMS(event.recovery_time * 60)}"
+        if event.recovery_time
+          value = "#{secsToDHMS(event.recovery_time * 60)}"
+        else
+          value = '-'
+        end
       when 'recovery_info'
         name = 'Recovery info'
         mins = event.recovery_info
@@ -140,6 +147,9 @@ module PostRunner
       when 'lactate_threshold_speed'
         name = 'Lactate Threshold Pace'
         value = pace(event, 'lactate_threshold_speed')
+      when 'functional_threshold_power'
+        name = 'Functional Threshold Power'
+        value = "#{event.functional_threshold_power} W"
       else
         name = event.event
         value = event.data

data/lib/postrunner/FFS_Activity.rb

@@ -63,6 +63,7 @@ module PostRunner
       'hiking' => 'Hiking',
       'multisport' => 'Multisport',
       'paddling' => 'Paddling',
+      'commuting' => 'Commuting',
       'all' => 'All'
     }
     ActivitySubTypes = {

data/lib/postrunner/FitFileStore.rb

@@ -508,9 +508,7 @@ module PostRunner
         # Not all FIT file have indexed device sections. In case the device
         # index is nil we'll take the first entry.
         if (di.device_index.nil? || di.device_index == 0) &&
-            (di.manufacturer &&
-               (di.garmin_product || di.product) &&
-               di.numeric_product && di.serial_number)
+            di.numeric_manufacturer && di.numeric_product
           return {
             :manufacturer => di.manufacturer,
             :product => di.garmin_product || di.product,

data/lib/postrunner/Main.rb

@@ -310,6 +310,7 @@ EOT
       handle_version_update
       import_legacy_archive
 
+      retval = 0
       case (cmd = args.shift)
       when 'check'
         if args.empty?
@@ -334,7 +335,9 @@ EOT
         # is given, use the current date.
         @ffs.monthly_report(day_in_localtime(args, '%Y-%m-01'))
       when 'delete'
-        process_activities(args, :delete)
+        unless process_activities(args, :delete)
+          retval = 1
+        end
       when 'dump'
         @filter = Fit4Ruby::FitFilter.new unless @filter
         process_files_or_activities(args, :dump)
@@ -344,9 +347,13 @@ EOT
         if args.empty?
           # If we have no file or directory for the import command, we get the
           # most recently used directory from the runtime config.
-          process_files([ @db['config']['import_dir']  ], :import)
+          unless process_files([ @db['config']['import_dir']  ], :import)
+            retval = 1
+          end
         else
-          process_files(args, :import)
+          unless process_files(args, :import)
+            retval = 1
+          end
           if args.length == 1 && Dir.exists?(args[0])
             # If only one directory was specified as argument we store the
             # directory for future use.
@@ -361,7 +368,9 @@ EOT
         unless (@name = args.shift)
           Log.abort 'You must provide a new name for the activity'
         end
-        process_activities(args, :rename)
+        unless process_activities(args, :rename)
+          retval = 1
+        end
       when 'set'
         unless (@attribute = args.shift)
           Log.abort 'You must specify the attribute you want to change'
@@ -369,7 +378,9 @@ EOT
         unless (@value = args.shift)
           Log.abort 'You must specify the new value for the attribute'
         end
-        process_activities(args, :set)
+        unless process_activities(args, :set)
+          retval = 1
+        end
       when 'show'
         if args.empty?
           @ffs.show_list_in_browser
@@ -378,12 +389,18 @@ EOT
           # given day in a browser.
           @ffs.show_monitoring(args[0])
         else
-          process_activities(args, :show)
+          unless process_activities(args, :show)
+            retval = 1
+          end
         end
       when 'sources'
-        process_activities(args, :sources)
+        unless process_activities(args, :sources)
+          retval = 1
+        end
       when 'summary'
-        process_activities(args, :summary)
+        unless process_activities(args, :summary)
+          retval = 1
+        end
       when 'units'
         change_unit_system(args)
       when 'htmldir'
@@ -399,7 +416,7 @@ EOT
       # Ensure that all updates are written to the database.
       @db.sync
 
-      0
+      retval
     end
 
     def help
@@ -409,11 +426,13 @@ EOT
     def process_files_or_activities(files_or_activities, command)
       files_or_activities.each do |foa|
         if foa[0] == ':'
-          process_activities([ foa ], command)
+          return false unless process_activities([ foa ], command)
         else
-          process_files([ foa ], command)
+          return false unless process_files([ foa ], command)
         end
       end
+
+      true
     end
 
     def process_activities(activity_refs, command)
@@ -426,15 +445,19 @@ EOT
           activities = @ffs.find(a_ref[1..-1])
           if activities.empty?
             Log.warn "No matching activities found for '#{a_ref}'"
-            return
+            return false
+          end
+          activities.each do |a|
+            unless process_activity(a, command)
+              return false
+            end
           end
-          activities.each { |a| process_activity(a, command) }
         else
           Log.abort "Activity references must start with ':': #{a_ref}"
         end
       end
 
-      nil
+      true
     end
 
     def process_files(files_or_dirs, command)
@@ -445,12 +468,14 @@ EOT
       files_or_dirs.each do |fod|
         if File.directory?(fod)
           Dir.glob(File.join(fod, '*.FIT'), File::FNM_CASEFOLD).each do |file|
-            process_file(file, command)
+            return false unless process_file(file, command)
           end
         else
-          process_file(fod, command)
+          return false unless process_file(fod, command)
         end
       end
+
+      true
     end
 
     # Process a single FIT file according to the given command.

data/lib/postrunner/MonitoringStatistics.rb

@@ -115,6 +115,10 @@ module PostRunner
       t.localtime(utc_offset).strftime('%H:%M')
     end
 
+    def prefix_for_time(t, a)
+      a.window_start_time.strftime('%Y-%m-%d') == t.strftime('%Y-%m-%d') ? ' ' : '+'
+    end
+
     def daily_sleep_cycle_table(analyzer)
       ti = FlexiTable.new
       ti.head
@@ -129,8 +133,8 @@ module PostRunner
         if last_to_time && c.from_time > last_to_time
           # We have a gap in the sleep cycles.
           ti.cell('Wake')
-          cell_right_aligned(ti, time_as_hm(last_to_time, utc_offset))
-          cell_right_aligned(ti, time_as_hm(c.from_time, utc_offset))
+          cell_right_aligned(ti, prefix_for_time(last_to_time, analyzer) + time_as_hm(last_to_time, utc_offset))
+          cell_right_aligned(ti, prefix_for_time(c.from_time, analyzer) + time_as_hm(c.from_time, utc_offset))
           cell_right_aligned(ti, "(#{secsToHM(c.from_time - last_to_time)})")
           ti.cell('')
           ti.cell('')
@@ -139,8 +143,8 @@ module PostRunner
         end
 
         ti.cell((idx + 1).to_s, format)
-        ti.cell(c.from_time.localtime(utc_offset).strftime('%H:%M'), format)
-        ti.cell(c.to_time.localtime(utc_offset).strftime('%H:%M'), format)
+        ti.cell(prefix_for_time(c.from_time.localtime(utc_offset), analyzer) + c.from_time.localtime(utc_offset).strftime('%H:%M'), format)
+        ti.cell(prefix_for_time(c.to_time.localtime(utc_offset), analyzer) + c.to_time.localtime(utc_offset).strftime('%H:%M'), format)
 
         duration = c.to_time - c.from_time
         totals[:duration] += duration

data/lib/postrunner/PersonalRecords.rb

@@ -111,7 +111,9 @@ module PostRunner
                [ 'Longest Distance', '%.3f km' % (@distance / 1000.0), '-' ] :
                [ PersonalRecords::SpeedRecordDistances[@sport][@distance],
                  secsToHMS(@duration),
-                 speedToPace(@distance / @duration) ]) +
+                 @sport == 'running' ?
+                 speedToPace(@distance / @duration) :
+                 '%.1f' % (@distance / @duration * 3.6) ]) +
               [ @store['file_store'].ref_by_activity(@activity),
                 ActivityLink.new(@activity, false),
                 @start_time.strftime("%Y-%m-%d") ])
@@ -220,7 +222,9 @@ module PostRunner
       def generate_table
         t = FlexiTable.new
         t.head
-        t.row([ 'Record', 'Time/Dist.', 'Avg. Pace', 'Ref.', 'Activity',
+        t.row([ 'Record', 'Time/Dist.',
+                @sport == 'running' ? 'Avg. Pace' : 'Avg. Speed',
+                'Ref.', 'Activity',
                 'Date' ],
               { :halign => :center })
         t.set_column_attributes([