git-fit 0.14.0 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def93fbb1103170a99f7a1a346e419c92bb147a1a6671a1a485248229a3b6178
-  data.tar.gz: e56db533020db64602a5b62a2d05b2d42f8e2115d0212425594136506668aac5
+  metadata.gz: 4aa9561c8dd3c3f589c8c0680f96b779a1d07b415cde954ed4f6787a4a5d3d28
+  data.tar.gz: 263aa4c476ab2b8a656d6a8aefcf6c6df7046042a42b362ccaf653a8201a6e0a
 SHA512:
-  metadata.gz: 844d55ba27a60361019e1ee0a26d37d378f777ba4cdcf5b9c6d7140da99f713e0d722d4171446a8a9b846d683145437e56681a3af56a3e1521c96c39446064d0
-  data.tar.gz: ea001dd780c5eb8134c7f0eefed75c917b05b7e63d99cf395a60f7241becde2041617821b4f319142c9e22ce534f568eaeaaab6e70b8fac04143375c582e2b06
+  metadata.gz: cffae3928c4efa2f3a1be2d329fbf74b23808ccd3baa0e6fb9524c029c3b8a261eff0fc1c9f26c742eb6bd2f1b053ba38d9b8a806c20085ddbca54c52c21c689
+  data.tar.gz: cef76be1158588e238686c931329613db7bde3a8ffe5453b61d1e3415aa53532ac10a5133c6e831e1b5ac7f3a04f9a194f0f18abfa522d3fcde459885850e93f

data/lib/git_fit/export/calculator.rb

@@ -36,6 +36,8 @@ module GitFit
         total_dist = 0.0
         total_time = 0
         total_elev = 0.0
+        total_loss = 0.0
+        total_steps = 0
         breakdown = Hash.new { |h, k| h[k] = { count: 0, distance_km: 0.0, moving_time_h: 0.0 } }
 
         rows.each do |r|
@@ -43,10 +45,14 @@ module GitFit
           d = r[:distance] || 0
           t = r[:moving_time] || 0
           e = r[:elevation_gain] || 0
+          l = r[:elevation_loss] || 0
+          s = r[:steps] || 0
 
           total_dist += d
           total_time += t
           total_elev += e
+          total_loss += l
+          total_steps += s
 
           breakdown[cat][:count] += 1
           breakdown[cat][:distance_km] += d / 1000.0
@@ -70,6 +76,8 @@ module GitFit
           total_distance_km: total_dist / 1000.0,
           total_moving_time_h: total_time / 3600.0,
           total_elevation_gain_m: total_elev,
+          total_elevation_loss_m: total_loss,
+          total_steps: total_steps,
           avg_cadence: cadences.any? ? (cadences.sum / cadences.size).round(1) : nil,
           avg_power: powers.any? ? (powers.sum / powers.size).round(1) : nil,
           sport_breakdown: breakdown.sort_by { |_, v| -v[:count] }.map do |cat, v|
@@ -83,6 +91,7 @@ module GitFit
         monthly = Hash.new do |h, k|
           h[k] = { count: 0, distance_km: 0.0, moving_time_h: 0.0,
                    total_hr: 0.0, hr_count: 0, total_elev: 0.0,
+                   total_loss: 0.0, total_steps: 0,
                    total_cadence: 0.0, cadence_count: 0,
                    total_power: 0.0, power_count: 0 }
         end
@@ -95,11 +104,15 @@ module GitFit
           t = r[:moving_time] || 0
           hr = r[:average_heartrate]
           e = r[:elevation_gain] || 0
+          l = r[:elevation_loss] || 0
+          s = r[:steps] || 0
 
           monthly[ym][:count] += 1
           monthly[ym][:distance_km] += d / 1000.0
           monthly[ym][:moving_time_h] += t / 3600.0
           monthly[ym][:total_elev] += e
+          monthly[ym][:total_loss] += l
+          monthly[ym][:total_steps] += s
           if hr && hr > 0
             monthly[ym][:total_hr] += hr
             monthly[ym][:hr_count] += 1
@@ -131,6 +144,8 @@ module GitFit
             avg_cadence: v[:cadence_count] > 0 ? (v[:total_cadence] / v[:cadence_count]).round(0) : nil,
             avg_power: v[:power_count] > 0 ? (v[:total_power] / v[:power_count]).round(0) : nil,
             elevation_gain_m: v[:total_elev].round(0),
+            elevation_loss_m: v[:total_loss].round(0),
+            steps: v[:total_steps],
           }
         end
       end
@@ -145,13 +160,18 @@ module GitFit
         by_year.sort.map do |year, acts|
           total_dist = acts.sum { |r| r[:distance] || 0 } / 1000.0
           total_time = acts.sum { |r| r[:moving_time] || 0 }
+          total_elev = acts.sum { |r| r[:elevation_gain] || 0 }
+          total_loss = acts.sum { |r| r[:elevation_loss] || 0 }
+          total_steps = acts.sum { |r| r[:steps] || 0 }
           longest = acts.map { |r| r[:distance] || 0 }.max / 1000.0
 
           streak = calculate_streak(acts)
 
           { year: year, count: acts.size, distance_km: total_dist.round(1),
             moving_time_h: (total_time / 3600.0).round(1),
-            longest_km: longest.round(1), streak: streak }
+            longest_km: longest.round(1), streak: streak,
+            elevation_gain_m: total_elev.round(0), elevation_loss_m: total_loss.round(0),
+            steps: total_steps }
         end
       end
 

data/lib/git_fit/sync/garmin_base.rb

@@ -138,7 +138,7 @@ module GitFit
           write_standardized_json(l2, act_id) if l2
         end
 
-        attrs = build_attrs(details, act_id, type, polyline)
+        attrs = build_attrs(details, act_id, type, polyline, l2_data: l2)
 
         if (start_t = parse_garmin_time(details.dig('summaryDTO', 'startTimeGMT')))
           local_t = resolve_local_time(start_t, act_id, polyline)
@@ -480,13 +480,18 @@ module GitFit
         "Re-auth: set sync.#{source_prefix}.secret in #{GitFit::Config.default_path}"
       end
 
-      def build_attrs(detail, activity_id, type, polyline = nil)
+      def build_attrs(detail, activity_id, type, polyline = nil, l2_data: nil)
         summary = detail['summaryDTO'] || {}
 
         start_t = parse_garmin_time(summary['startTimeGMT'])
         moving_time = summary['movingDuration']&.to_i || summary['duration']&.to_i
         elapsed_time = summary['elapsedDuration']&.to_i || summary['duration']&.to_i
 
+        average_power = summary['avgPower']&.to_f
+        average_power ||= fallback_avg_power(activity_id, l2_data)
+
+        max_power = summary['maxPower']&.to_f
+
         {
           run_id: "#{source_prefix}_#{activity_id}",
           name: detail['activityName'] || 'Garmin Activity',
@@ -503,8 +508,8 @@ module GitFit
           max_heartrate: summary['maxHR']&.to_f,
           average_cadence: summary['avgCadence']&.to_f,
           max_cadence: summary['maxCadence']&.to_f,
-          average_power: summary['avgPower']&.to_f,
-          max_power: summary['maxPower']&.to_f,
+          average_power: average_power,
+          max_power: max_power,
           calories: summary['calories']&.to_i,
           average_temperature: summary['avgTemperature']&.to_f,
           average_speed: summary['averageSpeed']&.to_f,
@@ -530,6 +535,26 @@ module GitFit
         val.is_a?(Hash) ? (val['typeKey'] || '').downcase : val.to_s.downcase
       end
 
+      def fallback_avg_power(activity_id, l2_data)
+        records = l2_data || load_l2_from_disk(activity_id)
+        return nil unless records.is_a?(Array) && records.any?
+
+        power_values = records.filter_map { |r| r['power']&.to_f }
+        power_values.select! { |p| p > 0 }
+        return nil if power_values.empty?
+
+        (power_values.sum.to_f / power_values.size).round(1)
+      end
+
+      def load_l2_from_disk(activity_id)
+        l2_path = std_path(activity_id)
+        return nil unless File.exist?(l2_path)
+
+        JSON.parse(File.read(l2_path))
+      rescue StandardError
+        nil
+      end
+
       def map_type(activity_type)
         ts = type_str(activity_type)
         return 'other' if ts.empty?

data/lib/git_fit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitFit
-  VERSION = '0.14.0'
+  VERSION = '0.14.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.2
 platform: ruby
 authors:
 - Lax