-
Notifications
You must be signed in to change notification settings - Fork 3
Hotspot map density #64
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.
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
Merged
rawcomposition
merged 4 commits into
rawcomposition:main
from
nleiby:up/hotspot-map-density
Sep 4, 2026
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| import React from "react"; | ||
| import { cn } from "lib/utils"; | ||
| import Icon from "components/Icon"; | ||
| import MapButton from "components/MapButton"; | ||
| import MinStepper from "components/MinStepper"; | ||
| import { Button } from "components/ui/button"; | ||
| import { Switch } from "components/ui/switch"; | ||
| import { useTrip, DEFAULT_HOTSPOT_FILTERS } from "hooks/useTrip"; | ||
|
|
||
| const MIN_CHECKLIST_STEPS = [0, 1, 5, 10, 25, 50, 100, 250, 500, 1000]; | ||
| const MIN_SPECIES_STEPS = [0, 25, 50, 100, 150, 200, 250, 300, 400]; | ||
|
|
||
| export default function HotspotFilterMenu() { | ||
| const { showAllHotspots, setShowAllHotspots, hotspotFilters, setHotspotFilters } = useTrip(); | ||
| const [open, setOpen] = React.useState(false); | ||
| const { minChecklists, minSpecies } = hotspotFilters; | ||
| const activeCount = | ||
| (showAllHotspots ? 0 : 1) + | ||
| (minChecklists !== DEFAULT_HOTSPOT_FILTERS.minChecklists ? 1 : 0) + | ||
| (minSpecies !== DEFAULT_HOTSPOT_FILTERS.minSpecies ? 1 : 0); | ||
|
|
||
| return ( | ||
| <div className="relative"> | ||
| <MapButton onClick={() => setOpen((o) => !o)} tooltip={open ? undefined : "Hotspots"} active={activeCount > 0}> | ||
| <Icon name="sliders" /> | ||
| </MapButton> | ||
| {open && ( | ||
| <> | ||
| <div onClick={() => setOpen(false)} className="fixed inset-0 z-30" /> | ||
| <div className="absolute top-0 right-14 sm:left-14 sm:right-auto z-40 w-[300px] bg-card border rounded-xl shadow-lg p-4"> | ||
| <div className="flex items-center justify-between mb-4"> | ||
| <div className="text-sm font-semibold text-foreground">Filters</div> | ||
| <Button | ||
| variant="link" | ||
| onClick={() => { | ||
| setShowAllHotspots(true); | ||
| setHotspotFilters(DEFAULT_HOTSPOT_FILTERS); | ||
| setOpen(false); | ||
| }} | ||
| className={cn("text-[11px] font-semibold hover:opacity-80", activeCount === 0 && "invisible")} | ||
| > | ||
| Clear all | ||
| </Button> | ||
| </div> | ||
| <label className="flex items-center justify-between gap-3 mb-4 cursor-pointer"> | ||
| <span className="text-[11px] uppercase tracking-wide text-muted-foreground font-semibold"> | ||
| Show saved only | ||
| </span> | ||
| <Switch checked={!showAllHotspots} onCheckedChange={(checked) => setShowAllHotspots(!checked)} /> | ||
| </label> | ||
| <div className={cn(!showAllHotspots && "opacity-40 pointer-events-none")}> | ||
| <div className="text-[11px] uppercase tracking-wide text-muted-foreground font-semibold mb-2"> | ||
| Minimum checklists | ||
| </div> | ||
| <div className="mb-4"> | ||
| <MinStepper | ||
| value={minChecklists} | ||
| onChange={(minChecklists) => setHotspotFilters({ minChecklists })} | ||
| steps={MIN_CHECKLIST_STEPS} | ||
| min={0} | ||
| /> | ||
| </div> | ||
| <div className="text-[11px] uppercase tracking-wide text-muted-foreground font-semibold mb-2"> | ||
| Minimum species | ||
| </div> | ||
| <MinStepper | ||
| value={minSpecies} | ||
| onChange={(minSpecies) => setHotspotFilters({ minSpecies })} | ||
| steps={MIN_SPECIES_STEPS} | ||
| min={0} | ||
| /> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| import { Button } from "components/ui/button"; | ||
|
|
||
| type Props = { | ||
| value: number; | ||
| onChange: (n: number) => void; | ||
| steps: number[]; | ||
| min: number; | ||
| }; | ||
|
|
||
| export default function MinStepper({ value, onChange, steps, min }: Props) { | ||
| const next = steps.find((s) => s > value) ?? value + 100; | ||
| const below = steps.filter((s) => s < value); | ||
| const prev = below.length > 0 ? below[below.length - 1] : Math.max(min, value - 100); | ||
|
|
||
| return ( | ||
| <div className="inline-flex items-center gap-1.5 px-2.5 py-1 border rounded-lg text-xs text-secondary-foreground"> | ||
| <span>Min</span> | ||
| <Button | ||
| variant="ghost" | ||
| size="icon" | ||
| onClick={() => onChange(prev)} | ||
| className="size-6 rounded text-secondary-foreground" | ||
| aria-label="Decrease" | ||
| > | ||
| − | ||
| </Button> | ||
| <span className="min-w-[22px] text-center font-bold text-foreground">{value}</span> | ||
| <Button | ||
| variant="ghost" | ||
| size="icon" | ||
| onClick={() => onChange(next)} | ||
| className="size-6 rounded text-secondary-foreground" | ||
| aria-label="Increase" | ||
| > | ||
| + | ||
| </Button> | ||
| </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
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
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
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.
Counts >1000 were returning markerColors[0], the same as 0 count.