postrunner 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dd09a8e49b1feea3d264427dae30981cb842f22
-  data.tar.gz: e9ec20c4cf98828275ab8f82d1230101dd35af53
+  metadata.gz: e7079467bfe7e66fd8fd3f18f607a94aeabe9924
+  data.tar.gz: 501da89a9f177cde254dd0fe9170df23089ec387
 SHA512:
-  metadata.gz: abe3df33c0cc4ae5bf687a365368cc1b969d9b754776097bccc70d134aed86ab6e933896579557a51a1ea3cd59eb7a57b4da861abf2d822e4d865474e3253978
-  data.tar.gz: 97f348e3b2f6faa5ebda4b7cce5517f7f1bf9dafa5d75b006e875a8490dca8963570c2042428783e99ef52b49d1b17b419f372e32c6fe627fbbb7e5872366b8b
+  metadata.gz: e12ab80e6e5ac8761cc5766d967a80f6e38d5fbd50a1a782ec3bbf40099a0fc0912a7b1878b2bba8a7b9d3f96b73c2fa47672e5987f1cd7d45db83b5173e00ac
+  data.tar.gz: 527efab9134703a38207197f2ad384cdbb6ba7ce242ce8f6ee589868f0b08c83fcd0229afcc6cebf928f88e27cad46abaa4b9e24ea1719009e99e1ac6b20f66f

data/README.md

@@ -1,9 +1,10 @@
 # PostRunner
 
 PostRunner is an application to manage FIT files such as those
-produced by Garmin products like the Forerunner 620 (FR620). It allows you to
-import the files from the device and inspect them. It can also update
-satellite orbit prediction data on the device to speed-up fix times.
+produced by Garmin products like the Forerunner 620 (FR620) and Fenix
+3. It allows you to import the files from the device and inspect them.
+It can also update satellite orbit prediction (EPO) data on the device
+to speed-up fix times.
 
 ## Installation
 

data/lib/postrunner/ActivitiesDB.rb

@@ -31,7 +31,7 @@ module PostRunner
       @cfg = cfg
       @fit_dir = File.join(@db_dir, 'fit')
       @archive_file = File.join(@db_dir, 'archive.yml')
-      @auxilliary_dirs = %w( icons jquery flot openlayers )
+      @auxilliary_dirs = %w( icons jquery flot openlayers postrunner )
 
       create_directories
       begin
@@ -352,14 +352,13 @@ module PostRunner
       unless Dir.exists?(src_dir)
         Log.fatal "Cannot find '#{src_dir}': #{$!}"
       end
-      dst_dir = File.join(@cfg[:html_dir], dir)
-      unless File.exists?(dst_dir)
-        begin
-          #FileUtils.ln_s(src_dir, dst_dir)
-          FileUtils.cp_r(src_dir, dst_dir)
-        rescue IOError
-          Log.fatal "Cannot create auxilliary directory '#{dst_dir}': #{$!}"
-        end
+      dst_dir = @cfg[:html_dir]
+
+      begin
+        #FileUtils.ln_s(src_dir, dst_dir)
+        FileUtils.cp_r(src_dir, dst_dir)
+      rescue IOError
+        Log.fatal "Cannot copy auxilliary data directory '#{dst_dir}': #{$!}"
       end
     end
 

data/lib/postrunner/Activity.rb

@@ -13,6 +13,7 @@
 require 'fit4ruby'
 
 require 'postrunner/ActivitySummary'
+require 'postrunner/DataSources'
 require 'postrunner/ActivityView'
 require 'postrunner/Schema'
 require 'postrunner/QueryResult'
@@ -201,6 +202,11 @@ module PostRunner
       @db.show_in_browser(@html_file)
     end
 
+    def sources
+      @fit_activity = load_fit_file unless @fit_activity
+      puts DataSources.new(self, @db.cfg[:unit_system]).to_s
+    end
+
     def summary
       @fit_activity = load_fit_file unless @fit_activity
       puts ActivitySummary.new(self, @db.cfg[:unit_system],
@@ -375,7 +381,7 @@ module PostRunner
       begin
         fit_activity = Fit4Ruby.read(fit_file, filter)
       rescue Fit4Ruby::Error
-        Log.fatal $!
+        Log.fatal "#{@fit_file} corrupted: #{$!}"
       end
 
       unless fit_activity

data/lib/postrunner/ActivityView.rb

@@ -67,14 +67,17 @@ module PostRunner
                                     :sub_type => @activity.activity_sub_type
                                   }).to_html(doc)
               TrackView.new(@activity).to_html(doc)
-              DeviceList.new(@activity.fit_activity).to_html(doc)
               UserProfileView.new(@activity.fit_activity, @unit_system).
                 to_html(doc)
+              DeviceList.new(@activity.fit_activity).to_html(doc)
             }
             doc.div({ :class => 'right_col' }) {
               ChartView.new(@activity, @unit_system).to_html(doc)
             }
           }
+          doc.div({ :class => 'two_col' }) {
+            DataSources.new(@activity, @unit_system).to_html(doc)
+          }
         }
       }
     end
@@ -91,12 +94,17 @@ body {
 }
 .left_col {
   float: left;
-  width: 400px;
+  width: 600px;
 }
 .right_col {
   float: right;
   width: 600px;
 }
+.two_col {
+  margin: 0 auto;
+  clear: both;
+  width: 1210px;
+}
 EOT
     end
 

data/lib/postrunner/DataSources.rb

@@ -0,0 +1,100 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = DataSources.rb -- PostRunner - Manage the data from your Garmin sport devices.
+#
+# Copyright (c) 2015 by Chris Schlaeger <cs@taskjuggler.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+require 'fit4ruby'
+
+require 'postrunner/FlexiTable'
+require 'postrunner/ViewFrame'
+require 'postrunner/DeviceList'
+
+module PostRunner
+
+  # The DataSources objects can generate a table that lists all the data
+  # sources in chronological order that were in use during a workout.
+  class DataSources
+
+    include Fit4Ruby::Converters
+
+    # Create a DataSources object.
+    # @param activity [Activity] The activity to analyze.
+    # @param unit_system [Symbol] The unit system to use (:metric or
+    #        :imperial )
+    def initialize(activity, unit_system)
+      @activity = activity
+      @fit_activity = activity.fit_activity
+      @unit_system = unit_system
+    end
+
+    def to_s
+      data_sources.to_s
+    end
+
+    def to_html(doc)
+      ViewFrame.new("Data Sources", 1210, data_sources).to_html(doc)
+    end
+
+    private
+
+    def data_sources
+      session = @fit_activity.sessions[0]
+
+      t = FlexiTable.new
+      t.enable_frame(false)
+      t.body
+      t.row([ 'Time', 'Distance', 'Mode', 'Distance', 'Speed',
+              'Cadence', 'Elevation', 'Heart Rate', 'Power', 'Calories'  ])
+      start_time = session.start_time
+      @fit_activity.data_sources.each do |source|
+        t.cell(secsToHMS(source.timestamp - start_time))
+        t.cell(distance(source.timestamp))
+        t.cell(source.mode)
+        t.cell(device_name(source.distance))
+        t.cell(device_name(source.speed))
+        t.cell(device_name(source.cadence))
+        t.cell(device_name(source.elevation))
+        t.cell(device_name(source.heart_rate))
+        t.cell(device_name(source.power))
+        t.cell(device_name(source.calories))
+        t.new_row
+      end
+
+      t
+    end
+
+    def device_name(index)
+      @fit_activity.device_infos.each do |device|
+        if device.device_index == index
+          return (DeviceList::DeviceTypeNames[device.device_type] ||
+                  device.device_type) + " [#{device.device_index}]"
+        end
+      end
+
+      ''
+    end
+
+    def distance(timestamp)
+      @fit_activity.records.each do |record|
+        if record.timestamp >= timestamp
+          unit = { :metric => 'km', :statute => 'mi'}[@unit_system]
+          value = record.get_as('distance', unit)
+          return '-' unless value
+          return "#{'%.2f %s' % [value, unit]}"
+        end
+      end
+
+      '-'
+    end
+
+  end
+
+end
+

data/lib/postrunner/DeviceList.rb

@@ -20,6 +20,25 @@ module PostRunner
 
     include Fit4Ruby::Converters
 
+    DeviceTypeNames = {
+      'acceleration' => 'Accelerometer',
+      'antfs' => 'Main Unit',
+      'barometric_pressure' => 'Barometer',
+      'bike_cadence' => 'Bike Cadence',
+      'bike_power' => 'Bike Power Meter',
+      'bike_speed' => 'Bike Speed',
+      'bike_speed_cadence' => 'Bike Speed + Cadence',
+      'environment_sensor_legacy' => 'GPS',
+      'gps' => 'GPS',
+      'heart_rate' => 'Heart Rate Sensor',
+      'running_dynamics' => 'Running Dynamics',
+      'stride_speed_distance' => 'Footpod'
+    }
+    ProductNames = {
+      'hrm_run_single_byte_product_id' => 'HRM Run',
+      'hrm_run' => 'HRM Run'
+    }
+
     def initialize(fit_activity)
       @fit_activity = fit_activity
     end
@@ -38,63 +57,67 @@ module PostRunner
       tables = []
       seen_indexes = []
       @fit_activity.device_infos.reverse_each do |device|
-        next if seen_indexes.include?(device.device_index) ||
-                device.manufacturer.nil? ||
-                device.manufacturer == 'Undocumented value 0' ||
-                device.device_type == 'Undocumented value 0'
+        next if seen_indexes.include?(device.device_index)
 
         tables << (t = FlexiTable.new)
         t.set_html_attrs(:style, 'margin-bottom: 15px') if tables.length != 1
         t.body
 
-        t.cell('Manufacturer:', { :width => '40%' })
-        t.cell(device.manufacturer.upcase, { :width => '60%' })
+        t.cell('Index:', { :width => '40%' })
+        t.cell(device.device_index.to_s, { :width => '60%' })
         t.new_row
 
+        if (manufacturer = device.manufacturer)
+          t.cell('Manufacturer:', { :width => '40%' })
+          t.cell(manufacturer.upcase, { :width => '60%' })
+          t.new_row
+        end
+
         if (product = %w( garmin dynastream dynastream_oem ).include?(
-                       device.manufacturer) ?
-                         device.garmin_product : device.product)
+            device.manufacturer) ? device.garmin_product : device.product) &&
+           product != 0xFFFF
           # For unknown products the numerical ID will be returned.
           product = product.to_s unless product.is_a?(String)
           t.cell('Product:')
           # Beautify some product names. The others will just be upcased.
-          rename = { 'hrm_run_single_byte_product_id' => 'HRM Run',
-                     'hrm_run' => 'HRM Run' }
-          product = rename.include?(product) ? rename[product] : product.upcase
+          product = ProductNames.include?(product) ?
+            ProductNames[product] : product.upcase
           t.cell(product)
           t.new_row
         end
+
         if (type = device.device_type)
-          rename = { 'heart_rate' => 'Heart Rate Sensor',
-                     'barometric_pressure' => 'Barometer',
-                     'position' => 'GPS',
-                     'stride_speed_distance' => 'Footpod',
-                     'running_dynamics' => 'Running Dynamics' }
-          type = rename[type] if rename.include?(type)
+          # Beautify some device type names.
+          type = DeviceTypeNames[type] if DeviceTypeNames.include?(type)
           t.cell('Device Type:')
           t.cell(type)
           t.new_row
         end
+
         if device.serial_number
           t.cell('Serial Number:')
           t.cell(device.serial_number)
           t.new_row
         end
+
         if device.software_version
           t.cell('Software Version:')
           t.cell(device.software_version)
           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)
           t.new_row
         end
+
         if device.battery_status
           t.cell('Battery Status:')
           t.cell(device.battery_status)
           t.new_row
         end
+
         if device.cum_operating_time
           t.cell('Cumulated Operating Time:')
           t.cell(secsToDHMS(device.cum_operating_time))

data/lib/postrunner/Log.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = Log.rb -- PostRunner - Manage the data from your Garmin sport devices.
+#
+# Copyright (c) 2014, 2015 by Chris Schlaeger <cs@taskjuggler.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+require 'fit4ruby'
+
+module PostRunner
+
+  # Use the Logger provided by Fit4Ruby for all console output.
+  Log = Fit4Ruby::ILogger.instance
+  Log.formatter = proc { |severity, datetime, progname, msg|
+    "#{severity == Logger::INFO ? '' : "#{severity}:"} #{msg}\n"
+  }
+  Log.level = Logger::INFO
+
+end
+

data/lib/postrunner/Main.rb

@@ -11,11 +11,11 @@
 #
 
 require 'optparse'
-require 'logger'
 require 'fit4ruby'
 require 'perobs'
 
 require 'postrunner/version'
+require 'postrunner/Log'
 require 'postrunner/RuntimeConfig'
 require 'postrunner/ActivitiesDB'
 require 'postrunner/MonitoringDB'
@@ -23,13 +23,6 @@ require 'postrunner/EPO_Downloader'
 
 module PostRunner
 
-  # Use the Logger provided by Fit4Ruby for all console output.
-  Log = Fit4Ruby::ILogger.new(STDOUT)
-  Log.formatter = proc { |severity, datetime, progname, msg|
-    "#{severity == Logger::INFO ? '' : "#{severity}:"} #{msg}\n"
-  }
-  Log.level = Logger::INFO
-
   class Main
 
     def initialize(args)
@@ -159,6 +152,10 @@ show [ <ref> ]
            Show the referenced FIT activity in a web browser. If no reference
            is provided show the list of activities in the database.
 
+sources [ <ref> ]
+           Show the data sources for the various measurements and how they
+           changed during the course of the activity.
+
 summary <ref>
            Display the summary information for the FIT file.
 
@@ -244,6 +241,8 @@ EOT
         else
           process_activities(args, :show)
         end
+      when 'sources'
+        process_activities(args, :sources)
       when 'summary'
         process_activities(args, :summary)
       when 'units'
@@ -358,6 +357,8 @@ EOT
         @activities.set(activity, @attribute, @value)
       when :show
         activity.show
+      when :sources
+        activity.sources
       when :summary
         activity.summary
       else

data/lib/postrunner/RuntimeConfig.rb

@@ -28,6 +28,7 @@ module PostRunner
         :version => '0.0.0',
         :unit_system => :metric,
         :import_dir => nil,
+        :data_dir => dir,
         :html_dir => File.join(dir, 'html')
       }
       @config_file = File.join(dir, 'config.yml')

data/lib/postrunner/TrackView.rb

@@ -16,14 +16,20 @@ require 'postrunner/ViewFrame'
 
 module PostRunner
 
+  # A TrackView object uses OpenLayers to draw a map with the waypoints of the
+  # activity. Lap end are marked with enumerated lap markers.
   class TrackView
 
+    # Create a new TrackView object for a given Activity.
+    # @param activity [Activity] The activity to render
     def initialize(activity)
       @activity = activity
       @session = @activity.fit_activity.sessions[0]
       @has_geo_data = @session.has_geo_data?
     end
 
+    # Render the map widget with the track and marker overlay as HTML code.
+    # @param doc [HTMLBuilder] HTML document to add to.
     def to_html(doc)
       return unless @has_geo_data
 
@@ -31,9 +37,10 @@ module PostRunner
         doc.unique(:trackview_style) {
           doc.style(style)
           doc.link({ 'rel' => 'stylesheet',
-                     'href' => 'openlayers/theme/default/style.css',
+                     'href' => 'openlayers/ol.css',
                      'type' => 'text/css' })
-          doc.script({ 'src' => 'openlayers/OpenLayers.js' })
+          doc.script({ 'src' => 'openlayers/ol.js' })
+          doc.script({ 'src' => 'postrunner/trackview.js' })
         }
         doc.script(java_script)
       }
@@ -60,82 +67,52 @@ EOT
     end
 
     def java_script
-      js = <<EOT
-var map;
-
-function init() {
-  var mercator = new OpenLayers.Projection("EPSG:900913");
-  var geographic = new OpenLayers.Projection("EPSG:4326");
-EOT
-
       center_long = @session.swc_long +
         (@session.nec_long - @session.swc_long) / 2.0
       center_lat = @session.swc_lat +
         (@session.nec_lat - @session.swc_lat) / 2.0
-      last_lap = @activity.fit_activity.laps[-1]
-
-      js << <<EOT
-  map = new OpenLayers.Map({
-      div: "map",
-      projection: mercator,
-      layers: [ new OpenLayers.Layer.OSM() ],
-      center: new OpenLayers.LonLat(#{center_long}, #{center_lat}).transform(geographic, mercator),
-      zoom: 13
-  });
-EOT
-      js << <<"EOT"
-  track_layer = new OpenLayers.Layer.PointTrack("Track",
-    {style: {strokeColor: '#FF0000',  strokeWidth: 5}});
-  map.addLayer(track_layer);
-  track_layer.addNodes([
-EOT
-      track_points(js)
-
-      js << <<"EOT"
-    ]);
-  var markers = new OpenLayers.Layer.Markers( "Markers" );
-  map.addLayer(markers);
 
-  var size = new OpenLayers.Size(21,25);
-  var offset = new OpenLayers.Pixel(-(size.w/2), -size.h);
+      <<"EOT"
+#{track_points}
+#{lap_markers}
+function init() {
+  pr_trackview_init(#{center_long}, #{center_lat});
+}
 EOT
-      set_marker(js, 'marker-green', @session.start_position_long,
-                 @session.start_position_lat)
-      @activity.fit_activity.laps[0..-2].each do |lap|
-        set_marker(js, 'marker-blue',
-                   lap.end_position_long, lap.end_position_lat)
-      end
-      set_marker(js, 'marker',
-                 last_lap.end_position_long, last_lap.end_position_lat)
-      js << "\n};"
-
-      js
     end
 
-    def track_points(script)
-      first = true
-      @activity.fit_activity.sessions.each do |session|
-        session.records.each do |record|
+    # Generate a javascript variable with an Array with the coordinates of the
+    # track points. Each coordinate is an Array with a longitude and latitude
+    # in EPSG:4326. Generate a javascript variable with an Array of track
+    # points.
+    def track_points
+      points = []
+      @activity.fit_activity.sessions.map do |session|
+        session.records.map do |record|
           long = record.position_long
           lat = record.position_lat
           next unless long && lat
 
-          if first
-            first = false
-          else
-            script << ","
-          end
-          script << <<"EOT"
-new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(#{long}, #{lat}).transform(geographic, mercator))
-EOT
+          points << "[ #{long}, #{lat} ]"
         end
       end
+
+      "var pr_track_points = [\n" +
+      points.join(', ') +
+      "\n];\n"
     end
 
-    def set_marker(script, type, long, lat)
-      script << <<"EOT"
-    markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(#{long},#{lat}).transform(geographic, mercator),new OpenLayers.Icon('openlayers/img/#{type}.png',size,offset)));
-EOT
+    # Generate a javascript variable with an Array with the coordinates of the
+    # start point and the lap end points. Each coordinate is an Array with a
+    # longitude and latitude in EPSG:4326.
+    def lap_markers
+      "var pr_lap_markers = [\n" +
+        "[ #{@session.start_position_long}," +
+        " #{@session.start_position_lat} ], " +
+        @activity.fit_activity.laps.map do |lap|
+          "[ #{lap.end_position_long}, #{lap.end_position_lat} ]"
+        end.join(', ') +
+        "\n];\n"
     end
 
   end