rsmp_schema 0.8.9 → 0.9.1

data/schemas/tlc/1.2.0/statuses/S0029.json

@@ -1,55 +1,36 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Forced input status.\nProvide status of input (1-255) regarding if they are forced or not. Can be used for all types of input where the traffic light controller must react to external control.\nCan be used for bus priority, coordination between traffic controllers, external control systems, and much more.",
-  "allOf" : [
-    {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "status"
-          ]
-        }
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "q"
-        ],
-        "properties" : {
-          "q" : {
-            "enum" : [
-              "undefined",
-              "unknown"
-            ]
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "status"
+      ]
+    }
+  },
+  "if" : {
+    "$ref" : "../../defs/guards.json#/$defs/q_unknown_or_undefined"
+  },
+  "then" : {},
+  "else" : {
+    "allOf" : [
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "status"
+            }
           }
-        }
-      },
-      "then" : {
-      },
-      "else" : {
-        "allOf" : [
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "status"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "description" : "Forced input status as text field",
-                  "type" : "string"
-                }
-              }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Forced input status as text field",
+              "type" : "string"
             }
           }
-        ]
+        }
       }
-    }
-  ]
+    ]
+  }
 }

data/schemas/tlc/1.2.0/statuses/S0030.json

@@ -1,55 +1,36 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Forced output status.\nProvide status of output (1-255) regarding if they are forced or not. Can be used for all types of output where the traffic light controller needs to control other equipment.\nCan be used for bus priority, coordination between traffic controllers, external control systems, and much more.",
-  "allOf" : [
-    {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "status"
-          ]
-        }
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "q"
-        ],
-        "properties" : {
-          "q" : {
-            "enum" : [
-              "undefined",
-              "unknown"
-            ]
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "status"
+      ]
+    }
+  },
+  "if" : {
+    "$ref" : "../../defs/guards.json#/$defs/q_unknown_or_undefined"
+  },
+  "then" : {},
+  "else" : {
+    "allOf" : [
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "status"
+            }
           }
-        }
-      },
-      "then" : {
-      },
-      "else" : {
-        "allOf" : [
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "status"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "description" : "Forced output status as text field",
-                  "type" : "string"
-                }
-              }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Forced output status as text field",
+              "type" : "string"
             }
           }
-        ]
+        }
       }
-    }
-  ]
+    ]
+  }
 }

data/schemas/tlc/1.2.0/statuses/S0031.json

@@ -1,55 +1,36 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Trigger level sensitivity for loop detector.\nThe trigger level sensitivity determines at what level the loop detector should trigger. If it set too low then then traffic will not be detected as intended. If it is set too high the detector might give false positives.\nCan be used to make sure that the detectors detect traffic as intended.",
-  "allOf" : [
-    {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "status"
-          ]
-        }
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "q"
-        ],
-        "properties" : {
-          "q" : {
-            "enum" : [
-              "undefined",
-              "unknown"
-            ]
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "status"
+      ]
+    }
+  },
+  "if" : {
+    "$ref" : "../../defs/guards.json#/$defs/q_unknown_or_undefined"
+  },
+  "then" : {},
+  "else" : {
+    "allOf" : [
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "status"
+            }
           }
-        }
-      },
-      "then" : {
-      },
-      "else" : {
-        "allOf" : [
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "status"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "description" : "Loop detector trigger level sensitivity is written as dd-ss where:\ndd=loop detector number\nss=sensitivity value\nEach loop detector is separated with a comma. E.g.dd-ss,dd-ss.",
-                  "type" : "string"
-                }
-              }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Loop detector trigger level sensitivity is written as dd-ss where:\ndd=loop detector number\nss=sensitivity value\nEach loop detector is separated with a comma. E.g.dd-ss,dd-ss.",
+              "type" : "string"
             }
           }
-        ]
+        }
       }
-    }
-  ]
+    ]
+  }
 }

data/schemas/tlc/1.2.0/statuses/S0032.json

@@ -1,116 +1,73 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Coordinated control\nThis status is used when coordination between traffic light controllers is active. Coordination is described in detail in the corresponding section\nPlease note that all values in this status uses comma-separated lists - one value for each intersection, e.g. \"1,2\" and \"centralized,off\"",
-  "allOf" : [
-    {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "intersection",
-            "source",
-            "status"
-          ]
-        }
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "q"
-        ],
-        "properties" : {
-          "q" : {
-            "enum" : [
-              "undefined",
-              "unknown"
-            ]
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "intersection",
+        "source",
+        "status"
+      ]
+    }
+  },
+  "if" : {
+    "$ref" : "../../defs/guards.json#/$defs/q_unknown_or_undefined"
+  },
+  "then" : {},
+  "else" : {
+    "allOf" : [
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "intersection"
+            }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Comma separated list of intersections which the status relates to, e.g. \"1,2\".\nUse \"0\" for all intersections of the TLC.",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer_list"
+            }
           }
         }
       },
-      "then" : {
-      },
-      "else" : {
-        "allOf" : [
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "intersection"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Comma separated list of intersections which the status relates to, e.g. \"1,2\".\nUse \"0\" for all intersections of the TLC."
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer_list"
-                    }
-                  ]
-                }
-              }
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "status"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "status"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "pattern" : "(?-mix:^(local|centralized|off)(?:,(local|centralized|off))*$)"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/string_list"
-                    }
-                  ]
-                }
-              }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "$ref" : "../../../core/3.1.2/definitions.json#/string_list",
+              "pattern" : "(?-mix:^(local|centralized|off)(?:,(local|centralized|off))*$)"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "source"
+          }
+        }
+      },
+      {
+              "if" : {
+                "properties" : {
+                  "n" : {
+                    "const" : "source"
+                  }
                 }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Source of the status change",
-                      "pattern" : "(?-mix:^(operator_panel|calendar_clock|control_block|forced|startup|other)(?:,(operator_panel|calendar_clock|control_block|forced|startup|other))*$)"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/string_list"
-                    }
-                  ]
+              },
+              "then" : {
+                "properties" : {
+                  "s" : {
+                    "description" : "Source of the status change",
+                    "$ref" : "../../../core/3.1.2/definitions.json#/string_list",
+                    "pattern" : "(?-mix:^(operator_panel|calendar_clock|control_block|forced|startup|other)(?:,(operator_panel|calendar_clock|control_block|forced|startup|other))*$)"
+                  }
                 }
               }
-            }
-          }
-        ]
       }
-    }
-  ]
+    ]
+  }
 }

data/schemas/tlc/1.2.0/statuses/S0033.json

@@ -1,114 +1,77 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Signal Priority Status\nThis status can be used to get updates about priority requests. For example, you can use it to know when priority requests are activated or cancelled.\nA list of priorities is returned, referred to by their request ids. The same request id can appear only once.\nAll priorities are included in the list (not only the ones that have changed state since the last update). This is done regardless of whether the status is send in respond to a status request, or due to a status subscription, and also regardless of whether a status subscription uses an update interval, or send-on-change, or both.\nIf you subscribe using an update interval, you're not guaranteed to get all intermediate states. To guarantee that, send-on-change must be used when subscribing.\nTo understand how this status relates to ETSI/J2735, please see the [wiki](https://github.com/rsmp-nordic/rsmp_sxl_traffic_lights/wiki/Signal-priority-and-ETSI-J2735).\nAll priorities are send on every status update, regardless of whether an interval, or sendOnChange (or both) is used.\nWhen a priority reaches an end states (completed, timeout, rejected, cooldown or stale), it must be sent once on the next status update, then removed from the list.\nA request always starts in the 'received' state. The following table shows the possible state transitions:\n\nState      | Possible next states\n---------- | -------------------------------------\nreceived   | queued, activated, rejected, cooldown\nqueued     | activated, timeout\nactivated  | completed, stale\ncompleted  |\ntimeout    |\nrejected   |\ncooldown   |\nstale      |",
-  "allOf" : [
-    {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "status"
-          ]
-        }
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "q"
-        ],
-        "properties" : {
-          "q" : {
-            "enum" : [
-              "undefined",
-              "unknown"
-            ]
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "status"
+      ]
+    }
+  },
+  "if" : {
+    "$ref" : "../../defs/guards.json#/$defs/q_unknown_or_undefined"
+  },
+  "then" : {},
+  "else" : {
+    "allOf" : [
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "status"
+            }
           }
-        }
-      },
-      "then" : {
-      },
-      "else" : {
-        "allOf" : [
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "status"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "description" : "JSON array of priority status items",
-                  "type" : "array",
-                  "items" : {
-                    "type" : "object",
-                    "required" : [
-                      "r",
-                      "s",
-                      "t"
-                    ],
-                    "additionalProperties" : false,
-                    "properties" : {
-                      "r" : {
-                        "description" : "ID of the priority request",
-                        "type" : "string"
-                      },
-                      "t" : {
-                        "allOf" : [
-                          {
-                            "description" : "Timestamp, indicating when the priority last changed state."
-                          },
-                          {
-                            "$ref" : "../../../core/3.1.2/definitions.json#/timestamp"
-                          }
-                        ]
-                      },
-                      "s" : {
-                        "description" : "Current status of the priority request",
-                        "type" : "string",
-                        "enum" : [
-                          "activated",
-                          "completed",
-                          "cooldown",
-                          "queued",
-                          "received",
-                          "rejected",
-                          "stale",
-                          "timeout"
-                        ]
-                      },
-                      "e" : {
-                        "allOf" : [
-                          {
-                            "description" : "Estimated green extension provided by the priority, in seconds\nOnly used when state is 'completed'."
-                          },
-                          {
-                            "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                          }
-                        ]
-                      },
-                      "d" : {
-                        "allOf" : [
-                          {
-                            "description" : "Estimated red reduction provided by the priority, in seconds\nOnly used when state is 'completed'."
-                          },
-                          {
-                            "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                          }
-                        ]
-                      }
-                    }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "JSON array of priority status items",
+              "type" : "array",
+              "items" : {
+                "type" : "object",
+                "required" : [
+                  "r",
+                  "s",
+                  "t"
+                ],
+                "unevaluatedProperties" : false,
+                "properties" : {
+                  "r" : {
+                    "description" : "ID of the priority request",
+                    "type" : "string"
+                  },
+                  "t" : {
+                    "description" : "Timestamp, indicating when the priority last changed state.",
+                    "$ref" : "../../../core/3.1.2/definitions.json#/timestamp"
+                  },
+                  "s" : {
+                    "description" : "Current status of the priority request",
+                    "type" : "string",
+                    "enum" : [
+                      "activated",
+                      "completed",
+                      "cooldown",
+                      "queued",
+                      "received",
+                      "rejected",
+                      "stale",
+                      "timeout"
+                    ]
+                  },
+                  "e" : {
+                    "description" : "Estimated green extension provided by the priority, in seconds\nOnly used when state is 'completed'.",
+                    "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+                  },
+                  "d" : {
+                    "description" : "Estimated red reduction provided by the priority, in seconds\nOnly used when state is 'completed'.",
+                    "$ref" : "../../../core/3.1.2/definitions.json#/integer"
                   }
                 }
               }
             }
           }
-        ]
+        }
       }
-    }
-  ]
+    ]
+  }
 }