Do not merge - temp PR to help reviewing #79

v2.3/gbfs.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
-  "$id": "https://github.com/NABSA/gbfs/blob/v2.3/gbfs.md#gbfsjson",
+  "$id": "https://github.com/NABSA/gbfs/blob/v3.0-RC/gbfs.md#gbfsjson",
   "description":
     "Auto-discovery file that links to all of the other files published by the system.",
   "type": "object",
@@ -21,58 +21,48 @@
       "description":
         "GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
       "type": "string",
-      "const": "2.3"
+      "const": "3.0-RC"
     },
     "data": {
-      "description": "Response data in the form of name:value pairs.",
-      "type": "object",
-      "patternProperties": {
-        "^[a-z]{2,3}(-[A-Z]{2})?$": {
-          "type": "object",
-          "properties": {
-            "feeds": {
-              "description":
-                "An array of all of the feeds that are published by the auto-discovery file. Each element in the array is an object with the keys below.",
-              "type": "array",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "name": {
-                    "description":
-                      "Key identifying the type of feed this is. The key must be the base file name defined in the spec for the corresponding feed type.",
-                    "type": "string",
-                    "enum": [
-                      "gbfs",
-                      "gbfs_versions",
-                      "system_information",
-                      "vehicle_types",
-                      "station_information",
-                      "station_status",
-                      "free_bike_status",
-                      "system_hours",
-                      "system_alerts",
-                      "system_calendar",
-                      "system_regions",
-                      "system_pricing_plans",
-                      "geofencing_zones"
-                    ]
-                  },
-                  "url": {
-                    "description": "URL for the feed.",
-                    "type": "string",
-                    "format": "uri"
-                  }
-                },
-                "required": ["name", "url"]
+      "properties": {
+        "feeds": {
+          "description": "An array of all of the feeds that are published by the auto-discovery file. Each element in the array is an object with the keys below.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "description": "Key identifying the type of feed this is. The key must be the base file name defined in the spec for the corresponding feed type.",
+                "type": "string",
+                "enum": [
+                  "gbfs",
+                  "manifest",
+                  "gbfs_versions",
+                  "system_information",
+                  "vehicle_types",
+                  "station_information",
+                  "station_status",
+                  "vehicle_status",
+                  "system_alerts",
+                  "system_regions",
+                  "system_pricing_plans",
+                  "geofencing_zones"
+                ]
+              },
+              "url": {
+                "description": "URL for the feed.",
+                "type": "string",
+                "format": "uri"
               }
             },
-            "required": true
+            "required": ["name", "url"]
           }
         },
         "required": true
-      },
-      "additionalProperties": false
-    }
+      }
+    },
+    "required": true
   },
+  "additionalProperties": false,
   "required": ["last_updated", "ttl", "version", "data"]
 }

v2.3/gbfs_versions.json

@@ -1,9 +1,8 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id":
-    "https://github.com/NABSA/gbfs/blob/v2.3/gbfs.md#gbfs_versionsjson-added-in-v11",
-  "description":
-    "Lists all feed endpoints published according to version sof the GBFS documentation. (added in v1.1)",
+    "https://github.com/NABSA/gbfs/blob/v3.0-RC/gbfs.md#gbfs_versionsjson-added-in-v11",
+  "description": "Lists all feed endpoints published according to version sof the GBFS documentation. (added in v1.1)",
   "type": "object",
   "properties": {
     "last_updated": {
@@ -22,7 +21,7 @@
       "description":
         "GBFS version number to which the feed conforms, according to the versioning framework.",
       "type": "string",
-      "const": "2.3"
+      "const": "3.0-RC"
     },
     "data": {
       "description": "Response data in the form of name:value pairs.",
@@ -36,16 +35,16 @@
             "type": "object",
             "properties": {
               "version": {
-                "description":
-                  "The semantic version of the feed in the form X.Y",
+                "description": "The semantic version of the feed in the form X.Y",
                 "type": "string",
                 "enum": [
                   "1.0",
                   "1.1",
                   "2.0",
                   "2.1",
                   "2.2",
-                  "2.3"
+                  "2.3",
+                  "3.0-RC"
                 ]
               },
               "url": {

v2.3/geofencing_zones.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id":
-    "https://github.com/NABSA/gbfs/blob/v2.3/gbfs.md#geofencing_zonesjson",
+    "https://github.com/NABSA/gbfs/blob/v3.0-RC/gbfs.md#geofencing_zonesjson",
   "description":
     "Describes geofencing zones and their associated rules and attributes (added in v2.1-RC).",
   "type": "object",
@@ -20,7 +20,7 @@
     "version": {
       "description": "GBFS version number to which the feed conforms, according to the versioning framework.",
       "type": "string",
-      "const": "2.3"
+      "const": "3.0-RC"
     },
     "data": {
       "description": "Array that contains geofencing information for the system.",
@@ -53,7 +53,22 @@
                     "properties": {
                       "name": {
                         "description": "Public name of the geofencing zone.",
-                        "type": "string"
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "start": {
+                              "description": "Start time of the alert.",
+                              "type": "integer",
+                              "minimum": 1450155600
+                            },
+                            "end": {
+                              "description": "End time of the alert.",
+                              "type": "integer",
+                              "minimum": 1450155600
+                            }
+                          }
+                        }
                       },
                       "start": {
                         "description": "Start time of the geofencing zone in POSIX time.",
@@ -76,8 +91,12 @@
                               "description": "Array of vehicle type IDs for which these restrictions apply.",
                               "items": { "type": "string" }
                             },
-                            "ride_allowed": {
-                              "description": "Is the undocked ride allowed to start and end in this zone?",
+                            "ride_start_allowed": {
+                              "description": "Is the ride allowed to start in this zone?",
+                              "type": "boolean"
+                            },
+                            "ride_end_allowed": {
+                              "description": "Is the ride allowed to end in this zone?",
                               "type": "boolean"
                             },
                             "ride_through_allowed": {
@@ -95,7 +114,7 @@
                               "type": "boolean"
                             }
                           },
-                          "required": ["ride_allowed", "ride_through_allowed"]
+                          "required": ["ride_start_allowed", "ride_end_allowed", "ride_through_allowed"]
                         }
                       }
                     }
@@ -136,6 +155,43 @@
             }
           },
           "required": ["type", "features"]
+        },
+        "rules": {
+          "description": "Array that contains one object per rule.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "vehicle_type_id": {
+                "type": "array",
+                "description": "Array of vehicle type IDs for which these restrictions apply.",
+                "items": { "type": "string" }
+              },
+              "ride_start_allowed": {
+                "description": "Is the ride allowed to start in this zone?",
+                "type": "boolean"
+              },
+              "ride_end_allowed": {
+                "description": "Is the ride allowed to end in this zone?",
+                "type": "boolean"
+              },
+              "ride_through_allowed": {
+                "description":
+                "Is the ride allowed to travel through this zone?",
+                "type": "boolean"
+              },
+              "maximum_speed_kph": {
+                "description": "What is the maximum speed allowed, in kilometers per hour?",
+                "type": "integer",
+                "minimum": 0
+              },
+              "station_parking": {
+                "description": "Vehicle MUST be parked at stations defined in station_information.json within this geofence zone",
+                "type": "boolean"
+              }
+            },
+            "required": ["ride_start_allowed", "ride_end_allowed", "ride_through_allowed"]
+          }
         }
       }
     }

v2.3/manifest.json

@@ -0,0 +1,79 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "https://github.com/NABSA/gbfs/blob/v3.0-RC/gbfs.md#manifestjson",
+  "description": "An index of gbfs.json URLs for each GBFS data set produced by a publisher. A single instance of this file should be published at a single stable URL, for example: https://example.com/gbfs/manifest.json.",
+  "type": "object",
+  "properties": {
+    "last_updated": {
+      "description": "Last time the data in the feed was updated in POSIX time.",
+      "type": "integer",
+      "minimum": 1450155600
+    },
+    "ttl": {
+      "description": "Number of seconds before the data in the feed will be updated again (0 if the data should always be refreshed).",
+      "type": "integer",
+      "minimum": 0
+    },
+    "version": {
+      "description": "GBFS version number to which the feed conforms, according to the versioning framework (added in v1.1).",
+      "type": "string",
+      "const": "3.0-RC"
+    },
+    "data": {
+      "type": "object",
+      "properties": {
+        "datasets": {
+          "description": "An array of objects, each containing the keys below.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "system_id": {
+                "description": "The system_id from system_information.json for the corresponding data set(s).",
+                "type": "string"
+              },
+              "versions": {
+                "description": "Contains one object, as defined below, for each of the available versions of a feed. The array MUST be sorted by increasing MAJOR and MINOR version number.",
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "version": {
+                      "description": "The semantic version of the feed in the form X.Y",
+                      "type": "string",
+                      "enum": [
+                        "1.0",
+                        "1.1",
+                        "2.0",
+                        "2.1",
+                        "2.2",
+                        "2.3",
+                        "3.0-RC"
+                      ]
+                    },
+                    "url": {
+                      "description": "URL of the corresponding gbfs.json endpoint",
+                      "type": "string",
+                      "format": "uri"
+                    }
+                  },
+                  "required": [
+                    "version",
+                    "url"
+                  ]
+                }
+              }
+            },
+            "required": [
+              "system_id",
+              "versions"
+            ]
+          }
+        }
+      },
+      "required": ["datasets"],
+      "additionalProperties": false
+    }
+  },
+  "required": ["last_updated", "ttl", "version", "data"]
+}