Remove central location check, fix loop structure, remove duplicate data processing, remove unnecessary separation of fit and gpx files where possible

Author: mrhheffernan

personal_heatmap.py

@@ -7,12 +7,9 @@
 import gpxpy
 import numpy as np
 import pandas as pd
-from geopy.geocoders import Nominatim
 
 from fit_to_csv import collect_data
 
-geolocator = Nominatim(user_agent="heatmap_app")
-
 
 def parse_args() -> argparse.Namespace:
     args = argparse.ArgumentParser()
@@ -37,9 +34,6 @@ def parse_args() -> argparse.Namespace:
 
 def main():
     args = parse_args()
-    location = geolocator.geocode("Montreal Quebec")
-    lat_check = float(location.raw["lat"])
-    lon_check = float(location.raw["lon"])
 
     gpx_files = glob.glob(args.dir + "/*.gpx")
     fit_files = glob.glob(args.dir + "/*.fit")
@@ -52,17 +46,16 @@ def main():
             df_activity_data = pd.DataFrame(activity_data)
             fit_data.append(df_activity_data)
 
-    lat = []
-    lon = []
-
     all_lat = []
     all_long = []
 
     print("Loading data")
 
     for activity in gpx_files:
-        gpx_filename = activity
-        with open(gpx_filename, "r") as gpx_file:
+        lon = []
+        lat = []
+
+        with open(activity, "r") as gpx_file:
             gpx = gpxpy.parse(gpx_file)
 
             for track in gpx.tracks:
@@ -71,82 +64,36 @@ def main():
                         lat.append(point.latitude)
                         lon.append(point.longitude)
 
-        check1 = np.any(np.isclose(lat, lat_check, atol=0.5))
-        check2 = np.any(np.isclose(lon, lon_check, atol=0.5))
-
-        if check1 and check2:
-            all_lat.append(lat)
-            all_long.append(lon)
+        all_lat.append(lat)
+        all_long.append(lon)
 
+    for activity in fit_data:
         lon = []
         lat = []
-
-    for activity in fit_data:
         for i in range(len(activity)):
             # TODO: use extend and .values.to_list() and avoid the loop entirely
-            lat.append(activity["position_lat"][i])
-            lon.append(activity["position_long"][i])
+            lat.append(float(activity["position_lat"][i]))
+            lon.append(float(activity["position_long"][i]))
 
-        check1 = np.any(np.isclose(lat, lat_check, atol=0.5))
-        check2 = np.any(np.isclose(lon, lon_check, atol=0.5))
+        all_lat.append(lat)
+        all_long.append(lon)
 
-        if check1 and check2:
-            all_lat.append(lat)
-            all_long.append(lon)
-
-        lon = []
-        lat = []
-
-    if not all_lat or not all_long:
-        raise ValueError(
-            "No activities found within the specified location. Check lat_check/lon_check."
-        )
-
-    all_lat = all_lat[0]
-    all_long = all_long[0]
-
-    central_long = sum(all_long) / len(all_long)
-    central_lat = sum(all_lat) / len(all_lat)
+    central_long = np.mean(np.array(all_long).flatten())
+    central_lat = np.mean(np.array(all_lat).flatten())
 
     print("Initializing map")
     m = folium.Map(
-        location=[central_lat, central_long], tiles="Stamen Toner", zoom_start=14.2
+        location=[central_lat, central_long], tiles="Cartodb Positron", zoom_start=14.2
     )
 
-    print("Plotting gpx data")
-
-    for activity in gpx_files:
-        gpx_filename = activity
-        with open(gpx_filename, "r") as gpx_file:
-            gpx = gpxpy.parse(gpx_file)
-
-            for track in gpx.tracks:
-                for segment in track.segments:
-                    for point in segment.points:
-                        lat.append(point.latitude)
-                        lon.append(point.longitude)
+    print("Plotting activities")
 
+    for i in range(len(all_lat)):
+        lat = all_lat[i]
+        lon = all_long[i]
         points = list(zip(lat, lon))
 
         folium.PolyLine(points, color="red", weight=2.5, opacity=0.5).add_to(m)
-        lat = []
-        lon = []
-
-    print("Plotting csv data")
-    color = "red"
-    hr = []
-    for activity in fit_data:
-        for i in range(len(activity)):
-            lat.append(activity["position_lat"][i])
-            lon.append(activity["position_long"][i])
-            if "heart_rate" in activity.columns:
-                hr.append(activity["heart_rate"][i])
-        points = list(zip(lat, lon))
-
-        folium.PolyLine(points, color=color, weight=2.5, opacity=0.5).add_to(m)
-        lat = []
-        lon = []
-        hr = []
 
     m.save(args.output_path)