Feat/to pickup (#256)

* feat: toPickup status

* fix: remove simulated loadingtime, it seems to create weird behavior

Author: irony

packages/simulator/lib/dispatch/dispatchCentral.js

@@ -65,6 +65,7 @@ const dispatch = (cars, bookings) => {
     filter((cars) => cars.length > 0),
     mergeMap((cars) =>
       bookings.pipe(
+        filter((booking) => !booking.car),
         bufferTime(5000),
         filter((b) => b.length > 0),
         //mergeMap((bookings) => getVroomPlan(cars, bookings)),

packages/simulator/lib/vehicles/bus.js

@@ -43,7 +43,7 @@ class Bus extends Vehicle {
     if (!this.booking) {
       this.booking = booking
       booking.assign(this)
-      this.status = 'pickup'
+      this.status = 'toPickup'
       await this.navigateTo(booking.destination.position)
       this.movedEvents.next(this)
     } else {

packages/simulator/lib/vehicles/taxi.js

@@ -43,8 +43,10 @@ class Taxi extends Vehicle {
     switch (this.status) {
       case 'pickup':
         await virtualTime.waitUntil(this.instruction.arrival)
+        this.status = 'toPickup'
         return this.navigateTo(this.booking.pickup.position)
       case 'delivery':
+        this.status = 'toDelivery'
         await virtualTime.waitUntil(this.instruction.arrival)
         return this.navigateTo(this.booking.destination.position)
       case 'returning':

packages/simulator/lib/vehicles/truck.js

@@ -25,8 +25,10 @@ class Truck extends Vehicle {
       case 'start':
         return this.navigateTo(this.startPosition)
       case 'pickup':
+        this.status = 'toPickup'
         return this.navigateTo(this.booking.pickup.position)
       case 'delivery':
+        this.status = 'toDelivery'
         return this.navigateTo(this.booking.destination.position)
       case 'ready':
       case 'returning':
@@ -46,7 +48,11 @@ class Truck extends Vehicle {
 
   async pickup() {
     // Wait 1 minute to simulate loading/unloading
-    await virtualTime.wait(60_000)
+    // this.simulate(false) // pause interpolation while we wait
+    // await virtualTime.wait(60_000)
+    if (!this.booking) return info('ERR: No booking to pickup', this.id)
+    if (this.cargo.indexOf(this.booking) > -1)
+      return info('ERR: Already picked up', this.id, this.booking.id)
 
     info('Pickup cargo', this.id, this.booking.id)
     // this.cargo = [...this.cargo, this.booking?.passenger]
@@ -63,6 +69,7 @@ class Truck extends Vehicle {
   }
 
   async handleBooking(booking) {
+    if (this.queue.indexOf(booking) > -1) throw new Error('Already queued')
     this.queue.push(booking)
     booking.assign(this)
     booking.queued(this)

packages/simulator/lib/vehicles/vehicle.js

@@ -1,5 +1,5 @@
 const { ReplaySubject } = require('rxjs')
-const { scan } = require('rxjs/operators')
+const { scan, filter } = require('rxjs/operators')
 const moment = require('moment')
 const { assert } = require('console')
 
@@ -8,7 +8,7 @@ const { haversine, bearing } = require('../distance')
 const interpolate = require('../interpolate')
 const Booking = require('../models/booking')
 const { safeId } = require('../id')
-const { error } = require('../log')
+const { error, info } = require('../log')
 const { virtualTime } = require('../virtualTime')
 const Position = require('../models/position')
 
@@ -142,7 +142,7 @@ class Vehicle {
     if (!this.booking) {
       this.booking = booking
       booking.assign(this)
-      this.status = 'pickup'
+      this.status = 'toPickup'
       this.statusEvents.next(this)
 
       this.navigateTo(booking.pickup.position)
@@ -191,7 +191,7 @@ class Vehicle {
         })
       if (this.booking && this.booking.destination) {
         this.booking.pickedUp(this.position)
-        this.status = 'delivery'
+        this.status = 'toDelivery'
         this.statusEvents.next(this)
 
         // should we first pickup more bookings before going to the destination?
@@ -300,13 +300,16 @@ class Vehicle {
     }
   }
 
+  // start -> toPickup -> pickup -> toDelivery -> delivery -> start
+
   stopped() {
+    info(`Vehicle ${this.id} stopped. Status: ${this.status}`)
     this.speed = 0
     this.statusEvents.next(this)
     if (this.booking) {
       this.simulate(false)
-      if (this.status === 'pickup') return this.pickup()
-      if (this.status === 'delivery') return this.dropOff()
+      if (this.status === 'toPickup') return this.pickup()
+      if (this.status === 'toDelivery') return this.dropOff()
     }
   }