Skip to content

Commit 99a54d4

Browse files
isabelle-drisabelle-dr
authored
Update V2.3-RC to V2.3-RC2 (#67)
* Update name tags * Update vehicle_types.json * Revert "Update vehicle_types.json" This reverts commit 04fae57. * Update vehicle_types.json * Update station_information.json * Update free_bike_status.json * Update geofencing_zones.json * remove coma in geofencing_zones.json * Remove additional comma in vehicle_types.json * remove regex for phone number in station information * Remove additional coma
1 parent 3d8926c commit 99a54d4

13 files changed

+177
-85
lines changed

v2.3-RC/free_bike_status.json renamed to v2.3-RC2/free_bike_status.json

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema",
33
"$id":
4-
"https://github.com/NABSA/gbfs/blob/v2.3-RC/gbfs.md#free_bike_statusjson",
4+
"https://github.com/NABSA/gbfs/blob/v2.3-RC2/gbfs.md#free_bike_statusjson",
55
"description":
66
"Describes the vehicles that are available for rent (as of v2.1-RC2).",
77
"type": "object",
@@ -22,7 +22,7 @@
2222
"description":
2323
"GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
2424
"type": "string",
25-
"const": "2.3-RC"
25+
"const": "2.3-RC2"
2626
},
2727
"data": {
2828
"description":
@@ -59,61 +59,68 @@
5959
"type": "boolean"
6060
},
6161
"rental_uris": {
62-
"description":
63-
"Contains rental uris for Android, iOS, and web in the android, ios, and web fields (added in v1.1).",
62+
"description": "Contains rental uris for Android, iOS, and web in the android, ios, and web fields (added in v1.1).",
6463
"type": "object",
6564
"properties": {
6665
"android": {
67-
"description":
68-
"URI that can be passed to an Android app with an intent (added in v1.1).",
66+
"description": "URI that can be passed to an Android app with an intent (added in v1.1).",
6967
"type": "string",
7068
"format": "uri"
7169
},
7270
"ios": {
73-
"description":
74-
"URI that can be used on iOS to launch the rental app for this vehicle (added in v1.1).",
71+
"description": "URI that can be used on iOS to launch the rental app for this vehicle (added in v1.1).",
7572
"type": "string",
7673
"format": "uri"
7774
},
7875
"web": {
79-
"description":
80-
"URL that can be used by a web browser to show more information about renting this vehicle (added in v1.1).",
76+
"description": "URL that can be used by a web browser to show more information about renting this vehicle (added in v1.1).",
8177
"type": "string",
8278
"format": "uri"
8379
}
8480
}
8581
},
8682
"vehicle_type_id": {
87-
"description":
88-
"The vehicle_type_id of this vehicle (added in v2.1-RC).",
83+
"description": "The vehicle_type_id of this vehicle (added in v2.1-RC).",
8984
"type": "string"
9085
},
9186
"last_reported": {
92-
"description":
93-
"The last time this vehicle reported its status to the operator's backend in POSIX time (added in v2.1-RC).",
87+
"description": "The last time this vehicle reported its status to the operator's backend in POSIX time (added in v2.1-RC).",
9488
"type": "number",
9589
"minimum": 1450155600
9690
},
9791
"current_range_meters": {
98-
"description":
99-
"The furthest distance in meters that the vehicle can travel without recharging or refueling with the vehicle's current charge or fuel (added in v2.1-RC).",
92+
"description": "The furthest distance in meters that the vehicle can travel without recharging or refueling with the vehicle's current charge or fuel (added in v2.1-RC).",
93+
"type": "number",
94+
"minimum": 0
95+
},
96+
"current_fuel_percent": {
97+
"description": "This value represents the current percentage, expressed from 0 to 1, of fuel or battery power remaining in the vehicle. Added in v2.3-RC.",
10098
"type": "number",
10199
"minimum": 0
102100
},
103101
"station_id": {
104-
"description":
105-
"Identifier referencing the station_id if the vehicle is currently at a station (added in v2.1-RC2).",
102+
"description": "Identifier referencing the station_id if the vehicle is currently at a station (added in v2.1-RC2).",
106103
"type": "string"
107104
},
108105
"home_station_id": {
109-
"description":
110-
"The station_id of the station this vehicle must be returned to (added in v2.3-RC).",
106+
"description": "The station_id of the station this vehicle must be returned to (added in v2.3-RC).",
111107
"type": "string"
112108
},
113109
"pricing_plan_id": {
114-
"description":
115-
"The plan_id of the pricing plan this vehicle is eligible for (added in v2.1-RC2).",
110+
"description": "The plan_id of the pricing plan this vehicle is eligible for (added in v2.2).",
116111
"type": "string"
112+
},
113+
"vehicle_equipment": {
114+
"description": "List of vehicle equipment provided by the operator in addition to the accessories already provided in the vehicle. Added in v2.3-RC2.",
115+
"type": "array",
116+
"items": {
117+
"enum": ["child_seat_a", "child_seat_b", "child_seat_c", "winter_tires", "snow_chains"]
118+
}
119+
},
120+
"available_until": {
121+
"description": "The date and time when any rental of the vehicle must be completed. Added in v2.3-RC2.",
122+
"type": "string",
123+
"pattern": "^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})([A-Z])$"
117124
}
118125
},
119126
"anyOf": [

v2.3-RC/gbfs.json renamed to v2.3-RC2/gbfs.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema",
3-
"$id": "https://github.com/NABSA/gbfs/blob/v2.3-RC/gbfs.md#gbfsjson",
3+
"$id": "https://github.com/NABSA/gbfs/blob/v2.3-RC2/gbfs.md#gbfsjson",
44
"description":
55
"Auto-discovery file that links to all of the other files published by the system.",
66
"type": "object",
@@ -21,7 +21,7 @@
2121
"description":
2222
"GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
2323
"type": "string",
24-
"const": "2.3-RC"
24+
"const": "2.3-RC2"
2525
},
2626
"data": {
2727
"description": "Response data in the form of name:value pairs.",

v2.3-RC/gbfs_versions.json renamed to v2.3-RC2/gbfs_versions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema",
33
"$id":
4-
"https://github.com/NABSA/gbfs/blob/v2.3-RC/gbfs.md#gbfs_versionsjson-added-in-v11",
4+
"https://github.com/NABSA/gbfs/blob/v2.3-RC2/gbfs.md#gbfs_versionsjson-added-in-v11",
55
"description":
66
"Lists all feed endpoints published according to version sof the GBFS documentation. (added in v1.1)",
77
"type": "object",
@@ -22,7 +22,7 @@
2222
"description":
2323
"GBFS version number to which the feed conforms, according to the versioning framework.",
2424
"type": "string",
25-
"const": "2.3-RC"
25+
"const": "2.3-RC2"
2626
},
2727
"data": {
2828
"description": "Response data in the form of name:value pairs.",

v2.3-RC/geofencing_zones.json renamed to v2.3-RC2/geofencing_zones.json

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema",
33
"$id":
4-
"https://github.com/NABSA/gbfs/blob/v2.3-RC/gbfs.md#geofencing_zonesjson",
4+
"https://github.com/NABSA/gbfs/blob/v2.3-RC2/gbfs.md#geofencing_zonesjson",
55
"description":
66
"Describes geofencing zones and their associated rules and attributes (added in v2.1-RC).",
77
"type": "object",
@@ -13,26 +13,22 @@
1313
"minimum": 1450155600
1414
},
1515
"ttl": {
16-
"description":
17-
"Number of seconds before the data in the feed will be updated again (0 if the data should always be refreshed).",
16+
"description": "Number of seconds before the data in the feed will be updated again (0 if the data should always be refreshed).",
1817
"type": "integer",
1918
"minimum": 0
2019
},
2120
"version": {
22-
"description":
23-
"GBFS version number to which the feed conforms, according to the versioning framework.",
21+
"description": "GBFS version number to which the feed conforms, according to the versioning framework.",
2422
"type": "string",
25-
"const": "2.3-RC"
23+
"const": "2.3-RC2"
2624
},
2725
"data": {
28-
"description":
29-
"Array that contains geofencing information for the system.",
26+
"description": "Array that contains geofencing information for the system.",
3027
"type": "object",
3128
"properties": {
3229
"geofencing_zones": {
3330
"type": "object",
34-
"description":
35-
"Each geofenced zone and its associated rules and attributes is described as an object within the array of features.",
31+
"description": "Each geofenced zone and its associated rules and attributes is described as an object within the array of features.",
3632
"properties": {
3733
"type": {
3834
"description": "FeatureCollection as per IETF RFC 7946.",
@@ -60,33 +56,28 @@
6056
"type": "string"
6157
},
6258
"start": {
63-
"description":
64-
"Start time of the geofencing zone in POSIX time.",
59+
"description": "Start time of the geofencing zone in POSIX time.",
6560
"type": "number",
6661
"minimum": 1450155600
6762
},
6863
"end": {
69-
"description":
70-
"End time of the geofencing zone in POSIX time.",
64+
"description": "End time of the geofencing zone in POSIX time.",
7165
"type": "number",
7266
"minimum": 1450155600
7367
},
7468
"rules": {
75-
"description":
76-
"Array that contains one object per rule.",
69+
"description": "Array that contains one object per rule.",
7770
"type": "array",
7871
"items": {
7972
"type": "object",
8073
"properties": {
8174
"vehicle_type_id": {
8275
"type": "array",
83-
"description":
84-
"Array of vehicle type IDs for which these restrictions apply.",
76+
"description": "Array of vehicle type IDs for which these restrictions apply.",
8577
"items": { "type": "string" }
8678
},
8779
"ride_allowed": {
88-
"description":
89-
"Is the undocked ride allowed to stat and end in this zone?",
80+
"description": "Is the undocked ride allowed to stat and end in this zone?",
9081
"type": "boolean"
9182
},
9283
"ride_through_allowed": {
@@ -95,10 +86,13 @@
9586
"type": "boolean"
9687
},
9788
"maximum_speed_kph": {
98-
"description":
99-
"What is the maximum speed allowed, in kilometers per hour?",
89+
"description": "What is the maximum speed allowed, in kilometers per hour?",
10090
"type": "integer",
10191
"minimum": 0
92+
},
93+
"station_parking": {
94+
"description": "Vehicle MUST be parked at stations defined in station_information.json within this geofence zone",
95+
"type": "boolean"
10296
}
10397
},
10498
"required": ["ride_allowed", "ride_through_allowed"]

v2.3-RC/station_information.json renamed to v2.3-RC2/station_information.json

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema",
33
"$id":
4-
"https://github.com/NABSA/gbfs/blob/v2.3-RC/gbfs.md#station_informationjson",
4+
"https://github.com/NABSA/gbfs/blob/v2.3-RC2/gbfs.md#station_informationjson",
55
"description":
66
"Details including system operator, system location, year implemented, URL, contact info, time zone.",
77
"type": "object",
@@ -22,7 +22,7 @@
2222
"description":
2323
"GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
2424
"type": "string",
25-
"const": "2.3-RC"
25+
"const": "2.3-RC2"
2626
},
2727
"data": {
2828
"description":
@@ -128,6 +128,25 @@
128128
}
129129
}
130130
},
131+
"parking_type": {
132+
"description": "Type of parking station. Added in v2.3-RC2",
133+
"type": "string",
134+
"enum": [
135+
"parking_lot",
136+
"street_parking",
137+
"underground_parking",
138+
"sidewalk_parking",
139+
"other"
140+
]
141+
},
142+
"parking_hoop": {
143+
"description": "Are parking hoops present at this station? Added in v2.3-RC2",
144+
"type": "boolean"
145+
},
146+
"contact_phone": {
147+
"description": "Contact phone of the station. Added in v2.3-RC2",
148+
"type": "string"
149+
},
131150
"capacity": {
132151
"description":
133152
"Number of total docking points installed at this station, both available and unavailable.",

v2.3-RC/station_status.json renamed to v2.3-RC2/station_status.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema",
3-
"$id": "https://github.com/NABSA/gbfs/blob/v2.3-RC/gbfs.md#station_statusjson",
3+
"$id": "https://github.com/NABSA/gbfs/blob/v2.3-RC2/gbfs.md#station_statusjson",
44
"description":
55
"Describes the capacity and rental availability of the station",
66
"type": "object",
@@ -21,7 +21,7 @@
2121
"description":
2222
"GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
2323
"type": "string",
24-
"const": "2.3-RC"
24+
"const": "2.3-RC2"
2525
},
2626
"data": {
2727
"description":

v2.3-RC/system_alerts.json renamed to v2.3-RC2/system_alerts.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema",
3-
"$id": "https://github.com/NABSA/gbfs/blob/v2.3-RC/gbfs.md#system_alertsjson",
3+
"$id": "https://github.com/NABSA/gbfs/blob/v2.3-RC2/gbfs.md#system_alertsjson",
44
"description": "Describes ad-hoc changes to the system.",
55
"type": "object",
66
"properties": {
@@ -20,7 +20,7 @@
2020
"description":
2121
"GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
2222
"type": "string",
23-
"const": "2.3-RC"
23+
"const": "2.3-RC2"
2424
},
2525
"data": {
2626
"description": "Array that contains ad-hoc alerts for the system.",

v2.3-RC/system_calendar.json renamed to v2.3-RC2/system_calendar.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema",
33
"$id":
4-
"https://github.com/NABSA/gbfs/blob/v2.3-RC/gbfs.md#system_calendarjson",
4+
"https://github.com/NABSA/gbfs/blob/v2.3-RC2/gbfs.md#system_calendarjson",
55
"description": "Describes the operating calendar for a system.",
66
"type": "object",
77
"properties": {
@@ -21,7 +21,7 @@
2121
"description":
2222
"GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
2323
"type": "string",
24-
"const": "2.3-RC"
24+
"const": "2.3-RC2"
2525
},
2626
"data": {
2727
"description": "Array that contains opertions calendar for the system.",

v2.3-RC/system_hours.json renamed to v2.3-RC2/system_hours.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema",
3-
"$id": "https://github.com/NABSA/gbfs/blob/v2.3-RC/gbfs.md#system_hoursjson",
3+
"$id": "https://github.com/NABSA/gbfs/blob/v2.3-RC2/gbfs.md#system_hoursjson",
44
"description": "Describes the system hours of operation.",
55
"type": "object",
66
"properties": {
@@ -20,7 +20,7 @@
2020
"description":
2121
"GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
2222
"type": "string",
23-
"const": "2.3-RC"
23+
"const": "2.3-RC2"
2424
},
2525
"data": {
2626
"description": "Array that contains system hours of operations.",

v2.3-RC/system_information.json renamed to v2.3-RC2/system_information.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema",
33
"$id":
4-
"https://github.com/NABSA/gbfs/blob/v2.3-RC/gbfs.md#system_informationjson",
4+
"https://github.com/NABSA/gbfs/blob/v2.3-RC2/gbfs.md#system_informationjson",
55
"description":
66
"Details including system operator, system location, year implemented, URL, contact info, time zone.",
77
"type": "object",
@@ -22,7 +22,7 @@
2222
"description":
2323
"GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
2424
"type": "string",
25-
"const": "2.3-RC"
25+
"const": "2.3-RC2"
2626
},
2727
"data": {
2828
"description": "Response data in the form of name:value pairs.",

0 commit comments

Comments
 (0)