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

merge back #64

Open
wants to merge 245 commits into
base: new-user-geolocation-and-ask-for-permission
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
245 commits
Select commit Hold shift + click to select a range
da60da4
filter for chateaus that aren't realtime
kylerchin Aug 9, 2024
be326eb
min zoom intercity rail to 4
kylerchin Aug 9, 2024
7392b9f
cleanup comments on page.svelte
kylerchin Aug 9, 2024
914e39a
show location again
kylerchin Aug 12, 2024
9173895
grey out previously visited stops
kylerchin Aug 21, 2024
6c1ea83
fix foothill urls
kylerchin Aug 24, 2024
aad7dcd
nearby departures demo release
kylerchin Sep 1, 2024
91e5299
only show times greater than 15 min ago
kylerchin Sep 1, 2024
2f8eefa
make proper scrollable
kylerchin Sep 1, 2024
1d241a3
make extra small
kylerchin Sep 1, 2024
554194a
Nearby departures with scrolling!
kylerchin Sep 1, 2024
f260a66
scrolling fix
kylerchin Sep 1, 2024
89226b3
size down the departure names
kylerchin Sep 1, 2024
b0bfb0d
comment out init instructions
kylerchin Sep 1, 2024
a1fced8
delete comment
kylerchin Sep 1, 2024
9b1e954
RouteHeading component
42A7C5 Sep 1, 2024
08c2cb9
remove octa bus livery
kylerchin Sep 2, 2024
7b643f5
show delay information
kylerchin Sep 3, 2024
ae72a7d
Make the countdown use realtime as well
kylerchin Sep 3, 2024
3750afd
update desc for nearby
kylerchin Sep 3, 2024
02bba26
fix contrast for nearby explainer
kylerchin Sep 3, 2024
cf74cd3
Basic stop list
42A7C5 Sep 4, 2024
127c5d5
Merge pull request #71 from catenarytransit/main
kylerchin Sep 4, 2024
5e5b5bf
ui improvements to nearby departures
kylerchin Sep 4, 2024
09e560c
Basic horizontal list
42A7C5 Sep 5, 2024
24c5742
Finish up UI
42A7C5 Sep 5, 2024
90ee9a1
Merge pull request #70 from catenarytransit/betterRoutes
kylerchin Sep 5, 2024
a28f474
deploy docker package
kylerchin Sep 6, 2024
e507e25
remove old build scripts
kylerchin Sep 6, 2024
a73fe94
Merge pull request #75 from catenarytransit/betterRoutes
kylerchin Sep 6, 2024
b381097
change to repo name before
kylerchin Sep 6, 2024
907bdef
make sure images have same before name
kylerchin Sep 6, 2024
6b5d8f8
unzip is requirement for installing bun
kylerchin Sep 6, 2024
bc04787
dont need to reference bun directly
kylerchin Sep 6, 2024
bf7ed99
source reference the bun bin
kylerchin Sep 6, 2024
67f7f64
Change shell to bash
kylerchin Sep 6, 2024
cc4d458
someone save me, ref to bun bin doesn't work
kylerchin Sep 6, 2024
9091f36
Install git
kylerchin Sep 6, 2024
c978364
Tag also with latest
kylerchin Sep 6, 2024
893b139
Also tag compilation step with latest
kylerchin Sep 6, 2024
c4d159c
remove framerate deps
kylerchin Sep 6, 2024
42aa64c
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Sep 6, 2024
a3650ef
remove package lock
kylerchin Sep 6, 2024
2e65295
generate new lock file
kylerchin Sep 6, 2024
cda974f
switch over to vite for cf
kylerchin Sep 6, 2024
dcc2e30
use special svelte js compiler
kylerchin Sep 6, 2024
19102c1
install wrangler
kylerchin Sep 6, 2024
8ef1600
Basic new UI
42A7C5 Sep 6, 2024
64708b8
new service alerts UI
42A7C5 Sep 7, 2024
a0b69ff
Better settings, dark mode, refinements
42A7C5 Sep 9, 2024
4f090b0
Fix sidebar top icons
42A7C5 Sep 9, 2024
33841f4
offset fix
42A7C5 Sep 9, 2024
9ea5340
Merge pull request #76 from catenarytransit/simpleTripInfo
kylerchin Sep 9, 2024
701efca
head sign bug crash fix
kylerchin Sep 9, 2024
d5b60d0
Fix known issue FR-SBM-1
42A7C5 Sep 9, 2024
74e3f4c
Fix known issues FR-SBM-2 and FR-SBM-3
42A7C5 Sep 9, 2024
8aa844b
Finalize fix for FR-SBM-3
42A7C5 Sep 9, 2024
b98e3f6
Fix known issue FR-SBM-0 and finalize fix for FR-SBM-4
42A7C5 Sep 9, 2024
d771591
Shorten time diff a bit, remove DUE to ensure localisation
kylerchin Sep 10, 2024
9451009
add locale translation for previous stops
kylerchin Sep 10, 2024
7978862
update formatting for previous stops text in french and english
kylerchin Sep 10, 2024
716feeb
fix plural stops for english
kylerchin Sep 10, 2024
55fd6af
cache nearby departures for easy return to page
kylerchin Sep 10, 2024
f9f98a4
reduce length of delay string
kylerchin Sep 10, 2024
4fbcc79
fix interpolated times
kylerchin Sep 17, 2024
d9fd38f
calculate if show both dep and arrival
kylerchin Sep 17, 2024
7bfb4b4
pick default pattern
kylerchin Sep 17, 2024
f93f63e
alerts are now clickable
kylerchin Sep 17, 2024
f664493
shrink route heading on mobile slightly
kylerchin Sep 17, 2024
9613191
vehicle numbers should be shown by default
kylerchin Sep 17, 2024
31729cc
Remove distributed, move to k8s
kylerchin Sep 18, 2024
18e1247
try to get the gps system to load faster
kylerchin Sep 20, 2024
1a7a3fd
remove old file reference
kylerchin Sep 20, 2024
bf14f19
loading bar and waiting for input location
kylerchin Sep 20, 2024
53465e0
stop shifting everytwhere the nearby screen
kylerchin Sep 20, 2024
b8438bc
better vehicle numbers
42A7C5 Sep 20, 2024
68a7900
Better vehicle display in selection page
42A7C5 Sep 20, 2024
fc59a51
Fix icon display issue that only occurs in prod
42A7C5 Sep 20, 2024
a4004ad
Fix delay diff
42A7C5 Sep 20, 2024
b01e714
Should fix inactive stops bug
42A7C5 Sep 20, 2024
bb978ed
oops
42A7C5 Sep 20, 2024
5743723
Stop name cleanup in nearby departures
42A7C5 Sep 20, 2024
d44bb08
Combine headsigns, nicer display
42A7C5 Sep 20, 2024
3e39018
Clean up trip names
42A7C5 Sep 20, 2024
8c5d537
Icon size fix, once again :(
42A7C5 Sep 20, 2024
02b2d5d
set light stop colour
kylerchin Sep 21, 2024
e262de1
decrease padding on small screens
kylerchin Sep 21, 2024
aae6e55
Fix scrollbar style, scheduled trip icon
42A7C5 Sep 21, 2024
80d8baf
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
42A7C5 Sep 21, 2024
2a7f228
reduce padding again
kylerchin Sep 21, 2024
174304e
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Sep 21, 2024
9125493
Fix dark mode detection issue
42A7C5 Sep 21, 2024
128780b
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
42A7C5 Sep 21, 2024
9afcc95
Fix vehicle # padding on mobile
42A7C5 Sep 21, 2024
cde8aca
Separate depart/arrive times
42A7C5 Sep 21, 2024
983adbb
Unified navbar
42A7C5 Sep 21, 2024
d860150
Move timecutoff to const above
kylerchin Sep 23, 2024
0e7f54a
default to tighter zoom
kylerchin Oct 5, 2024
da58001
dont cache geo resp for ip
kylerchin Oct 5, 2024
391a053
encode uri route id
kylerchin Oct 6, 2024
adc2ac0
switch encoding function for urls
kylerchin Oct 6, 2024
0283f6b
update node dependencies
kylerchin Oct 7, 2024
8ae82f8
unhide anteater express
kylerchin Oct 9, 2024
b93a71e
show previous trips grey
kylerchin Oct 11, 2024
733a8f0
prevent duplicate stop ids from showing up
kylerchin Oct 11, 2024
d0fa2d6
more lines shown at farther zoom level
kylerchin Oct 12, 2024
a21640f
fix non interactive not showing ferries
kylerchin Oct 12, 2024
13ac58a
more responsive at horizontal sizes
kylerchin Oct 17, 2024
416cf30
shrink trip commentry text
kylerchin Oct 17, 2024
48cb1b9
add platform numbers from api
kylerchin Oct 17, 2024
4da18c7
Improve platform number contrast
kylerchin Oct 18, 2024
bfaf3c0
reduce the importance of the bus layer between zoom 8-9
kylerchin Oct 23, 2024
d9853ec
do not fetch bus locations below zoom level 8
kylerchin Oct 23, 2024
bd0f42e
change fetch threshold to 8.2
kylerchin Oct 23, 2024
fc34d37
shrink bus label size at outer zoom levels
kylerchin Oct 23, 2024
1c9876a
shrink bus dots again
kylerchin Oct 23, 2024
741754d
remove unneeded step from pointing shell
kylerchin Oct 23, 2024
d69fdd1
make min zoom for bus a bit more
kylerchin Oct 23, 2024
d616683
increase zoom level requirements for bus pointer
kylerchin Oct 23, 2024
8bfaf9a
reduce offset of bus pointer
kylerchin Oct 23, 2024
81a9312
reduce bus bearing offset and label size again
kylerchin Oct 23, 2024
99e04ab
bus pointer smaller
kylerchin Oct 23, 2024
bd2faa2
shrink metro pointer size
kylerchin Oct 23, 2024
5356c63
shrink label size
kylerchin Oct 23, 2024
59ea00e
cleanup display of trams vs metro stops
kylerchin Oct 26, 2024
18ae8a5
shrink stops a bit more
kylerchin Oct 26, 2024
25166bd
lower gamma of lighter colours
kylerchin Oct 27, 2024
b6288a4
Fix German translations
s-martin Oct 27, 2024
11e46bf
Merge pull request #96 from s-martin/s-martin-patch-1
kylerchin Oct 27, 2024
7b5fe4f
shrink bus shapes again
kylerchin Oct 27, 2024
aee66c4
reduce size of shapes
kylerchin Oct 27, 2024
3d9c115
fix attribution
kylerchin Oct 28, 2024
3fa43e4
Fix duplicating times
42A7C5 Oct 28, 2024
e35d5ad
switch to CDN of chateaus.json for faster loads
kylerchin Oct 30, 2024
94808b2
remove double load of chateaus
kylerchin Oct 30, 2024
b4df2b6
Ycgcyv
kylerchin Nov 1, 2024
d41c278
remove chateaus from route info
kylerchin Nov 1, 2024
c719dcc
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Nov 1, 2024
77c4df4
Create nl.json
kkeuter Nov 1, 2024
331dece
maplibre trnasition step 1
kylerchin Nov 3, 2024
77ea17d
set pixel ratio high
kylerchin Nov 3, 2024
8c37652
Remove render timer
kylerchin Nov 3, 2024
2ecb8c4
most things work now!
kylerchin Nov 3, 2024
fd1056b
switch to maplibre
kylerchin Nov 3, 2024
146b5ca
Merge branch 'main' into maplibre_transition
kylerchin Nov 3, 2024
bbea70c
Merge pull request #98 from catenarytransit/maplibre_transition
kylerchin Nov 3, 2024
a1a580f
remove extra debug, shrink some rail labels
kylerchin Nov 3, 2024
d870a9c
Update sidebarInternals.svelte
kkeuter Nov 3, 2024
3994202
Update i18n.ts
kkeuter Nov 3, 2024
04736ce
Merge branch 'catenarytransit:main' into main
kkeuter Nov 3, 2024
14277d4
Merge pull request #99 from kkeuter/main
chw-03 Nov 3, 2024
17c73e5
swap to self hosted styles and fonts
kylerchin Nov 4, 2024
20a4bfd
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Nov 4, 2024
61cc5c1
dont brick glyph server
kylerchin Nov 4, 2024
1f119cb
water rendering fix
kylerchin Nov 4, 2024
61573d8
completely wipe and delete mapbox
kylerchin Nov 4, 2024
ee2b0ee
fix poi display
kylerchin Nov 4, 2024
b93423f
another poi bug fix
kylerchin Nov 4, 2024
2a850c1
poi suffering again
kylerchin Nov 4, 2024
76284e6
update maplibre version
kylerchin Nov 4, 2024
f1db967
dark mode primary street contrast
kylerchin Nov 4, 2024
cabf25c
remove unneeded stop size changing function
kylerchin Nov 4, 2024
7b4b2eb
fix broken filters
kylerchin Nov 4, 2024
f6bd95a
fix pedestrian path contrast
kylerchin Nov 4, 2024
e837a68
make sure grass shows up green
kylerchin Nov 4, 2024
50d365c
improve label halo brightness
kylerchin Nov 4, 2024
165c8ce
make buildings lighter on light mode at zoom 13
kylerchin Nov 4, 2024
de64754
colour pitches and tracks correctly
kylerchin Nov 4, 2024
14125ca
add pools
kylerchin Nov 4, 2024
23484cd
attempt to hide the accuracy layer as well
kylerchin Nov 4, 2024
85822aa
reduce opacity
kylerchin Nov 4, 2024
b419c97
make state boundaries show
kylerchin Nov 4, 2024
76f1fe2
ensure default land cover green shows
kylerchin Nov 4, 2024
495bae2
allow visibility of intercity rail shapes at level 3
kylerchin Nov 4, 2024
4563b07
cut the line width for rail lines
kylerchin Nov 4, 2024
975ad34
correct capitalisation
kylerchin Nov 4, 2024
b747c3c
decrease stroke width on lower zooms
kylerchin Nov 4, 2024
91d0f16
remove white halos
kylerchin Nov 4, 2024
19f4058
reduce importance of roads
kylerchin Nov 5, 2024
a53e033
light style tunnels
kylerchin Nov 5, 2024
30fc33e
correct more tunnels
kylerchin Nov 5, 2024
ccdac11
correct nearby status
kylerchin Nov 5, 2024
876d053
write the delays and earlys correctly
kylerchin Nov 5, 2024
c7704f5
dont brick the layer selection system
kylerchin Nov 7, 2024
31f1bd4
remove line fire
kylerchin Nov 8, 2024
b504368
evacuate
kylerchin Nov 8, 2024
29ab511
log missing layers as errors
kylerchin Nov 8, 2024
fc8a9dd
ensure that the pdf string is 3 digits long
kylerchin Nov 9, 2024
a6e8abb
show evacuation warning
kylerchin Nov 10, 2024
4ec3c3c
remove old fire map
kylerchin Nov 10, 2024
a6ba9fe
show alerts for routes clicked
kylerchin Nov 13, 2024
8e7e2b2
sort nearby depeartures correctly
kylerchin Nov 13, 2024
c2530d8
improve dark mode poi contrast
kylerchin Nov 13, 2024
57f797a
change text transparency and bold to be more sensible
kylerchin Nov 13, 2024
2db4f4b
wetland go before water
kylerchin Nov 13, 2024
88ee507
move wetland layer to bottom
kylerchin Nov 13, 2024
a49728b
shrink road lines and change colours on dark mode
kylerchin Nov 14, 2024
e30e751
change tunnel colours
kylerchin Nov 14, 2024
421b52f
format
kylerchin Nov 14, 2024
fd1de93
route label on by default
kylerchin Nov 14, 2024
28829ed
resolve bug impacting hide and show of dots
kylerchin Nov 15, 2024
07a1701
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Nov 15, 2024
2390cc7
make labeling settings work
kylerchin Nov 15, 2024
0ffe605
switch from mapbox to maplibre
kylerchin Nov 15, 2024
a11b77e
disable fill emissive strength
kylerchin Nov 15, 2024
96534af
Chateau see fix
kylerchin Nov 15, 2024
aeff1b3
move alerts into single alert box
kylerchin Nov 15, 2024
293adbd
update dependencies
kylerchin Nov 16, 2024
99d30ab
rollup plugin
kylerchin Nov 16, 2024
fb9c3d9
show wood layer
kylerchin Nov 16, 2024
752968b
enable show gtfs ids feature
kylerchin Nov 17, 2024
3bea294
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Nov 17, 2024
4d4dd10
print vehicle id thats out of service
kylerchin Nov 17, 2024
16d0f1d
remove excess console
kylerchin Nov 17, 2024
521f562
error messages
kylerchin Nov 17, 2024
81b5df4
fix extra quotations bricking route fetch
kylerchin Nov 17, 2024
40e9ca2
show gtfs route ids correctly involving quotations
kylerchin Nov 17, 2024
ecd892f
show cause and effect
kylerchin Nov 17, 2024
77ce7eb
show line between each alert
kylerchin Nov 17, 2024
38057ef
nyc mta specific exception
kylerchin Nov 17, 2024
fb4208e
print url as well
kylerchin Nov 17, 2024
df8fe8f
print url correctly
kylerchin Nov 17, 2024
a5574f8
remove image to prevent it from bricking
kylerchin Nov 17, 2024
6e8ff73
underline on hover link
kylerchin Nov 17, 2024
1384e4a
Only If saved state is true for showgtfsids in local storage, save as…
kylerchin Nov 17, 2024
0c96d67
Protobuf no longer exists for now
kylerchin Nov 17, 2024
895a84c
Be descriptive in base layers and future plans
kylerchin Nov 17, 2024
0c3deaa
Add site to read from
kylerchin Nov 17, 2024
eaa3fdf
Describe frontend project
kylerchin Nov 17, 2024
6000d2f
Update sidebarInternals.svelte
kylerchin Nov 17, 2024
2400cc9
order by Google language order
kylerchin Nov 17, 2024
4eb070a
import get
kylerchin Nov 17, 2024
42eb26d
if show gtfs, not store
kylerchin Nov 17, 2024
c9002e9
make link colours match
kylerchin Nov 17, 2024
bd7c290
null check desc text
kylerchin Nov 17, 2024
c5b9db8
particular order for languages
kylerchin Nov 17, 2024
47c3d04
add polish and italian
kylerchin Nov 17, 2024
cb821b1
move the pointer below labels
kylerchin Nov 21, 2024
609d668
fix: display settings persist properly on reload
42A7C5 Nov 22, 2024
f6781e7
fix: clean up lines and text styles in alert UI
42A7C5 Nov 22, 2024
a904595
testing an improved style for san diego area route-name substitutions
42A7C5 Nov 22, 2024
f18c5f2
fix: sidebar offset bug on medium screens
42A7C5 Nov 22, 2024
280dfb8
fix: no more insane bottom padding offsets
42A7C5 Nov 22, 2024
f5939ed
Revert as it broke mobile screens.
kylerchin Nov 22, 2024
3db5269
flix bus shut up
kylerchin Nov 25, 2024
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
41 changes: 0 additions & 41 deletions .github/workflows/deploy.yaml

This file was deleted.

41 changes: 41 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Release
on:
push:
branches: ['main']

env:
CARGO_TERM_COLOR: always
REGISTRY_USER: ${{ github.actor }}
REGISTRY_PASSWORD: ${{ github.token }}
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}

jobs:
build-and-push-frontend-image:
runs-on: ubuntu-latest

permissions:
contents: read
packages: write
attestations: write
id-token: write

steps:
- uses: actions/checkout@v4

- name: Compile Frontend
uses: redhat-actions/buildah-build@v2
with:
image: catenarytransit/catenaryfrontend
tags: ${{ github.sha }} latest
containerfiles: |
./Dockerfile

- name: Push Frontend To ghcr.io
id: push-to-ghcr-frontend
uses: redhat-actions/push-to-registry@v2
with:
image: catenarytransit/catenaryfrontend
tags: ${{ github.sha }} latest
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.PACKAGE_TOKEN }}
55 changes: 0 additions & 55 deletions .github/workflows/staging.yaml

This file was deleted.

19 changes: 19 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM debian:latest

# Install Bun

RUN apt-get update && apt-get install -y curl unzip git
RUN curl -fsSL https://bun.sh/install | bash

WORKDIR /frontend

# Copy the source code into the container

COPY . .

SHELL ["/bin/bash", "-c"]
RUN source /root/.bashrc
RUN ~/.bun/bin/bun install
RUN ~/.bun/bin/bun run build

CMD ["~/.bun/bin/bun run preview"]
23 changes: 17 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# catenary-frontend

This is the Svelte JS (and eventually Rust WASM) version of Catenary Maps. Catenary Maps allows users to discover public transport routes and track vehicles on public transport networks in countries around the world including the United States, Canada, EU Countries like Ireland, Germany, France, Spain, Germany, Switzerland, Portugal, Norway, Finland, Sweden, Belgium, Netherlands, and United Kingdom, Japan, Australia , and New Zealand. Data such as the speed and vehicle numbers is on Catenary, not shown on other map apps. We also collect realtime data from proprietary sources and convert them to GTFS. All data processing, ingestion, and queries are handled by https://github.com/catenarytransit/catenary-backend, which is written in Pure rhst.

Current site URL: https://maps.catenarymaps.org

## Install Dependenices

```bash
Expand All @@ -13,11 +17,18 @@ bun run build
bun run preview
```

#### Dev comments
### Developers

command to regenerate protobuf
Catenary Maps Web version.

```bash
cd src
protoc --ts_out=gtfs_proto gtfs-realtime.proto
```
Maprender: Maplibre https://maplibre.org/maplibre-gl-js/docs/

Base layers:
https://github.com/wipfli/esa-worldcover-polygons with data from https://esa-worldcover.org/en
OpenFreeMap https://openfreemap.org/ with data from https://OpenStreetMaps.org

For the seperate but concurrent Flutter Rust project (early alpha): https://github.com/catenarytransit/catenary_flutter

eventually, both web and flutter frontend will heavily use a shared set of structs and rust code for communicating with the backend websocket server.

The project to replicate Loom (line ordering optimised maps) by Patrick Brosi, PhD is a backend project, with minimal involvement with the frontend.
1 change: 0 additions & 1 deletion modules.d.ts
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
declare module 'mapbox-gl-framerate';
Loading