Skip to content

Commit 11fcb21

Browse files
michikommadermichikommader
committed
Rename Signal to RoadSignal
1 parent 6b07036 commit 11fcb21

File tree

10 files changed

+117
-117
lines changed

10 files changed

+117
-117
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ add_library(OpenDrive SHARED
3636
src/RoadMark.cpp
3737
src/RoadNetworkMesh.cpp
3838
src/RoadObject.cpp
39-
src/Signal.cpp
39+
src/RoadSignal.cpp
4040
src/RoutingGraph.cpp
4141
thirdparty/pugixml/pugixml.cpp
4242
)

‎include/OpenDriveMap.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class OpenDriveMap
2323
const bool with_lane_height = true,
2424
const bool abs_z_for_for_local_road_obj_outline = false,
2525
const bool fix_spiral_edge_cases = true,
26-
const bool with_signals = true);
26+
const bool with_road_signals = true);
2727

2828
std::vector<Road> get_roads() const;
2929
std::vector<Junction> get_junctions() const;

‎include/Road.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "Mesh.h"
66
#include "RefLine.h"
77
#include "RoadObject.h"
8-
#include "Signal.h"
8+
#include "RoadSignal.h"
99
#include "XmlNode.h"
1010

1111
#include <cstddef>
@@ -83,7 +83,7 @@ class Road : public XmlNode
8383

8484
std::vector<LaneSection> get_lanesections() const;
8585
std::vector<RoadObject> get_road_objects() const;
86-
std::vector<Signal> get_signals() const;
86+
std::vector<RoadSignal> get_road_signals() const;
8787

8888
double get_lanesection_s0(const double s) const;
8989
LaneSection get_lanesection(const double s) const;
@@ -104,7 +104,7 @@ class Road : public XmlNode
104104
Mesh3D get_lane_mesh(const Lane& lane, const double eps, std::vector<uint32_t>* outline_indices = nullptr) const;
105105

106106
Mesh3D get_roadmark_mesh(const Lane& lane, const RoadMark& roadmark, const double eps) const;
107-
Mesh3D get_signal_mesh(const Signal& signal) const;
107+
Mesh3D get_road_signal_mesh(const RoadSignal& road_signal) const;
108108
Mesh3D get_road_object_mesh(const RoadObject& road_object, const double eps) const;
109109

110110
std::set<double>
@@ -130,7 +130,7 @@ class Road : public XmlNode
130130
std::map<double, std::string> s_to_type;
131131
std::map<double, SpeedRecord> s_to_speed;
132132
std::map<std::string, RoadObject> id_to_object;
133-
std::map<std::string, Signal> id_to_signal;
133+
std::map<std::string, RoadSignal> id_to_signal;
134134
};
135135

136136
} // namespace odr

‎include/RoadNetworkMesh.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ struct RoadObjectsMesh : public RoadsMesh
5656
std::map<size_t, std::string> road_object_start_indices;
5757
};
5858

59-
struct SignalsMesh : public RoadsMesh
59+
struct RoadSignalsMesh : public RoadsMesh
6060
{
61-
std::string get_signal_id(const std::size_t vert_idx) const;
61+
std::string get_road_signal_id(const std::size_t vert_idx) const;
6262
std::array<size_t, 2> get_idx_interval_signal(const std::size_t vert_idx) const;
6363

64-
std::map<size_t, std::string> signal_start_indices;
64+
std::map<size_t, std::string> road_signal_start_indices;
6565
};
6666

6767
struct RoadNetworkMesh
@@ -71,7 +71,7 @@ struct RoadNetworkMesh
7171
LanesMesh lanes_mesh;
7272
RoadmarksMesh roadmarks_mesh;
7373
RoadObjectsMesh road_objects_mesh;
74-
SignalsMesh signals_mesh;
74+
RoadSignalsMesh road_signals_mesh;
7575
};
7676

7777
} // namespace odr

include/Signal.h renamed to include/RoadSignal.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@
99
namespace odr
1010
{
1111

12-
struct Signal : public XmlNode
12+
struct RoadSignal : public XmlNode
1313
{
14-
Signal(std::string road_id,
15-
std::string id,
16-
std::string name,
17-
double s0,
18-
double t0,
19-
bool is_dynamic,
20-
double zOffset,
21-
double value,
22-
double height,
23-
double width,
24-
double hOffset,
25-
double pitch,
26-
double roll,
27-
std::string orientation,
28-
std::string country,
29-
std::string type,
30-
std::string subtype,
31-
std::string unit,
32-
std::string text);
14+
RoadSignal(std::string road_id,
15+
std::string id,
16+
std::string name,
17+
double s0,
18+
double t0,
19+
bool is_dynamic,
20+
double zOffset,
21+
double value,
22+
double height,
23+
double width,
24+
double hOffset,
25+
double pitch,
26+
double roll,
27+
std::string orientation,
28+
std::string country,
29+
std::string type,
30+
std::string subtype,
31+
std::string unit,
32+
std::string text);
3333

3434
static Mesh3D get_box(const double width, const double length, const double height);
3535

‎src/OpenDriveMap.cpp‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "Road.h"
1515
#include "RoadMark.h"
1616
#include "RoadObject.h"
17-
#include "Signal.h"
17+
#include "RoadSignal.h"
1818
#include "Utils.hpp"
1919

2020
#include <algorithm>
@@ -61,7 +61,7 @@ OpenDriveMap::OpenDriveMap(const std::string& xodr_file,
6161
const bool with_lane_height,
6262
const bool abs_z_for_for_local_road_obj_outline,
6363
const bool fix_spiral_edge_cases,
64-
const bool with_signals) :
64+
const bool with_road_signals) :
6565
xodr_file(xodr_file)
6666
{
6767
pugi::xml_parse_result result = this->xml_doc.load_file(xodr_file.c_str());
@@ -632,44 +632,44 @@ OpenDriveMap::OpenDriveMap(const std::string& xodr_file,
632632
}
633633
}
634634
/* parse signals */
635-
if (with_signals)
635+
if (with_road_signals)
636636
{
637637
for (pugi::xml_node signal_node : road_node.child("signals").children("signal"))
638638
{
639-
std::string signal_id = signal_node.attribute("id").as_string("");
640-
CHECK_AND_REPAIR(road.id_to_signal.find(signal_id) == road.id_to_signal.end(),
641-
(std::string("signal::id already exists - ") + signal_id).c_str(),
642-
signal_id = signal_id + std::string("_dup"));
643-
644-
Signal& signal = road.id_to_signal
645-
.insert({signal_id,
646-
Signal(road_id,
647-
signal_id,
648-
signal_node.attribute("name").as_string(""),
649-
signal_node.attribute("s").as_double(0),
650-
signal_node.attribute("t").as_double(0),
651-
signal_node.attribute("dynamic").as_bool(),
652-
signal_node.attribute("zOffset").as_double(0),
653-
signal_node.attribute("value").as_double(0),
654-
signal_node.attribute("height").as_double(0),
655-
signal_node.attribute("width").as_double(0),
656-
signal_node.attribute("hOffset").as_double(0),
657-
signal_node.attribute("pitch").as_double(0),
658-
signal_node.attribute("roll").as_double(0),
659-
signal_node.attribute("orientation").as_string("none"),
660-
signal_node.attribute("country").as_string(""),
661-
signal_node.attribute("type").as_string("none"),
662-
signal_node.attribute("subtype").as_string("none"),
663-
signal_node.attribute("unit").as_string(""),
664-
signal_node.attribute("text").as_string("none"))})
665-
.first->second;
666-
signal.xml_node = signal_node;
667-
668-
CHECK_AND_REPAIR(signal.s0 >= 0, "signal::s < 0", signal.s0 = 0);
669-
CHECK_AND_REPAIR(signal.height >= 0, "signal::height < 0", signal.height = 0);
670-
CHECK_AND_REPAIR(signal.width >= 0, "signal::width < 0", signal.width = 0);
671-
672-
signal.lane_validities = extract_lane_validity_records(signal_node);
639+
std::string road_signal_id = signal_node.attribute("id").as_string("");
640+
CHECK_AND_REPAIR(road.id_to_signal.find(road_signal_id) == road.id_to_signal.end(),
641+
(std::string("signal::id already exists - ") + road_signal_id).c_str(),
642+
road_signal_id = road_signal_id + std::string("_dup"));
643+
644+
RoadSignal& road_signal = road.id_to_signal
645+
.insert({road_signal_id,
646+
RoadSignal(road_id,
647+
road_signal_id,
648+
signal_node.attribute("name").as_string(""),
649+
signal_node.attribute("s").as_double(0),
650+
signal_node.attribute("t").as_double(0),
651+
signal_node.attribute("dynamic").as_bool(),
652+
signal_node.attribute("zOffset").as_double(0),
653+
signal_node.attribute("value").as_double(0),
654+
signal_node.attribute("height").as_double(0),
655+
signal_node.attribute("width").as_double(0),
656+
signal_node.attribute("hOffset").as_double(0),
657+
signal_node.attribute("pitch").as_double(0),
658+
signal_node.attribute("roll").as_double(0),
659+
signal_node.attribute("orientation").as_string("none"),
660+
signal_node.attribute("country").as_string(""),
661+
signal_node.attribute("type").as_string("none"),
662+
signal_node.attribute("subtype").as_string("none"),
663+
signal_node.attribute("unit").as_string(""),
664+
signal_node.attribute("text").as_string("none"))})
665+
.first->second;
666+
road_signal.xml_node = signal_node;
667+
668+
CHECK_AND_REPAIR(road_signal.s0 >= 0, "signal::s < 0", road_signal.s0 = 0);
669+
CHECK_AND_REPAIR(road_signal.height >= 0, "signal::height < 0", road_signal.height = 0);
670+
CHECK_AND_REPAIR(road_signal.width >= 0, "signal::width < 0", road_signal.width = 0);
671+
672+
road_signal.lane_validities = extract_lane_validity_records(signal_node);
673673
}
674674
}
675675
}
@@ -685,7 +685,7 @@ RoadNetworkMesh OpenDriveMap::get_road_network_mesh(const double eps) const
685685
LanesMesh& lanes_mesh = out_mesh.lanes_mesh;
686686
RoadmarksMesh& roadmarks_mesh = out_mesh.roadmarks_mesh;
687687
RoadObjectsMesh& road_objects_mesh = out_mesh.road_objects_mesh;
688-
SignalsMesh& signals_mesh = out_mesh.signals_mesh;
688+
RoadSignalsMesh& road_signals_mesh = out_mesh.road_signals_mesh;
689689

690690
for (const auto& id_road : this->id_to_road)
691691
{
@@ -728,10 +728,10 @@ RoadNetworkMesh OpenDriveMap::get_road_network_mesh(const double eps) const
728728

729729
for (const auto& id_signal : road.id_to_signal)
730730
{
731-
const Signal& signal = id_signal.second;
732-
const std::size_t signals_idx_offset = signals_mesh.vertices.size();
733-
signals_mesh.signal_start_indices[signals_idx_offset] = signal.id;
734-
signals_mesh.add_mesh(road.get_signal_mesh(signal));
731+
const RoadSignal& road_signal = id_signal.second;
732+
const std::size_t signals_idx_offset = road_signals_mesh.vertices.size();
733+
road_signals_mesh.road_signal_start_indices[signals_idx_offset] = road_signal.id;
734+
road_signals_mesh.add_mesh(road.get_road_signal_mesh(road_signal));
735735
}
736736
}
737737

‎src/Road.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ SpeedRecord::SpeedRecord(std::string max, std::string unit) : max(max), unit(uni
5252
std::vector<LaneSection> Road::get_lanesections() const { return get_map_values(this->s_to_lanesection); }
5353
std::vector<RoadObject> Road::get_road_objects() const { return get_map_values(this->id_to_object); }
5454

55-
std::vector<Signal> Road::get_signals() const { return get_map_values(this->id_to_signal); }
55+
std::vector<RoadSignal> Road::get_road_signals() const { return get_map_values(this->id_to_signal); }
5656

5757
Road::Road(std::string id, double length, std::string junction, std::string name, bool left_hand_traffic) :
5858
length(length), id(id), junction(junction), name(name), left_hand_traffic(left_hand_traffic), ref_line(id, length)
@@ -334,28 +334,28 @@ Mesh3D Road::get_roadmark_mesh(const Lane& lane, const RoadMark& roadmark, const
334334
return out_mesh;
335335
}
336336

337-
Mesh3D Road::get_signal_mesh(const Signal& signal) const
337+
Mesh3D Road::get_road_signal_mesh(const RoadSignal& road_signal) const
338338
{
339-
const Mat3D rot_mat = EulerAnglesToMatrix<double>(signal.roll, signal.pitch, signal.hOffset);
340-
const double s = signal.s0;
341-
const double t = signal.t0;
342-
const double z = signal.zOffset;
343-
const double height = signal.height;
344-
const double width = signal.width;
345-
Mesh3D signal_mesh;
346-
signal_mesh = signal.get_box(width, 0.2, height);
339+
const Mat3D rot_mat = EulerAnglesToMatrix<double>(road_signal.roll, road_signal.pitch, road_signal.hOffset);
340+
const double s = road_signal.s0;
341+
const double t = road_signal.t0;
342+
const double z = road_signal.zOffset;
343+
const double height = road_signal.height;
344+
const double width = road_signal.width;
345+
Mesh3D road_signal_mesh;
346+
road_signal_mesh = road_signal.get_box(width, 0.2, height);
347347
Vec3D e_s, e_t, e_h;
348348
const Vec3D p0 = this->get_xyz(s, t, z, &e_s, &e_t, &e_h);
349349
const Mat3D base_mat{{{e_s[0], e_t[0], e_h[0]}, {e_s[1], e_t[1], e_h[1]}, {e_s[2], e_t[2], e_h[2]}}};
350-
for (Vec3D& pt_uvz : signal_mesh.vertices)
350+
for (Vec3D& pt_uvz : road_signal_mesh.vertices)
351351
{
352352
pt_uvz = MatVecMultiplication(rot_mat, pt_uvz);
353353
pt_uvz = MatVecMultiplication(base_mat, pt_uvz);
354354
pt_uvz = add(pt_uvz, p0);
355355

356-
signal_mesh.st_coordinates.push_back({s, t});
356+
road_signal_mesh.st_coordinates.push_back({s, t});
357357
}
358-
return signal_mesh;
358+
return road_signal_mesh;
359359
}
360360

361361
Mesh3D Road::get_road_object_mesh(const RoadObject& road_object, const double eps) const

‎src/RoadNetworkMesh.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ std::array<size_t, 2> RoadObjectsMesh::get_idx_interval_road_object(const std::s
8484
return get_key_interval<size_t, std::string>(this->road_object_start_indices, vert_idx, this->vertices.size());
8585
}
8686

87-
std::string SignalsMesh::get_signal_id(const std::size_t vert_idx) const
87+
std::string RoadSignalsMesh::get_road_signal_id(const std::size_t vert_idx) const
8888
{
89-
return get_nearest_lower_val<size_t, std::string>(this->signal_start_indices, vert_idx);
89+
return get_nearest_lower_val<size_t, std::string>(this->road_signal_start_indices, vert_idx);
9090
}
9191

92-
std::array<size_t, 2> SignalsMesh::get_idx_interval_signal(const std::size_t vert_idx) const
92+
std::array<size_t, 2> RoadSignalsMesh::get_idx_interval_signal(const std::size_t vert_idx) const
9393
{
94-
return get_key_interval<size_t, std::string>(this->signal_start_indices, vert_idx, this->vertices.size());
94+
return get_key_interval<size_t, std::string>(this->road_signal_start_indices, vert_idx, this->vertices.size());
9595
}
9696

9797
Mesh3D RoadNetworkMesh::get_mesh() const
@@ -100,7 +100,7 @@ Mesh3D RoadNetworkMesh::get_mesh() const
100100
out_mesh.add_mesh(this->lanes_mesh);
101101
out_mesh.add_mesh(this->roadmarks_mesh);
102102
out_mesh.add_mesh(this->road_objects_mesh);
103-
out_mesh.add_mesh(this->signals_mesh);
103+
out_mesh.add_mesh(this->road_signals_mesh);
104104
return out_mesh;
105105
}
106106

src/Signal.cpp renamed to src/RoadSignal.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
#include "Signal.h"
1+
#include "RoadSignal.h"
22

33
namespace odr
44
{
5-
Signal::Signal(std::string road_id,
6-
std::string id,
7-
std::string name,
8-
double s0,
9-
double t0,
10-
bool is_dynamic,
11-
double zOffset,
12-
double value,
13-
double height,
14-
double width,
15-
double hOffset,
16-
double pitch,
17-
double roll,
18-
std::string orientation,
19-
std::string country,
20-
std::string type,
21-
std::string subtype,
22-
std::string unit,
23-
std::string text) :
5+
RoadSignal::RoadSignal(std::string road_id,
6+
std::string id,
7+
std::string name,
8+
double s0,
9+
double t0,
10+
bool is_dynamic,
11+
double zOffset,
12+
double value,
13+
double height,
14+
double width,
15+
double hOffset,
16+
double pitch,
17+
double roll,
18+
std::string orientation,
19+
std::string country,
20+
std::string type,
21+
std::string subtype,
22+
std::string unit,
23+
std::string text) :
2424
road_id(road_id),
2525
id(id), name(name), s0(s0), t0(t0), is_dynamic(is_dynamic), zOffset(zOffset), value(value), height(height), width(width), hOffset(hOffset),
2626
pitch(pitch), roll(roll), orientation(orientation), country(country), type(type), subtype(subtype), unit(unit), text(text)
2727
{
2828
}
2929

30-
Mesh3D Signal::get_box(const double w, const double l, const double h)
30+
Mesh3D RoadSignal::get_box(const double w, const double l, const double h)
3131
{
3232
Mesh3D box_mesh;
3333
box_mesh.vertices = {Vec3D{l / 2, w / 2, 0},

0 commit comments

Comments
 (0)