rsmp_schema 0.8.8 → 0.9.0

data/schemas/tlc/1.0.8/statuses/S0092.json

@@ -1,79 +1,57 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Operator logged in/out web-interface.\nProvides information if maintenance personnel is currently working with the controller.",
-  "allOf" : [
-    {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "status",
-            "user"
-          ]
-        }
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "q"
-        ],
-        "properties" : {
-          "q" : {
-            "enum" : [
-              "undefined",
-              "unknown"
-            ]
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "status",
+        "user"
+      ]
+    }
+  },
+  "if" : {
+    "$ref" : "../../defs/guards.json#/$defs/q_unknown_or_undefined"
+  },
+  "then" : {},
+  "else" : {
+    "allOf" : [
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "user"
+            }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "nobody: No one logged in\n<username>: User currently logged in",
+              "type" : "string"
+            }
           }
         }
       },
-      "then" : {
-      },
-      "else" : {
-        "allOf" : [
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "user"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "description" : "nobody: No one logged in\n<username>: User currently logged in",
-                  "type" : "string"
-                }
-              }
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "status"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "status"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "type" : "string",
-                  "enum" : [
-                    "login",
-                    "logout"
-                  ]
-                }
-              }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "type" : "string",
+              "enum" : [
+                "login",
+                "logout"
+              ]
             }
           }
-        ]
+        }
       }
-    }
-  ]
+    ]
+  }
 }

data/schemas/tlc/1.0.8/statuses/S0095.json

@@ -1,55 +1,36 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Version of Traffic Light Controller.\nProvides diagnostic version information.",
-  "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" : "Manufacturer, product name and version of traffic light controller",
-                  "type" : "string"
-                }
-              }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Manufacturer, product name and version of traffic light controller",
+              "type" : "string"
             }
           }
-        ]
+        }
       }
-    }
-  ]
+    ]
+  }
 }

data/schemas/tlc/1.0.8/statuses/S0096.json

@@ -1,196 +1,126 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Current date and time\nProvides diagnostic information about the current date and time set in the controller.",
-  "allOf" : [
-    {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "day",
-            "hour",
-            "minute",
-            "month",
-            "second",
-            "year"
-          ]
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "day",
+        "hour",
+        "minute",
+        "month",
+        "second",
+        "year"
+      ]
+    }
+  },
+  "if" : {
+    "$ref" : "../../defs/guards.json#/$defs/q_unknown_or_undefined"
+  },
+  "then" : {},
+  "else" : {
+    "allOf" : [
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "year"
+            }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Year according to format YYYY. NOTE: UTC is used",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+            }
+          }
         }
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "q"
-        ],
-        "properties" : {
-          "q" : {
-            "enum" : [
-              "undefined",
-              "unknown"
-            ]
+      },
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "month"
+            }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Month (01-12) according to format MM. Note: UTC is used",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+            }
           }
         }
       },
-      "then" : {
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "day"
+            }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Day of month (01-31) according to format DD.  Note: UTC is used",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+            }
+          }
+        }
       },
-      "else" : {
-        "allOf" : [
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "year"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Year according to format YYYY. NOTE: UTC is used"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "hour"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "month"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Month (01-12) according to format MM. Note: UTC is used"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Hour of day (00-23) according to format DD. Note: UTC is used",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "day"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Day of month (01-31) according to format DD.  Note: UTC is used"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        }
+      },
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "minute"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "hour"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Hour of day (00-23) according to format DD. Note: UTC is used"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Minute (00-59) according to format MM. Note: UTC is used",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "minute"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Minute (00-59) according to format MM. Note: UTC is used"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        }
+      },
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "second"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "second"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Second (00-59) according to format SS. Note: UTC is used"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Second (00-59) according to format SS. Note: UTC is used",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
             }
           }
-        ]
+        }
       }
-    }
-  ]
+    ]
+  }
 }

data/schemas/tlc/1.0.8/statuses/S0201.json

@@ -1,88 +1,54 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Traffic Counting: Number of vehicles.\nUsed for Traffic counting.",
-  "allOf" : [
-    {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "starttime",
-            "vehicles"
-          ]
-        }
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "q"
-        ],
-        "properties" : {
-          "q" : {
-            "enum" : [
-              "undefined",
-              "unknown"
-            ]
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "starttime",
+        "vehicles"
+      ]
+    }
+  },
+  "if" : {
+    "$ref" : "../../defs/guards.json#/$defs/q_unknown_or_undefined"
+  },
+  "then" : {},
+  "else" : {
+    "allOf" : [
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "starttime"
+            }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Time stamp for start of measuring. Format according to W3C XML dateTime with a resolution of 3 decimal places. All time stamps in UTC. E.g. 2009-10-02T14:34:34.341Z",
+              "$ref" : "../../../core/3.1.2/definitions.json#/timestamp"
+            }
           }
         }
       },
-      "then" : {
-      },
-      "else" : {
-        "allOf" : [
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "starttime"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Time stamp for start of measuring. Format according to W3C XML dateTime with a resolution of 3 decimal places. All time stamps in UTC. E.g. 2009-10-02T14:34:34.341Z"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/timestamp"
-                    }
-                  ]
-                }
-              }
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "vehicles"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "vehicles"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Number of vehicles on a given detector logic (since last update)"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Number of vehicles on a given detector logic (since last update)",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
             }
           }
-        ]
+        }
       }
-    }
-  ]
+    ]
+  }
 }