Skip to content

Commit

Permalink
Merge pull request #794 from isucon/fix-fe-progress
Browse files Browse the repository at this point in the history
[FE] currentが直線距離から外れたり目的地と現在地が同じ場合に異常値になるのを修正
  • Loading branch information
narirou authored Dec 8, 2024
2 parents 383676f + be95473 commit b6fccd9
Showing 1 changed file with 11 additions and 3 deletions.
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

0 comments on commit b6fccd9

Please sign in to comment.