Skip to content

Commit 73f7bbc

Browse files
schnuerleschnuerle
committed
Fixed event types
1 parent 7302c3b commit 73f7bbc

5 files changed

Lines changed: 29 additions & 44 deletions

File tree

‎modes/car-share.md‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ _See more available trip and fare attributes for any mode used in the [trips obj
4343
The `journey_id` field shall have a consistent value in overlapping trips for a single reservation period, e.g. trips taken by a customer between ignition states over the duration of their reservation. A reservation is the duration the customer has continuous exclusive access to the vehicle whether parked or in motion. Journeys may be point-to-point or multi-segment.
4444

4545
- **Example 1**: customer makes a reservation and company delivers vehicle to customer, then one trip point-to-point by customer, ending reservation at destination
46-
- **Example 2**: Customer reservation for multiple days with trips for errands, gas, entertainment, etc
46+
- **Example 2**: customer reservation for multiple days with trips for errands, gas, entertainment, etc
4747
- **Example 3**: one trip point-to-point with an employee moving the vehicle to a new location for maintenance
4848

4949
![Journey Diagram](https://i.imgur.com/FHxQLps.png)
@@ -178,29 +178,25 @@ Valid car share vehicle event types are
178178
- `comms_lost`
179179
- `comms_restored`
180180
- `driver_cancellation`
181-
- `decommission`
182181
- `fueling_start`
183182
- `fueling_end`
184183
- `maintenance`
185184
- `maintenance_pick_up`
186185
- `maintenance_end`
187186
- `passenger_cancellation`
188187
- `provider_cancellation`
189-
- `recommission`
190188
- `remote_start`
191189
- `remote_end`
192-
- `reservation_cancel`
190+
- `reservation_stop`
193191
- `reservation_start`
194192
- `service_end`
195193
- `service_start`
196-
- `trip_cancel`
197194
- `trip_end`
198195
- `trip_enter_jurisdiction`
199196
- `trip_leave_jurisdiction`
200197
- `trip_resume`
201198
- `trip_start`
202199
- `trip_stop`
203-
- `unspecified`
204200

205201
See vehicle [Event Types][vehicle-events] for descriptions.
206202

@@ -215,7 +211,7 @@ This is the list of `vehicle_state` and `event_type` pairings that constitute th
215211
| `available` | `elsewhere` | N/A | `trip_leave_jurisdiction` | The vehicle has left jurisdictional boundaries while available for-hire |
216212
| `available` | `non_contactable` | N/A | `comms_lost` | The vehicle has went out of comms while available for-use |
217213
| `available` | `non_operational` | N/A | `service_end` | The vehicle has went out of service (is unavailable for-hire) |
218-
| `available` | `reserved` | `reserved` | `reserve` | The vehicle was reserved by a passenger |
214+
| `available` | `reserved` | `reserved` | `reservation_start` | The vehicle was reserved by a passenger |
219215
| `elsewhere` | `available` | N/A | `trip_enter_jurisdiction` | The vehicle has entered jurisdictional boundaries while available for-hire |
220216
| `elsewhere` | `non_contactable` | N/A | `comms_lost` | The vehicle has went out of comms while outside of jurisdictional boundaries |
221217
| `elsewhere` | `non_operational` | N/A | `trip_enter_jurisdiction` | The vehicle has entered jurisdictional boundaries while not operating commercially |
@@ -245,7 +241,7 @@ This is the list of `vehicle_state` and `event_type` pairings that constitute th
245241
| `reserved` | `available` | N/A | `provider_cancellation` | The provider has canceled the reservation |
246242
| `reserved` | `elsewhere` | N/A | `trip_leave_jurisdiction` | The vehicle has left the jurisdiction while in a reservation |
247243
| `reserved` | `non_contactable` | N/A | `comms_lost` | The vehicle went out of comms while being reserved by a passenger |
248-
| `reserved` | `stopped` | `stopped` | `reserve_stop` | The vehicle has stopped to pick up the passenger |
244+
| `reserved` | `stopped` | `stopped` | `reservation_stop` | The vehicle has stopped to pick up the passenger |
249245
| `stopped` | `available` | N/A | `driver_cancellation` | The driver has canceled the trip while either waiting for the passenger, or dropping them off |
250246
| `stopped` | `available` | N/A | `passenger_cancellation` | The passenger has canceled the trip while the vehicle is waiting to pick them up, or they are being dropped off |
251247
| `stopped` | `available` | N/A | `provider_cancellation` | The provider has canceled the trip while the vehicle is waiting for a passenger, or dropping them off |

‎modes/delivery-robots.md‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,6 @@ See [Vehicle States][vehicle-states] for descriptions.
164164

165165
Valid delivery vehicle event types are
166166

167-
- `agency_drop_off`
168-
- `agency_pick_up`
169-
- `battery_charged`
170-
- `battery_low`
171167
- `comms_lost`
172168
- `comms_restored`
173169
- `compliance_pick_up`
@@ -177,28 +173,22 @@ Valid delivery vehicle event types are
177173
- `maintenance`
178174
- `maintenance_pick_up`
179175
- `maintenance_end`
180-
- `missing`
181-
- `off_hours`
182-
- `on_hours`
183176
- `driver_cancellation`
184177
- `order_drop_off`
185178
- `order_pick_up`
186-
- `decommission`
187179
- `customer_cancellation`
188180
- `provider_cancellation`
189181
- `recommission`
190-
- `reservation_cancel`
191182
- `reservation_start`
183+
- `reservation_stop`
192184
- `service_end`
193185
- `service_start`
194-
- `trip_cancel`
195186
- `trip_end`
196187
- `trip_enter_jurisdiction`
197188
- `trip_leave_jurisdiction`
198189
- `trip_resume`
199190
- `trip_start`
200191
- `trip_pause`
201-
- `unspecified`
202192

203193
See vehicle [Event Types][vehicle-events] for descriptions.
204194

@@ -210,15 +200,15 @@ This is the list of `vehicle_state` and `event_type` pairings that constitute th
210200

211201
| **From** `vehicle_state` | **To** `vehicle_state` | `trip_state` | `event_type` | Description |
212202
| ------------------------ | ---------------------- | ------------ | ----------------------- | --------------------------------------------------------------------------------------------- |
213-
| `available` | `elsewhere` | N/A | `trip_leave_jurisdiction` | The vehicle has left jurisdictional boundaries while available for-hire |
203+
| `available` | `elsewhere` | N/A | `trip_leave_jurisdiction` | The vehicle has left jurisdictional boundaries while available for-hire |
214204
| `available` | `non_contactable` | N/A | `comms_lost` | The vehicle has gone out of comms while available for-use |
215205
| `available` | `non_operational` | N/A | `service_end` | The vehicle has gone out of service (is unavailable for-hire) |
216-
| `available` | `reserved` | `reserved` | `reserve` | The vehicle was reserved by a customer |
217-
| `elsewhere` | `available` | N/A | `trip_enter_jurisdiction` | The vehicle has entered jurisdictional boundaries while available for-hire |
206+
| `available` | `reserved` | `reserved` | `reservation_start` | The vehicle was reserved by a customer |
207+
| `elsewhere` | `available` | N/A | `trip_enter_jurisdiction` | The vehicle has entered jurisdictional boundaries while available for-hire |
218208
| `elsewhere` | `non_contactable` | N/A | `comms_lost` | The vehicle has gone out of comms while outside of jurisdictional boundaries |
219-
| `elsewhere` | `non_operational` | N/A | `trip_enter_jurisdiction` | The vehicle has entered jurisdictional boundaries while not operating commercially |
220-
| `elsewhere` | `on_trip` | `on_trip` | `trip_enter_jurisdiction` | The vehicle has entered jurisdictional boundaries while on a trip |
221-
| `elsewhere` | `reserved` | N/A | `trip_enter_jurisdiction` | The vehicle has entered jurisdictional boundaries while reserved by a customer |
209+
| `elsewhere` | `non_operational` | N/A | `trip_enter_jurisdiction` | The vehicle has entered jurisdictional boundaries while not operating commercially |
210+
| `elsewhere` | `on_trip` | `on_trip` | `trip_enter_jurisdiction` | The vehicle has entered jurisdictional boundaries while on a trip |
211+
| `elsewhere` | `reserved` | N/A | `trip_enter_jurisdiction` | The vehicle has entered jurisdictional boundaries while reserved by a customer |
222212
| `missing` | `available` | N/A | `located` | The vehicle has been located while available for-hire |
223213
| `missing` | `elsewhere` | N/A | `located` | The vehicle has been located while outside of jurisdictional boundaries |
224214
| `missing` | `non_operational` | N/A | `located` | The vehicle has been located while not operating commercially |
@@ -235,13 +225,13 @@ This is the list of `vehicle_state` and `event_type` pairings that constitute th
235225
| `non_contactable` | `reserved` | `reserved` | `comms_restored` | The vehicle has come back into comms while reserved by a customer |
236226
| `non_contactable` | `stopped` | `stopped` | `comms_restored` | The vehicle has come back into comms while stopped |
237227
| `non_operational` | `available` | N/A | `service_start` | The vehicle has gone into service (is available for-hire) |
238-
| `non_operational` | `elsewhere` | N/A | `trip_leave_jurisdiction` | The vehicle has left jurisdictional boundaries while not operating commercially |
228+
| `non_operational` | `elsewhere` | N/A | `trip_leave_jurisdiction` | The vehicle has left jurisdictional boundaries while not operating commercially |
239229
| `non_operational` | `non_contactable` | N/A | `comms_lost` | The vehicle has gone out of comms while not operating commercially |
240-
| `non_operational` | `non_operational` | N/A | `maintenance` | The vehicle has maintenance performed on site |
241-
| `non_operational` | `non_operational` | N/A | `maintenance_end` | Maintenance is complete |
242-
| `non_operational` | `removed` | N/A | `maintenance_pick_up` | The vehicle has entered the depot for maintenance |
230+
| `non_operational` | `non_operational` | N/A | `maintenance` | The vehicle has maintenance performed on site |
231+
| `non_operational` | `non_operational` | N/A | `maintenance_end` | Maintenance is complete |
232+
| `non_operational` | `removed` | N/A | `maintenance_pick_up` | The vehicle has entered the depot for maintenance |
243233
| `non_operational` | `removed` | N/A | `decommissioned` | The vehicle has been removed from the Provider's fleet |
244-
| `on_trip` | `elsewhere` | N/A | `trip_leave_jurisdiction` | The vehicle has left jurisdictional boundaries while on a trip |
234+
| `on_trip` | `elsewhere` | N/A | `trip_leave_jurisdiction` | The vehicle has left jurisdictional boundaries while on a trip |
245235
| `on_trip` | `non_contactable` | N/A | `comms_lost` | The vehicle has gone out of comms while on a trip to pick up the order |
246236
| `on_trip` | `stopped` | N/A | `order_drop_off` | The vehicle is at the customer's place and is waiting for them |
247237
| `on_trip` | `stopped` | `stopped` | `order_pick_up` | The vehicle has come to pick up the order at the restaurant |
@@ -252,9 +242,9 @@ This is the list of `vehicle_state` and `event_type` pairings that constitute th
252242
| `reserved` | `available` | N/A | `customer_cancellation` | The customer has canceled the reservation |
253243
| `reserved` | `available` | N/A | `driver_cancellation` | The driver has canceled the reservation |
254244
| `reserved` | `available` | N/A | `provider_cancellation` | The provider has canceled the reservation |
255-
| `reserved` | `elsewhere` | N/A | `trip_leave_jurisdiction` | The vehicle has left the jurisdiction while in a reservation |
245+
| `reserved` | `elsewhere` | N/A | `trip_leave_jurisdiction` | The vehicle has left the jurisdiction while in a reservation |
256246
| `reserved` | `non_contactable` | N/A | `comms_lost` | The vehicle has gone of comms while being reserved by a customer |
257-
| `reserved` | `stopped` | `stopped` | `reserve_stop` | The vehicle has stopped to pickup reservation |
247+
| `reserved` | `stopped` | `stopped` | `reservation_stop` | The vehicle has stopped to pickup reservation |
258248
| `stopped` | `available` | N/A | `customer_cancellation` | The customer has canceled the trip while the vehicle is waiting |
259249
| `stopped` | `available` | N/A | `driver_cancellation` | The driver has canceled the trip while waiting |
260250
| `stopped` | `available` | N/A | `provider_cancellation` | The provider has canceled the trip while the vehicle is waiting |

‎modes/event_types.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,34 @@ As with all MDS definitions, they should be described in a way that maximizes th
1010
| `agency_pick_up` | Pick up by the agency, e.g. impound |
1111
| `battery_charged` | Battery charged (entering service) |
1212
| `battery_low` | Battery low (exiting service) |
13+
| `changed_geographies` | Geography change per [Geography Driven Events](/general-information.md#geography-driven-events) |
1314
| `charging_start` | Battery start charging |
1415
| `charging_end` | Battery end charging |
1516
| `comms_lost` | Communications lost |
1617
| `comms_restored` | Communications restored |
1718
| `compliance_pick_up` | Pick up for compliance (rule violation) |
18-
| `order_drop_off` | Pick up of the order at the restaurant or shop or warehouse |
19-
| `order_pick_up` | Delivery of the order at the customer's location |
19+
| `customer_cancellation` | Customer cancelled a trip |
2020
| `decommissioned` | Decommissioned |
2121
| `driver_cancellation` | Driver cancelled a trip |
2222
| `fueling_start` | Fueling starts |
2323
| `fueling_end` | Fueling ends |
24-
| `not_located` | Location unknown |
2524
| `located` | Location found (opposite of Missing) |
2625
| `maintenance` | Start general maintenance in right of way |
2726
| `maintenance_pick_up` | Start pick up for maintenance outside of right of way |
2827
| `maintenance_end` | End of maintenance |
28+
| `not_located` | Location unknown |
2929
| `off_hours` | Off hours - end of service |
3030
| `on_hours` | On hours - start of service |
31-
| `customer_cancellation` | Customer cancelled a trip |
31+
| `order_drop_off` | Pick up of the order at business |
32+
| `order_pick_up` | Delivery of the order at the customer location |
3233
| `provider_cancellation` | Provider cancelled a trip |
3334
| `provider_drop_off` | Drop off by the provider |
3435
| `rebalance_pick_up` | Pick up for rebalancing |
3536
| `remote_start` | Remotely start the engine |
3637
| `remote_end` | Remotely stop the engine |
37-
| `reservation_cancel` | Reservation cancelled |
38+
| `reservation_cancel` | Reservation cancelled before trip |
3839
| `reservation_start` | Reservation started |
40+
| `reservation_stop` | Reservation stopped temporarily |
3941
| `system_resume` | Resume system operations, e.g. start of day |
4042
| `system_suspend` | Suspend system operations, e.g. end of day |
4143
| `trip_cancel` | Cancel trip |

‎modes/micromobility.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ Valid micromobility vehicle event types are
129129
- `agency_pick_up`
130130
- `battery_charged`
131131
- `battery_low`
132+
- `changed_geographies`
132133
- `comms_lost`
133134
- `comms_restored`
134135
- `compliance_pick_up`

0 commit comments

Comments
 (0)