minor fixes

janedotx · janedotx · commit dcd6287a1eb1 · 2020-06-29T14:36:51.000-04:00
diff --git a/general-information.md b/general-information.md
@@ -219,23 +219,7 @@ Accept: application/vnd.mds+json;version=0.3
 > * The `agency` API must respond as if version `0.3` was requested.
 > * The `policy` API must respond as if version `0.4` was requested.
 
-If an unsupported or invalid version is requested, the API must respond with a status of `406 Not Acceptable`. If this occurs, a client can explicitly negotiate available versions.
-
-A client negotiates available versions using the `OPTIONS` method to an MDS endpoint. For example, to check if `trips` supports either version `0.2` or `0.3` with a preference for `0.2`, the client would issue the following request:
-
-```http
-OPTIONS /trips/ HTTP/1.1
-Host: provider.example.com
-Accept: application/vnd.mds+json;version=0.2,application/vnd.mds+json;version=0.3;q=0.9
-```
-
-The response will include the most preferred supported version in the `Content-Type` header. For example, if only `0.3` is supported:
-
-```http
-Content-Type: application/vnd.mds+json;version=0.3
-```
-
-The client can use the returned value verbatim as a version request in the `Accept` header.
+If an unsupported or invalid version is requested, the API must respond with a status of `406 Not Acceptable`.
 
 [Top][toc]
 
diff --git a/policy/README.md b/policy/README.md
@@ -30,6 +30,7 @@ The goal of this specification is to enable Agencies to create, revise, and publ
 - Cap allowances (e.g. "Up to 500 additional scooters are permitted near train stations")
 - Speed-limit restrictions (e.g. "15 mph outside of downtown, 10 mph downtown")
 - Idle-time and disabled-time limitations (e.g. "5 days idle while rentable, 12 hours idle while unrentable, per device")
+- Trip fees and subsidies (e.g. "A 25 cent fee applied when a trip ends downtown")
 
 The machine-readable format allows Providers to obtain policies and compute compliance where it can be determined entirely by data obtained internally.
 
@@ -183,6 +184,7 @@ An individual `Policy` object is defined by the following fields:
 | `policy_id`      | UUID            | Required   | Unique ID of policy                                                                 |
 | `provider_ids`   | UUID[]          | Optional    | Providers for whom this policy is applicable; empty arrays and `null`/absent implies all Providers |
 | `description`    | String          | Required   | Description of policy                                                               |
+| `currency`       | String          | Optional   | An ISO 4217 Alphabetic Currency Code representing the [currency](../provider#costs--currencies) of all Rules of [type](#rule-types) `rate`.|
 | `start_date`     | [timestamp][ts] | Required   | Beginning date/time of policy enforcement                                           |
 | `end_date`       | [timestamp][ts] | Optional    | End date/time of policy enforcement                                                 |
 | `published_date` | [timestamp][ts] | Required   | Timestamp that the policy was published                                             |
@@ -205,6 +207,8 @@ An individual `Rule` object is defined by the following fields:
 | `propulsion_types` | `propulsion_type[]`         | Optional   | Applicable vehicle [propulsion types][propulsion-types], default "all". |
 | `minimum`          | integer                     | Optional   | Minimum value, if applicable (default 0) |
 | `maximum`          | integer                     | Optional   | Maximum value, if applicable (default unlimited) |
+| `rate_amount`      | integer                     | Optional   | The amount of a rate applied when this rule applies, if applicable (default zero). A positive integer rate amount represents a fee, while a negative integer represents a subsidy. Rate amounts are given in the `currency` defined in the [Policy](#policy). |
+| `rate_recurrence`  | enum                        | Optional   | Recurrence of the rate (see [Rate Recurrences](#rate-recurrences)) |
 | `start_time`       | ISO 8601 time `hh:mm:ss`              | Optional   | Beginning time-of-day when the rule is in effect (default 00:00:00). |
 | `end_time`         | ISO 8601 time `hh:mm:ss`              | Optional   | Ending time-of-day when the rule is in effect (default 23:59:59). |
 | `days`             | day[]                       | Optional   | Days `["sun", "mon", "tue", "wed", "thu", "fri", "sat"]` when the rule is in effect (default all) |
@@ -218,6 +222,7 @@ An individual `Rule` object is defined by the following fields:
 | `count` | Fleet counts based on regions. Rule `max`/`min` refers to number of devices.                                  |
 | `time`  | Individual limitations on time spent in one or more vehicle-states. Rule `max`/`min` refers to increments of time in [Rule Units](#rule-units). |
 | `speed` | Global or local speed limits. Rule `max`/`min` refers to speed in [Rule Units](#rule-units).                  |
+| `rate`  | **[Beta feature](/general-information.md#beta-features):** Yes (as of 1.0.0). Fees or subsidies based on regions and time spent in one or more vehicle-states. Rule `rate_amount` refers to the rate charged according to the [Rate Recurrence](#rate_recurrence). Agencies and Providers must agree on terms of use prior to utilizing the `rate` rule type.     |
 | `user`  | Information for users, e.g. about helmet laws. Generally can't be enforced via events and telemetry.          |
 
 ### Rule Units
@@ -227,6 +232,7 @@ An individual `Rule` object is defined by the following fields:
 | `seconds` | Seconds             |
 | `minutes` | Minutes             |
 | `hours`   | Hours               |
+| `days`    | Days                |
 | `mph`     | Miles per hour      |
 | `kph`     | Kilometers per hour |
 
@@ -242,6 +248,15 @@ An individual `Rule` object is defined by the following fields:
 | `publish_date`   | [timestamp][ts] | Required   | Timestamp that the policy was published, i.e. made immutable                                             |
 | `prev_geographies`  | UUID[]    | Optional   | Unique IDs of prior geographies replaced by this one                                   |
 
+### Rate Recurrences
+
+Rate recurrences specify when a rate is applied – either once, or periodically according to a `time_unit` specified using [Rule Units](#rule-units). A `time_unit` refers to a unit of time as measured in local time for the juristiction – a day begins at midnight local time, an hour begins at the top of the hour, etc.
+
+| Name      | Description         |
+| --------- | ------------------- |
+| `once`                      |  Rate is applied once to vehicles entering a matching status from a non-matching status.   |     
+| `each_time_unit`            |  During each `time_unit`, rate is applied once to vehicles entering or remaining in a matching status. Requires a `time_unit` to be specified using `rule_units`.  |  
+| `per_complete_time_unit`    | Rate is applied once per complete `time_unit` that vehicles remain in a matching status. Requires a `time_unit` to be specified using `rule_units`.  | 
 
 ### Messages
 
diff --git a/policy/examples.md b/policy/examples.md
@@ -8,6 +8,9 @@ This file presents a series of [Policy object](./README.md#policy) examples for
 - [Provider Cap](#provider-cap)
 - [Idle Time](#idle-time)
 - [Speed Limits](#speed-limits)
+- [Per Trip Fees](#per-trip-fees)
+- [Vehicle Right of Way Fees](#vehicle-right-of-way-fees)
+- [Metered Parking Fees](#metered-parking-fees)
 
 ## Prohibited Zone
 
@@ -219,5 +222,99 @@ This Policy sets a 15 MPH speed limit in greater LA, and a 10 MPH speed limit in
   }]
 }
 ```
+[Top](#table-of-contents)
+
+## Per Trip Fees
+This policy sets a 25 cent per-trip fee that is applied for trips that start in the municipal boundary.
+
+
+```json
+{
+      "policy_id": "d2567b3c-3071-48a6-bbeb-3424721dbd12",
+      "published_date": 1586736000000,
+      "name": "Trip Fees",
+      "start_date": 1586822400000,
+      "end_date": 1587427200000,
+      "prev_policies": null,
+      "rules": [{
+    		  "name": "City Wide Trip Fee",
+    		  "rule_type": "rate",
+    		  "rate_amount": 25,
+    		  "rate_recurrence": "once",
+    		  "geography": MUNICIPAL_BOUNDARY_GEOGRAPHY,
+    		  "statuses": {
+    		        "trip": ["trip_start"]
+    		   }
+    		}]
+    }
+```
+[Top](#table-of-contents)
+
+## Vehicle Right of Way Fees
+This policy sets a Right-of-Way fee that is charged once a day for vehicles deployed in a given area. It charges a 25 cents per day for vehicles deployed downtown, and 5 cents per day for vehicles deployed in a historically underserved neighborhood. In the case where a vehicle is deployed twice in both areas in the same day, the higher fee would apply (because it appears first in the rules).
 
+```json
+{
+      "policy_id": "4137a47c-836a-11ea-bc55-0242ac130003",
+      "published_date": 1586736000000,
+      "name": "Right of Way Fees",
+      "start_date": 1586822400000,
+      "end_date": 1587427200000,
+      "prev_policies": null,
+      "rules": [
+    			{
+    			  "name": "Downtown Right of Way Fee",
+    			  "rule_type": "rate",
+    			  "rate_amount": 25,
+    			  "rate_recurrence": "each_time_unit",
+    			  "rule_units": "days",
+    			  "geography": DOWNTOWN_GEOGRAPHY,
+    			  "statuses": {
+    			        "available": ["service_start"]
+    			   }
+    			},
+    			{
+    			  "name": "Decreased Right of Way Fee",
+    			  "rule_type": "rate",
+    			  "rate_amount": 5,
+    			  "rate_recurrence": "each_time_unit",
+    			  "rule_units": "days",
+    			  "geography": HISTORICALLY_UNDERSERVED_NEIGHBORHOOD_GEOGRAPHY,
+    			  "statuses": {
+    			        "available": ["service_start"]
+    			   }
+    			}
+    		]
+    }
+```
+[Top](#table-of-contents)
+
+## Metered Parking Fees
+This policy sets a 10 cent per hour metered parking charge that is applied while a vehicle is parked in a congested area during rush hour.
+
+```json
+{
+      "policy_id": "6a3dd008-836a-11ea-bc55-0242ac130003",
+      "published_date": 1586736000000,
+      "name": "Parking Fees",
+      "start_date": 1586822400000,
+      "end_date": 1587427200000,
+      "prev_policies": null,
+      "rules": [{
+    		  "name": "Downtown Peak-Hour Parking Fee",
+    		  "rule_type": "rate",
+    		  "rate_amount": 10,
+    		  "rate_recurrence": "per_complete_time_unit",
+    		  "rule_units": "hours",
+    		  "geography": INNER_CITY_GEOGRAPHY,
+    		  "days": ["mon","tue","wed","thu","fri"],
+    		  "start_time": "7:00:00",
+    		  "end_time": "8:30:00",
+    		  "statuses": {
+    		        "available": [],
+    		        "unavailable": [],
+    		   }
+    		}]
+    }
+```
 [Top](#table-of-contents)
diff --git a/providers.csv b/providers.csv
@@ -22,3 +22,4 @@ Baus,638ba503-4006-4c53-bf34-cd625cc03d61,https://bausmoves.com,https://mds.bird
 Bolt Technology,7ea695ca-9de7-4b3b-9f3c-241b2045a1fe,https://bolt.eu,https://mds.bolt.eu,https://mds.bolt.eu/gbfs/1
 Grin,8a0ecfce-5fb3-451e-8069-434b79c8b01a,https://ongrin.com,https://open-data.grow.mobi/mds/,https://open-data.grow.mobi/api/v1/gbfs/
 Dott,0a899e3a-705a-46f2-9189-d78cc83a2db4,https://ridedott.com,https://mds.api.ridedott.com,https://gbfs.api.ridedott.com
+Superpedestrian,420e6e94-55a6-4946-b6b3-4398fe22e912,https://www.superpedestrian.com,https://wrangler-mds-production.herokuapp.com/mds,
