-
Notifications
You must be signed in to change notification settings - Fork 667
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refactor/map_projection_loader_params' of github.com:Ta…
…ikiYamada4/autoware.universe into refactor/map_projection_loader_params
- Loading branch information
Showing
2 changed files
with
37 additions
and
41 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
map/map_projection_loader/config/map_projection_loader.param.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /**: | ||
| ros__parameters: | ||
| map_projector_info_path: $(var map_projector_info_path) | ||
| lanelet2_map_path: $(var lanelet2_map_path) | ||
| lanelet2_map_path: $(var lanelet2_map_path) |
76 changes: 36 additions & 40 deletions
76
map/map_projection_loader/schema/map_projection_loader.schema.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,38 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
| "title": "Parameters for map_projection_loader", | ||
| "type": "object", | ||
| "definitions": { | ||
| "map_projection_loader": { | ||
| "type": "object", | ||
| "properties": { | ||
| "map_projector_info_path": { | ||
| "type": "string", | ||
| "description": "The path where map_projector_info.yaml is located", | ||
| "default": "$(var map_projector_info_path)" | ||
| }, | ||
| "lanelet2_map_path": { | ||
| "type": "string", | ||
| "description": "The path where the lanelet2 map file (.osm) is located", | ||
| "default": "$(var lanelet2_map_path)" | ||
| } | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
| "title": "Parameters for map_projection_loader", | ||
| "type": "object", | ||
| "definitions": { | ||
| "map_projection_loader": { | ||
| "type": "object", | ||
| "properties": { | ||
| "map_projector_info_path": { | ||
| "type": "string", | ||
| "description": "The path where map_projector_info.yaml is located", | ||
| "default": "$(var map_projector_info_path)" | ||
| }, | ||
| "required": [ | ||
| "map_projector_info_path", | ||
| "lanelet2_map_path" | ||
| ], | ||
| "additionalProperties": false | ||
| } | ||
| }, | ||
| "properties": { | ||
| "/**": { | ||
| "type": "object", | ||
| "properties": { | ||
| "ros__parameters": { | ||
| "$ref": "#/definitions/map_projection_loader" | ||
| } | ||
| }, | ||
| "required": ["ros__parameters"], | ||
| "additionalProperties": false | ||
| } | ||
| }, | ||
| "required": ["/**"], | ||
| "additionalProperties": false | ||
| } | ||
|
|
||
| "lanelet2_map_path": { | ||
| "type": "string", | ||
| "description": "The path where the lanelet2 map file (.osm) is located", | ||
| "default": "$(var lanelet2_map_path)" | ||
| } | ||
| }, | ||
| "required": ["map_projector_info_path", "lanelet2_map_path"], | ||
| "additionalProperties": false | ||
| } | ||
| }, | ||
| "properties": { | ||
| "/**": { | ||
| "type": "object", | ||
| "properties": { | ||
| "ros__parameters": { | ||
| "$ref": "#/definitions/map_projection_loader" | ||
| } | ||
| }, | ||
| "required": ["ros__parameters"], | ||
| "additionalProperties": false | ||
| } | ||
| }, | ||
| "required": ["/**"], | ||
| "additionalProperties": false | ||
| } |