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.

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

Global Paths #22

Merged
merged 161 commits into from
Jan 5, 2022
Merged
Changes from 1 commit
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
7a9fcc8
Have started to move the major pieces into place, but huge huge issue…
sdl60660 Sep 17, 2021
c7d63c8
Updated prompt
sdl60660 Sep 17, 2021
9cc840e
Removed bounds on geocoder
sdl60660 Sep 17, 2021
16adf3f
small tweaks
sdl60660 Sep 21, 2021
187fe6a
Fixed 'x' button on navigation box during overview mode so that autop…
sdl60660 Sep 21, 2021
7decb11
Inset map now technically dynamic (though this is highlighting some o…
sdl60660 Sep 21, 2021
218fe18
Bumped padding and set max zoom level on inset map
sdl60660 Sep 22, 2021
82c9525
Adding ocean boundary data from here: https://github.com/nvkelso/natu…
sdl60660 Sep 22, 2021
b3deebf
Added global lakes files from here: https://github.com/nvkelso/natura…
sdl60660 Sep 22, 2021
ab2a5a0
Added global stopping features, fixed map bounds, fixed unknown river…
sdl60660 Oct 17, 2021
850f292
Added global stopping features, fixed map bounds, fixed unknown river…
sdl60660 Oct 17, 2021
88d4298
Pre-center map on origin for shared link
sdl60660 Oct 17, 2021
8eafd3f
Adjusting default multiplier on desktop
sdl60660 Oct 17, 2021
d5a5432
Resetting river highlight at start of run
sdl60660 Oct 17, 2021
f1aad5c
Changing default zoom on desktop back
sdl60660 Oct 17, 2021
e8d1044
Fixed feature group indexing and jumps, fixed an issue with final fea…
sdl60660 Oct 18, 2021
0f07569
Made some adjustments to elevation querrying that seems to help some …
sdl60660 Oct 18, 2021
5d606d2
Adjusted smoothing and error handling
sdl60660 Oct 18, 2021
43a583c
Fixed error handling for locations without hits
sdl60660 Oct 18, 2021
feb7331
Added latitude bounds to exclude Antarctica from the map, while still…
sdl60660 Oct 18, 2021
4be6a40
Disabled user pitch and rotate
sdl60660 Oct 19, 2021
d0d32df
Disabled user pitch and rotate
sdl60660 Oct 19, 2021
db36548
Removed some unnecessary lines
sdl60660 Oct 19, 2021
4d21520
Fixed starting position
sdl60660 Oct 19, 2021
83be652
Fixed click disable
sdl60660 Oct 19, 2021
4d9496f
Still some issues with speed variation at higher altitudes, but mostl…
sdl60660 Nov 5, 2021
92ee576
Updated terrain exagerration to get high elevation points more in lin…
sdl60660 Nov 7, 2021
edc0a5c
Removed a console log
sdl60660 Nov 8, 2021
a720762
Added ability for locator map to resize (and eventually serve as moda…
sdl60660 Nov 8, 2021
58ca448
Created feature name suggestion modal (though the design/content is n…
sdl60660 Nov 9, 2021
7023182
Fixed inset map size on mobile
sdl60660 Nov 9, 2021
ab90e1c
Fixed minor error-triggering bug on locator map
sdl60660 Nov 9, 2021
1ae49ca
Fixed one more locator map sizing issue introduced on the last commit
sdl60660 Nov 9, 2021
2481a6c
Fixed some conditional display issues on the navigation box
sdl60660 Nov 9, 2021
04280f3
Setting up name server
sdl60660 Dec 21, 2021
34c9db0
Merge branch 'global' of https://github.com/sdl60660/river-runner int…
sdl60660 Dec 21, 2021
0643aa3
Small name server fix and prepping for heroku
sdl60660 Dec 21, 2021
2daa978
Small name server tweak
sdl60660 Dec 21, 2021
05eb81f
node version specified'
sdl60660 Dec 21, 2021
4e06845
node version update
sdl60660 Dec 21, 2021
897af70
fixed package-locks
sdl60660 Dec 21, 2021
ce5b682
updated lockfile
sdl60660 Dec 21, 2021
9ce7ede
Removing package locks
sdl60660 Dec 21, 2021
1d00e8e
fixed procfile
sdl60660 Dec 21, 2021
2f49fe2
Text change on locator map modal
sdl60660 Dec 21, 2021
4d38f10
locator map styling
sdl60660 Dec 21, 2021
9dce5af
parsing request body
sdl60660 Dec 21, 2021
92f4954
Resolved merge issues, fixed some modal styling and added dummy (for …
sdl60660 Dec 21, 2021
3960d9b
Merge branch 'global' of https://github.com/sdl60660/river-runner int…
sdl60660 Dec 21, 2021
467fff1
Added another console log
sdl60660 Dec 21, 2021
3588c36
Merge branch 'global' of https://github.com/sdl60660/river-runner int…
sdl60660 Dec 21, 2021
ce8a509
Changing parsing on JSON
sdl60660 Dec 21, 2021
7fd1bef
Small update to models/logging
sdl60660 Dec 21, 2021
7126652
Removing debugging loggint
sdl60660 Dec 21, 2021
db0e657
Name suggestions are all wired up
sdl60660 Dec 21, 2021
2ac07f8
Merge branch 'global' of https://github.com/sdl60660/river-runner int…
sdl60660 Dec 21, 2021
45b9dcb
Bringing mapbox version back to 2.3 to reduce elevation responsivness…
sdl60660 Dec 21, 2021
0f5bd20
Removing duplicate attribution on locator/inset map
sdl60660 Dec 21, 2021
55d4c6c
Update README.md
sdl60660 Dec 22, 2021
3b5464c
Updated attribution
sdl60660 Dec 22, 2021
4cd39fc
Updating node versionn
sdl60660 Dec 22, 2021
3cd84d5
Fixed some of the issues with the intial terrain elevation query
sdl60660 Dec 22, 2021
fb62658
Set up name overrides for future if we hit critical mass of suggestio…
sdl60660 Dec 22, 2021
7d4e096
Added check on flowlines against inland features to properly label th…
sdl60660 Dec 22, 2021
6307463
Updated inset refresh rate and added manual override for gulf of st l…
sdl60660 Dec 23, 2021
dde50e1
Added some name overrides
sdl60660 Dec 23, 2021
0dbaf90
Updated data URL to trim number of returned properties and data size
sdl60660 Dec 27, 2021
3c3a416
Fixed issue with terminal stubs of stopping features (e.g. Gulf of Me…
sdl60660 Dec 27, 2021
a7e5b00
Fixed auto-play disrupt bug
sdl60660 Dec 27, 2021
fc3844a
Added an override
sdl60660 Dec 27, 2021
556a70f
Correcting an issue with river feature names when there are interrupt…
sdl60660 Dec 28, 2021
3dc4291
Added another couple of overrides
sdl60660 Dec 28, 2021
b2e0ae8
Added another override
sdl60660 Dec 28, 2021
2cfe037
Adding another name override
sdl60660 Dec 28, 2021
09cc2f9
Added another name override and prepped assignParentFeatureNames to a…
sdl60660 Dec 28, 2021
1595586
Cleaned up a little conditional logic
sdl60660 Dec 28, 2021
a7606a6
Added an extra clear on max bounds for inset map, as a fallback, and …
sdl60660 Dec 28, 2021
d67ef50
Commenting out some unused selectors
sdl60660 Dec 28, 2021
637821d
Adding a name override
sdl60660 Dec 28, 2021
592cb60
Added name override
sdl60660 Dec 28, 2021
4e45306
Added a couple more Australian overrides
sdl60660 Dec 28, 2021
82254a0
Trying something with overrides
sdl60660 Dec 28, 2021
e149337
reverting .toString() method, since it's unnecessary
sdl60660 Dec 28, 2021
dde6622
Name override
sdl60660 Dec 28, 2021
877d756
Updated Columbia River stopping feature name
sdl60660 Dec 28, 2021
ba427cc
Fixed cases where river features are staggered with several lakes in-…
sdl60660 Dec 28, 2021
8472500
Name override
sdl60660 Dec 28, 2021
2e22d48
Had to bump active path removal array length because some paths are l…
sdl60660 Dec 28, 2021
625723a
A few more name overrides
sdl60660 Dec 28, 2021
0ca37f4
Adding some name overrides, updating method on terminal stopping feat…
sdl60660 Dec 28, 2021
2643c41
Adjusted default mobile zoom level
sdl60660 Dec 28, 2021
c8fe5ef
Name override
sdl60660 Dec 29, 2021
b8f4132
Adding name overrides in Madagascar
sdl60660 Dec 29, 2021
be5abc0
Updated attribution box
sdl60660 Dec 30, 2021
71cd548
name overrides
sdl60660 Dec 30, 2021
7e2814b
Updated mobile breakpoint to 700px and added a new breakpoint for con…
sdl60660 Dec 30, 2021
f020d6c
Fixed navigation grouping issue when identified inland features don't…
sdl60660 Dec 31, 2021
2aa28af
Updated global stopping features to attach IDs
sdl60660 Dec 31, 2021
496b0d9
Fixed positioning on inset map's dot to true path instead of smoothed…
sdl60660 Dec 31, 2021
8cde3d7
Removing an unused variable from ticks
sdl60660 Dec 31, 2021
3664287
Removing some console logs
sdl60660 Dec 31, 2021
8cd6e93
Overrides
sdl60660 Dec 31, 2021
cd16a94
Override/stopping feature name update
sdl60660 Dec 31, 2021
e480450
Small name override/stopping feature name fix
sdl60660 Dec 31, 2021
6108788
Overrides
sdl60660 Dec 31, 2021
0628630
Switched format of override file to CSV, adjusted resize anomation on…
sdl60660 Jan 1, 2022
5305169
Renamed a component and added new overrides
sdl60660 Jan 1, 2022
afb8ec8
Renamed a component and added new overrides
sdl60660 Jan 1, 2022
67b5a94
Adding capacity to track queries (completely anonymously)
sdl60660 Jan 1, 2022
25f4a0c
Fixed a name server import issue
sdl60660 Jan 1, 2022
5291214
Re-factored/moved a lot of the old NLDI or advanced feature methods i…
sdl60660 Jan 1, 2022
909cdac
Removing some old data files and adding some overrides in Vietnam
sdl60660 Jan 1, 2022
ac6bc92
Some norweigen overrides
sdl60660 Jan 1, 2022
a3a9563
Name overrides
sdl60660 Jan 1, 2022
6843010
A little re-factoring
sdl60660 Jan 1, 2022
c9b2f16
A little refactoring and clean up
sdl60660 Jan 1, 2022
45d66df
Name override
sdl60660 Jan 1, 2022
68498d3
Fixed the camera start issue by unsmoothing the first couple of coord…
sdl60660 Jan 1, 2022
4364a99
Fixed some syntax in a util
sdl60660 Jan 1, 2022
18fc05e
Name overrides
sdl60660 Jan 1, 2022
a952931
Fixed a stopping feature and unsmoothed the last coordinate in a path…
sdl60660 Jan 1, 2022
3238bd7
Writing in an exception to the smoother in case of very short paths
sdl60660 Jan 1, 2022
ceb1581
Name overrides
sdl60660 Jan 1, 2022
8dac88f
Updated site meta tags (some will need to revert after merging back i…
sdl60660 Jan 1, 2022
f28dc49
package.json changes
sdl60660 Jan 2, 2022
bc38dba
Re-disabled touchZoomRotate on mobile
sdl60660 Jan 2, 2022
42cb24f
Correctly disabled zoom rotate without disabling zoom
sdl60660 Jan 2, 2022
9f5d0a7
Name overrides
sdl60660 Jan 2, 2022
85831cf
Name overrides
sdl60660 Jan 2, 2022
f5c7588
Adjusted default zoom levels and added override
sdl60660 Jan 2, 2022
35dd227
Added manifest.json and robots.txt to public
sdl60660 Jan 2, 2022
d10ef56
Updated robots.txt
sdl60660 Jan 2, 2022
6744538
Fixed some edge case issues with elevation queries and path smoothing…
sdl60660 Jan 2, 2022
160fa95
PR name overrides
sdl60660 Jan 2, 2022
f0b9eda
Name override
sdl60660 Jan 2, 2022
83eccea
Fixed geolocator issues for points out of bounds on map wrap
sdl60660 Jan 2, 2022
35b52b3
Sending search errors to queries collection now too to track most fre…
sdl60660 Jan 2, 2022
1ea58b8
Updated mongo schema for queries to include error flag
sdl60660 Jan 2, 2022
0e38e7d
Added a ridiculous, manual adjustment for the great lakes path, which…
sdl60660 Jan 2, 2022
70ccbd7
Adjusted default zoom level on desktop
sdl60660 Jan 2, 2022
ea22715
Added ko-fi link and tab-enabled some components with some new aria l…
sdl60660 Jan 2, 2022
f635881
Updated inset map aria label to be more dynamic
sdl60660 Jan 2, 2022
2479aab
Fixed Amazon feature naming/stop feature name
sdl60660 Jan 3, 2022
d86c118
Added some credits on usused components and capacity for adding a bui…
sdl60660 Jan 3, 2022
78940de
Made some adjustments to inland features
sdl60660 Jan 3, 2022
8a09cd3
Updated meta tags in site header
sdl60660 Jan 3, 2022
b11b793
Updated project github link to point to global branch (for now)
sdl60660 Jan 4, 2022
57b963d
Added different preview image for global
sdl60660 Jan 4, 2022
c293537
Adding version to preview image to fix cache
sdl60660 Jan 4, 2022
fd65724
Update README.md
sdl60660 Jan 4, 2022
920ece9
Update README.md
sdl60660 Jan 4, 2022
00dcebf
Added funding link
sdl60660 Jan 4, 2022
37c289a
Fixed funding links directory
sdl60660 Jan 4, 2022
381e188
More dynamic error handling to handle server down cases differently t…
sdl60660 Jan 4, 2022
fd5f7e9
Fixed typo in prompt box
sdl60660 Jan 4, 2022
33e9b8c
Overriding Amazon stopping feature name
sdl60660 Jan 5, 2022
b27b3f5
Tacking a tag onto email link
sdl60660 Jan 5, 2022
0e41695
Added name override
sdl60660 Jan 5, 2022
e2ac908
Directly attaching route URL to suggestions to make it faster to vet
sdl60660 Jan 5, 2022
e59f147
Updated column name on name override csv
sdl60660 Jan 5, 2022
76695bc
Merge branch 'main' into global
sdl60660 Jan 5, 2022
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
Prev Previous commit
Next Next commit
Updated inset map aria label to be more dynamic
sdl60660 committed Jan 2, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit f63588194c6bb6defc0d7b37a4f114b2067eed7d
19 changes: 18 additions & 1 deletion src/components/InsetMap.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script>
import resize from "svelte-actions-resize";
import { onMount, createEventDispatcher } from "svelte";
import { stoppingFeature, startLocation } from "../state";
import { mapbox } from "../mapbox.js";
import { tick } from "svelte";
import bbox from "@turf/bbox";
@@ -39,6 +40,9 @@
let suggestionFormData = {};
let userEmail = "";
let currentStartLocation = null;
let currentStoppingFeature = null;
$: containerWidth = width > 700 ? "26rem" : "100%";
$: containerHeight = width > 700 ? "14rem" : "20vh";
@@ -117,6 +121,18 @@
marker = new mapbox.Marker({ element: markerEl })
.setLngLat([0, 0])
.addTo(map);
const unsubscribeStoppingFeature = stoppingFeature.subscribe(
(featureName) => {
currentStoppingFeature = featureName;
}
);
const unsubscribeStartLocation = startLocation.subscribe(
(startLocation) => {
currentStartLocation = startLocation;
}
);
};
document.head.appendChild(link);
@@ -390,7 +406,8 @@
bind:this={container}
use:resize
on:resize={handleResize}
aria-label="inset map showing the flowpath from selected spot"
aria-label={`Inset map showing the flowpath from ${currentStartLocation} to ${currentStoppingFeature}.`}
tabindex="0"
>
{#if map}
<slot />