Skip to content

Commit 0323733

Browse files
committed
Added schema updates as per comments for pointcloud preprocessor
1 parent d91ee0a commit 0323733

File tree

3 files changed

+87
-62
lines changed

3 files changed

+87
-62
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,94 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3-
"title": "autoware_pointcloud_preprocessor parameters",
3+
"title": "Parameters for Blockage Diag Node",
44
"type": "object",
55
"definitions": {
6-
"blockage_diag_node": {
6+
"blockage_diag": {
77
"type": "object",
88
"properties": {
99
"blockage_ratio_threshold": {
1010
"type": "number",
1111
"description": "The threshold of blockage area ratio. If the blockage value exceeds this threshold, the diagnostic state will be set to ERROR.",
12-
"default": 0.1,
13-
"minimum": "0"
12+
"default": "0.1",
13+
"minimum": 0
1414
},
1515
"blockage_count_threshold": {
16-
"type": "integer",
16+
"type": "number",
1717
"description": "The threshold of number continuous blockage frames",
18-
"default": 50,
19-
"minimum": "0"
18+
"default": "50",
19+
"minimum": 0
2020
},
2121
"blockage_buffering_frames": {
2222
"type": "integer",
2323
"description": "The number of buffering about blockage detection [range:1-200]",
24-
"default": 2,
24+
"default": "2",
2525
"minimum": 1,
2626
"maximum": 200
2727
},
2828
"blockage_buffering_interval": {
2929
"type": "integer",
3030
"description": "The interval of buffering about blockage detection",
31-
"default": 1,
32-
"minimum": "0"
31+
"default": "1",
32+
"minimum": 0
3333
},
3434
"enable_dust_diag": {
3535
"type": "boolean",
36-
"description": "Enable dust diagnostic",
37-
"default": "false"
36+
"description": "enable dust diagnostic",
37+
"default": false
3838
},
3939
"publish_debug_image": {
4040
"type": "boolean",
41-
"description": "Publish debug image",
42-
"default": "false"
41+
"description": "publish debug image",
42+
"default": false
4343
},
4444
"dust_ratio_threshold": {
4545
"type": "number",
4646
"description": "The threshold of dusty area ratio",
47-
"default": 0.2,
48-
"minimum": "0"
47+
"default": "0.2",
48+
"minimum": 0
4949
},
5050
"dust_count_threshold": {
5151
"type": "integer",
5252
"description": "The threshold of number continuous frames include dusty area",
53-
"default": 10,
54-
"minimum": "0"
53+
"default": "10",
54+
"minimum": 0
5555
},
5656
"dust_kernel_size": {
5757
"type": "integer",
5858
"description": "The kernel size of morphology processing in dusty area detection",
59-
"default": 2,
60-
"minimum": "0"
59+
"default": "2",
60+
"minimum": 0
6161
},
6262
"dust_buffering_frames": {
6363
"type": "integer",
6464
"description": "The number of buffering about dusty area detection [range:1-200]",
65-
"default": 10,
65+
"default": "10",
6666
"minimum": 1,
6767
"maximum": 200
6868
},
6969
"dust_buffering_interval": {
7070
"type": "integer",
7171
"description": "The interval of buffering about dusty area detection",
72-
"default": 1,
73-
"minimum": "0"
72+
"default": "1",
73+
"minimum": 0
7474
},
7575
"max_distance_range": {
7676
"type": "number",
7777
"description": "Maximum view range for the LiDAR",
78-
"default": 200.0,
79-
"minimum": "0"
78+
"default": "200.0",
79+
"minimum": 0
8080
},
8181
"horizontal_resolution": {
8282
"type": "number",
8383
"description": "The horizontal resolution of depth map image [deg/pixel]",
84-
"default": 0.4,
85-
"minimum": "0"
84+
"default": "0.4",
85+
"minimum": 0
8686
},
8787
"blockage_kernel": {
8888
"type": "integer",
8989
"description": "The kernel size of morphology processing the detected blockage area",
90-
"default": 10,
91-
"minimum": "0"
90+
"default": "10",
91+
"minimum": 0
9292
},
9393
"angle_range": {
9494
"type": "array",
@@ -105,8 +105,8 @@
105105
"vertical_bins": {
106106
"type": "integer",
107107
"description": "The LiDAR channel",
108-
"default": 40,
109-
"minimum": "0"
108+
"default": "40",
109+
"minimum": 0
110110
},
111111
"is_channel_order_top2down": {
112112
"type": "boolean",
@@ -116,8 +116,8 @@
116116
"horizontal_ring_id": {
117117
"type": "integer",
118118
"description": "The id of horizontal ring of the LiDAR",
119-
"default": 18,
120-
"minimum": "0"
119+
"default": "18",
120+
"minimum": 0
121121
}
122122
},
123123
"required": [
@@ -140,21 +140,22 @@
140140
"is_channel_order_top2down",
141141
"horizontal_ring_id"
142142
],
143-
"additionalProperties": "false"
143+
"additionalProperties": false
144144
}
145145
},
146146
"properties": {
147147
"/**": {
148148
"type": "object",
149149
"properties": {
150150
"ros__parameters": {
151-
"$ref": "#/definitions/blockage_diag_node"
151+
"$ref": "#/definitions/blockage_diag"
152152
}
153153
},
154154
"required": ["ros__parameters"],
155-
"additionalProperties": "false"
155+
"additionalProperties": false
156156
}
157157
},
158158
"required": ["/**"],
159-
"additionalProperties": "false"
160-
}
159+
"additionalProperties": false
160+
}
161+
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3-
"title": "autoware_pointcloud_preprocessor parameters",
3+
"title": "Parameters for Passthrough Filter UInt16 Node",
44
"type": "object",
55
"definitions": {
6-
"passthrough_filter_uint16_node": {
6+
"passthrough_filter_uint16": {
77
"type": "object",
88
"properties": {
99
"filter_limit_min": {
1010
"type": "integer",
11-
"description": "Minimum allowed field value.",
11+
"description": "minimum allowed field value",
1212
"default": 0,
1313
"minimum": 0
1414
},
1515
"filter_limit_max": {
1616
"type": "integer",
17-
"description": "Maximum allowed field value.",
17+
"description": "maximum allowed field value",
1818
"default": 127,
1919
"minimum": 0
2020
},
2121
"filter_field_name": {
2222
"type": "string",
23-
"description": "Filtering field name.",
23+
"description": "filtering field name",
2424
"default": "channel"
2525
},
2626
"keep_organized": {
2727
"type": "boolean",
28-
"description": "Flag to keep the indices structure intact after filtering.",
28+
"description": "flag to keep indices structure",
2929
"default": false
3030
},
3131
"filter_limit_negative": {
3232
"type": "boolean",
33-
"description": "Flag to determine whether to filter inside or outside the given limits.",
33+
"description": "flag to return whether the data is inside limit or not",
3434
"default": false
3535
}
3636
},
@@ -45,10 +45,18 @@
4545
}
4646
},
4747
"properties": {
48-
"ros__parameters": {
49-
"$ref": "#/definitions/passthrough_filter_uint16_node"
48+
"/**": {
49+
"type": "object",
50+
"properties": {
51+
"ros__parameters": {
52+
"$ref": "#/definitions/passthrough_filter_uint16"
53+
}
54+
},
55+
"required": ["ros__parameters"],
56+
"additionalProperties": false
5057
}
5158
},
52-
"required": ["ros__parameters"],
59+
"required": ["/**"],
5360
"additionalProperties": false
54-
}
61+
}
62+
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,55 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3-
"title": "autoware_pointcloud_preprocessor parameters",
3+
"title": "Parameters for Pickup Based Voxel Grid Downsample Filter Node",
44
"type": "object",
55
"definitions": {
6-
"pickup_based_voxel_grid_downsample_filter_node": {
6+
"pickup_based_voxel_grid_downsample_filter": {
77
"type": "object",
88
"properties": {
99
"voxel_size_x": {
1010
"type": "number",
11-
"description": "Voxel size along the x-axis [m].",
11+
"description": "voxel size along the x-axis [m]",
1212
"default": 1.0,
13-
"minimum": 0.0
13+
"exclusiveMinimum": 0.0
1414
},
1515
"voxel_size_y": {
1616
"type": "number",
17-
"description": "Voxel size along the y-axis [m].",
17+
"description": "voxel size along the y-axis [m]",
1818
"default": 1.0,
19-
"minimum": 0.0
19+
"exclusiveMinimum": 0.0
2020
},
2121
"voxel_size_z": {
2222
"type": "number",
23-
"description": "Voxel size along the z-axis [m].",
23+
"description": "voxel size along the z-axis [m]",
2424
"default": 1.0,
25-
"minimum": 0.0
25+
"exclusiveMinimum": 0.0
2626
}
2727
},
28-
"required": ["voxel_size_x", "voxel_size_y", "voxel_size_z"],
28+
"required": [
29+
"voxel_size_x",
30+
"voxel_size_y",
31+
"voxel_size_z"
32+
],
2933
"additionalProperties": false
3034
}
3135
},
3236
"properties": {
33-
"ros__parameters": {
34-
"$ref": "#/definitions/pickup_based_voxel_grid_downsample_filter_node"
37+
"/**": {
38+
"type": "object",
39+
"properties": {
40+
"ros__parameters": {
41+
"$ref": "#/definitions/pickup_based_voxel_grid_downsample_filter"
42+
}
43+
},
44+
"required": [
45+
"ros__parameters"
46+
],
47+
"additionalProperties": false
3548
}
3649
},
37-
"required": ["ros__parameters"],
50+
"required": [
51+
"/**"
52+
],
3853
"additionalProperties": false
39-
}
54+
}
55+

0 commit comments

Comments
 (0)