@@ -34,11 +34,40 @@
3434 urlSearchMode = getUrlSearchMode(searchParams);
3535 urlChangedSinceShipQuery = true;
3636 navigating = false;
37+ console.log('url changed most recently!');
3738 }
3839 }
3940 $: {
4041 urlChangedSinceShipQuery = (search || true) && searchMode && false;
4142 }
43+ function autoNav() {
44+ console.log('judgement day, mfers!');
45+ if ((search !== urlSearch || searchMode !== urlSearchMode)) {
46+ if (urlChangedSinceShipQuery) {
47+ search = urlSearch;
48+ searchMode = urlSearchMode;
49+ console.log('url wins!');
50+ } else {
51+ console.log('search wins!');
52+ navigating = true;
53+ // create a temp one because the real one doesn't always update in time!
54+ let tempAnalysis = new SearchAnalysis(search);
55+ if (params.mode === 'chart') {
56+ navToChart(tempAnalysis.patpIsValid);
57+ } else {
58+ if (tempAnalysis.patpIsValid) {
59+ console.log('going to ship view!', search, tempAnalysis.patp);
60+ navToShipView(tempAnalysis.patp, true);
61+ } else {
62+ const fromShipMode = params.mode === 'ship';
63+ console.log('going to search view!');
64+ navToSearch(fromShipMode);
65+ }
66+ }
67+ }
68+ }
69+ }
70+ $: urlSearch, urlSearchMode, search, searchMode, autoNav();
4271 function nav(path, addToHistory = false) {
4372 (addToHistory ? push : replace)(path);
4473 }
@@ -51,7 +80,7 @@
5180 nav('/' + buildQuerystring({ mode: searchMode }), addToHistory);
5281 }
5382 }
54− function navToShipView(addToHistory = false) {
83+ function navToShipView(patp, addToHistory = false) {
5584 params.mode = 'ship';
5685 params.arg = patp;
5786 if (patp === search) {
@@ -87,27 +116,6 @@
87116 navHome(addToHistory);
88117 }
89118 }
90− function autoNav() {
91− if ((search !== urlSearch || searchMode !== urlSearchMode)) {
92− if (urlChangedSinceShipQuery) {
93− search = urlSearch;
94− searchMode = urlSearchMode;
95− } else {
96− navigating = true;
97− if (params.mode === 'chart') {
98− navToChart(analysis.patpIsValid);
99− } else {
100− if (patp) {
101− navToShipView(true);
102− } else {
103− const fromShipMode = params.mode === 'ship';
104− navToSearch(fromShipMode);
105− }
106− }
107− }
108− }
109− }
110− $: urlSearch, urlSearchMode, search, searchMode, autoNav();
111119 $: {
112120 let properMode = params.mode;
113121 if (properMode === 'chart') {