Add schemas for v2.1-RC2 (#35)

josee-sabourin · web-flow · commit d4ce387465b9 · 2020-10-27T13:42:03.000-04:00
Aggregate available vehicle types at a station
Extend system_pricing_plans.json
diff --git a/free_bike_status.json b/free_bike_status.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://github.com/NABSA/gbfs/blob/master/gbfs.md#free_bike_statusjson",
-  "description": "Describes the vehicles that are not at a station and are available for rent.",
+  "description": "Describes the vehicles that are available for rent (as of v2.1-RC2).",
   "type": "object",
   "properties": {
     "last_updated": {
@@ -18,7 +18,10 @@
       "description": "GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
       "type": "string",
       "enum": [
-        "2.1-RC"
+        "2.1-RC2",
+        "2.1",
+        "3.0-RC",
+        "3.0"
       ]
     },
     "data": {
@@ -87,10 +90,16 @@
               "type": "number",
               "minimum": 0
             },
+            "station_id": {
+              "description": "Identifier referencing the station_id if the vehicle is currently at a station (added in v2.1-RC2).",
+              "type": "string"
+            },
+            "pricing_plan_id": {
+              "description": "The plan_id of the pricing plan this vehicle is eligible for (added in v2.1-RC2).",
+              "type": "string"
+            },
             "required": [
               "bike_id",
-              "lat",
-              "lon",
               "is_reserved",
               "is_disabled"
             ]     
diff --git a/station_information.json b/station_information.json
@@ -18,7 +18,7 @@
       "description": "GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
       "type": "string",
       "enum": [
-        "2.1-RC"
+        "2.1-RC2"
       ]
     },
     "data": {
diff --git a/station_status.json b/station_status.json
@@ -18,7 +18,7 @@
       "description": "GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
       "type": "string",
       "enum": [
-        "2.1-RC"
+        "2.1-RC2"
       ]
     },
     "data": {
@@ -36,7 +36,22 @@
               "description": "Number of vehicles of any type physically available for rental at the station.",
               "type": "number",
               "minimum": 0
-            }, ,
+            },
+            "vehicles_types_available": {
+              "description": "Array of objects displaying the total number of each vehicle type at the station (added in v2.1-RC).",
+              "type": "array",
+              "items": {
+                "vehicle_type_id": {
+                  "description": "The vehicle_type_id of vehicle at the station (added in v2.1-RC).",
+                  "type": "string"
+                },
+                "count": {
+                  "description": "A number representing the total amount of this vehicle type at the station (added in v2.1-RC).",
+                  "type": "number",
+                  "minimum": 0
+                }
+              }
+            },
             "num_bikes_disabled": {
               "description": "Number of disabled vehicles of any type at the station.",
               "type": "number",
@@ -65,7 +80,7 @@
               "type": "boolean"
             },
             "last_reported": {
-              "description": "The last time this station reported its status to the operator's backend.",
+              "description": "The last time this station reported its status to the operator's backend in POSIX time.",
               "type": "number",
               "minimum": 1450155600
             },
diff --git a/system_pricing_plans.json b/system_pricing_plans.json
@@ -18,9 +18,10 @@
       "description": "GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
       "type": "string",
       "enum": [
-        "2.0-RC",
-        "2.0",
-        "2.1-RC"
+        "2.1-RC2",
+        "2.1",
+        "3.0-RC",
+        "3.0"
       ]
     },
     "data": {
@@ -60,6 +61,74 @@
             "description": {
               "description": "Customer-readable description of the pricing plan.",
               "type": "string"
+            },
+            "per_km_pricing": {
+              "description": "Array of segments when the price is a function of distance travelled, displayed in kilometers (added in v2.1-RC2).",
+              "type": "array",
+              "items": {
+                "start": {
+                  "description": "Number of kilometers that have to elapse before this segment starts applying (added in v2.1-RC2).",
+                  "type": "number",
+                  "minimum": 0
+                },
+                "rate": {
+                  "description": "Rate that is charged for each kilometer interval after the start (added in v2.1-RC2).",
+                  "type": "number"
+                },
+                "interval": {
+                  "description": "Interval in kilometers at which the rate of this segment is either reapplied indefinitely, or if defined, up until (but not including) end kilometer (added in v2.1-RC2).",
+                  "type": "number",
+                  "minimum": 0
+                },
+                "end": {
+                  "description": "The kilometer at which the rate will no longer apply (added in v2.1-RC2).",
+                  "type": "number",
+                  "minimum": 0
+                }
+              },
+              "dependencies": {
+                "per_km_pricing": [
+                  "start",
+                  "rate",
+                  "interval"
+                ]
+              }
+            },
+            "per_min_pricing": {
+              "description": "Array of segments when the price is a function of time travelled, displayed in minutes (added in v2.1-RC2).",
+              "type": "array",
+              "items": {
+                "start": {
+                  "description": "Number of minutes that have to elapse before this segment starts applying (added in v2.1-RC2).",
+                  "type": "number",
+                  "minimum": 0
+                },
+                "rate": {
+                  "description": "Rate that is charged for each minute interval after the start (added in v2.1-RC2).",
+                  "type": "number"
+                },
+                "interval": {
+                  "description": "Interval in minutes at which the rate of this segment is either reapplied (added in v2.1-RC2).",
+                  "type": "number",
+                  "minimum": "0"
+                },
+                "end": {
+                  "description": "The minute at which the rate will no longer apply (added in v2.1-RC2).",
+                  "type": "number",
+                  "minimum": 0
+                }
+              },
+              "dependencies": {
+                "per_min_pricing": [
+                  "start",
+                  "rate",
+                  "interval"
+                ]
+              }
+            },
+            "surge_pricing": {
+              "description": "Is there currently an increase in price in response to increased demand in this pricing plan? (added in v2.1-RC2)",
+              "type": "boolean"
             }
           },
           "required": [

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"description": "GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",`
`19`	`19`	`"type": "string",`
`20`	`20`	`"enum": [`
`21`		`- "2.1-RC"`
	`21`	`+ "2.1-RC2"`
`22`	`22`	`]`
`23`	`23`	`},`
`24`	`24`	`"data": {`