rsmp_schema 0.8.9 → 0.9.0

data/schemas/tlc/1.1.0/statuses/S0203.json

@@ -1,88 +1,54 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Traffic Counting: Occupancy.\nUsed for Traffic counting.",
-  "allOf" : [
-    {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "occupancy",
-            "starttime"
-          ]
-        }
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "q"
-        ],
-        "properties" : {
-          "q" : {
-            "enum" : [
-              "undefined",
-              "unknown"
-            ]
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "occupancy",
+        "starttime"
+      ]
+    }
+  },
+  "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\nXML dateTime with a resolution of 3 decimal places. All time stamps\nin 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\nXML dateTime with a resolution of 3 decimal places. All time stamps\nin UTC. E.g. 2009-10-02T14:34:34.341Z"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/timestamp"
-                    }
-                  ]
-                }
-              }
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "occupancy"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "occupancy"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Occupancy in percent (0-100%)"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Occupancy in percent (0-100%)",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
             }
           }
-        ]
+        }
       }
-    }
-  ]
+    ]
+  }
 }

data/schemas/tlc/1.1.0/statuses/S0204.json

@@ -1,304 +1,198 @@
 {
+  "$schema" : "https://json-schema.org/draft/2020-12/schema",
   "description" : "Traffic Counting: Number of vehicles of given classification.\nUsed for Traffic counting.",
-  "allOf" : [
-    {
-      "properties" : {
-        "n" : {
-          "enum" : [
-            "B",
-            "C",
-            "F",
-            "L",
-            "LS",
-            "MC",
-            "P",
-            "PS",
-            "SP",
-            "starttime"
-          ]
+  "properties" : {
+    "n" : {
+      "enum" : [
+        "B",
+        "C",
+        "F",
+        "L",
+        "LS",
+        "MC",
+        "P",
+        "PS",
+        "SP",
+        "starttime"
+      ]
+    }
+  },
+  "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\nXML dateTime with a resolution of 3 decimal places. All time stamps\nin UTC. E.g. 2009-10-02T14:34:34.341Z",
+              "$ref" : "../../../core/3.1.2/definitions.json#/timestamp"
+            }
+          }
         }
-      }
-    },
-    {
-      "if" : {
-        "required" : [
-          "q"
-        ],
-        "properties" : {
-          "q" : {
-            "enum" : [
-              "undefined",
-              "unknown"
-            ]
+      },
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "P"
+            }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Number of cars",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+            }
           }
         }
       },
-      "then" : {
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "PS"
+            }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Number of cars with trailers",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+            }
+          }
+        }
+      },
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "L"
+            }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Number of trucks",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+            }
+          }
+        }
+      },
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "LS"
+            }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Number of trucks with trailers",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
+            }
+          }
+        }
       },
-      "else" : {
-        "allOf" : [
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "starttime"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Time stamp for start of measuring. Format according to W3C\nXML dateTime with a resolution of 3 decimal places. All time stamps\nin UTC. E.g. 2009-10-02T14:34:34.341Z"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/timestamp"
-                    }
-                  ]
-                }
-              }
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "B"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "P"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Number of cars"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Number of buses",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "PS"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Number of cars with trailers"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        }
+      },
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "SP"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "L"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Number of trucks"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Number of trams",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "LS"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Number of trucks with trailers"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        }
+      },
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "MC"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "B"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Number of buses"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Number of motor cycles",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "SP"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Number of trams"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        }
+      },
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "C"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "MC"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Number of motor cycles"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Number of bicycles",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "C"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Number of bicycles"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        }
+      },
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "F"
             }
-          },
-          {
-            "if" : {
-              "required" : [
-                "n"
-              ],
-              "properties" : {
-                "n" : {
-                  "const" : "F"
-                }
-              }
-            },
-            "then" : {
-              "properties" : {
-                "s" : {
-                  "allOf" : [
-                    {
-                      "description" : "Number of pedestrians"
-                    },
-                    {
-                      "$ref" : "../../../core/3.1.2/definitions.json#/integer"
-                    }
-                  ]
-                }
-              }
+          }
+        },
+        "then" : {
+          "properties" : {
+            "s" : {
+              "description" : "Number of pedestrians",
+              "$ref" : "../../../core/3.1.2/definitions.json#/integer"
             }
           }
-        ]
+        }
       }
-    }
-  ]
+    ]
+  }
 }