Update app.py

app.py

@@ -23,15 +23,21 @@ def load_tab(sheet_name):
 
 # GPS calculations
 def calculate_gps_data(df):
-    df = df.sort_values(['Date', 'Time'])
+    df = df.sort_values(['Date', 'Time']).reset_index(drop=True)
     df[['Latitude', 'Longitude']] = df['Location'].str.split(', ', expand=True).astype(float)
-    df['Kms Travelled'] = df[['Latitude', 'Longitude']].shift().apply(
-        lambda row: geodesic((row['Latitude'], row['Longitude']), (row.name[0], row.name[1])).km if pd.notnull(row['Latitude']) else 0,
-        axis=1)
-    df['Duration Between Calls (min)'] = df[['Date', 'Time']].apply(
-        lambda row: pd.to_datetime(row['Date'] + ' ' + row['Time']), axis=1
-    ).diff().dt.total_seconds().div(60)
-    df.fillna({'Kms Travelled': 0, 'Duration Between Calls (min)': 0}, inplace=True)
+
+    df['Kms Travelled'] = 0.0
+    df['Duration Between Calls (min)'] = 0.0
+
+    for i in range(1, len(df)):
+        prev_coords = (df.at[i-1, 'Latitude'], df.at[i-1, 'Longitude'])
+        current_coords = (df.at[i, 'Latitude'], df.at[i, 'Longitude'])
+        df.at[i, 'Kms Travelled'] = geodesic(prev_coords, current_coords).km
+
+        prev_time = pd.to_datetime(df.at[i-1, 'Date'] + ' ' + df.at[i-1, 'Time'])
+        current_time = pd.to_datetime(df.at[i, 'Date'] + ' ' + df.at[i, 'Time'])
+        df.at[i, 'Duration Between Calls (min)'] = (current_time - prev_time).total_seconds() / 60.0
+
     return df
 
 # Load and process Field Sales data