git-fit 0.14.1 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d4addd08029f44a569bf1e7caebc7f890f6ef31a2acc4a0a4de7c9ff74dff4c
-  data.tar.gz: 3eedd8d3727f7e9bea165f347fcd30ac430b37518a1c3b36ce7a91d14d2dc15c
+  metadata.gz: 5922b46e00a21d66f591fb8d0e43b9a5e35dbb2fef4f5118aa7c689e62fa0118
+  data.tar.gz: 103cb559cef56006024fb838982410a47c49485c9a104ee6bd29a33cc05179f2
 SHA512:
-  metadata.gz: 416c3f458713d03a648d723d05b48af609f5165d9d09ae3f22646089825a2fc058974c34210f5553fe9e28ee52f108932d20a69b1bf8b8aee3fa682e45cc18ad
-  data.tar.gz: 6fce4b173ae5d10000a2b3e0035cb81e6c2c1c656357f4373d5532a51977acdae5610d8ecba42888fddf3f846094b6653c96ebdc438e72b23422300ec2e7592e
+  metadata.gz: d7de2f67f3c9d549cfa1f1117acb3d0843b15cf3543508a9e588e4d8a9e1b3e3ca06f1e6feb403204df9f17bc480b758b95586ef5ab55085e59795773890a545
+  data.tar.gz: 5e252339935260098d9d8811ba9a4229dabf58c86c861afad78e6a2d17096aaed24dc2500f2144a5982e2157a2d343cf35b1269e0098f32675153afda2583640

data/lib/git_fit/export/calculator.rb

@@ -61,6 +61,7 @@ module GitFit
 
         cadences = rows.map { |r| r[:average_cadence] }.compact
         powers = rows.map { |r| r[:average_power] }.compact
+        max_powers = rows.map { |r| r[:max_power] }.compact
 
         grouped_run_ids = if @db.table_exists?(:dedup_group_members)
                             @db[:dedup_group_members].select_map(:run_id)
@@ -80,6 +81,8 @@ module GitFit
           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,
+          max_power: max_powers.any? ? max_powers.max.round(1) : nil,
+          avg_max_power: max_powers.any? ? (max_powers.sum / max_powers.size).round(1) : nil,
           sport_breakdown: breakdown.sort_by { |_, v| -v[:count] }.map do |cat, v|
             { category: cat, count: v[:count], distance_km: v[:distance_km].round(1),
               moving_time_h: v[:moving_time_h].round(1) }
@@ -93,7 +96,8 @@ module GitFit
                    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 }
+                   total_power: 0.0, power_count: 0,
+                   max_power_peak: 0.0, total_max_power: 0.0, max_power_count: 0 }
         end
 
         rows.each do |r|
@@ -127,6 +131,12 @@ module GitFit
             monthly[ym][:total_power] += pow
             monthly[ym][:power_count] += 1
           end
+          max_pow = r[:max_power]
+          if max_pow && max_pow > 0
+            monthly[ym][:max_power_peak] = max_pow if max_pow > monthly[ym][:max_power_peak]
+            monthly[ym][:total_max_power] += max_pow
+            monthly[ym][:max_power_count] += 1
+          end
         end
 
         monthly.sort.map do |ym, v|
@@ -143,6 +153,8 @@ module GitFit
             avg_hr: v[:hr_count] > 0 ? (v[:total_hr] / v[:hr_count]).round(0) : nil,
             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,
+            max_power: v[:max_power_count] > 0 ? v[:max_power_peak].round(0) : nil,
+            avg_max_power: v[:max_power_count] > 0 ? (v[:total_max_power] / v[:max_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],
@@ -167,11 +179,15 @@ module GitFit
 
           streak = calculate_streak(acts)
 
+          year_max_powers = acts.map { |r| r[:max_power] }.compact
+
           { 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,
             elevation_gain_m: total_elev.round(0), elevation_loss_m: total_loss.round(0),
-            steps: total_steps }
+            steps: total_steps,
+            max_power: year_max_powers.any? ? year_max_powers.max.round(0) : nil,
+            avg_max_power: year_max_powers.any? ? (year_max_powers.sum / year_max_powers.size).round(0) : nil }
         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,28 @@ 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
+
+        average_cadence = summary['avgCadence']&.to_f
+        average_cadence ||= sport_cadence(summary, type)&.to_f
+        average_cadence ||= fallback_avg_cadence(activity_id, l2_data)
+
+        max_cadence = summary['maxCadence']&.to_f
+        max_cadence ||= sport_max_cadence(summary, type)&.to_f
+
+        average_temperature = summary['avgTemperature']&.to_f
+        average_temperature ||= fallback_avg_temperature(activity_id, l2_data)
+
         {
           run_id: "#{source_prefix}_#{activity_id}",
           name: detail['activityName'] || 'Garmin Activity',
@@ -501,12 +516,12 @@ module GitFit
           summary_polyline: polyline,
           average_heartrate: summary['averageHR']&.to_f,
           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_cadence: average_cadence,
+          max_cadence: max_cadence,
+          average_power: average_power,
+          max_power: max_power,
           calories: summary['calories']&.to_i,
-          average_temperature: summary['avgTemperature']&.to_f,
+          average_temperature: average_temperature,
           average_speed: summary['averageSpeed']&.to_f,
           elevation_gain: summary['elevationGain']&.to_f,
           elevation_loss: summary['elevationLoss']&.to_f,
@@ -530,6 +545,55 @@ 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 sport_cadence(summary, type)
+        type == 'ride' ? summary['avgBikingCadence'] : summary['avgRunningCadence']
+      end
+
+      def sport_max_cadence(summary, type)
+        type == 'ride' ? summary['maxBikingCadence'] : summary['maxRunningCadence']
+      end
+
+      def fallback_avg_cadence(activity_id, l2_data)
+        records = l2_data || load_l2_from_disk(activity_id)
+        return nil unless records.is_a?(Array) && records.any?
+
+        cadence_values = records.filter_map { |r| r['cadence']&.to_f }
+        cadence_values.select! { |c| c > 0 }
+        return nil if cadence_values.empty?
+
+        (cadence_values.sum.to_f / cadence_values.size).round(1)
+      end
+
+      def fallback_avg_temperature(activity_id, l2_data)
+        records = l2_data || load_l2_from_disk(activity_id)
+        return nil unless records.is_a?(Array) && records.any?
+
+        temp_values = records.filter_map { |r| r['temperature']&.to_f }
+        return nil if temp_values.empty?
+
+        (temp_values.sum.to_f / temp_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.1'
+  VERSION = '0.14.3'
 end

metadata

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