rsmp 0.48.2 → 0.48.3

data/schemas/tlc/1.2.1/{sxl.yaml → source/sxl.yaml}

@@ -118,7 +118,7 @@ objects:
               - : Signal group is undefined/does not exist
             pattern: "^[a-hA-G0-9N-P]*$"
           cyclecounter:
-            type: integer_as_string
+            type: integer
             description: |-
               Cycle counter.
               Used for handling of coordination between TLC's.
@@ -136,7 +136,7 @@ objects:
             min: 0
             max: 999
           basecyclecounter:
-            type: integer_as_string
+            type: integer
             description: |-
               Base cycle counter.
               Used for handling of coordination between TLC's.
@@ -145,7 +145,7 @@ objects:
             min: 0
             max: 999
           stage:
-            type: integer_as_string
+            type: integer
             description: Current stage (isolated)
             min: 0
             max: 999
@@ -201,7 +201,7 @@ objects:
           During startup mode the traffic controller shows dark, red, yellow flash or using the predetermined start cycle (minimum times).
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Controller is not in start up mode
               True: Controller is currently in start up mode
@@ -212,12 +212,12 @@ objects:
             type: array
             items:
               intersection:
-                type: integer_as_string
+                type: integer
                 description: Intersection id
                 min: 0
                 max: 255
               startup:
-                type: boolean_as_string
+                type: boolean
                 description: Start up mode
       S0006:
         description: |-
@@ -231,13 +231,13 @@ objects:
           Deprecated, use S0035 instead.
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             deprecated: true
             description: |-
               False: Emergency route inactive
               True: Emergency route active
           emergencystage:
-            type: integer_as_string
+            type: integer
             deprecated: true
             description: Number of emergency route (set to zero if no route is active)
             min: 0
@@ -446,7 +446,7 @@ objects:
           The time plan (signal program) may change signal timings, cycle time, control strategy and much more. Typical usage is is scenario based control where change of program is used to change priority etc.
         arguments:
           status:
-            type: integer_as_string
+            type: integer
             description: Current time plan
             min: 1
             max: 255
@@ -468,7 +468,7 @@ objects:
           Traffic situation is a concept used to divide multiple TLC's into areas and sub-areas. The traffic situation gives the possibility to change the TLC sub-area dynamically depending on the time of day and the traffic flow. Depending on the traffic situation each TLC selects the time plan dynamically.
         arguments:
           status:
-            type: integer_as_string
+            type: integer
             description: Current traffic situation
             min: 1
             max: 255
@@ -488,7 +488,7 @@ objects:
           Can be used by the management system to check the number of detector logics configured in the controller.
         arguments:
           number:
-            type: integer_as_string
+            type: integer
             description: Number of detector logics
             min: 1
             max: 65025
@@ -498,7 +498,7 @@ objects:
           Can be used for the management system to check the number of signal groups configured in the controller.
         arguments:
           number:
-            type: integer_as_string
+            type: integer
             description: Number of signal groups
             min: 1
             max: 65025
@@ -508,7 +508,7 @@ objects:
           Can be used for the management system to check the number of traffic situations configured in the controller.
         arguments:
           number:
-            type: integer_as_string
+            type: integer
             description: Number of traffic situations
             min: 1
             max: 65025
@@ -811,7 +811,7 @@ objects:
           Used in conjunction with dynamic bands, M0014
         arguments:
           status:
-            type: integer_as_string
+            type: integer
             description: Timeout, in minutes
             min: 0
             max: 65535
@@ -829,7 +829,7 @@ objects:
             type: array
             items:
               id:
-                type: integer_as_string
+                type: integer
                 description: ID of active emergency route
                 min: 1
                 max: 255
@@ -839,7 +839,7 @@ objects:
           Provides information if maintenance personnel is currently working on site.
         arguments:
           user:
-            type: integer_as_string
+            type: integer
             values:
               0: Nobody logged in
               1: Operator logged in at level 1 (read only)
@@ -850,7 +850,7 @@ objects:
           Provides information if maintenance personnel is currently working with the controller.
         arguments:
           user:
-            type: integer_as_string
+            type: integer
             values:
               0: Nobody logged in
               1: Operator logged in at level 1 (read only)
@@ -870,32 +870,32 @@ objects:
           Provides diagnostic information about the current date and time set in the controller.
         arguments:
           year:
-            type: integer_as_string
+            type: integer
             description: Year
             min: 0
             max: 9999
           month:
-            type: integer_as_string
+            type: integer
             description: Month
             min: 1
             max: 12
           day:
-            type: integer_as_string
+            type: integer
             description: Day of month
             min: 1
             max: 31
           hour:
-            type: integer_as_string
+            type: integer
             description: Hour
             min: 0
             max: 23
           minute:
-            type: integer_as_string
+            type: integer
             description: Minute
             min: 0
             max: 59
           second:
-            type: integer_as_string
+            type: integer
             description: Second
             min: 0
             max: 59
@@ -1123,14 +1123,14 @@ objects:
             type: string
             description: Security code 2
           timeout:
-            type: integer_as_string
+            type: integer
             description: |-
               Time in minutes until controller automatically reverts to previous functional position.
               0=no automatic return
             min: 0
             max: 1440
           intersection:
-            type: integer_as_string
+            type: integer
             description: |-
               Intersection number.
               Command only applies to specified intersection. Other intersections remains in their respective operating mode(s).
@@ -1147,7 +1147,7 @@ objects:
           Requires security code 2
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Controller uses time plan according to programming
               True: Controller uses time plan according to command
@@ -1155,7 +1155,7 @@ objects:
             type: string
             description: Security code 2
           timeplan:
-            type: integer_as_string
+            type: integer
             description: designation of time plan
             min: 1
             max: 255
@@ -1168,7 +1168,7 @@ objects:
           Requires security code 2
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Controller uses traffic situation according to own programming
               True: Controller uses traffic situation according to command
@@ -1176,7 +1176,7 @@ objects:
             type: string
             description: Security code 2
           traficsituation:
-            type: integer_as_string
+            type: integer
             description: designation of traficsituation
             min: 1
             max: 255
@@ -1188,7 +1188,7 @@ objects:
           Requires security code 2
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             deprecated: true
             description: 'True: Restart controller'
           securityCode:
@@ -1204,7 +1204,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Deactivate emergency route
               True: Activate emergency route
@@ -1212,7 +1212,7 @@ objects:
             type: string
             description: Security code 2
           emergencyroute:
-            type: integer_as_string
+            type: integer
             description: Number of emergency route
             min: 1
             max: 255
@@ -1227,7 +1227,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Deactivate input
               True: Activate input
@@ -1235,7 +1235,7 @@ objects:
             type: string
             description: Security code 2
           input:
-            type: integer_as_string
+            type: integer
             description: Number of Input
             min: 1
             max: 255
@@ -1248,7 +1248,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Deactivate fixed time control
               True: Activate fixed time control
@@ -1349,7 +1349,7 @@ objects:
           Requires security code 2
         arguments:
           plan:
-            type: integer_as_string
+            type: integer
             description: Plan to be changed
             min: 0
             max: 255
@@ -1377,12 +1377,12 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: integer_as_string
+            type: integer
             description: Set offset time in seconds
             min: 0
             max: 255
           plan:
-            type: integer_as_string
+            type: integer
             description: Time plan nr
             min: 0
             max: 255
@@ -1463,12 +1463,12 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: integer_as_string
+            type: integer
             description: Set cycle time in seconds
             min: 1
             max: 255
           plan:
-            type: integer_as_string
+            type: integer
             description: Time plan nr
             min: 0
             max: 255
@@ -1484,7 +1484,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Release input
               True: Force input
@@ -1492,12 +1492,12 @@ objects:
             type: string
             description: Security code 2
           input:
-            type: integer_as_string
+            type: integer
             description: Number of Input
             min: 1
             max: 255
           inputValue:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: input forced to False
               True: input forced to True
@@ -1510,7 +1510,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Force output
               True: Release output
@@ -1518,12 +1518,12 @@ objects:
             type: string
             description: Security code 2
           output:
-            type: integer_as_string
+            type: integer
             description: Number of Output
             min: 1
             max: 255
           outputValue:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: output forced to False
               True: output forced to True
@@ -1687,7 +1687,7 @@ objects:
           Requires security code 2.
         arguments:
           status:
-            type: integer_as_string
+            type: integer
             min: 0
             max: 65535
             description: Timeout, in minutes
@@ -1724,32 +1724,32 @@ objects:
             type: string
             description: Security code 1
           year:
-            type: integer_as_string
+            type: integer
             description: Year
             min: 0
             max: 9999
           month:
-            type: integer_as_string
+            type: integer
             description: Month
             min: 1
             max: 12
           day:
-            type: integer_as_string
+            type: integer
             description: Day of month
             min: 1
             max: 31
           hour:
-            type: integer_as_string
+            type: integer
             description: Hour
             min: 0
             max: 23
           minute:
-            type: integer_as_string
+            type: integer
             description: Minute
             min: 0
             max: 59
           second:
-            type: integer_as_string
+            type: integer
             description: Second
             min: 0
             max: 59
@@ -1767,7 +1767,7 @@ objects:
         category: D
         arguments:
           timeplan:
-            type: integer_as_string
+            type: integer
             description: Current time plan
             min: 1
             max: 255
@@ -1826,7 +1826,7 @@ objects:
             description: |-
               Time stamp for the most likely time for the signal group to go to green. If the signal group is green, it is the most likely time for the next green.
           ToGConfidence:
-            type: integer_as_string
+            type: integer
             description: Confidence of the likelyToGEstimate. 0-100%
             min: 0
             max: 100
@@ -1843,7 +1843,7 @@ objects:
             description: |-
               Time stamp for the most likely time for the signal group to go to red. If the signal group is red, it is the most likely time for the next red.
           ToRConfidence:
-            type: integer_as_string
+            type: integer
             description: Confidence of the likelyToREstimate. 0-100%
             min: 0
             max: 100
@@ -1857,7 +1857,7 @@ objects:
         reserved: true
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: No command (default)
               True: Order a signal group to green
@@ -1874,7 +1874,7 @@ objects:
         reserved: true
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: No command (default)
               True: Order a signal group to red
@@ -1906,7 +1906,7 @@ objects:
             description: Detector forced on/off while detector error
             values: ['on','off'] # on/off must be quoted, otherwise they are converted to true/false
           manual:
-            type: boolean_as_string
+            type: boolean
             description: Manually controlled detector logic (True/False)
       A0302:
         description: |-
@@ -1930,7 +1930,7 @@ objects:
             description: Detector forced on/off while detector error
             values: ['on','off'] # on/off must be quoted, otherwise they are converted to true/false
           manual:
-            type: boolean_as_string
+            type: boolean
             description: Manually controlled detector logic (True/False)
           logicerror:
             type: string
@@ -1960,7 +1960,7 @@ objects:
             description: Detector forced on/off while detector error
             values: ['on','off'] # on/off must be quoted, otherwise they are converted to true/false
           manual:
-            type: boolean_as_string
+            type: boolean
             description: Manually controlled detector logic (True/False)
       A0304:
         description: |-
@@ -1984,7 +1984,7 @@ objects:
             description: Detector forced on/off while detector error
             values: ['on','off'] # on/off must be quoted, otherwise they are converted to true/false
           manual:
-            type: boolean_as_string
+            type: boolean
             description: Manually controlled detector logic (True/False)
           logicerror:
             type: string
@@ -2003,7 +2003,7 @@ objects:
             type: timestamp
             description: Time stamp for start of measuring
           vehicles:
-            type: integer_as_string
+            type: integer
             description: Number of vehicles on a given detector logic (since last
               update)
             min: 0
@@ -2017,7 +2017,7 @@ objects:
             type: timestamp
             description: Time stamp for start of measuring
           speed:
-            type: integer_as_string
+            type: integer
             description: Average speed in km/h
             min: 0
             max: 65535
@@ -2030,7 +2030,7 @@ objects:
             type: timestamp
             description: Time stamp for start of measuring
           occupancy:
-            type: integer_as_string
+            type: integer
             description: Occupancy in percent (0-100%)
             min: 0
             max: 100
@@ -2043,47 +2043,47 @@ objects:
             type: timestamp
             description: Time stamp for start of measuring
           P:
-            type: integer_as_string
+            type: integer
             description: Number of cars
             min: 0
             max: 65535
           PS:
-            type: integer_as_string
+            type: integer
             description: Number of cars with trailers
             min: 0
             max: 65535
           L:
-            type: integer_as_string
+            type: integer
             description: Number of trucks
             min: 0
             max: 65535
           LS:
-            type: integer_as_string
+            type: integer
             description: Number of trucks with trailers
             min: 0
             max: 65535
           B:
-            type: integer_as_string
+            type: integer
             description: Number of buses
             min: 0
             max: 65535
           SP:
-            type: integer_as_string
+            type: integer
             description: Number of trams
             min: 0
             max: 65535
           MC:
-            type: integer_as_string
+            type: integer
             description: Number of motor cycles
             min: 0
             max: 65535
           C:
-            type: integer_as_string
+            type: integer
             description: Number of bicycles
             min: 0
             max: 65535
           F:
-            type: integer_as_string
+            type: integer
             description: Number of pedestrians
             min: 0
             max: 65535
@@ -2096,7 +2096,7 @@ objects:
           Requires security code 2
         arguments:
           status:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Deactivate manual control of detector logic
               True: Activate manual control of detector logic
@@ -2104,7 +2104,7 @@ objects:
             type: string
             description: Security code 2
           mode:
-            type: boolean_as_string
+            type: boolean
             description: |-
               False: Deactivate detector logic
               True: Activate detector logic

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

@@ -60,11 +60,11 @@
                   },
                   "e" : {
                     "description" : "Estimated green extension provided by the priority, in seconds\nOnly used when state is 'completed'.",
-                    "type" : "integer"
+                    "$ref" : "../defs/definitions.json#/integer"
                   },
                   "d" : {
                     "description" : "Estimated red reduction provided by the priority, in seconds\nOnly used when state is 'completed'.",
-                    "type" : "integer"
+                    "$ref" : "../defs/definitions.json#/integer"
                   }
                 }
               }

data/schemas/tlc/1.2.1/sxl_index.json

@@ -202,8 +202,8 @@
         "status" : {
           "type" : "array",
           "items" : {
-            "d" : "integer",
-            "e" : "integer",
+            "d" : "integer_as_string",
+            "e" : "integer_as_string",
             "r" : "string",
             "s" : "string",
             "t" : "timestamp"
@@ -470,14 +470,14 @@
         "type" : "string"
       },
       "optional" : {
-        "approachId" : "integer",
-        "connectionId" : "integer",
-        "eta" : "integer",
-        "inputId" : "integer",
-        "laneInId" : "integer",
-        "laneOutId" : "integer",
-        "level" : "integer",
-        "priorityId" : "integer",
+        "approachId" : "integer_as_string",
+        "connectionId" : "integer_as_string",
+        "eta" : "integer_as_string",
+        "inputId" : "integer_as_string",
+        "laneInId" : "integer_as_string",
+        "laneOutId" : "integer_as_string",
+        "level" : "integer_as_string",
+        "priorityId" : "integer_as_string",
         "signalGroupId" : "string",
         "vehicleType" : "string"
       }

data/schemas/tlc/1.3.0/commands/command_requests.json

@@ -1229,22 +1229,6 @@
           },
           "then" : {
             "allOf" : [
-              {
-                "contains" : {
-                  "required" : [
-                    "cCI",
-                    "n"
-                  ],
-                  "properties" : {
-                    "cCI" : {
-                      "const" : "M0022"
-                    },
-                    "n" : {
-                      "const" : "level"
-                    }
-                  }
-                }
-              },
               {
                 "contains" : {
                   "required" : [

data/schemas/tlc/1.3.0/{sxl.yaml → source/sxl.yaml}

@@ -1769,6 +1769,7 @@ objects:
               cancel: Cancel an existing priority
           level:
             type: integer_as_string
+            optional: true
             description: |-
               0: Lowest, 14: Highest
             min: 0

data/schemas/tlc/1.3.0/sxl_index.json

@@ -470,7 +470,6 @@
     },
     "M0022" : {
       "required" : {
-        "level" : "integer_as_string",
         "requestId" : "string",
         "type" : "string"
       },
@@ -481,6 +480,7 @@
         "inputId" : "integer_as_string",
         "laneInId" : "integer_as_string",
         "laneOutId" : "integer_as_string",
+        "level" : "integer_as_string",
         "priorityId" : "integer_as_string",
         "signalGroupId" : "string",
         "vehicleType" : "string"