GHI #112, #119 - Fix API data pipeline & add altitude tape [FV/typescript-rewrite] #116
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| import { type FC, useEffect, useState } from "react"; | ||
| import { POLLING_INTERVAL_MS } from "@/hooks/useSensorData"; | ||
| import { ConversionFactors, altitudeHandler, AltitudeMode } from "@/utils/units/units" | ||
|
|
||
| /* -- Constants -- */ | ||
| const DEFAULT_ALTITUDE_MAXIMUM_METERS = 10000 / ConversionFactors.METERS_TO_FEET; | ||
| const GROUND_BAND_REM = 2; // reserved space at the bottom for the reading | ||
| const TOP_CLEARANCE_REM = 3.33; // reserved space at the top so the pill can't breach it | ||
| const TRACK_TRANSITION_MS = POLLING_INTERVAL_MS; // small buffer so transitions finish before the next poll lands | ||
|
|
||
| /* -- Model Functions -- */ | ||
| export const getAltitudeMaximumMeters = (override?: number): number => { | ||
| if (typeof override === "number" && Number.isFinite(override) && override > 0) { | ||
| return override; | ||
| } | ||
|
|
||
| /* Rev 3's barometer has a different max altitude, so we could | ||
| apply scaling based on the platform using this function. This | ||
| is postponed for now, though. */ | ||
|
|
||
| return DEFAULT_ALTITUDE_MAXIMUM_METERS; | ||
| }; | ||
|
|
||
| /* -- View & Presenter -- */ | ||
| export interface AltitudeTapeProps { | ||
| altitudeMeters: number; | ||
| altitudeMaximumMeters?: number; | ||
| } | ||
|
|
||
| export const AltitudeTape: FC<AltitudeTapeProps> = ({ | ||
| altitudeMeters, | ||
| altitudeMaximumMeters, | ||
| }) => { | ||
| const [hasReceivedReading, setHasReceivedReading] = useState(false); | ||
|
|
||
| useEffect(() => { | ||
| if (altitudeMeters > 0 && !hasReceivedReading) { | ||
| setHasReceivedReading(true); | ||
| } | ||
| }, [altitudeMeters, hasReceivedReading]); | ||
|
|
||
| // Inline style rather than a Tailwind class, since the duration is | ||
| // computed at runtime from POLLING_INTERVAL_MS and won't survive | ||
| // Tailwind's JIT class scanning as a template string. | ||
| const trackTransitionStyle = hasReceivedReading | ||
| ? { transition: `bottom ${TRACK_TRANSITION_MS}ms` } | ||
| : {}; | ||
|
|
||
| if( altitudeHandler.mode === AltitudeMode.QFE ) { | ||
| altitudeMeters -= altitudeHandler.referenceElevation; | ||
| } | ||
| const maximum = getAltitudeMaximumMeters(altitudeMaximumMeters); | ||
| const safeAltitude = Number.isFinite(altitudeMeters) ? altitudeMeters : 0; | ||
| const clampedAltitude = Math.max(0, Math.min(safeAltitude, maximum)); | ||
| const fillPercent = maximum > 0 ? (clampedAltitude / maximum) * 100 : 0; | ||
| const clampedFillPercent = Math.max(0, Math.min(fillPercent, 100)); | ||
| const fillFraction = clampedFillPercent / 100; | ||
|
|
||
| // Both the bar and the pill sit within the space above the ground band, | ||
| // so 0% lands right at the top of the ground band instead of the very | ||
| // bottom of the container. The top of the container is also reserved, | ||
| // meaning the pill position will latch at maxAltitude and keep from | ||
| // blocking the unit readout. | ||
| const trackPosition = `calc(${fillFraction} * (100% - ${GROUND_BAND_REM}rem - ${TOP_CLEARANCE_REM}rem) + ${GROUND_BAND_REM}rem)`; | ||
|
|
||
| // Widget Layout | ||
| return ( | ||
| <div className="relative flex h-full w-20 flex-col items-center justify-between rounded-l-none rounded-r-lg font-sans text-xs text-white/90 transition-colors duration-700 shadow-xl"> | ||
| <div className="pointer-events-none absolute inset-0 overflow-hidden rounded-l-none rounded-r-lg"> | ||
| <div className="absolute inset-0 bg-gradient-to-b transition-colors duration-700 to-sky-200 from-blue-400 dark:to-sky-800 dark:from-blue-950" /> | ||
| <div | ||
| className="absolute bottom-0 left-0 right-0 bg-amber-800 transition-colors duration-700 dark:bg-amber-950" | ||
| style={{ height: `${GROUND_BAND_REM}rem` }} | ||
| /> | ||
| <div | ||
| className="absolute left-0 right-0 h-[2px] bg-white shadow-[0_0_4px_rgba(255,255,255,0.8)]" | ||
| style={{ bottom: trackPosition, ...trackTransitionStyle }} | ||
| /> | ||
| </div> | ||
|
|
||
| <div className="relative z-10 flex flex-col items-center pt-2 transition-colors duration-700 text-slate-800 dark:text-slate-400"> | ||
| <span className="font-medium leading-tight">Altitude</span> | ||
| <span className="text-[10px] font-normal leading-tight">({altitudeHandler.getReferenceMode()})</span> | ||
| </div> | ||
|
|
||
| <div | ||
| className="absolute left-0 right-0 z-20 flex justify-center" | ||
| style={{ bottom: trackPosition, transform: "translateY(50%)", ...trackTransitionStyle }} | ||
| > | ||
| <div className="rounded-full border border-white/25 bg-slate-200 dark:bg-slate-800 px-2 py-1 font-medium transition-colors duration-700 text-black/95 dark:text-white/95"> | ||
| {altitudeHandler.getDisplayString(altitudeMeters)} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug: The needle position (
trackPosition, driven byclampedAltitude/fillFraction) uses rawaltitudeMeters, but this pill rendersaltitudeHandler.getDisplayString(altitudeMeters), which subtractsreferenceElevationin QFE mode. They will disagree by the launch site elevation whenever QFE is active. Both need to go through the exact same conversion.Second issue:
clampedAltitudeclamps to a minimum of 0, butaltitudeUnits.tscomments state negative altitudes are allowed in QFE.