Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FE] currentが直線距離から外れたり目的地と現在地が同じ場合に異常値になるのを修正 #794

Merged
merged 2 commits into from
Dec 8, 2024
Merged

[FE] currentが直線距離から外れたり目的地と現在地が同じ場合に異常値になるのを修正 #794

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3548b8
fix: currentが直線距離から外れたり、目的地と現在地が同じ場合に異常値になるのを修正
narirou Dec 7, 2024
be95473
fix: floorを戻す
narirou Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions frontend/app/components/modules/simulator-configs/simulator-chair-config.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,21 @@ const progress = (
current: Coordinate,
end: Coordinate,
): number => {
const distance =
const startToEnd =
Math.abs(end.latitude - start.latitude) +
Math.abs(end.longitude - start.longitude);
const progress =
if (startToEnd === 0) {
return 100;
}
const currentToEnd =
Math.abs(end.latitude - current.latitude) +
Math.abs(end.longitude - current.longitude);
return Math.floor(((distance - progress) / distance) * 100);
return Math.floor(
Math.max(
Math.min(((startToEnd - currentToEnd) / startToEnd) * 100, 100),
0,
),
);
};

const ChairProgress: FC<{
Expand Down