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

Live intersection map #129

Draft
wants to merge 75 commits into
base: develop
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
d7fc67f
Adding useAppDispatch
jacob6838 Oct 10, 2024
66e96e6
Adding useAppSelector
jacob6838 Oct 15, 2024
9231453
Initial cvmanager-api rtk integration (not working)
jacob6838 Oct 15, 2024
f725783
Merge branch 'redux-optimization' into Feature/configuration-page
jacob6838 Oct 15, 2024
9708c78
upgrading mui package version
jacob6838 Oct 16, 2024
a82c307
Adding RTK config queries and updating theme
jacob6838 Oct 16, 2024
ad6e79b
Final visual touches
jacob6838 Oct 16, 2024
8b19fb1
Fixing deletion of config params
jacob6838 Oct 16, 2024
75986b8
changing to selectors (from lazy queries)
jacob6838 Oct 16, 2024
4a8242b
fully working configuration page
jacob6838 Oct 16, 2024
f05b9a7
Re-naming intersection api slice
jacob6838 Oct 16, 2024
bb35d89
Updating Grid to Grid2
jacob6838 Oct 16, 2024
d7210dc
Updating test snapshots
jacob6838 Oct 16, 2024
38ad168
Merge branch 'develop' into Feature/configuration-page
jacob6838 Oct 16, 2024
f6fa2ea
Fixing InputProps
jacob6838 Oct 16, 2024
abb8a67
Update ConfigurationPage.tsx
jacob6838 Oct 16, 2024
a453574
Update docker-compose-full-cm.yml
jacob6838 Oct 17, 2024
4ecd231
Merge branch 'Feature/configuration-page' into live-intersection-map
jacob6838 Oct 17, 2024
db209b0
working map and bsm display with mock data
jacob6838 Oct 18, 2024
4467733
live demo ready
jacob6838 Oct 18, 2024
665749e
Merging Develop
jacob6838 Nov 5, 2024
04fb02d
Merge branch 'keycloak-user-provider' into Feature/configuration-page
jacob6838 Nov 6, 2024
31431ad
Adding "Submit Query" to intersection time query
jacob6838 Nov 6, 2024
95581c4
Pre-emptively supporting de-duplicated SPaT messages
jacob6838 Nov 6, 2024
e4d7938
Merge branch 'Feature/configuration-page' into live-intersection-map
jacob6838 Nov 6, 2024
eee3c0d
Stopping live data loading when layer hidden
jacob6838 Nov 7, 2024
d9ee9f6
Merge branch 'keycloak-user-provider' into Feature/configuration-page
jacob6838 Nov 11, 2024
78e7637
Removing KEYSTORE_PASSWORD
jacob6838 Nov 11, 2024
5efc7d9
Merge branch 'develop' into live-intersection-map
jacob6838 Nov 13, 2024
890d4f9
Merging conflictvisualizer api addition
jacob6838 Nov 21, 2024
174137f
Merge branch 'develop' into Feature/configuration-page
jacob6838 Nov 21, 2024
9390ef3
Merge branch 'develop' into Feature/configuration-page
jacob6838 Dec 5, 2024
8b1870d
Merge branch 'develop' into live-intersection-map
jacob6838 Dec 6, 2024
0347bf2
Merge branch 'live-timeout-fix' into live-intersection-map
jacob6838 Dec 9, 2024
1e4fe28
Reading data from WebSockets, cancelling when layer hidden
jacob6838 Dec 9, 2024
3d37e47
Adding increased logging
jacob6838 Dec 10, 2024
2c06add
Update live-intersection-api.ts
jacob6838 Dec 10, 2024
1b0622a
Stopping duplicate websockets
jacob6838 Dec 10, 2024
ee7951a
Update live-intersection-api.ts
jacob6838 Dec 11, 2024
938e735
restricting backward-timed websocket updates
jacob6838 Dec 11, 2024
2e1d346
Working bsms, and spat ordered rendering
jacob6838 Dec 11, 2024
29738a7
Moving live intersections above RSUs
jacob6838 Dec 11, 2024
02e1843
Re-starting websockets on error
jacob6838 Dec 11, 2024
dce008c
Logging BSMs received
jacob6838 Dec 11, 2024
824a263
Not opening websockets until zoom level 12
jacob6838 Dec 11, 2024
fb476cb
Update live-intersection-api.ts
jacob6838 Dec 11, 2024
3682f90
Removing BSM id from surrounding intersections
jacob6838 Dec 12, 2024
1ac812f
Merge branch 'conflictvisualizer-api-integration' into Feature/config…
jacob6838 Dec 12, 2024
f9d4500
removing services/conflictvisualizer-api
jacob6838 Dec 12, 2024
ee219ae
Merge branch 'conflictvisualizer-api-integration' into Feature/config…
jacob6838 Dec 16, 2024
14eb1a9
Cleaning up logging statements
jacob6838 Dec 16, 2024
3150029
Merge branch 'develop' into Feature/configuration-page
jacob6838 Dec 16, 2024
4593c61
Merge branch 'conflictvisualizer-api-integration' into Feature/config…
jacob6838 Dec 17, 2024
7e0edce
Removing styled-engine and roboto
jacob6838 Dec 17, 2024
baf63b3
Merge branch 'conflictvisualizer-api-integration' into Feature/config…
jacob6838 Jan 9, 2025
6a98c2e
Create .gitattributes
jacob6838 Jan 9, 2025
0de810e
Merge branch 'develop' into Feature/configuration-page
jacob6838 Jan 13, 2025
7fba6d3
Merge branch 'conflictvisualizer-api-integration' into Feature/config…
jacob6838 Jan 13, 2025
7d350df
Merge branch 'conflictvisualizer-api-integration' into Feature/config…
jacob6838 Jan 14, 2025
4a6b6ac
Revert appDispatch and appSelector changes
jacob6838 Jan 14, 2025
a0f6936
Revert appDispatch and appSelector changes
jacob6838 Jan 14, 2025
b4b6ea8
Reverting minor changes
jacob6838 Jan 15, 2025
352593b
Reverting minor changes
jacob6838 Jan 15, 2025
fdb8f8c
Reverting minor changes
jacob6838 Jan 15, 2025
a5e4820
Merge branch 'conflictvisualizer-api-integration' into Feature/config…
jacob6838 Jan 15, 2025
9afc94f
Merge branch 'conflictvisualizer-api-integration' into Feature/config…
jacob6838 Jan 15, 2025
032df34
Merge branch 'develop' into Feature/configuration-page
jacob6838 Feb 10, 2025
483188b
Merge branch 'develop' into Feature/configuration-page
jacob6838 Feb 14, 2025
2d7f3ce
Formatting fixes on configuration page
jacob6838 Feb 14, 2025
1137b1a
Updating assessment dashboard background colors
jacob6838 Feb 19, 2025
822833d
Update notifications-table.tsx
jacob6838 Feb 19, 2025
50fc43d
Merge branch 'develop' into Feature/configuration-page
jacob6838 Feb 19, 2025
4bf37c8
removing intersection api startup delay
jacob6838 Feb 25, 2025
fa20a89
Merge branch 'develop' into Feature/configuration-page
jacob6838 Feb 27, 2025
d7c0d5f
Merge branch 'Feature/configuration-page' into live-intersection-map
jacob6838 Feb 27, 2025
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
Merge branch 'conflictvisualizer-api-integration' into Feature/config…
…uration-page
  • Loading branch information
jacob6838 committed Jan 15, 2025
commit 9afc94fc2081e576ed593c42e1cdd556056610f1

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.