Feat/snackbar (#262)

* chore: correct path for mount (#128) * feat: add skåne gtfs feed * feat: add snackbar * Delete agency.txt * fix: autohide snackbar + less info msgs * chore: 3s timeout before closing * chore: remove skane data * feat: black bar instead * Feat/no line shapes (#266) * chore: correct path for mount (#128) * feat: add skåne gtfs feed * feat: remove lineshapes and calculate them from trips * fix: remove skane, it's in cache * fix: remove subscriptions before starting new experiment * feat: move functionality to new menu (#263) * chore: do not bust cache on .gitignore * refactor: cleanup * feat: add layer toggles to new menu * refactor: cleanup * feat: edit experiment modal * chore: remove unused code * refactor: moved reset button to new component * fix: styling * refactor: move modal to new component * refactor: naming * fix: styling * refactor: cleaning up * fix: modal styling * feat: add logo * feat: show modal with kibana link * fix: naming * feat: show experiment id --------- Co-authored-by: Alexander Czigler <[email protected]>
PredictiveMovement · Apr 26, 2023 · 27eabab · 27eabab
1 parent ea65299
commit 27eabab
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 15 deletions.
diff --git a/packages/simulator/index.js b/packages/simulator/index.js
@@ -8,11 +8,10 @@ const {
 } = require('rxjs/operators')
 
 const { virtualTime } = require('./lib/virtualTime')
-
 const { safeId } = require('./lib/id')
 const { read } = require('./config')
 const statistics = require('./lib/statistics')
-const { info, error } = require('./lib/log')
+const { info, error, logStream } = require('./lib/log')
 const { haversine, getNrOfPointsBetween } = require('./lib/distance')
 
 const engine = {
@@ -40,6 +39,7 @@ const engine = {
     statistics.collectExperimentMetadata(parameters)
 
     const experiment = {
+      logStream,
       busStops: regions.pipe(
         filter((region) => region.stops),
         mergeMap((region) => region.stops),

diff --git a/packages/simulator/lib/dispatch/busDispatch.js b/packages/simulator/lib/dispatch/busDispatch.js
@@ -70,7 +70,7 @@ const busDispatch = async (buses, trips) => {
 
   const kommunName = trips[0].kommun
   info(
-    `Calling vroom for ${kommunName} with ${vehicles.length} buses and ${shipments.length} trips`
+    `Finding optimal route in ${kommunName} for ${vehicles.length} buses and ${shipments.length} trips`
   )
 
   const result = await plan({

diff --git a/packages/simulator/lib/dispatch/dispatchCentral.js b/packages/simulator/lib/dispatch/dispatchCentral.js
@@ -9,7 +9,7 @@ const {
   retryWhen,
   toArray,
 } = require('rxjs/operators')
-const { info, error, warn } = require('../log')
+const { info, error, warn, debug } = require('../log')
 const { clusterPositions } = require('../kmeans')
 
 const dispatch = (cars, bookings) => {
@@ -52,7 +52,7 @@ const dispatch = (cars, bookings) => {
         mergeAll(),
         filter(({ bookings }) => bookings.length > 0),
         tap(({ car, bookings }) =>
-          info(
+          debug(
             `Plan ${car.id} (${car.fleet.name}) received ${bookings.length} bookings`
           )
         ),

diff --git a/packages/simulator/lib/dispatch/taxiDispatch.js b/packages/simulator/lib/dispatch/taxiDispatch.js
@@ -1,12 +1,14 @@
 const { plan, taxiToVehicle, bookingToShipment } = require('../vroom')
 const moment = require('moment')
-const { error, debug, write } = require('../log')
+const { error, debug, write, info } = require('../log')
 const { virtualTime } = require('../virtualTime')
 
 const taxiDispatch = async (taxis, bookings) => {
   const vehicles = taxis.map(taxiToVehicle)
   const shipments = bookings.map(bookingToShipment) // TODO: concat bookings from existing vehicles with previous assignments
-  debug('Calling vroom for taxi', vehicles.length, shipments.length)
+  info(
+    `Finding optimal route for ${vehicles.length} taxis and ${shipments.length} pickups`
+  )
   write('🚕')
   const result = await plan({ shipments, vehicles })
   const virtualNow = await virtualTime.getTimeInMillisecondsAsPromise()

diff --git a/packages/simulator/lib/log.js b/packages/simulator/lib/log.js
@@ -1,4 +1,5 @@
 const chalk = require('chalk')
+const { ReplaySubject } = require('rxjs')
 
 // eslint-disable-next-line no-undef
 const LOG_LEVEL = process.env.LOG_LEVEL || 'info'
@@ -9,6 +10,8 @@ const logLevelIsAtLeastInfo =
 const logLevelIsAtLeastWarn =
   LOG_LEVEL.toUpperCase() === 'WARN' || logLevelIsAtLeastInfo
 
+const logStream = new ReplaySubject(10)
+
 const print = (logFn, titleFn, messageFn, title, message, data, ...rest) => {
   if (data) {
     logFn(
@@ -23,6 +26,7 @@ const print = (logFn, titleFn, messageFn, title, message, data, ...rest) => {
 }
 
 module.exports = {
+  logStream,
   debug: (message, data, ...rest) => {
     if (logLevelIsAtLeastDebug) {
       print(
@@ -48,6 +52,10 @@ module.exports = {
     )
   },
   info: (message, data, ...rest) => {
+    logStream.next(
+      message + ' ' + [data, ...rest].map((x) => JSON.stringify(x)).join(' ')
+    )
+
     if (logLevelIsAtLeastInfo) {
       print(
         console.log,

diff --git a/packages/simulator/lib/queueSubject.js b/packages/simulator/lib/queueSubject.js
@@ -1,7 +1,7 @@
 const { Subject, mergeMap, catchError, from } = require('rxjs')
 const { debug, error } = require('./log')
 
-const API_CALL_LIMIT = 5
+const API_CALL_LIMIT = 3
 
 const queueSubject = new Subject()
 

diff --git a/packages/simulator/lib/region.js b/packages/simulator/lib/region.js
@@ -176,7 +176,6 @@ class Region {
       this.taxis.pipe(
         scan((acc, taxi) => acc.push(taxi) && acc, []),
         debounceTime(1000),
-        tap((cars) => info('region taxis', cars.length)),
         filter((taxis) => taxis.length > 0),
         mergeMap((taxis) =>
           merge(this.manualBookings, this.unhandledBookings).pipe(

diff --git a/packages/simulator/lib/vehicles/truck.js b/packages/simulator/lib/vehicles/truck.js
@@ -1,5 +1,5 @@
 const { findBestRouteToPickupBookings } = require('../dispatch/truckDispatch')
-const { info, warn } = require('../log')
+const { info, warn, debug } = require('../log')
 const Vehicle = require('./vehicle')
 
 class Truck extends Vehicle {
@@ -53,7 +53,7 @@ class Truck extends Vehicle {
     if (this.cargo.indexOf(this.booking) > -1)
       return warn('Already picked up', this.id, this.booking.id)
 
-    info('Pickup cargo', this.id, this.booking.id)
+    debug('Pickup cargo', this.id, this.booking.id)
     // this.cargo = [...this.cargo, this.booking?.passenger]
     this.cargo.push(this.booking)
     this.cargoEvents.next(this)

diff --git a/packages/simulator/lib/vroom.js b/packages/simulator/lib/vroom.js
@@ -67,7 +67,7 @@ module.exports = {
   async plan({ jobs, shipments, vehicles }) {
     const result = await getFromCache({ jobs, shipments, vehicles })
     if (result) {
-      info('Vroom cache hit')
+      debug('Vroom cache hit')
       return result
     }
     debug('Vroom cache miss')

diff --git a/packages/simulator/simulator/citizens.js b/packages/simulator/simulator/citizens.js
@@ -9,7 +9,7 @@ const getCitizensInSquare = (
   workplaces,
   kommunName
 ) => {
-  const nrOfCitizens = Math.floor(population * 0.01) // sample x% of the population
+  const nrOfCitizens = Math.floor(population * 0.001) // sample x% of the population
   if (nrOfCitizens === 0) return from([])
   const addresses = from(getAddressesInArea(position, area, nrOfCitizens)).pipe(
     mergeAll()

diff --git a/packages/simulator/streams/gtfs.js b/packages/simulator/streams/gtfs.js
@@ -3,7 +3,7 @@ const key = process.env.TRAFIKLAB_KEY || 'aea471ef5dde447b87bc7bf4b971aaee'
 
 const fs = require('fs')
 const path = require('path')
-const { info, error } = require('../lib/log')
+const { info, error, debug } = require('../lib/log')
 
 const AdmZip = require('adm-zip')
 const fetch = require('node-fetch')
@@ -151,7 +151,7 @@ function gtfs(operator) {
         case 'TEB planerad':
         case 'VEN trafiken':
         case 'Öresundståg':
-          info(
+          debug(
             `Excluding route ${route.lineNumber} (${route.id}). Reason: ${route.description}`
           )
           return true

diff --git a/packages/simulator/web/routes.js b/packages/simulator/web/routes.js
@@ -24,6 +24,7 @@ function subscribe(experiment, socket) {
     defaultEmitters.includes('postombud') &&
       require('./routes/postombud').register(experiment, socket),
     require('./routes/time').register(experiment, socket),
+    require('./routes/log').register(experiment, socket),
   ]
     .filter((f) => f)
     .flat()

diff --git a/packages/simulator/web/routes/log.js b/packages/simulator/web/routes/log.js
@@ -0,0 +1,7 @@
+const register = (experiment, socket) => {
+  return [experiment.logStream.subscribe((item) => socket.emit('log', item))]
+}
+
+module.exports = {
+  register,
+}
diff --git a/packages/visualisation/src/App.jsx b/packages/visualisation/src/App.jsx
@@ -9,7 +9,13 @@ import ResetExperiment from './components/ResetExperiment'
 import EditExperimentModal from './components/EditExperimentModal'
 import Logo from './components/Logo'
 import ExperimentDoneModal from './components/ExperimentDoneModal/index.jsx'
+import { Snackbar, SnackbarContent } from '@mui/material'
 
+import Slide from '@mui/material/Slide';
+
+function TransitionUp(props) {
+  return <Slide {...props} direction="up" />
+}
 const App = () => {
   const [activeCar, setActiveCar] = useState(null)
   const [reset, setReset] = useState(false)
@@ -28,6 +34,8 @@ const App = () => {
   const [experimentParameters, setExperimentParameters] = useState({})
   const [currentParameters, setCurrentParameters] = useState({})
   const [fleets, setFleets] = useState({})
+  const [latestLogMessage, setLatestLogMessage] = useState('')
+  const [snackbarOpen, setSnackbarOpen] = useState(false)
   const [showEditExperimentModal, setShowEditExperimentModal] = useState(false)
   const [showExperimentDoneModal, setShowExperimentDoneModal] = useState(false)
   const [previousExperimentId, setPreviousExperimentId] = useState(null)
@@ -74,6 +82,7 @@ const App = () => {
     setMeasureStations([])
     setBusStops([])
     setLineShapes([])
+    setLatestLogMessage('')
     socket.emit('speed', speed) // reset speed on server
   })
 
@@ -114,6 +123,11 @@ const App = () => {
     setTime(time)
   })
 
+  useSocket('log', (message) => {
+    setLatestLogMessage(message)
+    setSnackbarOpen(true)
+  })
+
   const [bookings, setBookings] = React.useState([])
   useSocket('bookings', (newBookings) => {
     setReset(false)
@@ -333,6 +347,21 @@ const App = () => {
         setShowEditExperimentModal={setShowEditExperimentModal}
         experimentId={currentParameters.id}
       />
+
+      <Snackbar
+        sx={{ opacity: 0.8, bottom: 20  }}
+        anchorOrigin={{
+          vertical: 'bottom',
+          horizontal: 'center',
+        }}
+        variant="filled"
+        open={snackbarOpen}
+        autoHideDuration={3000}
+        TransitionComponent={TransitionUp}
+        onClose={() => setSnackbarOpen(false)}
+      >
+        <SnackbarContent sx={{ backgroundColor: 'black', height: 20, margin: 3, color: 'white' }} message={latestLogMessage} />
+      </Snackbar>
     </>
   )
 }