generate Provider schemas into the root

Existing endpoints are being augmented with Docked information
and new endpoints will co-exist.

Author: thekaveman

provider/README.md

@@ -413,7 +413,7 @@ In addition to the standard [Provider payload wrapper](#response-format), respon
 [decimal-degrees]: https://en.wikipedia.org/wiki/Decimal_degrees
 [dgps]: https://en.wikipedia.org/wiki/Differential_GPS
 [events]: #events
-[events-schema]: dockless/events.json
+[events-schema]: events.json
 [event-times]: #event-times
 [gbfs]: https://github.com/NABSA/gbfs
 [general-information]: /general-information.md
@@ -430,17 +430,17 @@ In addition to the standard [Provider payload wrapper](#response-format), respon
 [propulsion-types]: /general-information.md#propulsion-types
 [responses]: /general-information.md#responses
 [status]: #status-changes
-[status-schema]: dockless/status_changes.json
+[status-schema]: status_changes.json
 [stops]: #stops
 [st-intersects]: https://postgis.net/docs/ST_Intersects.html
 [toc]: #table-of-contents
 [trips]: #trips
-[trips-schema]: dockless/trips.json
+[trips-schema]: trips.json
 [ts]: /general-information.md#timestamps
 [vehicles]: #vehicles
 [vehicle-types]: /general-information.md#vehicle-types
 [vehicle-states]: /general-information.md#vehicle-states
 [vehicle-events]: /general-information.md#vehicle-state-events
-[vehicles-schema]: dockless/vehicles.json
+[vehicles-schema]: vehicles.json
 [versioning]: /general-information.md#versioning
 [wgs84]: https://en.wikipedia.org/wiki/World_Geodetic_System

provider/dockless/events.json provider/events.jsonprovider/dockless/events.json renamed to provider/events.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://raw.githubusercontent.com/openmobilityfoundation/mobility-data-specification/main/provider/dockless/events.json",
+  "$id": "https://raw.githubusercontent.com/openmobilityfoundation/mobility-data-specification/main/provider/events.json",
   "$schema": "http://json-schema.org/draft-06/schema#",
   "title": "Schema for MDS Provider events payloads",
   "type": "object",

provider/dockless/status_changes.json provider/status_changes.jsonprovider/dockless/status_changes.json renamed to provider/status_changes.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://raw.githubusercontent.com/openmobilityfoundation/mobility-data-specification/main/provider/dockless/status_changes.json",
+  "$id": "https://raw.githubusercontent.com/openmobilityfoundation/mobility-data-specification/main/provider/status_changes.json",
   "$schema": "http://json-schema.org/draft-06/schema#",
   "title": "Schema for MDS Provider status_changes payloads",
   "type": "object",

provider/dockless/trips.json provider/trips.jsonprovider/dockless/trips.json renamed to provider/trips.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://raw.githubusercontent.com/openmobilityfoundation/mobility-data-specification/main/provider/dockless/trips.json",
+  "$id": "https://raw.githubusercontent.com/openmobilityfoundation/mobility-data-specification/main/provider/trips.json",
   "$schema": "http://json-schema.org/draft-06/schema#",
   "title": "Schema for MDS Provider trips payloads",
   "type": "object",

provider/dockless/vehicles.json provider/vehicles.jsonprovider/dockless/vehicles.json renamed to provider/vehicles.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://raw.githubusercontent.com/openmobilityfoundation/mobility-data-specification/main/provider/dockless/vehicles.json",
+  "$id": "https://raw.githubusercontent.com/openmobilityfoundation/mobility-data-specification/main/provider/vehicles.json",
   "$schema": "http://json-schema.org/draft-06/schema#",
   "title": "Schema for MDS Provider vehicles payloads",
   "type": "object",

schema/generate_schemas.py

@@ -465,28 +465,29 @@ def write_provider_schemas(common_definitions):
     Create each of the Provider endpoint schema files in the appropriate directory.
     """
     print("\nStarting to generate Provider JSON Schemas...\n")
+    directory = "../provider"
 
     # /trips
     trips = provider_trips_schema(common_definitions)
-    with open("../provider/dockless/trips.json", "w") as schemafile:
+    with open(f"{directory}/trips.json", "w") as schemafile:
         schemafile.write(json.dumps(trips, indent=2))
         print("Wrote trips.json")
 
     # /status_changes
     status_changes = provider_status_changes_schema(common_definitions)
-    with open("../provider/dockless/status_changes.json", "w") as schemafile:
+    with open(f"{directory}/status_changes.json", "w") as schemafile:
         schemafile.write(json.dumps(status_changes, indent=2))
         print("Wrote status_changes.json")
 
     # /events
     events = provider_events_schema(common_definitions)
-    with open("../provider/dockless/events.json", "w") as schemafile:
+    with open(f"{directory}/events.json", "w") as schemafile:
         schemafile.write(json.dumps(events, indent=2))
         print("Wrote events.json")
 
     # /vehicles
     vehicles = provider_vehicles_schema(common_definitions)
-    with open("../provider/dockless/vehicles.json", "w") as schemafile:
+    with open(f"{directory}/vehicles.json", "w") as schemafile:
         schemafile.write(json.dumps(vehicles, indent=2))
         print("Wrote vehicles.json")
 

schema/templates/provider/endpoint.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://raw.githubusercontent.com/openmobilityfoundation/mobility-data-specification/main/provider/dockless/endpoint.json",
+  "$id": "https://raw.githubusercontent.com/openmobilityfoundation/mobility-data-specification/main/provider/endpoint.json",
   "$schema": "http://json-schema.org/draft-06/schema#",
   "title": "Schema for MDS Provider endpoint payloads",
   "type": "object",