rsmp_schema 0.8.9 → 0.9.1

data/schemas/tlc/1.1.0/commands/M0021.json

@@ -1,78 +1,50 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Set trigger level sensitivity for loop detector.\nThe trigger level sensitivity determines at what level a 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.\nThis command provides the ability to fine tune loop detectors to make sure they detect traffic as intended.\nRequires security code 2",
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "securityCode",
+        "status"
+      ]
+    },
+    "cO" : {
+      "const" : "setLevel"
+    }
+  },
   "allOf" : [
     {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "securityCode",
-            "status"
-          ]
-        },
-        "cO" : {
-          "const" : "setLevel"
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "status"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Loop detector trigger level sensitivity is written as dd-ss where:\ndd=loop detector number\nss=sensitivity value",
+            "type" : "string"
+          }
         }
       }
     },
     {
       "if" : {
-        "required" : [
-          "q"
-        ],
         "properties" : {
-          "q" : {
-            "enum" : [
-              "undefined",
-              "unknown"
-            ]
+          "n" : {
+            "const" : "securityCode"
           }
         }
       },
       "then" : {
-      },
-      "else" : {
-        "allOf" : [
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "status"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "description" : "Loop detector trigger level sensitivity is written as dd-ss where:\ndd=loop detector number\nss=sensitivity value",
-                  "type" : "string"
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "securityCode"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "description" : "Security code 2",
-                  "type" : "string"
-                }
-              }
-            }
+        "properties" : {
+          "v" : {
+            "description" : "Security code 2",
+            "type" : "string"
           }
-        ]
+        }
       }
     }
   ]

data/schemas/tlc/1.1.0/commands/M0022.json

@@ -1,354 +1,248 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Request Signal Priority\n\nUseful for bus priority or other type of priorities like emergency vehicles or groups of cyclists.\n\nThe benefit of using this message over activating inputs or detector logics is that you can specify a priority level, vehicle type and estimated time of arrival. You can also update or cancel the request, and use the corresponding status message to track the status of the request, including how much priority was actually given.\n\nTo understand how this command relates to ETSI/J2735, please see the [wiki](https://github.com/rsmp-nordic/rsmp_sxl_traffic_lights/wiki/Signal-priority-and-ETSI-J2735).\n\nActivating signal priority is expected to provide more green time for a particular movement through the intersection, but the exact mechanism must typically be configured in the controller.\n\nThe movement to prioritize can be referenced in a number of ways, depending on what is configured in the controller, and in the system that sends priority requests. Either:\n\n- Reference a signal group by setting 'signalGroupId'. This method is simple, but will not allow you to have different priority mechanism for the same signal group, unless they can be distinguished by the vehicle type. For example, if you need to trigger different priorities depending on whether a bus goes straight or makes a turn for the same signal group, you need to use of the other referencing methods.\n- Reference an input by setting 'inputId'. This can be useful if you previously used inputs to activate priority. The input will not be activated, only the priority.\n- Reference a connection by setting 'connectionId'. A connection is a movement from a specific ingoing lane to a specific outgoing lane.\n- Reference an intersection approach by setting 'approachId'.\n- Reference an ingoing lane by setting 'laneInId', and optionally also reference an outgoing lane by setting 'laneOutId'.\n\nReferencing attributes that are not used must be left out, rather than set to null or empty strings. This includes:\n\n- signalGroupId\n- inputId\n- connectionId\n- approachId\n- laneInId\n- laneOutId\n\nReferencing attributes are only used when initiating a request. When updating or cancelling the request, the request is identified by its requestId, and no referencing attributes are allowed.\n\nYou initiate a priority request with type set to 'new'. You must provide a request id that uniquely identifies the request on the controller. It can be a randomly generated UUID (universally unique identifier), or it can be constructed by combining e.g. a vehicle id and some other identifier. When updating or cancelling a request, you must pass the same request id again.\n\nProviding ETA (estimated time of arrival) when initiating a request is optional, but can help the controller plan ahead in cases where you're able to send the request before the vehicle arrives at the intersection. You're allowed to initiate the request without an ETA and provide it in a later request update. But providing the ETA when initiating the request is recommended, since it will give the controller more time to plan ahead.\n\nLike ETA, providing a vehicle type is optional, but can help the controller decide how to best handle the request.\n\nThe priority level provides a way to indicate the relative importance of the request compared to other requests. For example, emergency vehicles or delayed buses could be given a higher priority level.\n\nIf the ETA changes before the priority is cancelled, or you want to change the priority level, you can send another request message with type set to 'update'. The vehicle type cannot be changed.\n\nWhen you send a priority request, it will be processed to decide if it's possible to activate the requested priority.\n\nIf the request is accepted, the priority can either be activated immediately, or if another priority is currently active, it can be queued for later activation.\n\nIf the priority cannot be accepted the request is rejected. Cooldown is a specific type of rejection, which means that s similar request has just completed, and some time needs to pass before a similar request can be activated.\n\nWhen a request is queued, it is expected to become activated later, but in case too long passes without activation, the controller is expected to time out the request.\n\nOnce a priority is activated, you're excepted to cancel it as soon as there's no need for it anymore, typically when the vehicle has passed the intersection. You cancel a request by sending a request passing the existing request id setting the type to 'cancel'.\n\nIf a request is never cancelled, the controller is expected to remove the priority at some point, but until then the priority might block requests in other direction which is why you should always cancel a priority when it's not needed anymore.",
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "approachId",
+        "connectionId",
+        "eta",
+        "inputId",
+        "laneInId",
+        "laneOutId",
+        "level",
+        "priorityId",
+        "requestId",
+        "signalGroupId",
+        "type",
+        "vehicleType"
+      ]
+    },
+    "cO" : {
+      "const" : "requestPriority"
+    }
+  },
   "allOf" : [
     {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "approachId",
-            "connectionId",
-            "eta",
-            "inputId",
-            "laneInId",
-            "laneOutId",
-            "level",
-            "priorityId",
-            "requestId",
-            "signalGroupId",
-            "type",
-            "vehicleType"
-          ]
-        },
-        "cO" : {
-          "const" : "requestPriority"
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "requestId"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "A string that uniquely identifies the request on the controller",
+            "type" : "string"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "signalGroupId"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "ID of a signal group component.",
+            "type" : "string"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "inputId"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "ID of an input, using the same numbering scheme as M0006",
+            "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+          }
         }
       }
     },
     {
       "if" : {
-        "required" : [
-          "q"
-        ],
         "properties" : {
-          "q" : {
+          "n" : {
+            "const" : "connectionId"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "ID of a connection, connecting an ingoing and an outgoing lane",
+            "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "approachId"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "ID of an intersection approach",
+            "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "laneInId"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "ID of an ingoing lane",
+            "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "laneOutId"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "ID of an outgoing lane",
+            "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "priorityId"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "ID of a priority",
+            "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "type"
+          }
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "type" : "string",
             "enum" : [
-              "undefined",
-              "unknown"
+              "cancel",
+              "new",
+              "update"
             ]
           }
         }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "level"
+          }
+        }
       },
       "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "0: Lowest, 14: Highest",
+            "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "eta"
+          }
+        }
       },
-      "else" : {
-        "allOf" : [
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "requestId"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "description" : "A string that uniquely identifies the request on the controller",
-                  "type" : "string"
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "signalGroupId"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "description" : "ID of a signal group component.",
-                  "type" : "string"
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "inputId"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "allOf" : [
-                    {
-                      "description" : "ID of an input, using the same numbering scheme as M0006"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "connectionId"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "allOf" : [
-                    {
-                      "description" : "ID of a connection, connecting an ingoing and an outgoing lane"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "approachId"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "allOf" : [
-                    {
-                      "description" : "ID of an intersection approach"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "laneInId"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "allOf" : [
-                    {
-                      "description" : "ID of an ingoing lane"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "laneOutId"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "allOf" : [
-                    {
-                      "description" : "ID of an outgoing lane"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "priorityId"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "allOf" : [
-                    {
-                      "description" : "ID of a priority"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "type"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "type" : "string",
-                  "enum" : [
-                    "cancel",
-                    "new",
-                    "update"
-                  ]
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "level"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "allOf" : [
-                    {
-                      "description" : "0: Lowest, 14: Highest"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "eta"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "allOf" : [
-                    {
-                      "description" : "Estimated time of arrival to the intersection, in seconds"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
-            }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "vehicleType"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "v" : {
-                  "description" : "Vehicle type",
-                  "type" : "string",
-                  "enum" : [
-                    "bicycle",
-                    "bus",
-                    "car",
-                    "emergency",
-                    "heavyTruck",
-                    "lightTruck",
-                    "motorcycle",
-                    "other",
-                    "pedestrian",
-                    "safetyCar",
-                    "specialTransport",
-                    "tram"
-                  ]
-                }
-              }
-            }
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Estimated time of arrival to the intersection, in seconds",
+            "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+          }
+        }
+      }
+    },
+    {
+      "if" : {
+        "properties" : {
+          "n" : {
+            "const" : "vehicleType"
           }
-        ]
+        }
+      },
+      "then" : {
+        "properties" : {
+          "v" : {
+            "description" : "Vehicle type",
+            "type" : "string",
+            "enum" : [
+              "bicycle",
+              "bus",
+              "car",
+              "emergency",
+              "heavyTruck",
+              "lightTruck",
+              "motorcycle",
+              "other",
+              "pedestrian",
+              "safetyCar",
+              "specialTransport",
+              "tram"
+            ]
+          }
+        }
       }
     }
   ]