Add other fields from GPS data (#37)

* Renaming docker-compose to compose: Thats the new nomenclature.

Signed-off-by: Dipan Ghosh <5004441+dipanghosh@users.noreply.github.com>

* Modified script to include additonal data with GPS. Testing.

Signed-off-by: Dipan Ghosh <5004441+dipanghosh@users.noreply.github.com>

* changed long to lon

* update readme to refect compose.yml

* Removed excessive comments

---------

Signed-off-by: Dipan Ghosh <5004441+dipanghosh@users.noreply.github.com>
Co-authored-by: Arpan Ghosh <26424944+arpanghosh8453@users.noreply.github.com>

Author: dipanghosh

Fitbit_Fetch.py

@@ -553,22 +553,50 @@ def get_tcx_data(tcx_url, ActivityID):
     else:
         root = ET.fromstring(response.text)
         namespace = {"ns": "http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2"}
-        for trkpt in root.findall(".//ns:Trackpoint", namespace):
-            time = trkpt.find("ns:Time", namespace)
+        trackpoints = root.findall(".//ns:Trackpoint", namespace)
+        prev_time = None
+        prev_distance = None
+        
+        for i, trkpt in enumerate(trackpoints):
+            time_elem = trkpt.find("ns:Time", namespace)
             lat = trkpt.find(".//ns:LatitudeDegrees", namespace)
             lon = trkpt.find(".//ns:LongitudeDegrees", namespace)
-
-            if time is not None and lat is not None:
+            altitude = trkpt.find("ns:AltitudeMeters", namespace)
+            distance = trkpt.find("ns:DistanceMeters", namespace)
+            heart_rate = trkpt.find(".//ns:HeartRateBpm/ns:Value", namespace)
+
+            if time_elem is not None and lat is not None:
+                current_time = datetime.fromisoformat(time_elem.text.strip("Z"))
+                fields = {
+                    "lat": float(lat.text),
+                    "lon": float(lon.text)
+                }
+                if altitude is not None:
+                    fields["altitude"] = float(altitude.text)
+                if distance is not None:
+                    fields["distance"] = float(distance.text)
+                    current_distance = float(distance.text)
+                else:
+                    current_distance = None
+                if heart_rate is not None:
+                    fields["heart_rate"] = int(heart_rate.text)
+                if i > 0 and prev_time is not None and prev_distance is not None and current_distance is not None:
+                    time_diff = (current_time - prev_time).total_seconds()
+                    distance_diff = current_distance - prev_distance
+                    if time_diff > 0:
+                        speed_mps = distance_diff / time_diff
+                        speed_kph = speed_mps * 3.6
+                        fields["speed_kph"] = speed_kph
+                prev_time = current_time
+                prev_distance = current_distance
+                
                 collected_records.append({
                         "measurement": "GPS",
                         "tags": {
                             "ActivityID": ActivityID
                         },
-                        "time": datetime.fromisoformat(time.text.strip("Z")).astimezone(pytz.utc).isoformat(),
-                        "fields": {
-                            "lat": float(lat.text),
-                            "long": float(lon.text)
-                        }
+                        "time": datetime.fromisoformat(time_elem.text.strip("Z")).astimezone(pytz.utc).isoformat(),
+                        "fields": fields
                     })
 
 # Fetches latest activities from record ( upto last 50 )

README.md

@@ -64,7 +64,7 @@ You can use the Fitbit_Fetch_Autostart.service template to set up an auto-starti
 
 Follow this [guide](https://dev.fitbit.com/build/reference/web-api/developer-guide/getting-started/) to create an application. This will give you a client ID, client secret, and a refresh token ( end step after following OAuth setup )
 
-Initial setup : Create a folder named fitbit-fetch-data, cd into the folder, create a docker-compose.yml file with the below compose example ( Change the enviornment variables accordingly )
+Initial setup : Create a folder named fitbit-fetch-data, cd into the folder, create a compose.yml file with the below compose example ( Change the enviornment variables accordingly )
 
 Create folders named logs and tokens inside and make sure to chown them for uid 1000 ( otherwise you may get read/write permission denied errors )
 
@@ -151,7 +151,7 @@ The process is quite simple. you need to add an ENV variable and rerun the conta
 
 - In the docker compose file, add a new ENV variable `AUTO_DATE_RANGE=False` under the `environment` section along with other variables. This variable switches the mode to bulk update instead of regular daily update
 
-- Assuming you are already in the directory where the `docker-compose.yml` file is, run `docker compose run --rm fitbit-fetch-data` - this will run this container in _"remove container automatically after finish"_ mode which is useful for one time running like this. This will also attach the container to the shell as interactive mode, so don't close the shell until the bulk update is complete. 
+- Assuming you are already in the directory where the `compose.yml` file is, run `docker compose run --rm fitbit-fetch-data` - this will run this container in _"remove container automatically after finish"_ mode which is useful for one time running like this. This will also attach the container to the shell as interactive mode, so don't close the shell until the bulk update is complete. 
 
 - After initialization, you will be requested to input the start and end dates in YYYY-MM-DD format. the format is very important so please enter the dates like this `2024-03-13`. Start date must be earlier than end date. The script should work for any given range, but if you encounter an error during the bulk update with large date range, please break the date range into one year chunks (maybe a few days less than one year just to be safe), and run it for each one year chunk one after another. I personally did not encounter any issue with longer date ranges, but this is just a heads up.