move _percent fields into telemetry. correct some copy-paste errors.

Author: marie-x

agency/README.md

@@ -83,7 +83,7 @@ _No content returned on vehicle not found._
 
 ## Vehicle - Register
 
-The `/vehicles` registration endpoint is used to register a vehicle for use in the Agency jurisdiction.
+The `/vehicles` registration endpoint is used to register a vehicle for use in the Agency's jurisdiction.
 
 Endpoint: `/vehicles`
 Method: `POST`
@@ -170,7 +170,7 @@ Body Params:
 | ---------- | ------------------------------ | ------------------------------------------------------------------------------------------------------- |
 | `success`  | Integer                        | Number of successfully written events.                                                   |
 | `total`    | Integer                        | Total number of provided events.                                                                       |
-| `failures` | [Event](#vehicle-event-data)[] | Array of invalid events (empty if all successful).                          |
+| `failures` | [EventData](#vehicle-event-data)[] | Array of invalid events (empty if all successful).                          |
 
 (?) Should we have a description/error-code for each failure in the `failures`?
 
@@ -294,22 +294,22 @@ The Trips endpoint serves two purposes:
 
 **Endpoint:** `/trips`  
 **Method:** `POST`  
-**[Beta feature][beta]:** Yes (as of 2.0.0)  
+**[Beta feature][beta]:** No (as of 2.0.0)  
 **Payload:** `{ "trips": [] }`, an array of [Trips](#trip-data)
 
 Body Params:
 
 | Field         | Type                           | Required/Optional | Field Description                                                                      |
 | ------------- | ------------------------------ | ----------------- | -------------------------------------------------------------------------------------- |
-| `trips`        | [Trip](#trip-data)[] | Required          | Array of trips for one or more vehicles.                                           |
+| `trips`        | [Trip](#trip-data)[] | Required          | Array of trip records
 
 200 Success Response:
 
 | Field      | Type                           | Field Description                                                                                       |
 | ---------- | ------------------------------ | ------------------------------------------------------------------------------------------------------- |
-| `success`  | Integer                        | Number of successfully written telemetry data points.                                                   |
-| `total`    | Integer                        | Total number of provided points.                                                                       |
-| `failures` | [Telemetry](#telemetry-data)[] | Array of failed telemetry for zero or more vehicles (empty if all successful).                          |
+| `success`  | Integer                        | Number of successfully written trip records points                                                |
+| `total`    | Integer                        | Total number of provided points                                                                       |
+| `failures` | [Trip](#trip-data)[] | Array of failed trip records (empty if all successful)                          |
 
 
 400 Failure Response:

general-information.md

@@ -81,6 +81,7 @@ References to geographic datatypes (Point, MultiPolygon, etc.) imply coordinates
 
 Whenever a vehicle location coordinate measurement is presented, it must be represented as a GeoJSON [`Feature`][geojson-feature] object with a corresponding `properties` object with the following properties:
 
+(?) Reconcile with Telemetry description, below
 
 | Field          | Type            | Required/Optional     | Field Description                                            |
 | -------------- | --------------- | --------------------- | ------------------------------------------------------------ |
@@ -337,11 +338,14 @@ Because of the unreliability of device clocks, the Provider is unlikely to know
 
 A standard point of vehicle telemetry. References to latitude and longitude imply coordinates encoded in the [WGS 84 (EPSG:4326)](https://en.wikipedia.org/wiki/World_Geodetic_System) standard GPS or GNSS projection expressed as [Decimal Degrees](https://en.wikipedia.org/wiki/Decimal_degrees).
 
+(?) Add `journey_id`?
+
 | Field          | Type           | Required/Optional     | Field Description                                            |
 | -------------- | -------------- | --------------------- | ------------------------------------------------------------ |
 | `device_id`    | UUID           | Required              | ID used in [Register](#vehicle---register)                     |
 | `timestamp`    | [timestamp][ts]| Required              | Date/time that event occurred. Based on GPS or GNSS clock            |
 | `trip_id`      | UUID           | Required              | If telemetry occurred during a trip, the ID of the trip.  If not in a trip, `null`.
+| `stop_id`      | UUID           | Required if Applicable | Stop that the vehicle is currently located at. Only applicable for _docked_ Micromobility. See [Stops][stops] |
 | `gps`          | Object         | Required              | Telemetry position data                                      |
 | `gps.lat`      | Double         | Required              | Latitude of the location                                     |
 | `gps.lng`      | Double         | Required              | Longitude of the location                                    |
@@ -351,8 +355,8 @@ A standard point of vehicle telemetry. References to latitude and longitude impl
 | `gps.accuracy` | Float          | Required if Available | Horizontal accuracy, in meters                                           |
 | `gps.hdop`     | Float          | Required if Available | Horizontal GPS or GNSS accuracy value (see [hdop][hdop]) |
 | `gps.satellites` | Integer      | Required if Available | Number of GPS or GNSS satellites
-| `charge`       | Float          | Required if Applicable | Percent battery charge of vehicle, expressed between 0 and 1 |
-| `stop_id`      | UUID           | Required if Applicable | Stop that the vehicle is currently located at. Only applicable for _docked_ Micromobility. See [Stops][stops] |
+| `battery_percent`       | Integer          | Required if Applicable | Percent battery charge of vehicle, expressed between 0 and 100 |
+| `fuel_percent`       | Integer          | Required if Applicable | Percent fuel in vehicle, expressed between 0 and 100 |
 
 [Top][toc]
 
@@ -473,9 +477,6 @@ A vehicle record is as follows:
 | `last_event_types` | Enum[] | Required | [Vehicle event(s)][vehicle-events] of most recent state change, allowable values determined by `last_vehicle_state`. |
 | `last_event_location` | GeoJSON [Point Feature][point-geo]| Required | Location of vehicle's last event. See also [Stop-based Geographic Data][stop-based-geo]. |
 | `current_location` | GeoJSON [Point Feature][point-geo] | Required if Applicable | Current location of vehicle if different from last event, and the vehicle is not currently on a trip. See also [Stop-based Geographic Data][stop-based-geo]. |
-| `battery_percent`       | Integer          | Required if Applicable | Percent battery charge of vehicle, expressed between 0 and 100 |
-| `fuel_percent`       | Integer          | Required if Applicable | Percent fuel in vehicle, expressed between 0 and 100 |
-
 
 [Top][toc]