rsmp_schema 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5274777117f3a47d6976f4d3022bbdf5bbf2b0e70b3b491b73977c9477bb2b51
-  data.tar.gz: 65b3c34396fc8f156ce5f6455f2e7ba1cb3b1de2b157fa5066fef8537ae44dc2
+  metadata.gz: cd0960742756c8124a5d31ca1a1ee65fc8c6faa241b691dc9be4d5b812f4f2fb
+  data.tar.gz: d24862d2695c62725873055904d0352c7649d4950eb5a6cc3300fc9f4338234e
 SHA512:
-  metadata.gz: 0bec9bbbe8b3347d66aab360a9b8040eab152beeabfa366158363b14b4537513dc168c89fd1db610f71750ee9ae952d3362ddfc190ecfc78be7c100866ad2b59
-  data.tar.gz: 22bbc28e868edcb7ed1fce7e5e4af13b7039fc46bfaa626c3593c8f32c84baf820a5aa73749a212f3650ec214036ac2c0bb0e8a25daad5672e49dc7ce7a1a114
+  metadata.gz: 55df0fef4fb8d993aff660f35f896baaddc853a1c478c2a6badb887bc79d7759fd8bf11402d99c9cc420bc408e1fc262bf16e22804dab21af95bc29de6f0a247
+  data.tar.gz: 46200e23da9f07f2774ccbd303d5693c382004689ebf0508d914918a6089513cc92e5d573ebfbcae1d433ea16d313fdb7a637b154428206a23c6a8dc57152cbc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp_schema (0.4.0)
+    rsmp_schema (0.4.2)
       json_schemer (~> 0.2.21)
       thor (~> 1.2.1)
 
@@ -12,13 +12,14 @@ GEM
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
     hana (1.3.7)
-    json_schemer (0.2.21)
+    json_schemer (0.2.25)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
+      simpleidn (~> 0.2)
       uri_template (~> 0.7)
     rake (13.0.6)
-    regexp_parser (2.6.0)
+    regexp_parser (2.8.1)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -32,7 +33,12 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.1)
-    thor (1.2.1)
+    simpleidn (0.2.1)
+      unf (~> 0.1.4)
+    thor (1.2.2)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
     uri_template (0.7.0)
 
 PLATFORMS

data/lib/rsmp_schema/version.rb

@@ -1,5 +1,5 @@
 module RSMP
   module Schema
-    VERSION = "0.4.0"
+    VERSION = "0.4.2"
   end
 end

data/schemas/tlc/1.0.10/commands/M0001.json

@@ -30,14 +30,12 @@
       "then" : {
         "properties" : {
           "v" : {
-            "allOf" : [
-              {
-                "description" : "Set operating mode",
-                "pattern" : "(?-mix:^(NormalControl|YellowFlash|Dark)(?:,(NormalControl|YellowFlash|Dark))*$)"
-              },
-              {
-                "$ref" : "../../../core/3.1.2/definitions.json#/string_list"
-              }
+            "description" : "Set operating mode",
+            "type" : "string",
+            "enum" : [
+              "Dark",
+              "NormalControl",
+              "YellowFlash"
             ]
           }
         }

data/schemas/tlc/1.0.10/sxl.yaml

@@ -453,7 +453,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: string_list
+            type: string
             description: Set operating mode
             values:
               NormalControl: Normal Control

data/schemas/tlc/1.0.13/commands/M0001.json

@@ -30,14 +30,12 @@
       "then" : {
         "properties" : {
           "v" : {
-            "allOf" : [
-              {
-                "description" : "Set operating mode",
-                "pattern" : "(?-mix:^(NormalControl|YellowFlash|Dark)(?:,(NormalControl|YellowFlash|Dark))*$)"
-              },
-              {
-                "$ref" : "../../../core/3.1.2/definitions.json#/string_list"
-              }
+            "description" : "Set operating mode",
+            "type" : "string",
+            "enum" : [
+              "Dark",
+              "NormalControl",
+              "YellowFlash"
             ]
           }
         }

data/schemas/tlc/1.0.13/sxl.yaml

@@ -582,7 +582,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: string_list
+            type: string
             description: Set operating mode
             values:
               NormalControl: Normal Control

data/schemas/tlc/1.0.14/commands/M0001.json

@@ -30,14 +30,12 @@
       "then" : {
         "properties" : {
           "v" : {
-            "allOf" : [
-              {
-                "description" : "Set operating mode",
-                "pattern" : "(?-mix:^(NormalControl|YellowFlash|Dark)(?:,(NormalControl|YellowFlash|Dark))*$)"
-              },
-              {
-                "$ref" : "../../../core/3.1.2/definitions.json#/string_list"
-              }
+            "description" : "Set operating mode",
+            "type" : "string",
+            "enum" : [
+              "Dark",
+              "NormalControl",
+              "YellowFlash"
             ]
           }
         }

data/schemas/tlc/1.0.14/sxl.yaml

@@ -720,7 +720,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: string_list
+            type: string
             description: Set operating mode
             values:
               NormalControl: Normal Control

data/schemas/tlc/1.0.15/commands/M0001.json

@@ -30,14 +30,12 @@
       "then" : {
         "properties" : {
           "v" : {
-            "allOf" : [
-              {
-                "description" : "Set operating mode",
-                "pattern" : "(?-mix:^(NormalControl|YellowFlash|Dark)(?:,(NormalControl|YellowFlash|Dark))*$)"
-              },
-              {
-                "$ref" : "../../../core/3.1.2/definitions.json#/string_list"
-              }
+            "description" : "Set operating mode",
+            "type" : "string",
+            "enum" : [
+              "Dark",
+              "NormalControl",
+              "YellowFlash"
             ]
           }
         }

data/schemas/tlc/1.0.15/sxl.yaml

@@ -817,7 +817,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: string_list
+            type: string
             description: Set operating mode
             values:
               NormalControl: Normal Control

data/schemas/tlc/1.0.7/commands/M0001.json

@@ -30,14 +30,12 @@
       "then" : {
         "properties" : {
           "v" : {
-            "allOf" : [
-              {
-                "description" : "Set operating mode",
-                "pattern" : "(?-mix:^(NormalControl|YellowFlash|Dark)(?:,(NormalControl|YellowFlash|Dark))*$)"
-              },
-              {
-                "$ref" : "../../../core/3.1.2/definitions.json#/string_list"
-              }
+            "description" : "Set operating mode",
+            "type" : "string",
+            "enum" : [
+              "Dark",
+              "NormalControl",
+              "YellowFlash"
             ]
           }
         }

data/schemas/tlc/1.0.7/sxl.yaml

@@ -453,7 +453,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: string_list
+            type: string
             description: Set operating mode
             values:
               NormalControl: Normal Control

data/schemas/tlc/1.0.8/commands/M0001.json

@@ -30,14 +30,12 @@
       "then" : {
         "properties" : {
           "v" : {
-            "allOf" : [
-              {
-                "description" : "Set operating mode",
-                "pattern" : "(?-mix:^(NormalControl|YellowFlash|Dark)(?:,(NormalControl|YellowFlash|Dark))*$)"
-              },
-              {
-                "$ref" : "../../../core/3.1.2/definitions.json#/string_list"
-              }
+            "description" : "Set operating mode",
+            "type" : "string",
+            "enum" : [
+              "Dark",
+              "NormalControl",
+              "YellowFlash"
             ]
           }
         }

data/schemas/tlc/1.0.8/sxl.yaml

@@ -453,7 +453,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: string_list
+            type: string
             description: Set operating mode
             values:
               NormalControl: Normal Control

data/schemas/tlc/1.0.9/commands/M0001.json

@@ -30,14 +30,12 @@
       "then" : {
         "properties" : {
           "v" : {
-            "allOf" : [
-              {
-                "description" : "Set operating mode",
-                "pattern" : "(?-mix:^(NormalControl|YellowFlash|Dark)(?:,(NormalControl|YellowFlash|Dark))*$)"
-              },
-              {
-                "$ref" : "../../../core/3.1.2/definitions.json#/string_list"
-              }
+            "description" : "Set operating mode",
+            "type" : "string",
+            "enum" : [
+              "Dark",
+              "NormalControl",
+              "YellowFlash"
             ]
           }
         }

data/schemas/tlc/1.0.9/sxl.yaml

@@ -453,7 +453,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: string_list
+            type: string
             description: Set operating mode
             values:
               NormalControl: Normal Control

data/schemas/tlc/1.1/alarms/A0009.json

@@ -1,7 +1,7 @@
 {
   "allOf" : [
     {
-      "description" : "Other error.\nUsed for other errors not covered by any other alarm type\nIs a \"minor fault\" defined according to 3.11 in EN12675."
+      "description" : "Other error.\nUsed for other errors not covered by any other alarm type.\nIs a \"minor fault\" defined according to 3.11 in EN12675."
     }
   ]
 }

data/schemas/tlc/1.1/commands/M0001.json

@@ -30,14 +30,12 @@
       "then" : {
         "properties" : {
           "v" : {
-            "allOf" : [
-              {
-                "description" : "Set operating mode",
-                "pattern" : "(?-mix:^(NormalControl|YellowFlash|Dark)(?:,(NormalControl|YellowFlash|Dark))*$)"
-              },
-              {
-                "$ref" : "../../../core/3.1.2/definitions.json#/string_list"
-              }
+            "description" : "Set operating mode",
+            "type" : "string",
+            "enum" : [
+              "Dark",
+              "NormalControl",
+              "YellowFlash"
             ]
           }
         }
@@ -57,14 +55,8 @@
       "then" : {
         "properties" : {
           "v" : {
-            "allOf" : [
-              {
-                "description" : "Security code 2"
-              },
-              {
-                "$ref" : "../../../core/3.1.2/definitions.json#/string_list"
-              }
-            ]
+            "description" : "Security code 2",
+            "type" : "string"
           }
         }
       }
@@ -111,10 +103,10 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "Comma separated list of intersections which the status relates to, e.g. “1,2”.\nUse “0” for all intersections of the TLC."
+                "description" : "Intersection number"
               },
               {
-                "$ref" : "../../../core/3.1.2/definitions.json#/integer_list"
+                "$ref" : "../../../core/3.1.2/definitions.json#/integer"
               }
             ]
           }

data/schemas/tlc/1.1/commands/M0013.json

@@ -1,7 +1,7 @@
 {
   "allOf" : [
     {
-      "description" : "Activate a series of inputs\n\nSet given inputs (1-255) of the controllers general purpose I/O to either true or false. This command was introduced due to coordination requirements needing to set many inputs to true/false at the same time and M0006 being to slow to send a message for each input individually. With this command many inputs can be set to true/false at the same time using a single command message. It can be used for all types of input where the traffic light controller must react to external control. Typical usages are bus priority, coordination between traffic controllers, external control systems, and much more.\n\nRequires security code 2.\n\nThe parameter ‘status’ sets/unsets a block of 16 inputs at a time. It can be repeated to set several blocks of 16 inputs. Values are separated with comma. Blocks are separated with semicolon. Format: [Offset];[Bits to set];[Bits to unset];…\n\n- ‘Offset’ defines where the 16 inputs starts from\n- ‘Bits to set’ defines which bit(s) to set. ‘0’ if unsed\n- ‘Bits to unset’ defines which bit(s) to unset. ‘0’ if unused\n\nExample 1: “3,4134,65” sets input 4,5,8,15 and unsets 3,9 - Input starts from no. 5 - “4134” is 1 0000 0010 0110 in binary, but since input starts from 3, it is shifted 3 bits, e.g. 1000 0001 0011 0000 which are bits 4,5,8,15 - “65” is 100 0001 in binary, but since input starts from 3, it is shifted 3 bits, e.g. 10 0000 1000 which are bits 3,9\n\nExample 2: “12,1,4” sets input 12 and unsets 14 - Input starts from no. 12 - “1” is 1 in binary, but since input starts at 12 it is shifted 12 bits, e.g. 1 0000 0000 0000, which is bit 12 - “4” is 100 in binary, but since input starts at 12 it is shifted 12 bits, e.g. 100 0000 0000 0000, which is bit 14\n\nAnd both these examples could be sent in the same message as: “3,4143,65;12,1,4”\n\nSuch a message would set input 4,5,8,12,15 and unset input 3,9,14\n\nExample 3: “0,1,2” sets input 0 and unsets 1 - Input starts from 0 - “1” is 1 in binary, which is bit 0 - “2” is 10 in binary, which is bit 1",
+      "description" : "Activate a series of inputs\n\nSet given inputs (1-255) of the controllers general purpose I/O to either true or false. This command was introduced due to coordination requirements needing to set many inputs to true/false at the same time and M0006 being to slow to send a message for each input individually. With this command many inputs can be set to true/false at the same time using a single command message. It can be used for all types of input where the traffic light controller must react to external control. Typical usages are bus priority, coordination between traffic controllers, external control systems, and much more.\n\nRequires security code 2.\n\nThe parameter ‘status’ sets/unsets a block of 16 inputs at a time. It can be repeated to set several blocks of 16 inputs. Values are separated with comma. Blocks are separated with semicolon. Format: [Offset];[Bits to set];[Bits to unset];…\n\n- ‘Offset’ defines where the 16 inputs starts from\n- ‘Bits to set’ defines which bit(s) to set. ‘0’ if unused\n- ‘Bits to unset’ defines which bit(s) to unset. ‘0’ if unused\n\nExample 1:\n“3,4134,65” sets input 4,5,8,15 and unsets 3,9\n- Input starts from no. 5\n- “4134” is 1 0000 0010 0110 in binary, but since input starts from 3, it is shifted 3 bits, e.g. 1000 0001 0011 0000 which are bits 4,5,8,15\n- “65” is 100 0001 in binary, but since input starts from 3, it is shifted 3 bits, e.g. 10 0000 1000 which are bits 3,9\n\nExample 2:\n“12,1,4” sets input 12 and unsets 14\n- Input starts from no. 12\n- “1” is 1 in binary, but since input starts at 12 it is shifted 12 bits, e.g. 1 0000 0000 0000, which is bit 12\n- “4” is 100 in binary, but since input starts at 12 it is shifted 12 bits, e.g. 100 0000 0000 0000, which is bit 14\n\nAnd both these examples could be sent in the same message as: “3,4143,65;12,1,4”\n\nSuch a message would set input 4,5,8,12,15 and unset input 3,9,14\n\nExample 3:\n“0,1,2” sets input 0 and unsets 1\n- Input starts from 0\n- “1” is 1 in binary, which is bit 0\n- “2” is 10 in binary, which is bit 1",
       "properties" : {
         "n" : {
           "enum" : [
@@ -28,7 +28,7 @@
       "then" : {
         "properties" : {
           "v" : {
-            "description" : "Sets/Unsets a block of 16 inputs at a time. Can be repeated to set several blocks of 16 inputs. Values are separated with comma. Blocks are separated with semicolon. Since semicolon breaks the SXL csv-format, colon, \":\" is used in example below.\n\nFormat: [Offset],[Bits to set],[Bits to unset]:…\n\nOffset sets where the 16 inputs starts from followed by two 16 bit values telling which bit to set and unset in binary format, i.e. first bit have value 1 and last bit have value 32768.\n\nExample 1:\n\"5, 4134, 65\" sets input 6,7,10,17 = on and 5,11 = off\n(Input starts from no. 5 and bit 1,2,5,12 = 1 and bit 0,6 = 0)\n\nExample 2:\n\"22, 1, 4\" sets input 22 = on and 24 = off\n(Input starts from no. 22 and bit 0 = 1 and bit 2 = 0)\n\nAnd both thease examples could be sent in the same message as:\n\"5,4143:65:22,1,4\"\n\nSuch a message would activate input 6,7,10,17,22 and deactivate input 5,11,24",
+            "description" : "Sets/Unsets a block of 16 inputs at a time. Can be repeated to set several blocks of 16 inputs. Values are separated with comma. Blocks are separated with semicolon.\nFormat: [Offset];[Bits to set];[Bits to unset];…",
             "type" : "string"
           }
         }

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

@@ -1,7 +1,7 @@
 {
   "allOf" : [
     {
-      "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.\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.",
+      "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" : [
@@ -58,7 +58,7 @@
       "then" : {
         "properties" : {
           "v" : {
-            "description" : "(Optional) ID of a signal group component.",
+            "description" : "ID of a signal group component.",
             "type" : "string"
           }
         }
@@ -80,7 +80,7 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "(Optional) ID of an input, using the same numbering scheme as M0006"
+                "description" : "ID of an input, using the same numbering scheme as M0006"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"
@@ -106,7 +106,7 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "(Optional) ID of a connection, connecting an ingoing and an outgoing lane"
+                "description" : "ID of a connection, connecting an ingoing and an outgoing lane"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"
@@ -132,7 +132,7 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "(Optional) ID of an intersection approach"
+                "description" : "ID of an intersection approach"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"
@@ -158,7 +158,7 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "(Optional) ID of an ingoing lane"
+                "description" : "ID of an ingoing lane"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"
@@ -184,7 +184,7 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "(Optional) ID of an outgoing lane"
+                "description" : "ID of an outgoing lane"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"
@@ -210,7 +210,7 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "(Optional) ID of a priority"
+                "description" : "ID of a priority"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"
@@ -234,7 +234,6 @@
       "then" : {
         "properties" : {
           "v" : {
-            "description" : "new: New priority request\nupdate: Update to existing priority request\ncancel: Cancel an existing priority",
             "type" : "string",
             "enum" : [
               "cancel",
@@ -287,7 +286,7 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "(Optional) Estimated time of arrival to the intersection, in seconds"
+                "description" : "Estimated time of arrival to the intersection, in seconds"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"
@@ -311,7 +310,7 @@
       "then" : {
         "properties" : {
           "v" : {
-            "description" : "(Optional) Vehicle type\n\npedestrian: Pedestrians\nbicycle: Bicycles\nmotorcycle: Motorcycles\ncar: Passenger vehicle\nbus: Bus used for public transport\nlightTruck: Light truck\nheavyTruck: Heavy truck\ntram: Trams used for Public transport\nemergency: Police, fire or ambulance\nsafetyCar: For e.g. escort vehicles\nspecialTransport: For e.g. heavy load\nother: Other type of vehicle",
+            "description" : "Vehicle type",
             "type" : "string",
             "enum" : [
               "bicycle",

data/schemas/tlc/1.1/commands/M0023.json

@@ -1,7 +1,7 @@
 {
   "allOf" : [
     {
-      "description" : "Set timeout for dynamic bands\nSwitch to a designated time plan if this timeout is reached due to lost connection with the supervisor.\nDisable by setting timeout to '0'.\nUsed in conjunction with dynamic bands, M0014",
+      "description" : "Set timeout for dynamic bands\nSwitch to a designated time plan if this timeout is reached due to lost connection with the supervisor.\nDisable by setting timeout to '0'.\nUsed in conjunction with dynamic bands, M0014\nRequires security code 2.",
       "properties" : {
         "n" : {
           "enum" : [

data/schemas/tlc/1.1/commands/M0104.json

@@ -1,7 +1,7 @@
 {
   "allOf" : [
     {
-      "description" : "Set clock.\nCan be used to manually set the clock of the traffic light controller if automatic  time synchronization (NTP or watchdog sync) is not available. For instance, during maintenance work.\nRequires security code 1",
+      "description" : "Set clock.\nCan be used to manually set the clock of the traffic light controller if automatic  time synchronization (NTP or watchdog sync) is not available. For instance, during maintenance work.\nNote: UTC is used.\nRequires security code 1",
       "properties" : {
         "n" : {
           "enum" : [
@@ -55,7 +55,7 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "Changes internal clock. Note: UTC is used\nYear according to YYYY"
+                "description" : "Year"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"
@@ -81,7 +81,7 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "Changes internal clock. Note: UTC is used\nMonth according to MM (01-12)"
+                "description" : "Month"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"
@@ -107,7 +107,7 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "Changes internal clock. Note: UTC is used\nDay in month according to DD (01-31)"
+                "description" : "Day of month"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"
@@ -133,7 +133,7 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "Changes internal clock. Note: UTC is used\nHour according to HH (00-23)"
+                "description" : "Hour"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"
@@ -159,7 +159,7 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "Changes internal clock. Note: UTC is used\nMinute according to MM (00-59)"
+                "description" : "Minute"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"
@@ -185,7 +185,7 @@
           "v" : {
             "allOf" : [
               {
-                "description" : "Changes internal clock. Note: UTC is used\nSecond according to SS (00-59)"
+                "description" : "Second"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"

data/schemas/tlc/1.1/statuses/S0001.json

@@ -50,7 +50,7 @@
           "s" : {
             "allOf" : [
               {
-                "description" : "Cycle counter.\nUsed for handling of coordination between TLC’s.\nIs counted from 0 until it reaches the cycle time (See S0028).\n\nc = (b + o) mod t\n \nwhere c = cycle counter,\nb = base cycle counter,\no = offset,\nt = cycle time,\nmod = modulo\n\nSee the coordination section for more information."
+                "description" : "Cycle counter.\nUsed for handling of coordination between TLC’s.\nIs counted from 0 until it reaches the cycle time (See S0028).\n\nc = (b + o) mod t\n\nwhere c = cycle counter,\nb = base cycle counter,\no = offset,\nt = cycle time,\nmod = modulo\n\nSee the coordination section for more information."
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"

data/schemas/tlc/1.1/statuses/S0003.json

@@ -25,7 +25,7 @@
       "then" : {
         "properties" : {
           "s" : {
-            "description" : "Input status as text field",
+            "description" : "Input status as text field\nEach character represent the state of the input in consecutive order.\n0 : Input is not active\n1 : Input is active\n- : Input is undefined/does not exist",
             "type" : "string"
           }
         }
@@ -45,7 +45,7 @@
       "then" : {
         "properties" : {
           "s" : {
-            "description" : "Extended input status as text field\nEach character represent the state of the detector logic in consecutive order.\n0 : Detector logic is not active\n1 : Detector logic is active\n- : Detector logic is undefined/does not exist",
+            "description" : "Extended input status as text field\nEach character represent the state of the extended input status in consecutive order.\n0 : Input is not active\n1 : Input is active\n- : Input is undefined/does not exist",
             "type" : "string"
           }
         }

data/schemas/tlc/1.1/statuses/S0004.json

@@ -25,7 +25,7 @@
       "then" : {
         "properties" : {
           "s" : {
-            "description" : "Output status as text field",
+            "description" : "Output status as text field\nEach character represent the state of the output status in consecutive order.\n0 : Output is not active\n1 : Output is active\n- : Output is undefined/does not exist",
             "type" : "string"
           }
         }
@@ -45,7 +45,7 @@
       "then" : {
         "properties" : {
           "s" : {
-            "description" : "Extended output status as text field\nEach character represent the state of the detector logic in consecutive order.\n0 : Detector logic is not active\n1 : Detector logic is active\n- : Detector logic is undefined/does not exist",
+            "description" : "Extended output status as text field\nEach character represent the state of the extended output status in consecutive order.\n0 : Output is not active\n1 : Output is active\n- : Output is undefined/does not exist",
             "type" : "string"
           }
         }

data/schemas/tlc/1.1/statuses/S0006.json

@@ -1,7 +1,7 @@
 {
   "allOf" : [
     {
-      "description" : "Emergency stage.\nThe status is active during emergency prioritization.\nUsed in situations where full priority is given in the emergency vehicle program.",
+      "description" : "Emergency route.\nThe status is active during emergency prioritization.\nUsed in situations where full priority is given in the emergency vehicle program.\nIf no emergency route is active, status should be set to False, and emergencystage to zero.",
       "properties" : {
         "n" : {
           "enum" : [
@@ -53,7 +53,7 @@
           "s" : {
             "allOf" : [
               {
-                "description" : "Number of emergency stage"
+                "description" : "Number of emergency stage (set to zero if no route is active)"
               },
               {
                 "$ref" : "../../../core/3.1.2/definitions.json#/integer"