p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed missing laneChange record in OSM converted OpenDRIVE maps.

This commit is contained in:
Axel 2020-12-21 10:06:05 +01:00 committed by Axel1092
parent 14c22d9267
commit 383c0ebb74
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -24,6 +24,7 @@
* Fixed bug causing camera-based sensors to stop sending data * Fixed bug causing camera-based sensors to stop sending data
* Added `WorldSettings.deterministic_ragdolls` to enable deterministic or physically based ragdolls * Added `WorldSettings.deterministic_ragdolls` to enable deterministic or physically based ragdolls
* Fixed the lack of determinism on the output of raycast sensors * Fixed the lack of determinism on the output of raycast sensors
* Fixed missing `laneChange` record in converted OSM maps
* Fixed bug in the actor's id returned by the semantic lidar * Fixed bug in the actor's id returned by the semantic lidar
* Fixed error when using `--config` parameter in `make package` * Fixed error when using `--config` parameter in `make package`
* Fixed dependency of library **Xerces-c** on package * Fixed dependency of library **Xerces-c** on package

16
Util/OSM2ODR/src/netwrite/NWWriter_OpenDrive.cpp
View File

@ -286,7 +286,8 @@ NWWriter_OpenDrive::writeNormalEdge(OutputDevice& device, const NBEdge* e,
writeEmptyCenterLane(device, centerMark, 0.13); writeEmptyCenterLane(device, centerMark, 0.13);
device << " <right>\n"; device << " <right>\n";
for (int j = e->getNumLanes(); --j >= 0;) { for (int j = e->getNumLanes(); --j >= 0;) {
device << " <lane id=\"-" << e->getNumLanes() - j << "\" type=\"" << getLaneType(e->getPermissions(j)) << "\" level=\"true\">\n"; std::string laneType = getLaneType(e->getPermissions(j));
device << " <lane id=\"-" << e->getNumLanes() - j << "\" type=\"" << laneType << "\" level=\"true\">\n";
device << " <link/>\n"; device << " <link/>\n";
// this could be used for geometry-link junctions without u-turn, // this could be used for geometry-link junctions without u-turn,
// predecessor and sucessors would be lane indices, // predecessor and sucessors would be lane indices,
@ -307,7 +308,15 @@ NWWriter_OpenDrive::writeNormalEdge(OutputDevice& device, const NBEdge* e,
// solid road mark to the right of a forbidden lane // solid road mark to the right of a forbidden lane
markType = "solid"; markType = "solid";
} }
device << " <roadMark sOffset=\"0\" type=\"" << markType << "\" weight=\"standard\" color=\"standard\" width=\"0.13\"/>\n"; std::string laneChange = "both";
if (j == 0) {
laneChange = "none";
} else if (getLaneType(e->getPermissions(j - 1)) == laneType) {
laneChange = "both";
} else {
laneChange = "none";
}
device << " <roadMark sOffset=\"0\" type=\"" << markType << "\" weight=\"standard\" color=\"standard\" width=\"0.13\" laneChange=\"" << laneChange << "\"/>\n";
device << " <speed sOffset=\"0\" max=\"" << lanes[j].speed << "\"/>\n"; device << " <speed sOffset=\"0\" max=\"" << lanes[j].speed << "\"/>\n";
device << " </lane>\n"; device << " </lane>\n";
} }
@ -509,7 +518,8 @@ NWWriter_OpenDrive::writeEmptyCenterLane(OutputDevice& device, const std::string
device << " <center>\n"; device << " <center>\n";
device << " <lane id=\"0\" type=\"none\" level=\"true\">\n"; device << " <lane id=\"0\" type=\"none\" level=\"true\">\n";
device << " <link/>\n"; device << " <link/>\n";
device << " <roadMark sOffset=\"0\" type=\"" << mark << "\" weight=\"standard\" color=\"standard\" width=\"" << markWidth << "\"/>\n"; // laneChange = none as roads contain lanes in one direction only
device << " <roadMark sOffset=\"0\" type=\"" << mark << "\" weight=\"standard\" color=\"standard\" width=\"" << markWidth << "\" laneChange=\"none\"/>\n";
device << " </lane>\n"; device << " </lane>\n";
device << " </center>\n"; device << " </center>\n";
} }