Added settings class for osm to odr conversion and documentation.
This commit is contained in:
Axel1092
bernat
parent
ed4805557b
commit
1047c76d2b
|
|
@ -1367,6 +1367,36 @@ Returns a waypoint if all the parameters passed are correct. Otherwise, returns
|
|||
|
||||
---
|
||||
|
||||
## carla.OSM2ODR<a name="carla.OSM2ODR"></a>
|
||||
Class that performs the conversion of Open Street Maps data to OpenDRIVE.
|
||||
|
||||
<h3>Methods</h3>
|
||||
- <a name="carla.OSM2ODR.convert_to_odr"></a>**<font color="#7fb800">convert_to_odr</font>**(<font color="#00a6ed">**osm_file**</font>, <font color="#00a6ed">**settings**</font>)
|
||||
Converts a Open Street Maps file to OpenDRIVE format using the settings provided by the second argument.
|
||||
- **Parameters:**
|
||||
- `osm_file` (_str_) – The input Open Street Maps xml data.
|
||||
- `settings` (_[carla.OSM2ODRSettings](#carla.OSM2ODRSettings)_) – The settings used for the conversion.
|
||||
- **Return:** _str_
|
||||
|
||||
---
|
||||
|
||||
## carla.OSM2ODRSettings<a name="carla.OSM2ODRSettings"></a>
|
||||
Class containing settings to perform the conversion of Open Street Map data to OpenDRIVE.
|
||||
|
||||
<h3>Instance Variables</h3>
|
||||
- <a name="carla.OSM2ODRSettings.use_offsets"></a>**<font color="#f8805a">use_offsets</font>** (_bool_)
|
||||
Enables the use of offset to position the map.
|
||||
- <a name="carla.OSM2ODRSettings.offset_x"></a>**<font color="#f8805a">offset_x</font>** (_float_)
|
||||
Offset in the x axis.
|
||||
- <a name="carla.OSM2ODRSettings.offset_y"></a>**<font color="#f8805a">offset_y</font>** (_float_)
|
||||
Offset in the y axis.
|
||||
- <a name="carla.OSM2ODRSettings.default_lane_width"></a>**<font color="#f8805a">default_lane_width</font>** (_float_)
|
||||
Defines the default width of lanes.
|
||||
- <a name="carla.OSM2ODRSettings.elevation_layer_height"></a>**<font color="#f8805a">elevation_layer_height</font>** (_float_)
|
||||
Defines the height of the different layers defined in Open Street Map data (see https://wiki.openstreetmap.org/wiki/Key:layer).
|
||||
|
||||
---
|
||||
|
||||
## carla.ObstacleDetectionEvent<a name="carla.ObstacleDetectionEvent"></a>
|
||||
<div style="padding-left:30px;margin-top:-20px"><small><b>Inherited from _[carla.SensorData](#carla.SensorData)_</b></small></div></p><p>Class that defines the obstacle data for <b>sensor.other.obstacle</b>. Learn more about this [here](ref_sensors.md#obstacle-detector).
|
||||
|
||||
|
|
|
|||
|
|
@ -8,19 +8,25 @@
|
|||
|
||||
class OSM2ODR {
|
||||
public:
|
||||
static std::string ConvertOSMToOpenDRIVE(std::string osm_file) {
|
||||
return osm2odr::ConvertOSMToOpenDRIVE(osm_file);
|
||||
}
|
||||
// static std::string ConvertOSMToOpenDRIVE(std::string osm_file, osm2odr::) {
|
||||
// return osm2odr::ConvertOSMToOpenDRIVE(osm_file);
|
||||
// }
|
||||
};
|
||||
|
||||
void export_converter() {
|
||||
using namespace osm2odr;
|
||||
using namespace boost::python;
|
||||
|
||||
// def("convert_to_odr", &ConvertOSMToOpenDRIVE, (arg("osm_file"), arg("offsetX") = 0, arg("offsetY") = 0));
|
||||
class_<OSM2ODRSettings>("OSM2ODRSettings", init<>())
|
||||
.add_property("use_offsets", &OSM2ODRSettings::use_offsets, &OSM2ODRSettings::use_offsets)
|
||||
.add_property("offset_x", &OSM2ODRSettings::offset_x, &OSM2ODRSettings::offset_x)
|
||||
.add_property("offset_y", &OSM2ODRSettings::offset_y, &OSM2ODRSettings::offset_y)
|
||||
.add_property("default_lane_width", &OSM2ODRSettings::default_lane_width, &OSM2ODRSettings::default_lane_width)
|
||||
.add_property("elevation_layer_height", &OSM2ODRSettings::elevation_layer_height, &OSM2ODRSettings::elevation_layer_height)
|
||||
;
|
||||
|
||||
class_<OSM2ODR>("OSM2ODR", init<>())
|
||||
.def("convert_to_odr", &OSM2ODR::ConvertOSMToOpenDRIVE, (arg("osm_file")))
|
||||
class_<OSM2ODR>("OSM2ODR", no_init)
|
||||
.def("convert_to_odr", &ConvertOSMToOpenDRIVE, (arg("osm_file"), arg("OSM2ODRSettings") = OSM2ODRSettings()))
|
||||
.staticmethod("convert_to_odr")
|
||||
;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,55 @@
|
|||
---
|
||||
- module_name: carla
|
||||
|
||||
# - CLASSES ------------------------------
|
||||
classes:
|
||||
- class_name: OSM2ODR
|
||||
# - DESCRIPTION ------------------------
|
||||
doc: >
|
||||
Class that performs the conversion of Open Street Maps data to OpenDRIVE.
|
||||
# - METHODS ----------------------------
|
||||
methods:
|
||||
- def_name: convert_to_odr
|
||||
static:
|
||||
True
|
||||
return: str
|
||||
doc: >
|
||||
The converted OpenDRIVE xml data.
|
||||
params:
|
||||
- param_name: osm_file
|
||||
type: str
|
||||
doc: >
|
||||
The input Open Street Maps xml data.
|
||||
- param_name: settings
|
||||
type: carla.OSM2ODRSettings
|
||||
doc: >
|
||||
The settings used for the conversion.
|
||||
doc: >
|
||||
Converts a Open Street Maps file to OpenDRIVE format using the settings provided by the second argument.
|
||||
# --------------------------------------
|
||||
- class_name: OSM2ODRSettings
|
||||
# - DESCRIPTION ------------------------
|
||||
doc: >
|
||||
Class containing settings to perform the conversion of Open Street Map data to OpenDRIVE.
|
||||
# - PROPERTIES -------------------------
|
||||
instance_variables:
|
||||
- var_name: use_offsets
|
||||
type: bool
|
||||
doc: >
|
||||
Enables the use of offset to position the map.
|
||||
- var_name: offset_x
|
||||
type: float
|
||||
doc: >
|
||||
Offset in the x axis.
|
||||
- var_name: offset_y
|
||||
type: float
|
||||
doc: >
|
||||
Offset in the y axis.
|
||||
- var_name: default_lane_width
|
||||
type: float
|
||||
doc: >
|
||||
Defines the default width of lanes.
|
||||
- var_name: elevation_layer_height
|
||||
type: float
|
||||
doc: >
|
||||
Defines the height of the different layers defined in Open Street Map data (see https://wiki.openstreetmap.org/wiki/Key:layer).
|
||||
|
|
@ -66,17 +66,25 @@ namespace osm2odr {
|
|||
}
|
||||
|
||||
std::string ConvertOSMToOpenDRIVE(std::string osm_file, OSM2ODRSettings settings) {
|
||||
// std::string OptionsArgs = "--geometry.remove --ramps.guess --edges.join --junctions.join --keep-edges.by-type highway.motorway,highway.motorway_link,highway.trunk,highway.trunk_link,highway.primary,highway.primary_link,highway.secondary,highway.secondary_link,highway.tertiary,highway.tertiary_link,highway.unclassified,highway.residential --tls.discard-loaded --tls.discard-simple --default.lanewidth 4.0 --osm.layer-elevation 4";
|
||||
|
||||
std::vector<std::string> OptionsArgs = {
|
||||
"--proj", "+proj=tmerc",
|
||||
"--simple-projection",
|
||||
"--geometry.remove", "--ramps.guess", "--edges.join", "--junctions.join", "--roundabouts.guess",
|
||||
"--keep-edges.by-type", "highway.motorway,highway.motorway_link,highway.trunk,highway.trunk_link,highway.primary,highway.primary_link,highway.secondary,highway.secondary_link,highway.tertiary,highway.tertiary_link,highway.unclassified,highway.residential",
|
||||
"--tls.discard-loaded", "--tls.discard-simple", "--default.lanewidth", "4.0",
|
||||
"--osm.layer-elevation", "4",
|
||||
"--keep-edges.by-type",
|
||||
"highway.motorway,highway.motorway_link,highway.trunk,highway.trunk_link,highway.primary,highway.primary_link,highway.secondary,highway.secondary_link,highway.tertiary,highway.tertiary_link,highway.unclassified,highway.residential",
|
||||
"--tls.discard-loaded", "--tls.discard-simple", "--default.lanewidth",
|
||||
std::to_string(settings.default_lane_width),
|
||||
"--osm-files", "TRUE", "--opendrive-output", "TRUE", // necessary for now to enable osm input and xodr output
|
||||
"--offset.x", std::to_string(settings.offsetX), "--offset.y", std::to_string(settings.offsetY)
|
||||
};
|
||||
if (settings.elevation_layer_height > 0) {
|
||||
OptionsArgs.push_back("--osm.layer-elevation");
|
||||
OptionsArgs.push_back(std::to_string(settings.elevation_layer_height));
|
||||
}
|
||||
if (settings.use_offsets) {
|
||||
OptionsArgs.push_back("--offset.x");
|
||||
OptionsArgs.push_back(std::to_string(settings.offset_x));
|
||||
OptionsArgs.push_back("--offset.y");
|
||||
OptionsArgs.push_back(std::to_string(settings.offset_y));
|
||||
}
|
||||
|
||||
// OptionsCont::getOptions().clear();
|
||||
OptionsCont& oc = OptionsCont::getOptions();
|
||||
|
|
|
|||
|
|
@ -11,8 +11,11 @@
|
|||
namespace osm2odr {
|
||||
|
||||
struct OSM2ODRSettings {
|
||||
double offsetX = 0;
|
||||
double offsetY = 0;
|
||||
bool use_offsets = false;
|
||||
double offset_x = 0;
|
||||
double offset_y = 0;
|
||||
double default_lane_width = 4.0;
|
||||
double elevation_layer_height = 0;
|
||||
};
|
||||
|
||||
std::string ConvertOSMToOpenDRIVE(std::string osm_file, OSM2ODRSettings settings = OSM2ODRSettings());
|
||||
|
|
|
|||
Loading…
Reference in New Issue