Skip to content
Merged
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
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "www-epivis",
"version": "2.1.9",
"version": "2.1.10",
"private": true,
"license": "MIT",
"description": "",
Expand Down
8 changes: 6 additions & 2 deletions src/components/dialogs/ImportAPIDialog.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,12 @@
bind:group={$formSelections.dataSource}
value="covidcast"
/>
Delphi Indicators (aka COVIDcast) (source:
<a target="_blank" href="https://delphi.cmu.edu/">delphi.cmu.edu</a>)</label
Delphi Indicators (aka COVIDcast) (docs:
<a
target="_blank"
href="https://cmu-delphi.github.io/delphi-epidata/api/covidcast_signals.html#all-available-sources-and-signals"
>cmu-delphi.github.io</a
>)</label
>
<label
><input
Expand Down
8 changes: 7 additions & 1 deletion src/deriveLinkDefaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
importTwitter,
importWiki,
} from './api/EpiData';
import { NavMode } from './components/chartUtils';
import DataSet, { DataGroup, DEFAULT_GROUP, flatten, DEFAULT_VIEWPORT } from './data/DataSet';
import EpiDate from './data/EpiDate';
import EpiPoint from './data/EpiPoint';
Expand All @@ -35,13 +36,15 @@ export interface SharedState {
active: DataSet[];
viewport: null | [number, number, number, number];
showPoints: boolean;
navMode: NavMode;
}

const DEFAULT_VALUES: SharedState = {
group: DEFAULT_GROUP,
active: [],
viewport: DEFAULT_VIEWPORT,
showPoints: false,
navMode: NavMode.pan,
};

const lookups = {
Expand Down Expand Up @@ -202,6 +205,8 @@ export default function deriveLinkDefaults(): SharedState & { loader?: ReturnTyp
active: [],
showPoints: parsed.chart?.showPoints ?? DEFAULT_VALUES.showPoints,
viewport: parsed.chart?.viewport ?? DEFAULT_VALUES.viewport,
// if we were not passed viewport coords, set to autofit mode
navMode: parsed.chart?.viewport ? DEFAULT_VALUES.navMode : NavMode.autofit,
loader: initialLoader(parsed.datasets),
};
} catch (err) {
Expand All @@ -214,7 +219,8 @@ export default function deriveLinkDefaults(): SharedState & { loader?: ReturnTyp
export function getDirectLinkImpl(state: SharedState): { url: URL; anySkipped: boolean } {
const config: ILinkConfig = {
chart: {
viewport: state.viewport ?? [0, 0, 0, 0],
// if in autofit mode, pass null viewport, else preserve viewport (or default to 0s)
viewport: state.navMode == NavMode.autofit ? null : state.viewport ?? [0, 0, 0, 0],
showPoints: state.showPoints,
},
datasets: [],
Expand Down
4 changes: 2 additions & 2 deletions src/store.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { get, writable } from 'svelte/store';
import { NavMode } from './components/chartUtils';
import DataSet, { DataGroup } from './data/DataSet';
import deriveLinkDefaults, { getDirectLinkImpl } from './deriveLinkDefaults';
import FormSelections from './components/dialogs/formSelections';
Expand All @@ -16,7 +15,7 @@ export const expandedDataGroups = writable([defaults.group]);

export const isShowingPoints = writable(defaults.showPoints);
export const initialViewport = writable(defaults.viewport);
export const navMode = writable(NavMode.autofit);
export const navMode = writable(defaults.navMode);

export function getFormSelections() {
try {
Expand Down Expand Up @@ -97,6 +96,7 @@ export function getDirectLink(chart: IChart): { url: URL; anySkipped: boolean }
active: get(activeDatasets),
showPoints: get(isShowingPoints),
viewport: chart.getViewport(),
navMode: get(navMode),
});
}

Expand Down