Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@ const DEFAULT_BOUNDS = {
export const VelocityHeatmapRectangles = ({
visMode,
setMinMax,
}: VelocityHeatmapRectanglesProps) => {
onLoadingChange,
onErrorChange,
}: VelocityHeatmapRectanglesProps & {
onLoadingChange?: (loading: boolean) => void
onErrorChange?: (error: string | null) => void
}) => {
const { search } = useContext(SearchContext)
const zoom = useZoomLevel()
const { data, loading, error, currZoom } = useVelocityAggregationData(
Expand Down Expand Up @@ -83,14 +88,17 @@ export const VelocityHeatmapRectangles = ({
setMinMax?.(minV, maxV)
}, [minV, maxV, setMinMax])

// Propagate loading/error state to parent for overlay display
useEffect(() => {
onLoadingChange?.(loading)
}, [loading, onLoadingChange])

useEffect(() => {
onErrorChange?.(error ? String(error) : null)
Comment thread
AvivAbachi marked this conversation as resolved.
}, [error, onErrorChange])

return (
<>
{error || loading ? (
<div className="err">
{error ? 'error' : null}
{loading ? 'loading! ' : null}
</div>
) : null}
{data?.map((point, idx) => {
const bounds: [[number, number], [number, number]] = [
[point.roundedLat - half, point.roundedLon - half],
Expand Down
38 changes: 37 additions & 1 deletion src/pages/velocityHeatmap/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { OpenInFullRounded } from '@mui/icons-material'
import { IconButton, Stack } from '@mui/material'
import { Alert, CircularProgress, IconButton, Stack } from '@mui/material'
import React, { useCallback, useContext, useRef, useState } from 'react'
import { MapContainer, TileLayer } from 'react-leaflet'
import dayjs from 'src/dayjs'
Expand Down Expand Up @@ -27,6 +27,8 @@ const VelocityHeatmapPage: React.FC = () => {
const [visMode, setVisMode] = useState<'avg' | 'std' | 'cv'>('avg')
const [min, setMin] = useState(0)
const [max, setMax] = useState(1)
const [isLoading, setIsLoading] = useState(false)
const [errorMessage, setErrorMessage] = useState<string | null>(null)

const mapContainerRef = useRef<HTMLDivElement>(null)
const buttonRef = useRef<HTMLButtonElement>(null)
Expand Down Expand Up @@ -71,6 +73,38 @@ const VelocityHeatmapPage: React.FC = () => {
onClick={toggleExpanded}>
<OpenInFullRounded fontSize="large" />
</IconButton>
{isLoading && (
<div
style={{
position: 'absolute',
top: 0,
left: 0,
right: 0,
bottom: 0,
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
alignItems: 'center',
backgroundColor: 'rgba(255, 255, 255, 0.7)',
zIndex: 1000,
gap: 12,
}}>
<CircularProgress size={48} />
<span style={{ fontSize: '1.1em', color: '#333' }}>Loading heatmap data...</span>
</div>
)}
{errorMessage && !isLoading && (
<div
style={{
position: 'absolute',
top: 12,
left: '50%',
transform: 'translateX(-50%)',
zIndex: 1000,
}}>
<Alert severity="error">{errorMessage}</Alert>
</div>
)}
<MapContainer
center={[29.65, 34.6]}
zoom={DEFAULT_ZOOM_LEVEL}
Expand All @@ -86,6 +120,8 @@ const VelocityHeatmapPage: React.FC = () => {
setMin(min)
setMax(max)
}}
onLoadingChange={setIsLoading}
onErrorChange={setErrorMessage}
/>
<VelocityHeatmapLegend visMode={visMode} min={min} max={max} />
</MapContainer>
Expand Down
Loading