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

Closed
wants to merge 418 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
418 commits
Select commit Hold shift + click to select a range
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
f8aac78
adjust sizing and fonts
kylerchin Nov 28, 2024
c481020
allow showing bus stops a bit futher out, but thinner as compromise
kylerchin Nov 28, 2024
b3f3511
shrink local rail dots a bit
kylerchin Nov 28, 2024
cb67012
reduce line thickness farther out on metros
kylerchin Nov 28, 2024
ca4a33f
bus stop fix
kylerchin Nov 29, 2024
76628ef
decrease forest opacity at city level zoom
kylerchin Nov 30, 2024
29ee6ca
same for light mode, opacity of forest
kylerchin Nov 30, 2024
ce16256
hide 3d buildings
kylerchin Nov 30, 2024
16f3571
remove 3d buildings for dark mode as well
kylerchin Nov 30, 2024
018dbf2
darken streams
kylerchin Nov 30, 2024
0c6eee8
wetland bg
kylerchin Nov 30, 2024
893f7ff
change background colour of school
kylerchin Nov 30, 2024
f916335
reduce opacity of esa world cover
kylerchin Nov 30, 2024
69ae8aa
balance contrast of buildings
kylerchin Nov 30, 2024
48854d1
fall back to regular marker
kylerchin Nov 30, 2024
d7f4787
fix dark mode circles
kylerchin Nov 30, 2024
f20c244
prefer the local language
kylerchin Nov 30, 2024
7d54dcf
correct thickness of aeroport lines
kylerchin Dec 6, 2024
97aead6
fix bug in what was the previous and current stop
kylerchin Dec 6, 2024
4a55f86
dont comment the st
kylerchin Dec 6, 2024
27192f1
chinese lang fix for seconds
kylerchin Dec 8, 2024
d4b4ad2
remove old file
kylerchin Dec 9, 2024
6ae7393
use multiple subdomains to speed up loading
kylerchin Dec 9, 2024
dfef985
fix setting name system and theme selectors
kylerchin Dec 9, 2024
1665446
switch off using old dark mode store
kylerchin Dec 9, 2024
9f37108
transition the context line between dark and light mode
kylerchin Dec 9, 2024
6610f2e
show stops and shapes in routes menu
kylerchin Dec 9, 2024
80ad3cc
spread requests across multiple domains;
kylerchin Dec 10, 2024
5a828c4
fix scrollbar track colour
kylerchin Dec 10, 2024
5501e1c
2 digit hours
kylerchin Dec 10, 2024
00a4a6e
Interpolate stop size
kylerchin Dec 10, 2024
4ca7c28
Fix compilation error, two digit hours
kylerchin Dec 10, 2024
5240cf4
Use stop tz by default
kylerchin Dec 10, 2024
aa10aa5
Snap bearing pointer to map
kylerchin Dec 10, 2024
3e6caaf
round down
kylerchin Dec 13, 2024
8920a0f
Shrink at farther zooms
kylerchin Dec 15, 2024
dcb4b97
move grass above land use
kylerchin Dec 19, 2024
34516a3
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Dec 19, 2024
eb92b84
pitch on top of grass
kylerchin Dec 19, 2024
91d3ae4
Make pedestrian area more visible
kylerchin Dec 19, 2024
7799f86
make pedestrian tunnel;s show up
kylerchin Dec 24, 2024
bfaa2b7
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Dec 24, 2024
c32065c
Update README.md
wendellmeset Jan 6, 2025
902b98f
Merge pull request #102 from wendellmeset/patch-1
kylerchin Jan 6, 2025
f0738c0
increase priority of make fire map
kylerchin Jan 8, 2025
7e87802
geobearingicon size fix
kylerchin Jan 8, 2025
f8ed73a
remove unused const
kylerchin Jan 8, 2025
4a26acd
minzoom 4
kylerchin Jan 8, 2025
d67e9bb
change minimum zoom to 5
kylerchin Jan 8, 2025
c1cd60c
map opacity to brightness
kylerchin Jan 8, 2025
0c484a6
Update to 60s instead
kylerchin Jan 8, 2025
053b15e
switch to github for evacuation data
kylerchin Jan 9, 2025
edc1eeb
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Jan 9, 2025
68633e3
perimeter map
kylerchin Jan 9, 2025
e721609
increase opacity of fire activity perims
kylerchin Jan 9, 2025
38fd625
increase update frequency
kylerchin Jan 9, 2025
991b970
la city fire evac map
kylerchin Jan 9, 2025
3b53b89
label los angeles zones
kylerchin Jan 9, 2025
e598a4e
switch to cf pages for la city evac map
kylerchin Jan 9, 2025
a908a02
improve text for la city evac
kylerchin Jan 9, 2025
306ac53
correct field names
kylerchin Jan 9, 2025
c0a09c7
fix all red splotches
kylerchin Jan 9, 2025
6eb027b
lower layer intensity when zooming in
kylerchin Jan 9, 2025
92d42e3
improve modis sizing
kylerchin Jan 9, 2025
13ed3be
interpolate the text size for warning labels
kylerchin Jan 9, 2025
0e7cc89
update modis every 60 s
kylerchin Jan 9, 2025
7eef6dc
switch to using function instead
kylerchin Jan 9, 2025
f79c462
reduce opacity of evacuations
kylerchin Jan 9, 2025
4ff9e82
fire map labels
kylerchin Jan 9, 2025
163888d
set min zoom fore fire names
kylerchin Jan 9, 2025
061a9eb
delete broken functions
kylerchin Jan 9, 2025
f8d5e12
diy drawing map
kylerchin Jan 10, 2025
6d579c4
move fire names to manual data folder
kylerchin Jan 10, 2025
8352aef
manual evac data
kylerchin Jan 10, 2025
0fec6bc
switch to watchduty
kylerchin Jan 10, 2025
2faf438
swap subdomain for tiles
kylerchin Jan 10, 2025
f2d1eae
maxzoom 10
kylerchin Jan 10, 2025
b894cad
set min zoom as well
kylerchin Jan 10, 2025
d9ef1d0
setup bounds
kylerchin Jan 10, 2025
374ca6d
Increase opacity, decrease text size
kylerchin Jan 10, 2025
b97853e
Decrease LA fire map opacity
kylerchin Jan 10, 2025
33e6f1e
Change text sizing
kylerchin Jan 10, 2025
37759c5
reduce opacity of wildfire perims
kylerchin Jan 12, 2025
399522e
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Jan 12, 2025
fbb7312
exclude cancellations from inactive? need to come up with a better so…
kylerchin Jan 12, 2025
868b02a
better exclusion algorithm that accounts for the stop before it
kylerchin Jan 12, 2025
67300fd
add hill shading
kylerchin Jan 12, 2025
47ed88f
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Jan 12, 2025
6eb8f23
update test pages
kylerchin Jan 12, 2025
fe4f00c
fix order of hillshade
kylerchin Jan 12, 2025
9e83a8f
Fix when no rt
kylerchin Jan 12, 2025
3763363
exaggeration 0.3
kylerchin Jan 12, 2025
8971f78
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Jan 12, 2025
14dc2d9
change hillshade-exaggeration
kylerchin Jan 12, 2025
e8d3c2a
add contours
kylerchin Jan 12, 2025
c05e001
shared worker for processing hillshade
kylerchin Jan 12, 2025
b0e8fb2
improve contour colour
kylerchin Jan 12, 2025
befa20c
add elevation marker labels
kylerchin Jan 12, 2025
dcf0054
minimum contour
kylerchin Jan 12, 2025
89a8066
decrease contour colour
kylerchin Jan 12, 2025
c980af6
contour colours
kylerchin Jan 13, 2025
9bf9fe9
hillshade and contours
kylerchin Jan 13, 2025
1eb3ca4
shade contours
kylerchin Jan 13, 2025
b113a34
cors allow catenary
kylerchin Jan 13, 2025
8861eb9
switch api key
kylerchin Jan 13, 2025
b2f1c8c
disable hillshading for now
kylerchin Jan 13, 2025
cb1bdeb
names of fires
kylerchin Jan 14, 2025
49d9193
first attempt of route id filtering
kylerchin Jan 15, 2025
bcc49e5
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Jan 15, 2025
1311a6f
new button layout
kylerchin Jan 16, 2025
e795891
filters work pls
kylerchin Jan 16, 2025
ca1d7d7
use new filter
kylerchin Jan 16, 2025
f9acf91
Merge pull request #103 from catenarytransit/nearby-improvements
kylerchin Jan 16, 2025
cb5af0a
refilter
kylerchin Jan 16, 2025
d265cb4
Merge pull request #104 from catenarytransit/nearby-improvements
kylerchin Jan 16, 2025
465a904
fetch correctly
kylerchin Jan 16, 2025
6002372
Merge pull request #105 from catenarytransit/nearby-improvements
kylerchin Jan 16, 2025
87bd2a6
filter finish
kylerchin Jan 16, 2025
f0065cf
Merge pull request #106 from catenarytransit/nearby-improvements
kylerchin Jan 16, 2025
2ea42ca
fix icon placement and text size for wildfires
kylerchin Jan 17, 2025
bd24f83
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Jan 17, 2025
b561c59
add terrain tiles using catenary source
kylerchin Jan 17, 2025
9f54ce0
format document a bit
kylerchin Jan 17, 2025
4f40e75
specify encoding
kylerchin Jan 17, 2025
37f7435
change encoding
kylerchin Jan 17, 2025
ee8435b
prepend with png
kylerchin Jan 17, 2025
c9a89f5
lower cache size
kylerchin Jan 17, 2025
be74bf1
change colours
kylerchin Jan 17, 2025
67b392e
change exaggeration
kylerchin Jan 17, 2025
83ffbbb
change shadow to black
kylerchin Jan 17, 2025
fcb4ff7
lower max zoom for now
kylerchin Jan 17, 2025
558c0fc
fix typo
kylerchin Jan 17, 2025
3f3431d
increase max zoom to 12
kylerchin Jan 17, 2025
ef76ca2
remove cloudflare tracker
kylerchin Jan 17, 2025
4857346
fix filtering bug
kylerchin Jan 17, 2025
d355d91
another fix for random function
kylerchin Jan 17, 2025
c42fee2
dont call own listener
kylerchin Jan 17, 2025
b46d645
fix another filter
kylerchin Jan 17, 2025
c6ebef7
remove terrain layers temp
kylerchin Jan 17, 2025
b53cf1b
change intensity to fixed number
kylerchin Jan 17, 2025
41ceb4b
Merge pull request #107 from catenarytransit/terrain-tests
kylerchin Jan 17, 2025
bdf59ea
disable making contours
kylerchin Jan 17, 2025
882f574
compile with source map
kylerchin Jan 17, 2025
988e527
use new build system
kylerchin Jan 17, 2025
9c2b528
disable terrain for now
kylerchin Jan 17, 2025
6dcfa1d
disable mlcontours
kylerchin Jan 17, 2025
8f10f0c
move into comments
kylerchin Jan 17, 2025
42e5783
whatever adapter
kylerchin Jan 17, 2025
6ba6d18
add packg
kylerchin Jan 17, 2025
cb69d57
Merge pull request #108 from catenarytransit/terrain-tests
kylerchin Jan 17, 2025
9141258
delete ml contour
kylerchin Jan 17, 2025
ba7774b
Merge branch 'main' of https://github.com/catenarytransit/catenary-fr…
kylerchin Jan 17, 2025
2baed1c
update svelte version
kylerchin Jan 17, 2025
cdc97a3
do not minify code
kylerchin Jan 17, 2025
e81b14a
check mapglobalexists first
kylerchin Jan 17, 2025
3b66b31
only clear if number valid
kylerchin Jan 17, 2025
060e761
remove GTM
kylerchin Jan 17, 2025
e71142c
gtm move to app.html
kylerchin Jan 17, 2025
5ac7c84
update meta descriptions
kylerchin Jan 17, 2025
2b42d08
sure, minify
kylerchin Jan 17, 2025
8ed3e78
hillshade reimpl
kylerchin Jan 18, 2025
d15ea20
allow zoom to 14
kylerchin Jan 18, 2025
a3db852
size reduction of tiles
kylerchin Jan 18, 2025
0b026a6
improve light mode hillshade colours
kylerchin Jan 18, 2025
9dd80e9
improve hillshading
kylerchin Jan 18, 2025
26a464a
temp use amazon source, reduce exaggeration
kylerchin Jan 19, 2025
e72c55b
reduce min layer to 13
kylerchin Jan 19, 2025
60d93e3
toggle for topo mode
kylerchin Jan 20, 2025
838ec39
Checkbox change variable
kylerchin Jan 20, 2025
b744424
Update +page.svelte
kylerchin Jan 20, 2025
07a6d1b
Fix trigger for updating local state
kylerchin Jan 20, 2025
2a909e3
Check and remove null trip_id
kylerchin Jan 20, 2025
ff9d101
Reenable stop codes
kylerchin Jan 20, 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
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 Rust.

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.
2 changes: 1 addition & 1 deletion log.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
File dev
File preview

Errors :
0 : status file error
Expand Down
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
Loading