Merge pull request #699 from openmobilityfoundation/ms-1.1.0-fixes

Support: Schema fixes for MDS 1.1.0
openmobilityfoundation · Sep 24, 2021 · 349e9c0 · 349e9c0
2 parents 7dca90a + 5271fa8
commit 349e9c0
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 22 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,3 +1,14 @@
+## 1.1.1
+
+> Released: 2021-09-24 
+
+The 1.1.1 support release fixes the version validation for 1.1.0 in the JSON schema, and adds comms_restored to removed state. 
+
+### CHANGES
+
+- ["removed" missing "comms_restored" option in provider schemas](https://github.com/openmobilityfoundation/mobility-data-specification/issues/690)
+- [Version number is 1.0.x for 1.1.0 release](https://github.com/openmobilityfoundation/mobility-data-specification/issues/669)
+
 ## 1.1.0
 
 > Released: 2021-03-30 

diff --git a/policy/policy.json b/policy/policy.json
@@ -462,9 +462,9 @@
       "type": "string",
       "description": "The version of MDS this data represents",
       "examples": [
-        "1.0.0"
+        "1.1.0"
       ],
-      "pattern": "^1\\.0\\.[0-9]+$"
+      "pattern": "^1\\.1\\.[0-9]+$"
     },
     "days": {
       "$id": "#/definitions/days",
@@ -545,7 +545,7 @@
       ],
       "description": "Integer milliseconds since Unix epoch",
       "multipleOf": 1.0,
-      "minimum": 0
+      "minimum": 1514764800000
     },
     "null_uuid_array": {
       "$id": "#/definitions/null_uuid_array",
@@ -616,4 +616,4 @@
     }
   },
   "additionalProperties": false
-}
+}
diff --git a/provider/events.json b/provider/events.json
@@ -37,9 +37,9 @@
       "type": "string",
       "description": "The version of MDS this data represents",
       "examples": [
-        "1.0.0"
+        "1.1.0"
       ],
-      "pattern": "^1\\.0\\.[0-9]+$"
+      "pattern": "^1\\.1\\.[0-9]+$"
     },
     "Point": {
       "$id": "#/definitions/Point",
@@ -571,4 +571,4 @@
     }
   },
   "additionalProperties": false
-}
+}
diff --git a/provider/status_changes.json b/provider/status_changes.json
@@ -37,9 +37,9 @@
       "type": "string",
       "description": "The version of MDS this data represents",
       "examples": [
-        "1.0.0"
+        "1.1.0"
       ],
-      "pattern": "^1\\.0\\.[0-9]+$"
+      "pattern": "^1\\.1\\.[0-9]+$"
     },
     "Point": {
       "$id": "#/definitions/Point",
@@ -423,6 +423,7 @@
                         "contains": {
                           "enum": [
                             "agency_pick_up",
+                            "comms_restored",
                             "compliance_pick_up",
                             "decommissioned",
                             "located",
@@ -508,4 +509,4 @@
     }
   },
   "additionalProperties": false
-}
+}
diff --git a/provider/stops.json b/provider/stops.json
@@ -37,9 +37,9 @@
       "type": "string",
       "description": "The version of MDS this data represents",
       "examples": [
-        "1.0.0"
+        "1.1.0"
       ],
-      "pattern": "^1\\.0\\.[0-9]+$"
+      "pattern": "^1\\.1\\.[0-9]+$"
     },
     "Point": {
       "$id": "#/definitions/Point",
@@ -350,4 +350,4 @@
     }
   },
   "additionalProperties": false
-}
+}
diff --git a/provider/trips.json b/provider/trips.json
@@ -37,9 +37,9 @@
       "type": "string",
       "description": "The version of MDS this data represents",
       "examples": [
-        "1.0.0"
+        "1.1.0"
       ],
-      "pattern": "^1\\.0\\.[0-9]+$"
+      "pattern": "^1\\.1\\.[0-9]+$"
     },
     "Point": {
       "$id": "#/definitions/Point",
@@ -375,4 +375,4 @@
     }
   },
   "additionalProperties": false
-}
+}
diff --git a/provider/vehicles.json b/provider/vehicles.json
@@ -37,9 +37,9 @@
       "type": "string",
       "description": "The version of MDS this data represents",
       "examples": [
-        "1.0.0"
+        "1.1.0"
       ],
-      "pattern": "^1\\.0\\.[0-9]+$"
+      "pattern": "^1\\.1\\.[0-9]+$"
     },
     "Point": {
       "$id": "#/definitions/Point",
@@ -562,4 +562,4 @@
     }
   },
   "additionalProperties": false
-}
+}
diff --git a/schema/templates/common.json b/schema/templates/common.json
@@ -704,9 +704,9 @@
       "type": "string",
       "description": "The version of MDS this data represents",
       "examples": [
-        "1.0.0"
+        "1.1.0"
       ],
-      "pattern": "^1\\.0\\.[0-9]+$"
+      "pattern": "^1\\.1\\.[0-9]+$"
     }
   }
-}
+}