honor the 'viewport' of direct links (dont autofit them away) (#114)

Author: melange396

src/deriveLinkDefaults.ts

@@ -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';
@@ -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 = {
@@ -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) {
@@ -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: [],

src/store.ts

@@ -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';
@@ -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 {
@@ -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),
   });
 }