fit4ruby 3.3.0 → 3.8.0

data/lib/fit4ruby/FitDefinitionFieldBase.rb

@@ -3,7 +3,7 @@
 #
 # = FitDefinitionFieldBase.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014, 2017 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2017, 2020 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
@@ -30,7 +30,7 @@ module Fit4Ruby
 
     def set_type(fit_type)
       idx = FIT_TYPE_DEFS.index { |x| x[0] == fit_type }
-      raise "Unknown type #{fit_type}" unless idx
+      raise ArgumentError, "Unknown type #{fit_type}" unless idx
       self.base_type_number = idx
       self.byte_count = FIT_TYPE_DEFS[idx][3]
     end
@@ -39,13 +39,22 @@ module Fit4Ruby
       FIT_TYPE_DEFS[checked_base_type_number][fit_type ? 0 : 1]
     end
 
+    def set_length(count)
+      if (byte_count = FIT_TYPE_DEFS[self.base_type_number][3] * count) > 255
+        raise ArgumentError,
+          "FitDefinitionField byte count too large (#{byte_count})"
+      end
+      self.byte_count = byte_count
+    end
+
     def is_array?
       if total_bytes > base_type_bytes
         if total_bytes % base_type_bytes != 0
-          Log.error "Total bytes (#{total_bytes}) must be multiple of " +
-                    "base type bytes (#{base_type_bytes}) of type " +
-                    "#{base_type_number.snapshot} in Global FIT " +
-                    "Message #{name}."
+          raise RuntimeError,
+            "Total bytes (#{total_bytes}) must be multiple of " +
+            "base type bytes (#{base_type_bytes}) of type " +
+            "#{base_type_number.snapshot} in Global FIT " +
+            "Message #{name}."
         end
         return true
       end

data/lib/fit4ruby/FitDeveloperDataFieldDefinition.rb

@@ -48,7 +48,7 @@ module Fit4Ruby
     def find_field_definition
       return @field_definition if @field_definition
 
-      tlr = parent.parent.fit_entity.top_level_record
+      tlr = parent.parent.fit_entity
       @field_definition = tlr.field_descriptions.find do |fd|
         fd.field_definition_number == field_number.snapshot &&
           fd.developer_data_index == developer_data_index.snapshot

data/lib/fit4ruby/FitFile.rb

@@ -81,6 +81,8 @@ module Fit4Ruby
         io.close
       end
 
+      return nil if entities.empty?
+
       entities[0].top_level_record
     end
 

data/lib/fit4ruby/FitMessageRecord.rb

@@ -3,7 +3,8 @@
 #
 # = FitMessageRecord.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014, 2015, 2018, 2019 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015, 2018, 2019, 2020
+# 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
@@ -15,6 +16,7 @@ require 'fit4ruby/Log'
 require 'fit4ruby/GlobalFitMessage'
 require 'fit4ruby/FitFileEntity'
 require 'fit4ruby/DumpedField'
+require 'fit4ruby/BDFieldNameTranslator'
 
 module Fit4Ruby
 
@@ -26,6 +28,8 @@ module Fit4Ruby
   # decendents are used.
   class FitMessageRecord
 
+    include BDFieldNameTranslator
+
     attr_reader :global_message_number, :name, :message_record
 
     def initialize(definition)
@@ -36,7 +40,7 @@ module Fit4Ruby
         @name = @gfm.name
       else
         @name = "message#{@global_message_number}"
-        Log.warn { "Unknown global message number #{@global_message_number}" }
+        Log.debug { "Unknown global message number #{@global_message_number}" }
       end
       @message_record = produce(definition)
     end
@@ -44,23 +48,17 @@ module Fit4Ruby
     def read(io, entity, filter = nil, fields_dump = nil, fit_entity)
       @message_record.read(io)
 
-      # Check if we have a developer defined message for this global message
-      # number.
-      if fit_entity.top_level_record
-        developer_fields = fit_entity.top_level_record.field_descriptions
-        @dfm = developer_fields[@global_message_number]
-      end
-
       if @name == 'file_id'
-        unless (entity_type = @message_record['type'].snapshot)
+        # Caveat: 'type' is used as '_type' in BinData fields!
+        unless (entity_type = @message_record['_type'].snapshot)
           Log.fatal "Corrupted FIT file: file_id record has no type definition"
         end
         entity.set_type(entity_type)
       end
       obj = entity.new_fit_data_record(@name)
 
-      # It's important to ensure that alternative fields processed after the
-      # regular fields so that the decision field has already been already set.
+      # It's important to ensure that alternative fields are processed after
+      # the regular fields so that the decision field has already been set.
       sorted_fields = @definition.data_fields.sort do |f1, f2|
         f1alt = is_alt_field?(f1)
         f2alt = is_alt_field?(f2)
@@ -70,14 +68,18 @@ module Fit4Ruby
           f1alt ? 1 : -1
       end
 
-      #(sorted_fields + @definition.developer_fields).each do |field|
       sorted_fields.each do |field|
-        value = @message_record[field.name].snapshot
+        value = @message_record[to_bd_field_name(field.name)].snapshot
         # Strings are null byte terminated. There may be more bytes in the
         # file, but we have to discard all bytes from the first null byte
         # onwards.
-        if value.is_a?(String) && (null_byte = value.index("\0"))
-          value = null_byte == 0 ? '' : value[0..(null_byte - 1)]
+        if value.is_a?(String)
+          if (null_byte = value.index("\0"))
+            value = null_byte == 0 ? '' : value[0..(null_byte - 1)]
+          end
+          if value.empty?
+            value = nil
+          end
         end
 
         field_name, field_def = get_field_name_and_global_def(field, obj)
@@ -86,8 +88,8 @@ module Fit4Ruby
         if filter && fields_dump &&
            (filter.field_names.nil? ||
             filter.field_names.include?(field_name)) &&
-           !(((value.respond_to?('count') &&
-               (value.count(field.undefined_value) == value.length)) ||
+           !(((value.is_a?(String) &&
+               (value.count(field.undefined_value.chr) == value.length)) ||
               value == field.undefined_value) && filter.ignore_undef)
           fields_dump << DumpedField.new(
             @global_message_number,
@@ -109,7 +111,7 @@ module Fit4Ruby
           next
         end
 
-        field_name = field_description.field_name
+        field_name = field_description.full_field_name(fit_entity)
         units = field_description.units
         type = field.type
         native_message_number = field_description.native_mesg_num
@@ -118,6 +120,8 @@ module Fit4Ruby
         value = @message_record[field.name].snapshot
         value = nil if value == field.undefined_value
 
+        obj.set(field_name, value) if obj
+
         if filter && fields_dump &&
            (filter.field_names.nil? ||
             filter.field_names.include?(field_name)) &&
@@ -178,7 +182,8 @@ module Fit4Ruby
       fields = []
       (definition.data_fields.to_a +
        definition.developer_fields.to_a).each do |field|
-        field_def = [ field.type, field.name ]
+        field_name = to_bd_field_name(field.name)
+        field_def = [ field.type, field_name ]
 
         # Some field types need special handling.
         if field.type == 'string'
@@ -186,7 +191,7 @@ module Fit4Ruby
           field_def << { :read_length => field.total_bytes }
         elsif field.is_array?
           # For Arrays we have to break them into separte fields.
-          field_def = [ :array, field.name,
+          field_def = [ :array, field_name,
                         { :type => field.type.intern,
                           :initial_length =>
                             field.total_bytes / field.base_type_bytes } ]

data/lib/fit4ruby/FitRecord.rb

@@ -49,7 +49,8 @@ module Fit4Ruby
       if header.normal? && header.message_type.snapshot == 1
         # process definition message
         definition = FitDefinition.read(
-          io, entity, header.developer_data_flag.snapshot, @fit_entity)
+          io, entity, header.developer_data_flag.snapshot,
+          @fit_entity.top_level_record)
         @definitions[local_message_type] = FitMessageRecord.new(definition)
       else
         # process data message

data/lib/fit4ruby/FitTypeDefs.rb

@@ -21,9 +21,9 @@ module Fit4Ruby
     [ 'uint16', 'uint16', 0xFFFF, 2 ],
     [ 'sint32', 'int32', 0x7FFFFFFF, 4 ],
     [ 'uint32', 'uint32', 0xFFFFFFFF, 4 ],
-    [ 'string', 'string', '', 0 ],
+    [ 'string', 'string', 0, 1 ],
     [ 'float32', 'float', 0xFFFFFFFF, 4 ],
-    [ 'float63', 'double', 0xFFFFFFFF, 4 ],
+    [ 'float64', 'double', 0xFFFFFFFFFFFFFFFF, 8 ],
     [ 'uint8z', 'uint8', 0, 1 ],
     [ 'uint16z', 'uint16', 0, 2 ],
     [ 'uint32z', 'uint32', 0, 4 ],

data/lib/fit4ruby/GlobalFitDictionaries.rb

@@ -312,50 +312,306 @@ module Fit4Ruby
     entry 144, 'uint64z'
 
     dict 'garmin_product'
+    entry 1, 'hrm1'
+    entry 2, 'axh01'
+    entry 3, 'axb01'
+    entry 4, 'axb02'
+    entry 5, 'hrm2ss'
+    entry 6, 'dsi_alf02'
+    entry 7, 'hrm3ss'
     entry 8, 'hrm_run_single_byte_product_id'
     entry 9, 'bsm'
     entry 10, 'bcm'
+    entry 11, 'axs01'
+    entry 12, 'hrm_tri_single_byte_product_id'
+    entry 13, 'hrm4_run_single_byte_product_id'
+    entry 14, 'fr225_single_byte_product_id'
+    entry 473, 'fr301_china'
+    entry 474, 'fr301_japan'
+    entry 475, 'fr301_korea'
+    entry 494, 'fr301_taiwan'
+    entry 717, 'fr405'
+    entry 782, 'fr50'
+    entry 987, 'fr405_japan'
+    entry 988, 'fr60'
+    entry 1011, 'dsi_alf01'
+    entry 1018, 'fr310xt'
+    entry 1036, 'edge500'
+    entry 1124, 'fr110'
+    entry 1169, 'edge800'
+    entry 1199, 'edge500_taiwan'
+    entry 1213, 'edge500_japan'
+    entry 1253, 'chirp'
+    entry 1274, 'fr110_japan'
+    entry 1325, 'edge200'
+    entry 1328, 'fr910xt'
+    entry 1333, 'edge800_taiwan'
+    entry 1334, 'edge800_japan'
+    entry 1341, 'alf04'
+    entry 1345, 'fr610'
+    entry 1360, 'fr210_japan'
+    entry 1380, 'vector_ss'
+    entry 1381, 'vector_cp'
+    entry 1386, 'edge800_china'
+    entry 1387, 'edge500_china'
+    entry 1405, 'approach_g10'
+    entry 1410, 'fr610_japan'
+    entry 1422, 'edge500_korea'
+    entry 1436, 'fr70'
+    entry 1446, 'fr310xt_4t'
+    entry 1461, 'amx'
+    entry 1482, 'fr10'
+    entry 1497, 'edge800_korea'
+    entry 1499, 'swim'
+    entry 1537, 'fr910xt_china'
     entry 1551, 'fenix'
+    entry 1555, 'edge200_taiwan'
+    entry 1561, 'edge510'
+    entry 1567, 'edge810'
+    entry 1570, 'tempe'
+    entry 1600, 'fr910xt_japan'
     # The Fenix3 is rumored to have a Mediatek MT3333 GPS chipset. Not sure if
     # that would be a beter name.
     entry 1620, 'fenix3_gps' # Just a guess
     entry 1621, 'fenix5_gps' # Just a guess
     entry 1623, 'fr620'
     entry 1632, 'fr220'
+    entry 1664, 'fr910xt_korea'
+    entry 1688, 'fr10_japan'
     # The FR620 is rumored to have a MediaTek MT3339 GPS chipset while the
     # FR920XT is rumored to have a MT3333. Not sure why they have the same ID
     # in the FIT file for the GPS device.
     entry 1689, 'fr620_fr920xt_gps' # Just a guess
+    entry 1721, 'edge810_japan'
+    entry 1735, 'virb_elite'
+    entry 1736, 'edge_touring'
+    entry 1742, 'edge510_japan'
     entry 1743, 'hrm_tri'
     entry 1752, 'hrm_run'
     entry 1765, 'fr920xt'
+    entry 1821, 'edge510_asia'
+    entry 1822, 'edge810_china'
+    entry 1823, 'edge810_taiwan'
+    entry 1836, 'edge1000'
+    entry 1837, 'vivo_fit'
+    entry 1853, 'virb_remote'
+    entry 1885, 'vivo_ki'
+    entry 1903, 'fr15'
+    entry 1907, 'vivo_active'
+    entry 1918, 'edge510_korea'
     entry 1928, 'fr620_japan'
     entry 1929, 'fr620_china'
     entry 1930, 'fr220_japan'
     entry 1931, 'fr220_china'
+    entry 1936, 'approach_s6'
+    entry 1956, 'vivo_smart'
     entry 1967, 'fenix2'
     entry 1988, 'epix'
     entry 2050, 'fenix3'
+    entry 2052, 'edge1000_taiwan'
+    entry 2053, 'edge1000_japan'
+    entry 2061, 'fr15_japan'
+    entry 2067, 'edge520'
+    entry 2070, 'edge1000_china'
     entry 2072, 'fr620_russia'
     entry 2073, 'fr220_russia'
+    entry 2079, 'vector_s'
+    entry 2100, 'edge1000_korea'
     entry 2130, 'fr920xt_taiwan'
     entry 2131, 'fr920xt_china'
     entry 2132, 'fr920xt_japan'
+    entry 2134, 'virbx'
+    entry 2135, 'vivo_smart_apac'
+    entry 2140, 'etrex_touch'
+    entry 2147, 'edge25'
+    entry 2148, 'fr25'
+    entry 2150, 'vivo_fit2'
+    entry 2153, 'fr225'
+    entry 2156, 'fr630'
+    entry 2157, 'fr230'
+    entry 2158, 'fr735xt'
+    entry 2160, 'vivo_active_apac'
+    entry 2161, 'vector_2'
+    entry 2162, 'vector_2s'
+    entry 2172, 'virbxe'
     entry 2173, 'fr620_taiwan'
+    entry 2174, 'fr220_taiwan'
+    entry 2175, 'truswing'
     entry 2188, 'fenix3_china'
     entry 2189, 'fenix3_twn'
+    entry 2192, 'varia_headlight'
+    entry 2193, 'varia_taillight_old'
+    entry 2204, 'edge_explore_1000'
+    entry 2219, 'fr225_asia'
+    entry 2225, 'varia_radar_taillight'
+    entry 2226, 'varia_radar_display'
+    entry 2238, 'edge20'
+    entry 2260, 'edge520_asia'
+    entry 2261, 'edge520_japan'
+    entry 2262, 'd2_bravo'
+    entry 2266, 'approach_s20'
+    entry 2271, 'vivo_smart2'
+    entry 2274, 'edge1000_thai'
+    entry 2276, 'varia_remote'
+    entry 2288, 'edge25_asia'
+    entry 2289, 'edge25_jpn'
+    entry 2290, 'edge20_asia'
+    entry 2292, 'approach_x40'
+    entry 2293, 'fenix3_japan'
+    entry 2294, 'vivo_smart_emea'
+    entry 2310, 'fr630_asia'
+    entry 2311, 'fr630_jpn'
+    entry 2313, 'fr230_jpn'
     entry 2327, 'hrm4_run'
+    entry 2332, 'epix_japan'
+    entry 2337, 'vivo_active_hr'
+    entry 2347, 'vivo_smart_gps_hr'
+    entry 2348, 'vivo_smart_hr'
+    entry 2361, 'vivo_smart_hr_asia'
+    entry 2362, 'vivo_smart_gps_hr_asia'
+    entry 2368, 'vivo_move'
+    entry 2379, 'varia_taillight'
+    entry 2397, 'fr235_japan'
+    entry 2398, 'varia_vision'
+    entry 2406, 'vivo_fit3'
+    entry 2407, 'fenix3_korea'
+    entry 2408, 'fenix3_sea'
     entry 2413, 'fenix3_hr'
+    entry 2417, 'virb_ultra_30'
+    entry 2429, 'index_smart_scale'
     entry 2431, 'fr235'
     entry 2432, 'fenix3_chronos'
+    entry 2441, 'oregon7xx'
+    entry 2444, 'rino7xx'
+    entry 2457, 'epix_korea'
+    entry 2473, 'fenix3_hr_chn'
+    entry 2474, 'fenix3_hr_twn'
+    entry 2475, 'fenix3_hr_jpn'
+    entry 2476, 'fenix3_hr_sea'
+    entry 2477, 'fenix3_hr_kor'
+    entry 2496, 'nautix'
+    entry 2497, 'vivo_active_hr_apac'
+    entry 2512, 'oregon7xx_ww'
+    entry 2530, 'edge_820'
+    entry 2531, 'edge_explore_820'
+    entry 2533, 'fr735xt_apac'
+    entry 2534, 'fr735xt_japan'
     entry 2544, 'fenix5s'
-    entry 2604, 'fenix5x'
+    entry 2547, 'd2_bravo_titanium'
+    entry 2567, 'varia_ut800'
     entry 2593, 'running_dynamics_pod'
+    entry 2599, 'edge_820_china'
+    entry 2600, 'edge_820_japan'
+    entry 2604, 'fenix5x'
+    entry 2606, 'vivo_fit_jr'
+    entry 2622, 'vivo_smart3'
+    entry 2623, 'vivo_sport'
+    entry 2628, 'edge_820_taiwan'
+    entry 2629, 'edge_820_korea'
+    entry 2630, 'edge_820_sea'
+    entry 2650, 'fr35_hebrew'
+    entry 2656, 'approach_s60'
+    entry 2667, 'fr35_apac'
+    entry 2668, 'fr35_japan'
+    entry 2675, 'fenix3_chronos_asia'
+    entry 2687, 'virb_360'
     entry 2691, 'fr935'
     entry 2697, 'fenix5'
+    entry 2700, 'vivoactive3'
+    entry 2733, 'fr235_china_nfc'
+    entry 2769, 'foretrex_601_701'
+    entry 2772, 'vivo_move_hr'
+    entry 2713, 'edge_1030'
+    entry 2796, 'fenix5_asia'
+    entry 2797, 'fenix5s_asia'
+    entry 2798, 'fenix5x_asia'
+    entry 2806, 'approach_z80'
+    entry 2814, 'fr35_korea'
+    entry 2819, 'd2charlie'
+    entry 2831, 'vivo_smart3_apac'
+    entry 2832, 'vivo_sport_apac'
+    entry 2833, 'fr935_asia'
+    entry 2859, 'descent'
+    entry 2886, 'fr645'
+    entry 2888, 'fr645m'
+    entry 2891, 'fr30'
+    entry 2900, 'fenix5s_plus'
+    entry 2909, 'Edge_130'
+    entry 2924, 'edge_1030_asia'
+    entry 2927, 'vivosmart_4'
+    entry 2945, 'vivo_move_hr_asia'
     entry 2957, 'fenix5_gps_galileo' # Just a guess
+    entry 2962, 'approach_x10'
+    entry 2977, 'fr30_asia'
+    entry 2988, 'vivoactive3m_w'
+    entry 3003, 'fr645_asia'
+    entry 3004, 'fr645m_asia'
+    entry 3011, 'edge_explore'
+    entry 3028, 'gpsmap66'
+    entry 3049, 'approach_s10'
+    entry 3066, 'vivoactive3m_l'
+    entry 3085, 'approach_g80'
+    entry 3092, 'edge_130_asia'
+    entry 3095, 'edge_1030_bontrager'
+    entry 3110, 'fenix5_plus'
     entry 3111, 'fenix5x_plus'
+    entry 3112, 'edge_520_plus'
+    entry 3121, 'edge_530'
+    entry 3122, 'edge_830'
+    entry 3134, 'fenix5s_plus_apac'
+    entry 3135, 'fenix5x_plus_apac'
+    entry 3142, 'edge_520_plus_apac'
+    entry 3144, 'fr235l_asia'
+    entry 3145, 'fr245_asia'
+    entry 3163, 'vivo_active3m_apac'
+    entry 3218, 'vivo_smart4_asia'
+    entry 3224, 'vivoactive4_small'
+    entry 3225, 'vivoactive4_large'
+    entry 3226, 'venu'
+    entry 3246, 'marq_driver'
+    entry 3247, 'marq_aviator'
+    entry 3248, 'marq_captain'
+    entry 3249, 'marq_commander'
+    entry 3250, 'marq_expedition'
+    entry 3251, 'marq_athlete'
+    entry 3287, 'fenix6S_sport'
+    entry 3288, 'fenix6S'
+    entry 3289, 'fenix6_sport'
+    entry 3290, 'fenix6'
+    entry 3291, 'fenix6x'
+    entry 3299, 'hrm_dual'
+    entry 3308, 'vivo_move3_premium'
+    entry 3314, 'approach_s40'
+    entry 3321, 'fr245m_asia'
+    entry 3349, 'edge_530_apac'
+    entry 3350, 'edge_830_apac'
+    entry 3378, 'vivo_move3'
+    entry 3387, 'vivo_active4_small_asia'
+    entry 3388, 'vivo_active4_large_asia'
+    entry 3389, 'vivo_active4_oled_asia'
+    entry 3405, 'swim2'
+    entry 3420, 'marq_driver_asia'
+    entry 3421, 'marq_aviator_asia'
+    entry 3422, 'vivo_move3_asia'
+    entry 3446, 'vivo_active3t_chn'
+    entry 3448, 'marq_captain_asia'
+    entry 3449, 'marq_commander_asia'
+    entry 3450, 'marq_expedition_asia'
+    entry 3451, 'marq_athlete_asia'
+    entry 3469, 'fr45_asia'
+    entry 3473, 'vivoactive3_daimler'
+    entry 3512, 'fenix6s_sport_asia'
+    entry 3513, 'fenix6s_asia'
+    entry 3514, 'fenix6_sport_asia'
+    entry 3515, 'fenix6_asia'
+    entry 3516, 'fenix6x_asia'
+    entry 3624, 'marq_adventurer'
+    entry 3648, 'marq_adventurer_asia'
+    entry 3639, 'swim2_apac'
+    entry 3737, 'venu_daimler_asia'
+    entry 3740, 'venu_daimler'
     entry 10007, 'sdm4'
+    entry 10014, 'edge_remote'
     entry 20119, 'training_center'
     entry 65532, 'android_antplus_plugin'
     entry 65534, 'connect'
@@ -593,7 +849,7 @@ module Fit4Ruby
     dict 'swim_stroke'
     entry 0, 'freestyle'
     entry 1, 'backstroke'
-    entry 2, 'breaststrike'
+    entry 2, 'breaststroke'
     entry 3, 'butterfly'
     entry 4, 'drill'
     entry 5, 'mixed'
@@ -627,39 +883,39 @@ module Fit4Ruby
     entry 24, 'challenge'
     entry 25, 'indoor_skiing'
     entry 26, 'cardio_training'
-    entry 27, 'indoor_walking '
-    entry 28, 'e_bike_fitness '
+    entry 27, 'indoor_walking'
+    entry 28, 'e_bike_fitness'
     entry 29, 'bmx'
-    entry 30, 'casual_walking '
+    entry 30, 'casual_walking'
     entry 31, 'speed_walking'
-    entry 32, 'bike_to_run_transition '
-    entry 33, 'run_to_bike_transition '
+    entry 32, 'bike_to_run_transition'
+    entry 33, 'run_to_bike_transition'
     entry 34, 'swim_to_bike_transition'
     entry 35, 'atv'
     entry 36, 'motocross'
     entry 37, 'backcountry'
-    entry 38, 'resort '
-    entry 39, 'rc_drone '
-    entry 40, 'wingsuit '
-    entry 41, 'whitewater '
-    entry 42, 'skate_skiing '
-    entry 43, 'yoga '
+    entry 38, 'resort'
+    entry 39, 'rc_drone'
+    entry 40, 'wingsuit'
+    entry 41, 'whitewater'
+    entry 42, 'skate_skiing'
+    entry 43, 'yoga'
     entry 44, 'pilates'
-    entry 45, 'indoor_running '
-    entry 46, 'gravel_cycling '
+    entry 45, 'indoor_running'
+    entry 46, 'gravel_cycling'
     entry 47, 'e_bike_mountain'
     entry 48, 'commuting'
     entry 49, 'mixed_surface'
-    entry 50, 'navigate '
-    entry 51, 'track_me '
+    entry 50, 'navigate'
+    entry 51, 'track_me'
     entry 52, 'map'
     entry 53, 'single_gas_diving'
-    entry 54, 'multi_gas_diving '
-    entry 55, 'gauge_diving '
-    entry 56, 'apnea_diving '
+    entry 54, 'multi_gas_diving'
+    entry 55, 'gauge_diving'
+    entry 56, 'apnea_diving'
     entry 57, 'apnea_hunting'
-    entry 58, 'virtual_activity '
-    entry 59, 'obstacle '
+    entry 58, 'virtual_activity'
+    entry 59, 'obstacle'
     entry 254, 'all'
 
     dict 'training_status'