Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
368 commits
Select commit Hold shift + click to select a range
a4fea7e
chore: Update Elasticsearch URL to use Telge Twin API endpoint
swedishdeveloper Sep 3, 2024
13b9b99
2.6.16
github-actions[bot] Sep 3, 2024
285d011
ghcr.io/predictivemovement/telge-twin-simulator:2.6.16
fluxcdbot Sep 3, 2024
f39a080
ghcr.io/predictivemovement/telge-twin-sample:2.6.15
fluxcdbot Sep 3, 2024
4dd5129
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.16
fluxcdbot Sep 3, 2024
2131093
ghcr.io/predictivemovement/telge-twin-sample:2.6.16
fluxcdbot Sep 3, 2024
52480aa
chore: Update Elasticsearch URL to use Telge Twin API endpoint
swedishdeveloper Sep 3, 2024
b0b1f46
2.6.17
github-actions[bot] Sep 3, 2024
44f3d8d
ghcr.io/predictivemovement/telge-twin-simulator:2.6.17
fluxcdbot Sep 3, 2024
11ade63
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.17
fluxcdbot Sep 3, 2024
736ff4d
ghcr.io/predictivemovement/telge-twin-sample:2.6.17
fluxcdbot Sep 3, 2024
cf1cde4
chore: Update STREAMS_URL in simulator.yaml
swedishdeveloper Sep 3, 2024
7bc4ca8
wip: telge
schweinryder Sep 4, 2024
29c3c90
Update fleet hub location and address for Södertälje kommun
swedishdeveloper Sep 4, 2024
3bc7479
wip: streams and routes
schweinryder Sep 4, 2024
06ad9d3
Merge branch 'telge-dev' of https://github.com/PredictiveMovement/tel…
schweinryder Sep 4, 2024
d3cc405
Update fleet hub location and address for Södertälje kommun
swedishdeveloper Sep 4, 2024
b16d876
Merge branch 'telge-dev' of https://github.com/PredictiveMovement/tel…
schweinryder Sep 4, 2024
0fd25ca
feat: add södertälje as municipality
irony Sep 4, 2024
0df0c4f
Merge remote-tracking branch 'origin/feat/sodertalje' into telge-dev
schweinryder Sep 4, 2024
6c21713
feat: Inactivating passengers.
olavG91 Sep 5, 2024
9080432
chore: more robust way of adding bookings in södertälje
irony Sep 5, 2024
f51a85d
feat: Add passenger booking statistics collection
olavG91 Sep 5, 2024
4a83369
refactor: Remove buses.
olavG91 Sep 5, 2024
27e9b25
chore: minor
schweinryder Sep 5, 2024
2ba0489
Merge branch 'telge-dev' of https://github.com/PredictiveMovement/tel…
schweinryder Sep 5, 2024
8f9a4f9
Merge branch 'feat/sodertalje' into telge-dev
olavG91 Sep 5, 2024
06fe324
wip: garbage truck fleet
schweinryder Sep 5, 2024
f819854
Merge branch 'telge-dev' of https://github.com/PredictiveMovement/tel…
schweinryder Sep 5, 2024
d69511a
wip: garbage collection points
schweinryder Sep 5, 2024
e7c442b
chore: change start time
schweinryder Sep 5, 2024
cbb5e3c
chore: Remove measureStations
olavG91 Sep 5, 2024
f0969bd
wip
schweinryder Sep 5, 2024
cb5c791
Added taxi
olavG91 Sep 5, 2024
2118540
feat: major cleanup
irony Sep 5, 2024
f681401
renames
irony Sep 5, 2024
a858a83
renames
irony Sep 5, 2024
9ee6156
wip
schweinryder Sep 5, 2024
01f608a
Merge branch 'telge-dev' of https://github.com/PredictiveMovement/tel…
schweinryder Sep 5, 2024
adda4d2
Merge branch 'local' into telge-dev
schweinryder Sep 5, 2024
cdbf828
fix: more cleanup
irony Sep 6, 2024
77fef20
fix: better error handling when trying to cluster on wrong data
irony Sep 6, 2024
a8ef35e
wip: emitting garbage collection points
schweinryder Sep 6, 2024
2eefc54
ghcr.io/predictivemovement/telge-twin-simulator:2.6.18
fluxcdbot Sep 6, 2024
4589673
Merge branch 'telge-dev' into feat/cleanup
olavG91 Sep 6, 2024
c46c550
Merge pull request #5 from PredictiveMovement/feat/cleanup
swedishdeveloper Sep 6, 2024
29eac64
Removed taxi configuration and fixed coordinate range validation in k…
olavG91 Sep 6, 2024
8a1880d
fix: cleanup
olavG91 Sep 6, 2024
fdf4bd3
Merge pull request #6 from PredictiveMovement/telge-dev
irony Sep 6, 2024
355c35a
2.6.18
github-actions[bot] Sep 6, 2024
ba2866c
fix: remove unused files
irony Sep 6, 2024
df7ac81
2.6.19
github-actions[bot] Sep 6, 2024
9ce445c
fix: remove unused files
irony Sep 6, 2024
39f2183
ghcr.io/predictivemovement/telge-twin-simulator:2.6.19
fluxcdbot Sep 6, 2024
0878156
Merge branch 'main' of https://github.com/PredictiveMovement/telge-twin
irony Sep 6, 2024
92614b2
2.6.20
github-actions[bot] Sep 6, 2024
1c4375b
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.19
fluxcdbot Sep 6, 2024
64bcecc
ghcr.io/predictivemovement/telge-twin-simulator:2.6.20
fluxcdbot Sep 6, 2024
d36091c
ghcr.io/predictivemovement/telge-twin-sample:2.6.20
fluxcdbot Sep 6, 2024
a85e3f2
fix: merge issues
irony Sep 6, 2024
5b8d3ed
fix: try to figure out why bookings arrive double
irony Sep 6, 2024
1a88b1d
Merge branch 'main' of https://github.com/PredictiveMovement/telge-twin
irony Sep 6, 2024
51f0596
2.6.21
github-actions[bot] Sep 6, 2024
71a3543
ghcr.io/predictivemovement/telge-twin-simulator:2.6.21
fluxcdbot Sep 6, 2024
89c6d95
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.21
fluxcdbot Sep 6, 2024
1e637e3
ghcr.io/predictivemovement/telge-twin-sample:2.6.21
fluxcdbot Sep 6, 2024
ab974bb
chore: rename kommun to municipality
irony Sep 7, 2024
82a588a
Merge pull request #7 from PredictiveMovement/chore/renameToMunicipal…
irony Sep 7, 2024
9b843d9
2.6.22
github-actions[bot] Sep 7, 2024
e9924ed
ghcr.io/predictivemovement/telge-twin-simulator:2.6.22
fluxcdbot Sep 7, 2024
750f912
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.22
fluxcdbot Sep 7, 2024
5bdc72a
ghcr.io/predictivemovement/telge-twin-sample:2.6.22
fluxcdbot Sep 7, 2024
2b5bcfc
feat wip
schweinryder Sep 12, 2024
67b04f8
wip: telge data
schweinryder Sep 12, 2024
aff6126
wip: trucks
schweinryder Sep 13, 2024
8521a98
Fix so vehicles show on map again.
olavG91 Sep 13, 2024
6f127fe
2.6.23
github-actions[bot] Sep 13, 2024
3775ea1
feat: load from file
schweinryder Sep 13, 2024
1024833
ghcr.io/predictivemovement/telge-twin-simulator:2.6.23
fluxcdbot Sep 13, 2024
944a4b5
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.23
fluxcdbot Sep 13, 2024
f72daff
ghcr.io/predictivemovement/telge-twin-sample:2.6.23
fluxcdbot Sep 13, 2024
0b3dcc5
Merge branch 'wip'
schweinryder Sep 13, 2024
a57d9cc
chore: local merge
schweinryder Sep 13, 2024
8dbe8bc
2.6.24
github-actions[bot] Sep 13, 2024
2e40750
ghcr.io/predictivemovement/telge-twin-simulator:2.6.24
fluxcdbot Sep 13, 2024
4c336b0
Updated map to show recycle positions.
olavG91 Sep 13, 2024
1c59b9b
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.24
fluxcdbot Sep 13, 2024
6d9fe6d
ghcr.io/predictivemovement/telge-twin-sample:2.6.24
fluxcdbot Sep 13, 2024
75f45d6
Merge branch 'main' of https://github.com/PredictiveMovement/telge-twin
olavG91 Sep 13, 2024
5d98734
2.6.25
github-actions[bot] Sep 13, 2024
b14d516
ghcr.io/predictivemovement/telge-twin-simulator:2.6.25
fluxcdbot Sep 13, 2024
7b005be
Update recycle center data filtering in Map component
olavG91 Sep 13, 2024
60a2fe6
Merge branch 'main' of https://github.com/PredictiveMovement/telge-twin
olavG91 Sep 13, 2024
d1e9ce3
2.6.26
github-actions[bot] Sep 13, 2024
902da4a
ghcr.io/predictivemovement/telge-twin-sample:2.6.25
fluxcdbot Sep 13, 2024
61610bb
Refactor recycle center data filtering in Map component
olavG91 Sep 13, 2024
ef9fef4
Merge branch 'main' of https://github.com/PredictiveMovement/telge-twin
olavG91 Sep 13, 2024
2f38738
2.6.27
github-actions[bot] Sep 13, 2024
472f68d
ghcr.io/predictivemovement/telge-twin-simulator:2.6.26
fluxcdbot Sep 13, 2024
f0c2495
ghcr.io/predictivemovement/telge-twin-simulator:2.6.27
fluxcdbot Sep 13, 2024
b09019a
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.27
fluxcdbot Sep 13, 2024
cc478e3
ghcr.io/predictivemovement/telge-twin-sample:2.6.27
fluxcdbot Sep 13, 2024
004c29d
Refactor recycle center data filtering in Map component
olavG91 Sep 13, 2024
a05a45a
Merge branch 'main' of https://github.com/PredictiveMovement/telge-twin
olavG91 Sep 13, 2024
862580f
2.6.28
github-actions[bot] Sep 13, 2024
00e36fc
ghcr.io/predictivemovement/telge-twin-simulator:2.6.28
fluxcdbot Sep 13, 2024
3217586
ghcr.io/predictivemovement/telge-twin-sample:2.6.28
fluxcdbot Sep 13, 2024
68ef194
Refactor fleet creation logic and load vehicle data from file
olavG91 Sep 13, 2024
5bb3885
Merge branch 'main' of https://github.com/PredictiveMovement/telge-twin
olavG91 Sep 13, 2024
26e13b3
2.6.29
github-actions[bot] Sep 13, 2024
86d0d60
ghcr.io/predictivemovement/telge-twin-simulator:2.6.29
fluxcdbot Sep 13, 2024
82f7e53
ghcr.io/predictivemovement/telge-twin-sample:2.6.29
fluxcdbot Sep 13, 2024
275fd66
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.29
fluxcdbot Sep 13, 2024
96f1647
Refactor fleet and recycle truck classes
olavG91 Sep 18, 2024
dac9701
feat: Trucks only pickup the correct booking.
olavG91 Sep 19, 2024
1426657
Refactor dispatchCentral.js and recycleTruck.js
olavG91 Sep 19, 2024
7925291
feat: assign bookings based on carID
schweinryder Sep 19, 2024
5aa12a4
Merge branch 'local' into feat/routes
schweinryder Sep 19, 2024
ee3a10b
chore: remove unneccessary warning
schweinryder Sep 19, 2024
e5c517c
fix: vehicles only pickup bookings according to data.
olavG91 Sep 19, 2024
8437589
Merge branch 'feat/routes' of https://github.com/PredictiveMovement/t…
olavG91 Sep 19, 2024
c948b9c
refactor: Remove unnecessary imports and log statements in dispatchCe…
olavG91 Sep 19, 2024
62cd23c
refactor: Update vehicle data file paths
olavG91 Sep 19, 2024
ff2369e
refactor: Remove limit from telge.js
olavG91 Sep 19, 2024
ce11690
feat: better booking id:s
schweinryder Sep 19, 2024
2a55216
feat: recycle trucks property 'recyclingType'
schweinryder Sep 19, 2024
dd782ab
Merge branch 'feat/routes' of https://github.com/PredictiveMovement/t…
schweinryder Sep 19, 2024
27a23bb
refactor: Remove limit from telge.js and update dispatchCentral.js
olavG91 Sep 19, 2024
9ddc5cd
refactor: Remove limit from telge.js and update dispatchCentral.js
swedishdeveloper Sep 19, 2024
ceb70d9
refactor: Update RecycleTruck
olavG91 Sep 20, 2024
bed9cf9
refactor: Remove unused methods and console.log statements in Recycle…
olavG91 Sep 20, 2024
cf0d368
Merge pull request #9 from PredictiveMovement/feat/routes
swedishdeveloper Sep 20, 2024
b6b73eb
2.6.30
github-actions[bot] Sep 20, 2024
f210cdd
ghcr.io/predictivemovement/telge-twin-simulator:2.6.30
fluxcdbot Sep 20, 2024
3a8b0e8
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.30
fluxcdbot Sep 20, 2024
a7d7705
ghcr.io/predictivemovement/telge-twin-sample:2.6.30
fluxcdbot Sep 20, 2024
1e41a43
feat: visualisation fixes
schweinryder Sep 20, 2024
f0bd0cd
fix: visualisation
schweinryder Sep 20, 2024
ca4e827
2.6.31
github-actions[bot] Sep 20, 2024
2e349a7
ghcr.io/predictivemovement/telge-twin-simulator:2.6.31
fluxcdbot Sep 20, 2024
6fb36cb
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.31
fluxcdbot Sep 20, 2024
a338e40
ghcr.io/predictivemovement/telge-twin-sample:2.6.31
fluxcdbot Sep 20, 2024
1e058d1
fix: replace occurrences of "paket" with "tömningar" in HoverInfoBox …
irony Sep 21, 2024
a6ca826
fix: update terms to reflect context of vehicles emptying trash bins
irony Sep 21, 2024
00fd48c
fix: update "Lastat" to "Tömt" in HoverInfoBox component
irony Sep 21, 2024
f185bc2
fix: remove "Anländer kl" line from HoverInfoBox component
irony Sep 21, 2024
7ab6ac8
refactor: extract layer creation into separate functions and update r…
irony Sep 21, 2024
35985a9
fix: remove duplicate word in status message for queued state
irony Sep 21, 2024
1b89bd3
fix: remove latitude and longitude from HoverInfoBox component
irony Sep 21, 2024
102f480
fix: remove "Från" and "Till" fields from HoverInfoBox component
irony Sep 21, 2024
4c7957b
fix: update status labels in Map component for clarity and correctness
irony Sep 21, 2024
152cd58
feat: update fill colors for picked-up and delivered items in the map…
irony Sep 21, 2024
b58f171
fix: restore previous color scheme for booking layer in Map.jsx
irony Sep 21, 2024
aa77729
feat: increase opacity for delivered items in the map visualization
irony Sep 21, 2024
4d53848
fix: set opacity to around 50 for delivered items in the bookingLayer
irony Sep 21, 2024
cd722e2
fix: correct color opacity for 'Picked up' status in Map component
irony Sep 21, 2024
ea013c7
refactor: remove all references to buses and bus lines from the codebase
irony Sep 21, 2024
52292ff
feat: update HoverInfoBox to display picked up and emptied items
irony Sep 21, 2024
3501a95
fix: update unit from "tömningar" to "kärl" in HoverInfoBox component
irony Sep 21, 2024
adf71d3
feat: update info box to remain open on hover over it
irony Sep 21, 2024
6f72d71
feat: update hover information every second regardless of mouse movement
irony Sep 21, 2024
c828c6c
feat: add 2-minute delay for each pickup operation in RecycleTruck class
irony Sep 21, 2024
4276f47
feat: use virtualTime to simulate a 2-minute delay in the pickup meth…
irony Sep 21, 2024
bf56d68
feat: use virtualTime.wait for 2-minute delay in pickup method of Rec…
irony Sep 21, 2024
bf4695a
fix: return promise from wait function in VirtualTime class
irony Sep 21, 2024
a924eff
fix: correct virtualTime import to access wait function properly
irony Sep 21, 2024
552a0db
chore: copy changes and adjust weights for trucks
irony Sep 22, 2024
2412f41
chore: adjust standard units for different types of transport
irony Sep 22, 2024
7277bb7
feat: colors
irony Sep 22, 2024
c23aa30
chore: clean
schweinryder Sep 25, 2024
c83205b
feat: shrink destination radius
schweinryder Sep 25, 2024
dea20b1
chore: rename heading to destination
schweinryder Sep 25, 2024
1da38ec
Merge pull request #10 from PredictiveMovement/feat/infobox
swedishdeveloper Sep 25, 2024
947afd1
2.6.32
github-actions[bot] Sep 25, 2024
c059ebb
ghcr.io/predictivemovement/telge-twin-simulator:2.6.32
fluxcdbot Sep 25, 2024
684fe23
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.32
fluxcdbot Sep 25, 2024
01dcda2
ghcr.io/predictivemovement/telge-twin-sample:2.6.32
fluxcdbot Sep 25, 2024
9fafeec
Merge pull request #11 from PredictiveMovement/feat/smaller-stop-radius
swedishdeveloper Sep 25, 2024
a5b6fd3
2.6.33
github-actions[bot] Sep 25, 2024
ef2d888
ghcr.io/predictivemovement/telge-twin-simulator:2.6.33
fluxcdbot Sep 25, 2024
9cbcbb0
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.33
fluxcdbot Sep 25, 2024
2c8d729
ghcr.io/predictivemovement/telge-twin-sample:2.6.33
fluxcdbot Sep 25, 2024
eabb039
fix: remove Skåne from regions in telge
irony Sep 26, 2024
a4fd317
fix: zoom in on södertälje
irony Sep 26, 2024
ca34a98
fix: do not limit resources for now
irony Sep 26, 2024
a6e475d
Cleanup
olavG91 Sep 26, 2024
2aba522
More cleanup
olavG91 Sep 26, 2024
67a58f4
Added queue system to OSRM
olavG91 Sep 27, 2024
b281154
Queue system for pelias and postal code lookup.
olavG91 Sep 27, 2024
8108695
Keep some of the functionality for bus stops and removed a debug feat…
swedishdeveloper Sep 27, 2024
e31b901
Merge pull request #12 from PredictiveMovement/fix/cleanup
swedishdeveloper Sep 27, 2024
76e458a
2.6.34
github-actions[bot] Sep 27, 2024
918b4a1
ghcr.io/predictivemovement/telge-twin-simulator:2.6.34
fluxcdbot Sep 27, 2024
0e5562c
ghcr.io/predictivemovement/telge-twin-visualisation:2.6.34
fluxcdbot Sep 27, 2024
ad0e412
ghcr.io/predictivemovement/telge-twin-sample:2.6.34
fluxcdbot Sep 27, 2024
e975767
Close all sockets
swedishdeveloper Sep 27, 2024
7a996ed
Adjustments in telge.js
olavG91 Sep 27, 2024
40c5990
fix: 100 limit should be fine
irony Sep 27, 2024
aff5499
fix: use cache to speed up load times
irony Sep 27, 2024
5beaff3
fix: cache and refactor code
irony Sep 28, 2024
a82c154
fix: typo
irony Sep 28, 2024
ba0c507
fix: instructions on cache miss
irony Sep 28, 2024
3ecf8c1
fix: typo
irony Sep 28, 2024
cd3e7ff
Caching function for storing OSRM data.
olavG91 Sep 30, 2024
9eb64ff
Comments removal
olavG91 Sep 30, 2024
09b5350
Added caching to pelias
olavG91 Sep 30, 2024
61c4979
Added clustering
olavG91 Sep 30, 2024
2685f9f
Refactor.
olavG91 Sep 30, 2024
7025d2f
Vehicles only handle correct recyclingType
olavG91 Sep 30, 2024
7caf9cb
Check if vehicle can handle booking.
swedishdeveloper Sep 30, 2024
66d727d
Better bookings
swedishdeveloper Sep 30, 2024
7faf7ad
Vroom planning
swedishdeveloper Oct 1, 2024
ad98163
Show recycling types
swedishdeveloper Oct 1, 2024
3cd45ff
Clustering
olavG91 Oct 1, 2024
7dc9231
feat: unit test
schweinryder Oct 1, 2024
39ca249
Clustering by groups
swedishdeveloper Oct 1, 2024
83b2441
Merge branch 'feat/clustering' of https://github.com/PredictiveMoveme…
schweinryder Oct 2, 2024
576e7cb
chore: possible to forcefully ignore cache
schweinryder Oct 2, 2024
7ea5545
Vroom planning
olavG91 Oct 2, 2024
b3ed1fe
Vehicle uses vroom for routes
olavG91 Oct 2, 2024
4106fef
chore: cleanup
schweinryder Oct 2, 2024
18ca4ed
Merge branch 'feat/clustering' of https://github.com/PredictiveMoveme…
schweinryder Oct 2, 2024
04f96bf
feat: clustering utility and tests
schweinryder Oct 2, 2024
dad2885
feat: clearer center calc test
schweinryder Oct 2, 2024
e848a41
add telge integration test
schweinryder Oct 3, 2024
58ee12d
Vehicle drive after routes
swedishdeveloper Oct 3, 2024
d48afc7
Bookings should be picked up
swedishdeveloper Oct 3, 2024
2e0b916
chore: better test
schweinryder Oct 3, 2024
a19f44f
chore: extended clustering and test
schweinryder Oct 4, 2024
955c662
Clustering bookings
olavG91 Oct 4, 2024
7decc83
Fleets can have vehicles from other fleets.
swedishdeveloper Oct 4, 2024
c124d82
Wait for all fleets to be done before activating vehicles.
swedishdeveloper Oct 4, 2024
a5c7207
Clustering by recycle type
swedishdeveloper Oct 4, 2024
64bedb8
feat: add precheck script to test all objects
irony Oct 5, 2024
0140e1c
chore: generalise recyclePickupPoints to bookings and remove unused code
irony Oct 5, 2024
11520b2
feat: cluster and vroom now working
irony Oct 5, 2024
7471852
feat: use truck instructions
irony Oct 5, 2024
e6ca514
feat: Divide cars into proportional groups based on booking cluster size
irony Oct 5, 2024
728cb56
fix: Prevent TypeError by adding optional chaining for booking proper…
irony Oct 5, 2024
db54deb
chore: remove duplicate code (this is code is called nearest)
irony Oct 6, 2024
7a53575
chore: remove duplicate code, this is already done in telge.js
irony Oct 6, 2024
73e4290
fix: switch to jobs instead of shipment to respect capacity on vehicle
irony Oct 6, 2024
5677bee
fix: clear interval on error
irony Oct 6, 2024
ee2d834
fix: use vroom with clusters in vehicle
irony Oct 6, 2024
d8a4055
feat: continuosly update hover box data
schweinryder Oct 7, 2024
90d59b4
chore: visualisation cleanup and minor fixes
schweinryder Oct 7, 2024
a092abc
This fixes the undefined error in fleet logs, adding dispatchedBookin…
olavG91 Oct 9, 2024
1ac55d3
Merge pull request #13 from PredictiveMovement/chore/precheck
swedishdeveloper Oct 9, 2024
15cd716
2.6.35
github-actions[bot] Oct 9, 2024
7555c6b
Merge branch 'main' of https://github.com/PredictiveMovement/telge-tw…
olavG91 Oct 9, 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
24 changes: 0 additions & 24 deletions .github/dependabot.yml

This file was deleted.

56 changes: 0 additions & 56 deletions .github/not_in_use_flux.yml

This file was deleted.

102 changes: 102 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
name: Continuous Integration

env:
# Use docker.io for Docker Hub if empty
REGISTRY: ghcr.io
# github.repository as <account>/<repo>
IMAGE_NAME: ${{ github.repository }}

on:
push:
branches:
- main
tags:
- production*
- staging*
paths-ignore:
- 'k8s/**'

jobs:
version:
runs-on: ubuntu-latest

steps:
- name: 🛎️ Checkout
uses: actions/checkout@v3

- name: 🎫 Update patch version
run: |
git fetch
git checkout main
git pull origin main
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
if [[ $GITHUB_REF == refs/tags/production* ]]; then
npm version major
elif [[ $GITHUB_REF == refs/tags/staging* ]]; then
npm version minor
else
npm version patch
fi
git fetch --all
git push origin main

ci:
runs-on: ubuntu-latest
needs: version

steps:
- name: 🛎️ Checkout
uses: actions/checkout@v3

- id: imagename
uses: ASzc/change-string-case-action@v2
with:
string: ${{ github.repository }}

- run: |
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
if [[ $GITHUB_REF == refs/tags/production* ]]; then
npm version major
elif [[ $GITHUB_REF == refs/tags/staging* ]]; then
npm version minor
else
npm version patch
fi

- name: 📝 Get Current Version
id: package-version
uses: martinbeentjes/npm-get-version-action@main

- name: 🔐 Login to Docker Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: 🔧 Build and push Simulator
uses: docker/build-push-action@v4
with:
context: ./packages/simulator
push: true
tags: |
${{ env.REGISTRY }}/${{ steps.imagename.outputs.lowercase }}-simulator:${{ steps.package-version.outputs.current-version}}
- name: 🔧 Build and push Visualisation
uses: docker/build-push-action@v4
with:
context: ./packages/visualisation
push: true
build-args: |
VITE_MAPBOX_ACCESS_TOKEN=${{ secrets.VITE_MAPBOX_ACCESS_TOKEN }}
VITE_SIMULATOR_URL=${{ secrets.VITE_SIMULATOR_URL }}
tags: |
${{ env.REGISTRY }}/${{ steps.imagename.outputs.lowercase }}-visualisation:${{ steps.package-version.outputs.current-version}}
- name: 🔧 Build and push SampleAdresses
uses: docker/build-push-action@v4
with:
context: ./packages/sampleAddresses
push: true
tags: |
${{ env.REGISTRY }}/${{ steps.imagename.outputs.lowercase }}-sample:${{ steps.package-version.outputs.current-version}}
47 changes: 0 additions & 47 deletions .github/workflows/main.yaml

This file was deleted.

41 changes: 0 additions & 41 deletions .github/workflows/pr.yaml

This file was deleted.

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ node_modules
.envrc
.vscode/
.cache
k8s/dependencies
.aider.tags.cache.v3
.aider*
.env
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# A Digital Twin for transport systems
# A Digital Twin for Telge Återvinning

## Quick start

Expand Down
45 changes: 11 additions & 34 deletions k8s/base/digital-twin/simulator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
apiVersion: v1
kind: Service
metadata:
Expand All @@ -23,24 +22,24 @@ spec:
labels:
app: simulator
spec:
nodeSelector:
role: worker
containers:
- name: simulator
image: predictivemovement/digital-twin-simulator
resources:
requests:
cpu: "1"
memory: "1Gi"
image: ghcr.io/predictivemovement/telge-twin-simulator:2.6.34 # {"$imagepolicy": "flux-system:simulator"}
# resources:
# requests:
# cpu: "1"
# memory: "1Gi"
ports:
- containerPort: 4000
env:
- name: VROOM_URL
value: http://vroom.vroom.svc.cluster.local:3000
- name: ELASTICSEARCH_URL
value: http://elasticsearch.elasticsearch:9200
value: http://elastic-elasticsearch.elasticsearch.svc.cluster.local:9200
- name: PELIAS_URL
value: http://pelias-api.pelias.svc.cluster.local:3100
- name: STREAMS_URL
value: http://sample-address.pm-streams:4001
value: http://sample-address:4001
volumeMounts:
- mountPath: /app/.cache
name: cache-volume
Expand All @@ -61,32 +60,10 @@ metadata:
spec:
tls:
- hosts:
- tvilling-stage.predictivemovement.se
- helsingborg-stage.predictivemovement.se # Legacy.
- rorla-stage.predictivemovement.se # Legacy.
- tvilling-stage.telge.iteam.pub
secretName: simulator-stage-tls
rules:
- host: tvilling-stage.predictivemovement.se
http:
paths:
- path: /socket.io
pathType: Prefix
backend:
service:
name: simulator
port:
number: 4000
- host: helsingborg-stage.predictivemovement.se
http:
paths:
- path: /socket.io
pathType: Prefix
backend:
service:
name: simulator
port:
number: 4000
- host: rorla-stage.predictivemovement.se
- host: tvilling-stage.telge.iteam.pub
http:
paths:
- path: /socket.io
Expand Down
Loading