Skip to content

Commit f9727e3

Browse files
committed
regenerate all schemas again
1 parent 788e3d9 commit f9727e3

9 files changed

Lines changed: 129 additions & 93 deletions

File tree

agency/get_stops.json

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,8 @@
111111
},
112112
"devices": {
113113
"$id": "#/definitions/stop/properties/devices",
114-
"type": "array",
115-
"description": "List of device_id for vehicles currently at this Stop.",
116-
"items": {
117-
"$ref": "#/definitions/uuid"
118-
}
114+
"$ref": "#/definitions/uuid_array",
115+
"description": "List of device_id for vehicles currently at this Stop."
119116
}
120117
}
121118
},
@@ -171,6 +168,15 @@
171168
],
172169
"pattern": "^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$"
173170
},
171+
"uuid_array": {
172+
"$id": "#/definitions/uuid_array",
173+
"type": "array",
174+
"description": "Array of UUID",
175+
"items": {
176+
"$id": "#/definitions/uuid_array/items",
177+
"$ref": "#/definitions/uuid"
178+
}
179+
},
174180
"vehicle_type_counts": {
175181
"$id": "#/definitions/vehicle_type_counts",
176182
"type": "object",

agency/get_vehicle.json

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,12 @@
77
"propulsion_types": {
88
"$id": "#/definitions/propulsion_types",
99
"type": "array",
10-
"description": "The type of propulsion; allows multiple values",
10+
"description": "Array of propulsion types, allowing multiple values",
1111
"items": {
12-
"type": "string",
13-
"enum": [
14-
"combustion",
15-
"electric",
16-
"electric_assist",
17-
"human"
18-
]
12+
"$id": "#/definitions/propulsion_types/items",
13+
"$ref": "#/definitions/propulsion_type"
1914
},
20-
"uniqueItems": true,
21-
"minItems": 1
15+
"uniqueItems": true
2216
},
2317
"string": {
2418
"$id": "#/definitions/string",
@@ -155,7 +149,8 @@
155149
"propulsion_types": {
156150
"$id": "#/definitions/vehicle/properties/propulsion_types",
157151
"$ref": "#/definitions/propulsion_types",
158-
"description": "The type of propulsion; allows multiple values"
152+
"description": "The type of propulsion; allows multiple values",
153+
"minItems": 1
159154
},
160155
"year": {
161156
"$id": "#/properties/year",

agency/post_stops.json

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,8 @@
111111
},
112112
"devices": {
113113
"$id": "#/definitions/stop/properties/devices",
114-
"type": "array",
115-
"description": "List of device_id for vehicles currently at this Stop.",
116-
"items": {
117-
"$ref": "#/definitions/uuid"
118-
}
114+
"$ref": "#/definitions/uuid_array",
115+
"description": "List of device_id for vehicles currently at this Stop."
119116
}
120117
}
121118
},
@@ -171,6 +168,15 @@
171168
],
172169
"pattern": "^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$"
173170
},
171+
"uuid_array": {
172+
"$id": "#/definitions/uuid_array",
173+
"type": "array",
174+
"description": "Array of UUID",
175+
"items": {
176+
"$id": "#/definitions/uuid_array/items",
177+
"$ref": "#/definitions/uuid"
178+
}
179+
},
174180
"vehicle_type_counts": {
175181
"$id": "#/definitions/vehicle_type_counts",
176182
"type": "object",

agency/post_vehicle.json

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,12 @@
77
"propulsion_types": {
88
"$id": "#/definitions/propulsion_types",
99
"type": "array",
10-
"description": "The type of propulsion; allows multiple values",
10+
"description": "Array of propulsion types, allowing multiple values",
1111
"items": {
12-
"type": "string",
13-
"enum": [
14-
"combustion",
15-
"electric",
16-
"electric_assist",
17-
"human"
18-
]
12+
"$id": "#/definitions/propulsion_types/items",
13+
"$ref": "#/definitions/propulsion_type"
1914
},
20-
"uniqueItems": true,
21-
"minItems": 1
15+
"uniqueItems": true
2216
},
2317
"string": {
2418
"$id": "#/definitions/string",
@@ -79,7 +73,8 @@
7973
"propulsion_types": {
8074
"$id": "#/definitions/vehicle/properties/propulsion_types",
8175
"$ref": "#/definitions/propulsion_types",
82-
"description": "The type of propulsion; allows multiple values"
76+
"description": "The type of propulsion; allows multiple values",
77+
"minItems": 1
8378
},
8479
"year": {
8580
"$id": "#/properties/year",

provider/events.json

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -124,21 +124,26 @@
124124
}
125125
}
126126
},
127+
"propulsion_type": {
128+
"$id": "#/definitions/propulsion_type",
129+
"type": "string",
130+
"description": "The type of propulsion",
131+
"enum": [
132+
"combustion",
133+
"electric",
134+
"electric_assist",
135+
"human"
136+
]
137+
},
127138
"propulsion_types": {
128139
"$id": "#/definitions/propulsion_types",
129140
"type": "array",
130-
"description": "The type of propulsion; allows multiple values",
141+
"description": "Array of propulsion types, allowing multiple values",
131142
"items": {
132-
"type": "string",
133-
"enum": [
134-
"combustion",
135-
"electric",
136-
"electric_assist",
137-
"human"
138-
]
143+
"$id": "#/definitions/propulsion_types/items",
144+
"$ref": "#/definitions/propulsion_type"
139145
},
140-
"uniqueItems": true,
141-
"minItems": 1
146+
"uniqueItems": true
142147
},
143148
"vehicle_type": {
144149
"$id": "#/definitions/vehicle_type",
@@ -332,7 +337,8 @@
332337
"propulsion_types": {
333338
"$id": "#/definitions/vehicle/properties/propulsion_types",
334339
"$ref": "#/definitions/propulsion_types",
335-
"description": "The type of propulsion; allows multiple values"
340+
"description": "The type of propulsion; allows multiple values",
341+
"minItems": 1
336342
},
337343
"event_time": {
338344
"$id": "#/properties/data/properties/status_changes/items/properties/event_time",

provider/status_changes.json

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -124,21 +124,26 @@
124124
}
125125
}
126126
},
127+
"propulsion_type": {
128+
"$id": "#/definitions/propulsion_type",
129+
"type": "string",
130+
"description": "The type of propulsion",
131+
"enum": [
132+
"combustion",
133+
"electric",
134+
"electric_assist",
135+
"human"
136+
]
137+
},
127138
"propulsion_types": {
128139
"$id": "#/definitions/propulsion_types",
129140
"type": "array",
130-
"description": "The type of propulsion; allows multiple values",
141+
"description": "Array of propulsion types, allowing multiple values",
131142
"items": {
132-
"type": "string",
133-
"enum": [
134-
"combustion",
135-
"electric",
136-
"electric_assist",
137-
"human"
138-
]
143+
"$id": "#/definitions/propulsion_types/items",
144+
"$ref": "#/definitions/propulsion_type"
139145
},
140-
"uniqueItems": true,
141-
"minItems": 1
146+
"uniqueItems": true
142147
},
143148
"vehicle_type": {
144149
"$id": "#/definitions/vehicle_type",
@@ -273,7 +278,8 @@
273278
"propulsion_types": {
274279
"$id": "#/definitions/vehicle/properties/propulsion_types",
275280
"$ref": "#/definitions/propulsion_types",
276-
"description": "The type of propulsion; allows multiple values"
281+
"description": "The type of propulsion; allows multiple values",
282+
"minItems": 1
277283
},
278284
"event_time": {
279285
"$id": "#/properties/data/properties/status_changes/items/properties/event_time",

provider/stops.json

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,8 @@
238238
},
239239
"devices": {
240240
"$id": "#/definitions/stop/properties/devices",
241-
"type": "array",
242-
"description": "List of device_id for vehicles currently at this Stop.",
243-
"items": {
244-
"$ref": "#/definitions/uuid"
245-
}
241+
"$ref": "#/definitions/uuid_array",
242+
"description": "List of device_id for vehicles currently at this Stop."
246243
}
247244
}
248245
},
@@ -270,6 +267,15 @@
270267
}
271268
}
272269
},
270+
"uuid_array": {
271+
"$id": "#/definitions/uuid_array",
272+
"type": "array",
273+
"description": "Array of UUID",
274+
"items": {
275+
"$id": "#/definitions/uuid_array/items",
276+
"$ref": "#/definitions/uuid"
277+
}
278+
},
273279
"vehicle_type_counts": {
274280
"$id": "#/definitions/vehicle_type_counts",
275281
"type": "object",

provider/trips.json

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,21 @@
124124
}
125125
}
126126
},
127+
"currency": {
128+
"$id": "#/definitions/currency",
129+
"type": [
130+
"string",
131+
"null"
132+
],
133+
"pattern": "^[A-Z]{3}$",
134+
"default": "USD",
135+
"description": "An ISO 4217 Alphabetic Currency Code representing currency of the payee. If null, USD cents is implied.",
136+
"examples": [
137+
"USD",
138+
"EUR",
139+
"GBP"
140+
]
141+
},
127142
"MDS_FeatureCollection_Route": {
128143
"$id": "#/definitions/MDS_FeatureCollection_Route",
129144
"title": "MDS GeoJSON FeatureCollection Route",
@@ -155,21 +170,26 @@
155170
}
156171
}
157172
},
173+
"propulsion_type": {
174+
"$id": "#/definitions/propulsion_type",
175+
"type": "string",
176+
"description": "The type of propulsion",
177+
"enum": [
178+
"combustion",
179+
"electric",
180+
"electric_assist",
181+
"human"
182+
]
183+
},
158184
"propulsion_types": {
159185
"$id": "#/definitions/propulsion_types",
160186
"type": "array",
161-
"description": "The type of propulsion; allows multiple values",
187+
"description": "Array of propulsion types, allowing multiple values",
162188
"items": {
163-
"type": "string",
164-
"enum": [
165-
"combustion",
166-
"electric",
167-
"electric_assist",
168-
"human"
169-
]
189+
"$id": "#/definitions/propulsion_types/items",
190+
"$ref": "#/definitions/propulsion_type"
170191
},
171-
"uniqueItems": true,
172-
"minItems": 1
192+
"uniqueItems": true
173193
},
174194
"vehicle_type": {
175195
"$id": "#/definitions/vehicle_type",
@@ -250,7 +270,8 @@
250270
"propulsion_types": {
251271
"$id": "#/definitions/vehicle/properties/propulsion_types",
252272
"$ref": "#/definitions/propulsion_types",
253-
"description": "The type of propulsion; allows multiple values"
273+
"description": "The type of propulsion; allows multiple values",
274+
"minItems": 1
254275
},
255276
"trip_id": {
256277
"$id": "#/properties/data/properties/trips/items/properties/trip_id",
@@ -340,18 +361,7 @@
340361
},
341362
"currency": {
342363
"$id": "#/properties/data/properties/trips/items/properties/currency",
343-
"type": [
344-
"string",
345-
"null"
346-
],
347-
"pattern": "^[A-Z]{3}$",
348-
"default": "USD",
349-
"description": "An ISO 4217 Alphabetic Currency Code representing the currency of the payee. If null, USD cents is implied.",
350-
"examples": [
351-
"USD",
352-
"EUR",
353-
"GBP"
354-
]
364+
"$ref": "#/definitions/currency"
355365
}
356366
}
357367
}

provider/vehicles.json

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -247,21 +247,26 @@
247247
"$ref": "#/definitions/vehicle_event"
248248
}
249249
},
250+
"propulsion_type": {
251+
"$id": "#/definitions/propulsion_type",
252+
"type": "string",
253+
"description": "The type of propulsion",
254+
"enum": [
255+
"combustion",
256+
"electric",
257+
"electric_assist",
258+
"human"
259+
]
260+
},
250261
"propulsion_types": {
251262
"$id": "#/definitions/propulsion_types",
252263
"type": "array",
253-
"description": "The type of propulsion; allows multiple values",
264+
"description": "Array of propulsion types, allowing multiple values",
254265
"items": {
255-
"type": "string",
256-
"enum": [
257-
"combustion",
258-
"electric",
259-
"electric_assist",
260-
"human"
261-
]
266+
"$id": "#/definitions/propulsion_types/items",
267+
"$ref": "#/definitions/propulsion_type"
262268
},
263-
"uniqueItems": true,
264-
"minItems": 1
269+
"uniqueItems": true
265270
},
266271
"vehicle_type": {
267272
"$id": "#/definitions/vehicle_type",
@@ -340,7 +345,8 @@
340345
"propulsion_types": {
341346
"$id": "#/definitions/vehicle/properties/propulsion_types",
342347
"$ref": "#/definitions/propulsion_types",
343-
"description": "The type of propulsion; allows multiple values"
348+
"description": "The type of propulsion; allows multiple values",
349+
"minItems": 1
344350
},
345351
"last_event_time": {
346352
"$id": "#/properties/data/properties/vehicles/items/properties/last_event_time",

0 commit comments

Comments
 (0)