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

some more small fixes

This commit is contained in:
Manish 2019-03-18 13:12:41 +01:00
parent ae672bbfc7
commit 68920485be
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LibCarla/source/carla/opendrive/parser/LaneParser.cpp
View File

@ -15,13 +15,13 @@ namespace opendrive {
namespace parser {
void LaneParser::ParseLanes(
RoadId road_id,
int32_t lane_section_id,
road::RoadId road_id,
int lane_section_id,
const pugi::xml_node &parent_node,
carla::road::MapBuilder &map_builder) {
for (pugi::xml_node lane_node : parent_node.children("lane")) {
LaneId lane_id = lane_node.attribute("id").as_int();
road::LaneId lane_id = lane_node.attribute("id").as_int();
// Lane Width
for (pugi::xml_node lane_width_node : lane_node.children("width")) {
@ -48,7 +48,7 @@ namespace parser {
}
// Lane Road Mark
int32_t road_mark_id = 0;
int road_mark_id = 0;
for (pugi::xml_node lane_road_mark : lane_node.children("roadMark")) {
float s = lane_road_mark.attribute("sOffset").as_float();
@ -185,10 +185,10 @@ namespace parser {
// Lanes
for (pugi::xml_node road_node : open_drive_node.children("road")) {
RoadId road_id = road_node.attribute("id").as_uint();
road::RoadId road_id = road_node.attribute("id").as_int();
for (pugi::xml_node lanes_node : road_node.children("lanes")) {
int32_t lane_section_id = 0;
int lane_section_id = 0;
for (pugi::xml_node lane_section_node : lanes_node.children("laneSection")) {
pugi::xml_node left_node = lane_section_node.child("left");

4
LibCarla/source/carla/opendrive/parser/LaneParser.h
View File

@ -6,6 +6,8 @@
#pragma once
#include "carla/road/RoadTypes.h"
namespace pugi {
class xml_document;
class xml_node;
@ -24,7 +26,7 @@ namespace parser {
private:
static void ParseLanes(
RoadId road_id,
road::RoadId road_id,
int lane_section_id,
const pugi::xml_node &parent_node,
carla::road::MapBuilder &map_builder);