Skip to content

Commit 6103d1e

Browse files
committed
Fixed the dist function bug in param_regression
1 parent 82d6ce6 commit 6103d1e

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

radp/digital_twin/mobility/param_regression.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ def calculate_distances_and_velocities(group: pd.DataFrame) -> pd.DataFrame:
124124
group["prev_longitude"] = group["lon"].shift(1)
125125
group["prev_latitude"] = group["lat"].shift(1)
126126
group["distance"] = group.apply(
127-
lambda row: GISTools.get_log_distance(
128-
row["prev_latitude"], row["prev_longitude"], row["lat"], row["lon"]
129-
)
130-
if not pd.isna(row["prev_longitude"])
131-
else 0,
132-
axis=1,
133-
)
127+
lambda row: GISTools.dist(
128+
(row["prev_latitude"], row["prev_longitude"]), (row["lat"], row["lon"])
129+
) * 1000 # Multiplying by 1000 to convert km to m
130+
if not pd.isna(row["prev_longitude"]) else 0,
131+
axis=1,
132+
)
133+
134134
# Assuming time interval between ticks is 1 unit, adjust below if different
135135
group["velocity"] = (
136136
group["distance"] / 1

0 commit comments

Comments
 (0)