regenerate all schemas again

RideReport · Sep 12, 2020 · f9727e3 · f9727e3
1 parent 788e3d9
commit f9727e3
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 93 deletions.
diff --git a/agency/get_stops.json b/agency/get_stops.json
@@ -111,11 +111,8 @@
         },
         "devices": {
           "$id": "#/definitions/stop/properties/devices",
-          "type": "array",
-          "description": "List of device_id for vehicles currently at this Stop.",
-          "items": {
-            "$ref": "#/definitions/uuid"
-          }
+          "$ref": "#/definitions/uuid_array",
+          "description": "List of device_id for vehicles currently at this Stop."
         }
       }
     },
@@ -171,6 +168,15 @@
       ],
       "pattern": "^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$"
     },
+    "uuid_array": {
+      "$id": "#/definitions/uuid_array",
+      "type": "array",
+      "description": "Array of UUID",
+      "items": {
+        "$id": "#/definitions/uuid_array/items",
+        "$ref": "#/definitions/uuid"
+      }
+    },
     "vehicle_type_counts": {
       "$id": "#/definitions/vehicle_type_counts",
       "type": "object",

diff --git a/agency/get_vehicle.json b/agency/get_vehicle.json
@@ -7,18 +7,12 @@
     "propulsion_types": {
       "$id": "#/definitions/propulsion_types",
       "type": "array",
-      "description": "The type of propulsion; allows multiple values",
+      "description": "Array of propulsion types, allowing multiple values",
       "items": {
-        "type": "string",
-        "enum": [
-          "combustion",
-          "electric",
-          "electric_assist",
-          "human"
-        ]
+        "$id": "#/definitions/propulsion_types/items",
+        "$ref": "#/definitions/propulsion_type"
       },
-      "uniqueItems": true,
-      "minItems": 1
+      "uniqueItems": true
     },
     "string": {
       "$id": "#/definitions/string",
@@ -155,7 +149,8 @@
     "propulsion_types": {
       "$id": "#/definitions/vehicle/properties/propulsion_types",
       "$ref": "#/definitions/propulsion_types",
-      "description": "The type of propulsion; allows multiple values"
+      "description": "The type of propulsion; allows multiple values",
+      "minItems": 1
     },
     "year": {
       "$id": "#/properties/year",

diff --git a/agency/post_stops.json b/agency/post_stops.json
@@ -111,11 +111,8 @@
         },
         "devices": {
           "$id": "#/definitions/stop/properties/devices",
-          "type": "array",
-          "description": "List of device_id for vehicles currently at this Stop.",
-          "items": {
-            "$ref": "#/definitions/uuid"
-          }
+          "$ref": "#/definitions/uuid_array",
+          "description": "List of device_id for vehicles currently at this Stop."
         }
       }
     },
@@ -171,6 +168,15 @@
       ],
       "pattern": "^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$"
     },
+    "uuid_array": {
+      "$id": "#/definitions/uuid_array",
+      "type": "array",
+      "description": "Array of UUID",
+      "items": {
+        "$id": "#/definitions/uuid_array/items",
+        "$ref": "#/definitions/uuid"
+      }
+    },
     "vehicle_type_counts": {
       "$id": "#/definitions/vehicle_type_counts",
       "type": "object",

diff --git a/agency/post_vehicle.json b/agency/post_vehicle.json
@@ -7,18 +7,12 @@
     "propulsion_types": {
       "$id": "#/definitions/propulsion_types",
       "type": "array",
-      "description": "The type of propulsion; allows multiple values",
+      "description": "Array of propulsion types, allowing multiple values",
       "items": {
-        "type": "string",
-        "enum": [
-          "combustion",
-          "electric",
-          "electric_assist",
-          "human"
-        ]
+        "$id": "#/definitions/propulsion_types/items",
+        "$ref": "#/definitions/propulsion_type"
       },
-      "uniqueItems": true,
-      "minItems": 1
+      "uniqueItems": true
     },
     "string": {
       "$id": "#/definitions/string",
@@ -79,7 +73,8 @@
     "propulsion_types": {
       "$id": "#/definitions/vehicle/properties/propulsion_types",
       "$ref": "#/definitions/propulsion_types",
-      "description": "The type of propulsion; allows multiple values"
+      "description": "The type of propulsion; allows multiple values",
+      "minItems": 1
     },
     "year": {
       "$id": "#/properties/year",

diff --git a/provider/events.json b/provider/events.json
@@ -124,21 +124,26 @@
         }
       }
     },
+    "propulsion_type": {
+      "$id": "#/definitions/propulsion_type",
+      "type": "string",
+      "description": "The type of propulsion",
+      "enum": [
+        "combustion",
+        "electric",
+        "electric_assist",
+        "human"
+      ]
+    },
     "propulsion_types": {
       "$id": "#/definitions/propulsion_types",
       "type": "array",
-      "description": "The type of propulsion; allows multiple values",
+      "description": "Array of propulsion types, allowing multiple values",
       "items": {
-        "type": "string",
-        "enum": [
-          "combustion",
-          "electric",
-          "electric_assist",
-          "human"
-        ]
+        "$id": "#/definitions/propulsion_types/items",
+        "$ref": "#/definitions/propulsion_type"
       },
-      "uniqueItems": true,
-      "minItems": 1
+      "uniqueItems": true
     },
     "vehicle_type": {
       "$id": "#/definitions/vehicle_type",
@@ -332,7 +337,8 @@
               "propulsion_types": {
                 "$id": "#/definitions/vehicle/properties/propulsion_types",
                 "$ref": "#/definitions/propulsion_types",
-                "description": "The type of propulsion; allows multiple values"
+                "description": "The type of propulsion; allows multiple values",
+                "minItems": 1
               },
               "event_time": {
                 "$id": "#/properties/data/properties/status_changes/items/properties/event_time",

diff --git a/provider/status_changes.json b/provider/status_changes.json
@@ -124,21 +124,26 @@
         }
       }
     },
+    "propulsion_type": {
+      "$id": "#/definitions/propulsion_type",
+      "type": "string",
+      "description": "The type of propulsion",
+      "enum": [
+        "combustion",
+        "electric",
+        "electric_assist",
+        "human"
+      ]
+    },
     "propulsion_types": {
       "$id": "#/definitions/propulsion_types",
       "type": "array",
-      "description": "The type of propulsion; allows multiple values",
+      "description": "Array of propulsion types, allowing multiple values",
       "items": {
-        "type": "string",
-        "enum": [
-          "combustion",
-          "electric",
-          "electric_assist",
-          "human"
-        ]
+        "$id": "#/definitions/propulsion_types/items",
+        "$ref": "#/definitions/propulsion_type"
       },
-      "uniqueItems": true,
-      "minItems": 1
+      "uniqueItems": true
     },
     "vehicle_type": {
       "$id": "#/definitions/vehicle_type",
@@ -273,7 +278,8 @@
               "propulsion_types": {
                 "$id": "#/definitions/vehicle/properties/propulsion_types",
                 "$ref": "#/definitions/propulsion_types",
-                "description": "The type of propulsion; allows multiple values"
+                "description": "The type of propulsion; allows multiple values",
+                "minItems": 1
               },
               "event_time": {
                 "$id": "#/properties/data/properties/status_changes/items/properties/event_time",

diff --git a/provider/stops.json b/provider/stops.json
@@ -238,11 +238,8 @@
         },
         "devices": {
           "$id": "#/definitions/stop/properties/devices",
-          "type": "array",
-          "description": "List of device_id for vehicles currently at this Stop.",
-          "items": {
-            "$ref": "#/definitions/uuid"
-          }
+          "$ref": "#/definitions/uuid_array",
+          "description": "List of device_id for vehicles currently at this Stop."
         }
       }
     },
@@ -270,6 +267,15 @@
         }
       }
     },
+    "uuid_array": {
+      "$id": "#/definitions/uuid_array",
+      "type": "array",
+      "description": "Array of UUID",
+      "items": {
+        "$id": "#/definitions/uuid_array/items",
+        "$ref": "#/definitions/uuid"
+      }
+    },
     "vehicle_type_counts": {
       "$id": "#/definitions/vehicle_type_counts",
       "type": "object",

diff --git a/provider/trips.json b/provider/trips.json
@@ -124,6 +124,21 @@
         }
       }
     },
+    "currency": {
+      "$id": "#/definitions/currency",
+      "type": [
+        "string",
+        "null"
+      ],
+      "pattern": "^[A-Z]{3}$",
+      "default": "USD",
+      "description": "An ISO 4217 Alphabetic Currency Code representing currency of the payee. If null, USD cents is implied.",
+      "examples": [
+        "USD",
+        "EUR",
+        "GBP"
+      ]
+    },
     "MDS_FeatureCollection_Route": {
       "$id": "#/definitions/MDS_FeatureCollection_Route",
       "title": "MDS GeoJSON FeatureCollection Route",
@@ -155,21 +170,26 @@
         }
       }
     },
+    "propulsion_type": {
+      "$id": "#/definitions/propulsion_type",
+      "type": "string",
+      "description": "The type of propulsion",
+      "enum": [
+        "combustion",
+        "electric",
+        "electric_assist",
+        "human"
+      ]
+    },
     "propulsion_types": {
       "$id": "#/definitions/propulsion_types",
       "type": "array",
-      "description": "The type of propulsion; allows multiple values",
+      "description": "Array of propulsion types, allowing multiple values",
       "items": {
-        "type": "string",
-        "enum": [
-          "combustion",
-          "electric",
-          "electric_assist",
-          "human"
-        ]
+        "$id": "#/definitions/propulsion_types/items",
+        "$ref": "#/definitions/propulsion_type"
       },
-      "uniqueItems": true,
-      "minItems": 1
+      "uniqueItems": true
     },
     "vehicle_type": {
       "$id": "#/definitions/vehicle_type",
@@ -250,7 +270,8 @@
               "propulsion_types": {
                 "$id": "#/definitions/vehicle/properties/propulsion_types",
                 "$ref": "#/definitions/propulsion_types",
-                "description": "The type of propulsion; allows multiple values"
+                "description": "The type of propulsion; allows multiple values",
+                "minItems": 1
               },
               "trip_id": {
                 "$id": "#/properties/data/properties/trips/items/properties/trip_id",
@@ -340,18 +361,7 @@
               },
               "currency": {
                 "$id": "#/properties/data/properties/trips/items/properties/currency",
-                "type": [
-                  "string",
-                  "null"
-                ],
-                "pattern": "^[A-Z]{3}$",
-                "default": "USD",
-                "description": "An ISO 4217 Alphabetic Currency Code representing the currency of the payee. If null, USD cents is implied.",
-                "examples": [
-                  "USD",
-                  "EUR",
-                  "GBP"
-                ]
+                "$ref": "#/definitions/currency"
               }
             }
           }

diff --git a/provider/vehicles.json b/provider/vehicles.json
@@ -247,21 +247,26 @@
         "$ref": "#/definitions/vehicle_event"
       }
     },
+    "propulsion_type": {
+      "$id": "#/definitions/propulsion_type",
+      "type": "string",
+      "description": "The type of propulsion",
+      "enum": [
+        "combustion",
+        "electric",
+        "electric_assist",
+        "human"
+      ]
+    },
     "propulsion_types": {
       "$id": "#/definitions/propulsion_types",
       "type": "array",
-      "description": "The type of propulsion; allows multiple values",
+      "description": "Array of propulsion types, allowing multiple values",
       "items": {
-        "type": "string",
-        "enum": [
-          "combustion",
-          "electric",
-          "electric_assist",
-          "human"
-        ]
+        "$id": "#/definitions/propulsion_types/items",
+        "$ref": "#/definitions/propulsion_type"
       },
-      "uniqueItems": true,
-      "minItems": 1
+      "uniqueItems": true
     },
     "vehicle_type": {
       "$id": "#/definitions/vehicle_type",
@@ -340,7 +345,8 @@
               "propulsion_types": {
                 "$id": "#/definitions/vehicle/properties/propulsion_types",
                 "$ref": "#/definitions/propulsion_types",
-                "description": "The type of propulsion; allows multiple values"
+                "description": "The type of propulsion; allows multiple values",
+                "minItems": 1
               },
               "last_event_time": {
                 "$id": "#/properties/data/properties/vehicles/items/properties/last_event_time",