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

Add WIP map view #536

Open
wants to merge 15 commits into
base: add-map-view
Choose a base branch
from
Open

Add WIP map view #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d7df0f1
Add leaflet and wrap Treenome in own component
Apr 18, 2023
923c9a1
Add toggle to show map view (displays cat picture)
Apr 18, 2023
5a3f528
Add map view w/ heatmap based on tree sample data
Apr 20, 2023
9f74398
Cleanup View code
Apr 24, 2023
fe349d6
Separate out map state and orthographic state
Apr 27, 2023
5537976
Fix map colors and clean up code
Sep 4, 2023
14e3abe
Merge branch 'master' of https://github.com/theosanderson/taxonium in…
Sep 4, 2023
bdd87cb
Merge branch 'master' of https://github.com/theosanderson/taxonium in…
Sep 25, 2023
cf33a82
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 26, 2023
8174d24
Update map view to work in Storybook
Sep 28, 2023
0066aae
Merge branch 'theosanderson:master' into add-map-view
simonbukin Oct 9, 2023
b835f72
Update .gitignore and remove extra merged folder
Oct 9, 2023
99d7cb1
Remove redundant colors code
Oct 25, 2023
f75cf00
Fix minimap crash
Dec 13, 2023
f0c735c
Disable minimap when map view is open
Dec 17, 2023
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
6 changes: 6 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

66 changes: 56 additions & 10 deletions taxonium_component/src/Deck.jsx
View file
Open in desktop
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We seem to have ended up with the zoom controls repeated 2x, once on the map and once on the tree. (I'd say they are better just on the tree).

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a usecase where zooming into the map would be helpful? I was assuming that users may want to zoom into part of the map to view pie charts in only certain regions (eventually), but maybe you had a different idea here. Would the map view be fully zoomed out by default if we remove the zoom functionality?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, there might be use cases where zooming would be useful - but atm the buttons on the map affect the tree so this is not achieved. I don't see a strong need for zoom buttons for the map -- as opposed to panning and scrolling -- we need them for the tree due to separate X and Y zooms.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import React, { useState, useCallback, useRef } from "react";
import DeckGL from "@deck.gl/react";
import { View } from "@deck.gl/core";
import useLayers from "./hooks/useLayers";
import JBrowsePanel from "./components/JBrowsePanel";
import { ClipLoader } from "react-spinners";
import {
CircularProgressbarWithChildren,
Expand All @@ -19,9 +18,9 @@ import DeckSettingsModal from "./components/DeckSettingsModal";
import { TreenomeButtons } from "./components/TreenomeButtons";
import TreenomeModal from "./components/TreenomeModal";
import FirefoxWarning from "./components/FirefoxWarning";
import { JBrowseErrorBoundary } from "./components/JBrowseErrorBoundary";
import ColorSettingModal from "./components/ColorSettingModal";
import Key from "./components/Key";
import ColorSettingModal from "./components/ColorSettingModal";
import TreenomeBrowser from "./components/TreenomeBrowser";

const MemoizedKey = React.memo(Key);

Expand Down Expand Up @@ -359,12 +358,7 @@ function Deck({
}}
>
<span ref={jbrowseRef}>
<JBrowseErrorBoundary>
<JBrowsePanel
treenomeState={treenomeState}
settings={settings}
/>
</JBrowseErrorBoundary>
<TreenomeBrowser state={treenomeState} settings={settings} />
<TreenomeModal
treenomeSettingsOpen={treenomeSettingsOpen}
setTreenomeSettingsOpen={setTreenomeSettingsOpen}
Expand All @@ -384,7 +378,59 @@ function Deck({
settings={settings}
/>
</View>
<View id="main"></View>

<View id="map">
<div
id="map-div"
key={"map-div-key"}
style={{
width: "100%",
height: "100%",
borderLeftWidth: "1px",
borderColor: "black",
borderStyle: "solid",
position: "relative",
zIndex: 2,
}}
></div>
</View>

<View id="main">
<NodeHoverTip
hoverInfo={hoverInfo}
hoverDetails={hoverDetails}
colorHook={colorHook}
colorBy={colorBy}
config={config}
filterMutations={settings.filterMutations}
deckSize={deckSize}
/>
<TreenomeMutationHoverTip
hoverInfo={hoverInfo}
hoverDetails={hoverDetails}
colorHook={colorHook}
colorBy={colorBy}
config={config}
treenomeReferenceInfo={treenomeReferenceInfo}
/>
<MemoizedKey
keyStuff={keyStuff}
colorByField={colorBy.colorByField}
colorByGene={colorBy.colorByGene}
colorByPosition={colorBy.colorByPosition}
config={config}
/>
<DeckButtons
zoomReset={zoomReset}
zoomIncrement={zoomIncrement}
zoomAxis={zoomAxis}
setZoomAxis={setZoomAxis}
snapshot={snapshot}
loading={data.status === "loading"}
requestOpenSettings={() => setDeckSettingsOpen(true)}
settings={settings}
/>
</View>
</DeckGL>
</div>
);
Expand Down
27 changes: 27 additions & 0 deletions taxonium_component/src/components/SearchPanel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,33 @@ function SearchPanel({
</button>
</span>
)}
{<br />}
{true && (
<span>
<span className="text-gray-500 text-sm">Map View:</span>
<input
name="mapEnabled"
style={{ verticalAlign: "middle" }}
type="checkbox"
className="m-3 inline-block"
checked={settings.mapViewOpen}
onChange={(e) => {
settings.setMapOpenAndToast(!settings.mapViewOpen);
}}
/>
<button
style={{ cursor: "default" }}
data-tip="Display a map with points corresponding to the location a sample was collected."
data-html={true}
>
<span
style={{ display: "inline-block", verticalAlign: "middle" }}
>
<BsQuestionCircle />
</span>
</button>
</span>
)}
</div>
<div className="py-3 space-y-2">
<div className="flex space-x-2">
Expand Down
10 changes: 10 additions & 0 deletions taxonium_component/src/components/TreenomeBrowser.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import JBrowsePanel from "./JBrowsePanel";
import { JBrowseErrorBoundary } from "./JBrowseErrorBoundary";

export default function TreenomeBrowser({ state, settings }) {
return (
<JBrowseErrorBoundary>
<JBrowsePanel treenomeState={state} settings={settings} />
</JBrowseErrorBoundary>
);
}
Loading