feat(lanelet2_extension): add multi osm parser #234
Conversation
StepTurtle
changed the title
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
|
|
||
| #include <string> | ||
|
|
||
| using namespace std::string_literals; |
There was a problem hiding this comment.
using declarations in the global namespace in headers are prohibited
| namespace lanelet | ||
| { | ||
| namespace io_handlers |
There was a problem hiding this comment.
nested namespaces can be concatenated
| namespace lanelet | |
| { | |
| namespace io_handlers | |
| namespace lanelet::io_handlers |
| void parserError(Id id, const std::string & what); | ||
| }; | ||
| } // namespace | ||
| } // namespace io_handlers |
There was a problem hiding this comment.
nested namespaces can be concatenated
| } // namespace io_handlers |
| std::unique_ptr<LaneletMap> parse( | ||
| const std::vector<std::string> & lanelet2_filenames, ErrorMessages & errors) const; | ||
|
|
||
| std::unique_ptr<LaneletMap> fromOsmFile(const osm::File & file, ErrorMessages & errors) const; |
There was a problem hiding this comment.
invalid case style for function fromOsmFile
| std::unique_ptr<LaneletMap> fromOsmFile(const osm::File & file, ErrorMessages & errors) const; | |
| std::unique_ptr<LaneletMap> from_osm_file(const osm::File & file, ErrorMessages & errors) const; |
|
|
||
| std::unique_ptr<LaneletMap> fromOsmFile(const osm::File & file, ErrorMessages & errors) const; | ||
|
|
||
| std::unique_ptr<LaneletMap> fromOsmFile( |
There was a problem hiding this comment.
invalid case style for function fromOsmFile
| std::unique_ptr<LaneletMap> fromOsmFile( | |
| std::unique_ptr<LaneletMap> from_osm_file( |
| std::unique_ptr<LaneletMap> fromOsmFile( | ||
| const std::map<std::string, osm::File> & files_map, ErrorMessages & errors) const; | ||
|
|
||
| static void parseVersions( |
There was a problem hiding this comment.
invalid case style for function parseVersions
| static void parseVersions( | |
| static void parse_versions( |
| static constexpr const char * name() { return "autoware_multi_osm_handler"; } | ||
| }; | ||
|
|
||
| namespace |
There was a problem hiding this comment.
do not use unnamed namespaces in header files
|
|
||
| namespace | ||
| { | ||
| RegisterParser<MultiOsmParser> regParser; |
There was a problem hiding this comment.
variable regParser defined in a header file; variable definitions in header files can lead to ODR violations
|
|
||
| namespace | ||
| { | ||
| RegisterParser<MultiOsmParser> regParser; |
There was a problem hiding this comment.
invalid case style for variable regParser
| RegisterParser<MultiOsmParser> regParser; | |
| RegisterParser<MultiOsmParser> reg_parser; |
| class MultiFileLoader | ||
| { | ||
| public: | ||
| static std::unique_ptr<LaneletMap> loadMap( |
There was a problem hiding this comment.
invalid case style for function loadMap
| static std::unique_ptr<LaneletMap> loadMap( | |
| static std::unique_ptr<LaneletMap> load_map( |
| MultiFileLoader loader; | ||
| loader.loadNodes(file.nodes, projector); | ||
| loader.loadWays(file.ways); | ||
| auto laneletsWithRelation = loader.loadLanelets(file.relations); |
There was a problem hiding this comment.
invalid case style for variable laneletsWithRelation
| auto laneletsWithRelation = loader.loadLanelets(file.relations); | |
| auto lanelets_with_relation = loader.loadLanelets(file.relations); |
| auto laneletsWithRelation = loader.loadLanelets(file.relations); | ||
| auto areasWithRelation = loader.loadAreas(file.relations); | ||
| loader.loadRegulatoryElements(file.relations); | ||
| loader.addRegulatoryElements(laneletsWithRelation); |
There was a problem hiding this comment.
invalid case style for variable laneletsWithRelation
| loader.addRegulatoryElements(laneletsWithRelation); | |
| loader.addRegulatoryElements(lanelets_with_relation); |
| loader.loadNodes(file.nodes, projector); | ||
| loader.loadWays(file.ways); | ||
| auto laneletsWithRelation = loader.loadLanelets(file.relations); | ||
| auto areasWithRelation = loader.loadAreas(file.relations); |
There was a problem hiding this comment.
invalid case style for variable areasWithRelation
| auto areasWithRelation = loader.loadAreas(file.relations); | |
| auto areas_with_relation = loader.loadAreas(file.relations); |
| auto areasWithRelation = loader.loadAreas(file.relations); | ||
| loader.loadRegulatoryElements(file.relations); | ||
| loader.addRegulatoryElements(laneletsWithRelation); | ||
| loader.addRegulatoryElements(areasWithRelation); |
There was a problem hiding this comment.
invalid case style for variable areasWithRelation
| loader.addRegulatoryElements(areasWithRelation); | |
| loader.addRegulatoryElements(areas_with_relation); |
| loader.lineStrings_, loader.points_); | ||
| } | ||
|
|
||
| static std::unique_ptr<LaneletMap> loadMap( |
There was a problem hiding this comment.
invalid case style for function loadMap
| static std::unique_ptr<LaneletMap> loadMap( | |
| static std::unique_ptr<LaneletMap> load_map( |
| loader.loadWays(file.second.ways); | ||
| }); | ||
|
|
||
| LaneletsWithRegulatoryElements laneletsWithRelation; |
There was a problem hiding this comment.
invalid case style for variable laneletsWithRelation
| LaneletsWithRegulatoryElements laneletsWithRelation; | |
| LaneletsWithRegulatoryElements lanelets_with_relation; |
|
|
||
| LaneletsWithRegulatoryElements laneletsWithRelation; | ||
| for (const auto & file : files_map) { | ||
| laneletsWithRelation = loader.loadLanelets(file.second.relations); |
There was a problem hiding this comment.
invalid case style for variable laneletsWithRelation
| laneletsWithRelation = loader.loadLanelets(file.second.relations); | |
| lanelets_with_relation = loader.loadLanelets(file.second.relations); |
| for (const auto & file : files_map) { | ||
| loader.loadRegulatoryElements(file.second.relations); | ||
| } | ||
| loader.addRegulatoryElements(laneletsWithRelation); |
There was a problem hiding this comment.
invalid case style for variable laneletsWithRelation
| loader.addRegulatoryElements(laneletsWithRelation); | |
| loader.addRegulatoryElements(lanelets_with_relation); |
| laneletsWithRelation = loader.loadLanelets(file.second.relations); | ||
| } | ||
|
|
||
| AreasWithRegulatoryElements areasWithRelation; |
There was a problem hiding this comment.
invalid case style for variable areasWithRelation
| AreasWithRegulatoryElements areasWithRelation; | |
| AreasWithRegulatoryElements areas_with_relation; |
|
|
||
| AreasWithRegulatoryElements areasWithRelation; | ||
| for (const auto & file : files_map) { | ||
| areasWithRelation = loader.loadAreas(file.second.relations); |
There was a problem hiding this comment.
invalid case style for variable areasWithRelation
| areasWithRelation = loader.loadAreas(file.second.relations); | |
| areas_with_relation = loader.loadAreas(file.second.relations); |
| loader.loadRegulatoryElements(file.second.relations); | ||
| } | ||
| loader.addRegulatoryElements(laneletsWithRelation); | ||
| loader.addRegulatoryElements(areasWithRelation); |
There was a problem hiding this comment.
invalid case style for variable areasWithRelation
| loader.addRegulatoryElements(areasWithRelation); | |
| loader.addRegulatoryElements(areas_with_relation); |
|
|
||
| MultiFileLoader() = default; | ||
|
|
||
| void loadNodes(const lanelet::osm::Nodes & nodes, const Projector & projector); |
There was a problem hiding this comment.
function lanelet::io_handlers::(anonymous namespace)::MultiFileLoader::loadNodes has internal linkage but is not defined
| const osm::File & file, const Projector & projector, ErrorMessages & errors) | ||
| { | ||
| MultiFileLoader loader; | ||
| loader.loadNodes(file.nodes, projector); |
There was a problem hiding this comment.
invalid case style for function loadNodes
| loader.loadNodes(file.nodes, projector); | |
| loader.load_nodes(file.nodes, projector); |
| MultiFileLoader loader; | ||
|
|
||
| std::for_each(files_map.begin(), files_map.end(), [&loader, &projector](const auto & file) { | ||
| loader.loadNodes(file.second.nodes, projector); |
There was a problem hiding this comment.
invalid case style for function loadNodes
| loader.loadNodes(file.second.nodes, projector); | |
| loader.load_nodes(file.second.nodes, projector); |
|
|
||
| MultiFileLoader() = default; | ||
|
|
||
| void loadNodes(const lanelet::osm::Nodes & nodes, const Projector & projector); |
There was a problem hiding this comment.
invalid case style for function loadNodes
| void loadNodes(const lanelet::osm::Nodes & nodes, const Projector & projector); | |
| void load_nodes(const lanelet::osm::Nodes & nodes, const Projector & projector); |
|
|
||
| void loadNodes(const lanelet::osm::Nodes & nodes, const Projector & projector); | ||
|
|
||
| void loadWays(const lanelet::osm::Ways & ways); |
There was a problem hiding this comment.
function lanelet::io_handlers::(anonymous namespace)::MultiFileLoader::loadWays has internal linkage but is not defined
| { | ||
| MultiFileLoader loader; | ||
| loader.loadNodes(file.nodes, projector); | ||
| loader.loadWays(file.ways); |
There was a problem hiding this comment.
invalid case style for function loadWays
| loader.loadWays(file.ways); | |
| loader.load_ways(file.ways); |
| }); | ||
|
|
||
| std::for_each(files_map.begin(), files_map.end(), [&loader](const auto & file) { | ||
| loader.loadWays(file.second.ways); |
There was a problem hiding this comment.
invalid case style for function loadWays
| loader.loadWays(file.second.ways); | |
| loader.load_ways(file.second.ways); |
|
|
||
| void loadNodes(const lanelet::osm::Nodes & nodes, const Projector & projector); | ||
|
|
||
| void loadWays(const lanelet::osm::Ways & ways); |
There was a problem hiding this comment.
invalid case style for function loadWays
| void loadWays(const lanelet::osm::Ways & ways); | |
| void load_ways(const lanelet::osm::Ways & ways); |
|
|
||
| void loadWays(const lanelet::osm::Ways & ways); | ||
|
|
||
| LaneletsWithRegulatoryElements loadLanelets(const lanelet::osm::Relations & relations); |
There was a problem hiding this comment.
function lanelet::io_handlers::(anonymous namespace)::MultiFileLoader::loadLanelets has internal linkage but is not defined
| MultiFileLoader loader; | ||
| loader.loadNodes(file.nodes, projector); | ||
| loader.loadWays(file.ways); | ||
| auto laneletsWithRelation = loader.loadLanelets(file.relations); |
There was a problem hiding this comment.
invalid case style for function loadLanelets
| auto laneletsWithRelation = loader.loadLanelets(file.relations); | |
| auto laneletsWithRelation = loader.load_lanelets(file.relations); |
|
|
||
| LaneletsWithRegulatoryElements laneletsWithRelation; | ||
| for (const auto & file : files_map) { | ||
| laneletsWithRelation = loader.loadLanelets(file.second.relations); |
There was a problem hiding this comment.
invalid case style for function loadLanelets
| laneletsWithRelation = loader.loadLanelets(file.second.relations); | |
| laneletsWithRelation = loader.load_lanelets(file.second.relations); |
|
|
||
| void loadWays(const lanelet::osm::Ways & ways); | ||
|
|
||
| LaneletsWithRegulatoryElements loadLanelets(const lanelet::osm::Relations & relations); |
There was a problem hiding this comment.
invalid case style for function loadLanelets
| LaneletsWithRegulatoryElements loadLanelets(const lanelet::osm::Relations & relations); | |
| LaneletsWithRegulatoryElements load_lanelets(const lanelet::osm::Relations & relations); |
|
|
||
| LaneletsWithRegulatoryElements loadLanelets(const lanelet::osm::Relations & relations); | ||
|
|
||
| AreasWithRegulatoryElements loadAreas(const lanelet::osm::Relations & relations); |
There was a problem hiding this comment.
function lanelet::io_handlers::(anonymous namespace)::MultiFileLoader::loadAreas has internal linkage but is not defined
| loader.loadNodes(file.nodes, projector); | ||
| loader.loadWays(file.ways); | ||
| auto laneletsWithRelation = loader.loadLanelets(file.relations); | ||
| auto areasWithRelation = loader.loadAreas(file.relations); |
There was a problem hiding this comment.
invalid case style for function loadAreas
| auto areasWithRelation = loader.loadAreas(file.relations); | |
| auto areasWithRelation = loader.load_areas(file.relations); |
|
|
||
| AreasWithRegulatoryElements areasWithRelation; | ||
| for (const auto & file : files_map) { | ||
| areasWithRelation = loader.loadAreas(file.second.relations); |
There was a problem hiding this comment.
invalid case style for function loadAreas
| areasWithRelation = loader.loadAreas(file.second.relations); | |
| areasWithRelation = loader.load_areas(file.second.relations); |
|
|
||
| LaneletsWithRegulatoryElements loadLanelets(const lanelet::osm::Relations & relations); | ||
|
|
||
| AreasWithRegulatoryElements loadAreas(const lanelet::osm::Relations & relations); |
There was a problem hiding this comment.
invalid case style for function loadAreas
| AreasWithRegulatoryElements loadAreas(const lanelet::osm::Relations & relations); | |
| AreasWithRegulatoryElements load_areas(const lanelet::osm::Relations & relations); |
|
|
||
| AreasWithRegulatoryElements loadAreas(const lanelet::osm::Relations & relations); | ||
|
|
||
| void loadRegulatoryElements(const osm::Relations & relations); |
There was a problem hiding this comment.
function lanelet::io_handlers::(anonymous namespace)::MultiFileLoader::loadRegulatoryElements has internal linkage but is not defined
| loader.loadWays(file.ways); | ||
| auto laneletsWithRelation = loader.loadLanelets(file.relations); | ||
| auto areasWithRelation = loader.loadAreas(file.relations); | ||
| loader.loadRegulatoryElements(file.relations); |
There was a problem hiding this comment.
invalid case style for function loadRegulatoryElements
| loader.loadRegulatoryElements(file.relations); | |
| loader.load_regulatory_elements(file.relations); |
| } | ||
|
|
||
| for (const auto & file : files_map) { | ||
| loader.loadRegulatoryElements(file.second.relations); |
There was a problem hiding this comment.
invalid case style for function loadRegulatoryElements
| loader.loadRegulatoryElements(file.second.relations); | |
| loader.load_regulatory_elements(file.second.relations); |
|
|
||
| AreasWithRegulatoryElements loadAreas(const lanelet::osm::Relations & relations); | ||
|
|
||
| void loadRegulatoryElements(const osm::Relations & relations); |
There was a problem hiding this comment.
invalid case style for function loadRegulatoryElements
| void loadRegulatoryElements(const osm::Relations & relations); | |
| void load_regulatory_elements(const osm::Relations & relations); |
| void loadRegulatoryElements(const osm::Relations & relations); | ||
|
|
||
| template <typename PrimT> | ||
| void addRegulatoryElements(std::vector<std::pair<PrimT, const osm::Relation *>> & addTos); |
There was a problem hiding this comment.
function lanelet::io_handlers::(anonymous namespace)::MultiFileLoader::addRegulatoryElements<lanelet::Area> has internal linkage but is not defined
| void loadRegulatoryElements(const osm::Relations & relations); | ||
|
|
||
| template <typename PrimT> | ||
| void addRegulatoryElements(std::vector<std::pair<PrimT, const osm::Relation *>> & addTos); |
There was a problem hiding this comment.
function lanelet::io_handlers::(anonymous namespace)::MultiFileLoader::addRegulatoryElements<lanelet::Lanelet> has internal linkage but is not defined
| loader.addRegulatoryElements(laneletsWithRelation); | ||
| loader.addRegulatoryElements(areasWithRelation); |
There was a problem hiding this comment.
invalid case style for function addRegulatoryElements
| loader.addRegulatoryElements(laneletsWithRelation); | |
| loader.addRegulatoryElements(areasWithRelation); | |
| loader.add_regulatory_elements(laneletsWithRelation); | |
| loader.add_regulatory_elements(areasWithRelation); |
| loader.addRegulatoryElements(laneletsWithRelation); | ||
| loader.addRegulatoryElements(areasWithRelation); |
There was a problem hiding this comment.
invalid case style for function addRegulatoryElements
| loader.addRegulatoryElements(laneletsWithRelation); | |
| loader.addRegulatoryElements(areasWithRelation); | |
| loader.add_regulatory_elements(laneletsWithRelation); | |
| loader.add_regulatory_elements(areasWithRelation); |
| void loadRegulatoryElements(const osm::Relations & relations); | ||
|
|
||
| template <typename PrimT> | ||
| void addRegulatoryElements(std::vector<std::pair<PrimT, const osm::Relation *>> & addTos); |
There was a problem hiding this comment.
invalid case style for function addRegulatoryElements
| void addRegulatoryElements(std::vector<std::pair<PrimT, const osm::Relation *>> & addTos); | |
| void add_regulatory_elements(std::vector<std::pair<PrimT, const osm::Relation *>> & addTos); |
| void addRegulatoryElements(std::vector<std::pair<PrimT, const osm::Relation *>> & addTos); | ||
|
|
||
| template <const char * Type> | ||
| bool isType(const lanelet::osm::Relation & relation); |
There was a problem hiding this comment.
invalid case style for function isType
| bool isType(const lanelet::osm::Relation & relation); | |
| bool is_type(const lanelet::osm::Relation & relation); |
| template <const char * Type> | ||
| bool isType(const lanelet::osm::Relation & relation); | ||
|
|
||
| static lanelet::AttributeMap getAttributes(const lanelet::osm::Attributes & osmAttributes); |
There was a problem hiding this comment.
invalid case style for function getAttributes
| static lanelet::AttributeMap getAttributes(const lanelet::osm::Attributes & osmAttributes); | |
| static lanelet::AttributeMap get_attributes(const lanelet::osm::Attributes & osmAttributes); |
|
|
||
| static lanelet::AttributeMap getAttributes(const lanelet::osm::Attributes & osmAttributes); | ||
|
|
||
| LineString3d getLaneletBorder(const osm::Relation & llElem, const std::string & role); |
There was a problem hiding this comment.
invalid case style for function getLaneletBorder
| LineString3d getLaneletBorder(const osm::Relation & llElem, const std::string & role); | |
| LineString3d get_lanelet_border(const osm::Relation & llElem, const std::string & role); |
|
|
||
| LineString3d getLaneletBorder(const osm::Relation & llElem, const std::string & role); | ||
|
|
||
| LineStrings3d getLinestrings(const osm::Roles & roles, const std::string & roleName, Id refId); |
There was a problem hiding this comment.
invalid case style for function getLinestrings
| LineStrings3d getLinestrings(const osm::Roles & roles, const std::string & roleName, Id refId); | |
| LineStrings3d get_linestrings(const osm::Roles & roles, const std::string & roleName, Id refId); |
|
|
||
| LineStrings3d getLinestrings(const osm::Roles & roles, const std::string & roleName, Id refId); | ||
|
|
||
| LineStrings3d getOuterRing(const osm::Relation & area); |
There was a problem hiding this comment.
invalid case style for function getOuterRing
| LineStrings3d getOuterRing(const osm::Relation & area); | |
| LineStrings3d get_outer_ring(const osm::Relation & area); |
|
|
||
| LineStrings3d getOuterRing(const osm::Relation & area); | ||
|
|
||
| std::vector<LineStrings3d> getInnerRing(const osm::Relation & area); |
There was a problem hiding this comment.
invalid case style for function getInnerRing
| std::vector<LineStrings3d> getInnerRing(const osm::Relation & area); | |
| std::vector<LineStrings3d> get_inner_ring(const osm::Relation & area); |
|
|
||
| std::vector<LineStrings3d> getInnerRing(const osm::Relation & area); | ||
|
|
||
| RuleParameterMap getRulesForRegulatoryElement(Id currElemId, const osm::Roles & roles); |
There was a problem hiding this comment.
invalid case style for function getRulesForRegulatoryElement
| RuleParameterMap getRulesForRegulatoryElement(Id currElemId, const osm::Roles & roles); | |
| RuleParameterMap get_rules_for_regulatory_element(Id currElemId, const osm::Roles & roles); |
|
|
||
| RuleParameterMap getRulesForRegulatoryElement(Id currElemId, const osm::Roles & roles); | ||
|
|
||
| std::vector<LineStrings3d> assembleBoundary(LineStrings3d lineStrings, Id id); |
There was a problem hiding this comment.
invalid case style for function assembleBoundary
| std::vector<LineStrings3d> assembleBoundary(LineStrings3d lineStrings, Id id); | |
| std::vector<LineStrings3d> assemble_boundary(LineStrings3d lineStrings, Id id); |
| std::vector<LineStrings3d> assembleBoundary(LineStrings3d lineStrings, Id id); | ||
|
|
||
| template <typename PrimT> | ||
| PrimT getOrGetDummy( |
There was a problem hiding this comment.
invalid case style for function getOrGetDummy
| PrimT getOrGetDummy( | |
| PrimT get_or_get_dummy( |
| PrimT getOrGetDummy( | ||
| const typename std::unordered_map<Id, PrimT> & map, Id id, Id currentPrimitiveId); | ||
|
|
||
| void parserError(Id id, const std::string & what); |
There was a problem hiding this comment.
invalid case style for function parserError
| void parserError(Id id, const std::string & what); | |
| void parser_error(Id id, const std::string & what); |
| namespace lanelet | ||
| { | ||
| namespace io_handlers |
There was a problem hiding this comment.
nested namespaces can be concatenated
| namespace lanelet | |
| { | |
| namespace io_handlers | |
| namespace lanelet::io_handlers |
| *map_version = metainfo.attribute("map_version").value(); | ||
| } | ||
| } | ||
| } // namespace io_handlers |
There was a problem hiding this comment.
nested namespaces can be concatenated
| } // namespace io_handlers |
| using AreasWithRegulatoryElements = PrimitivesWithRegulatoryElement<Area>; | ||
| using LaneletsWithRegulatoryElements = PrimitivesWithRegulatoryElement<Lanelet>; | ||
|
|
||
| bool isValid(const LineStrings3d & lss) |
There was a problem hiding this comment.
invalid case style for function isValid
| bool isValid(const LineStrings3d & lss) | |
| bool is_valid(const LineStrings3d & lss) |
| // check if we closed the ring | ||
| if (currRing.back().back().id() == currRing.front().front().id()) { | ||
| // wohoo. Check the clockwise requirement. | ||
| if (!isValid(currRing)) { |
There was a problem hiding this comment.
invalid case style for function isValid
| if (!isValid(currRing)) { | |
| if (!is_valid(currRing)) { |
| // wohoo. Check the clockwise requirement. | ||
| if (!isValid(currRing)) { | ||
| reverse(currRing); | ||
| if (!isValid(currRing)) { |
There was a problem hiding this comment.
invalid case style for function isValid
| if (!isValid(currRing)) { | |
| if (!is_valid(currRing)) { |
| } | ||
|
|
||
| template <typename PrimT> | ||
| PrimT getDummy(Id id) |
There was a problem hiding this comment.
invalid case style for function getDummy
| PrimT getDummy(Id id) | |
| PrimT get_dummy(Id id) |
| return map.at(id); | ||
| } catch (std::out_of_range &) { | ||
| parserError(currentPrimitiveId, "Failed to get id "s + std::to_string(id) + " from map"); | ||
| return getDummy<PrimT>(id); |
There was a problem hiding this comment.
invalid case style for function getDummy
| return getDummy<PrimT>(id); | |
| return get_dummy<PrimT>(id); |
| return std::make_shared<GenericRegulatoryElement>(std::make_shared<RegulatoryElementData>(id)); | ||
| } | ||
|
|
||
| Errors buildErrorMessage(const std::string & errorIntro, const Errors & errors) |
There was a problem hiding this comment.
invalid case style for function buildErrorMessage
| Errors buildErrorMessage(const std::string & errorIntro, const Errors & errors) | |
| Errors build_error_message(const std::string & errorIntro, const Errors & errors) |
| registerIds(file.second.relations); | ||
| } | ||
|
|
||
| errors = buildErrorMessage( |
There was a problem hiding this comment.
invalid case style for function buildErrorMessage
| errors = buildErrorMessage( | |
| errors = build_error_message( |
| registerIds(file.nodes); | ||
| registerIds(file.ways); | ||
| registerIds(file.relations); | ||
| errors = buildErrorMessage( |
There was a problem hiding this comment.
invalid case style for function buildErrorMessage
| errors = buildErrorMessage( | |
| errors = build_error_message( |
| for (const auto & nodeElem : nodes) { | ||
| const auto & node = nodeElem.second; |
There was a problem hiding this comment.
invalid case style for variable nodeElem
| for (const auto & nodeElem : nodes) { | |
| const auto & node = nodeElem.second; | |
| for (const auto & node_elem : nodes) { | |
| const auto & node = node_elem.second; |
| for (const auto & wayElem : ways) { | ||
| const auto & way = wayElem.second; |
There was a problem hiding this comment.
invalid case style for variable wayElem
| for (const auto & wayElem : ways) { | |
| const auto & way = wayElem.second; | |
| for (const auto & way_elem : ways) { | |
| const auto & way = way_elem.second; |
| auto isArea = attributes.find(AttributeNamesString::Area); | ||
| if (isArea != attributes.end() && isArea->second.asBool().get_value_or(false)) { |
There was a problem hiding this comment.
invalid case style for variable isArea
| auto isArea = attributes.find(AttributeNamesString::Area); | |
| if (isArea != attributes.end() && isArea->second.asBool().get_value_or(false)) { | |
| auto is_area = attributes.find(AttributeNamesString::Area); | |
| if (is_area != attributes.end() && is_area->second.asBool().get_value_or(false)) { |
| // The regulatory elements are not parsed yet. We store lanelets with one | ||
| // for | ||
| // later. | ||
| LaneletsWithRegulatoryElements llWithRegulatoryElement; |
There was a problem hiding this comment.
invalid case style for variable llWithRegulatoryElement
| LaneletsWithRegulatoryElements llWithRegulatoryElement; | |
| LaneletsWithRegulatoryElements ll_with_regulatory_element; |
| llWithRegulatoryElement.push_back(std::make_pair(lanelet, &llElem)); | ||
| } | ||
| } | ||
| return llWithRegulatoryElement; |
There was a problem hiding this comment.
invalid case style for variable llWithRegulatoryElement
| llWithRegulatoryElement.push_back(std::make_pair(lanelet, &llElem)); | |
| } | |
| } | |
| return llWithRegulatoryElement; | |
| ll_with_regulatory_element.push_back(std::make_pair(lanelet, &llElem)); | |
| } | |
| } | |
| return ll_with_regulatory_element; |
| for (const auto & relElem : relations) { | ||
| const auto & llElem = relElem.second; |
There was a problem hiding this comment.
invalid case style for variable relElem
| for (const auto & relElem : relations) { | |
| const auto & llElem = relElem.second; | |
| for (const auto & rel_elem : relations) { | |
| const auto & llElem = rel_elem.second; |
| const auto & llElem = relElem.second; | ||
| if (!isType<AttributeValueString::Lanelet>(llElem)) { |
There was a problem hiding this comment.
invalid case style for variable llElem
| const auto & llElem = relElem.second; | |
| if (!isType<AttributeValueString::Lanelet>(llElem)) { | |
| const auto & ll_elem = relElem.second; | |
| if (!isType<AttributeValueString::Lanelet>(ll_elem)) { |
| const auto id = llElem.id; | ||
| const auto attributes = getAttributes(llElem.attributes); | ||
| auto left = getLaneletBorder(llElem, RoleNameString::Left); | ||
| auto right = getLaneletBorder(llElem, RoleNameString::Right); |
There was a problem hiding this comment.
invalid case style for variable llElem
| const auto id = llElem.id; | |
| const auto attributes = getAttributes(llElem.attributes); | |
| auto left = getLaneletBorder(llElem, RoleNameString::Left); | |
| auto right = getLaneletBorder(llElem, RoleNameString::Right); | |
| const auto id = ll_elem.id; | |
| const auto attributes = getAttributes(ll_elem.attributes); | |
| auto left = getLaneletBorder(ll_elem, RoleNameString::Left); | |
| auto right = getLaneletBorder(ll_elem, RoleNameString::Right); |
| if (findRole(llElem.members, RoleNameString::Centerline) != llElem.members.end()) { | ||
| auto center = getLaneletBorder(llElem, RoleNameString::Centerline); |
There was a problem hiding this comment.
invalid case style for variable llElem
| if (findRole(llElem.members, RoleNameString::Centerline) != llElem.members.end()) { | |
| auto center = getLaneletBorder(llElem, RoleNameString::Centerline); | |
| if (findRole(ll_elem.members, RoleNameString::Centerline) != ll_elem.members.end()) { | |
| auto center = getLaneletBorder(ll_elem, RoleNameString::Centerline); |
| if (findRole(llElem.members, RoleNameString::RegulatoryElement) != llElem.members.end()) { | ||
| llWithRegulatoryElement.push_back(std::make_pair(lanelet, &llElem)); |
There was a problem hiding this comment.
invalid case style for variable llElem
| if (findRole(llElem.members, RoleNameString::RegulatoryElement) != llElem.members.end()) { | |
| llWithRegulatoryElement.push_back(std::make_pair(lanelet, &llElem)); | |
| if (findRole(ll_elem.members, RoleNameString::RegulatoryElement) != ll_elem.members.end()) { | |
| llWithRegulatoryElement.push_back(std::make_pair(lanelet, &ll_elem)); |
| AreasWithRegulatoryElements MultiFileLoader::loadAreas(const lanelet::osm::Relations & relations) | ||
| { | ||
| // regElems are not parsed yet. We store areas with one for later. | ||
| AreasWithRegulatoryElements arWithRegulatoryElement; |
There was a problem hiding this comment.
invalid case style for variable arWithRegulatoryElement
| AreasWithRegulatoryElements arWithRegulatoryElement; | |
| AreasWithRegulatoryElements ar_with_regulatory_element; |
| arWithRegulatoryElement.push_back(std::make_pair(area, &arElem)); | ||
| } | ||
| } | ||
| return arWithRegulatoryElement; |
There was a problem hiding this comment.
invalid case style for variable arWithRegulatoryElement
| arWithRegulatoryElement.push_back(std::make_pair(area, &arElem)); | |
| } | |
| } | |
| return arWithRegulatoryElement; | |
| ar_with_regulatory_element.push_back(std::make_pair(area, &arElem)); | |
| } | |
| } | |
| return ar_with_regulatory_element; |
| for (const auto & relElem : relations) { | ||
| const auto & arElem = relElem.second; |
There was a problem hiding this comment.
invalid case style for variable relElem
| for (const auto & relElem : relations) { | |
| const auto & arElem = relElem.second; | |
| for (const auto & rel_elem : relations) { | |
| const auto & arElem = rel_elem.second; |
| const auto & arElem = relElem.second; | ||
| if (!isType<AttributeValueString::Multipolygon>(arElem)) { |
There was a problem hiding this comment.
invalid case style for variable arElem
| const auto & arElem = relElem.second; | |
| if (!isType<AttributeValueString::Multipolygon>(arElem)) { | |
| const auto & ar_elem = relElem.second; | |
| if (!isType<AttributeValueString::Multipolygon>(ar_elem)) { |
| const auto id = arElem.id; | ||
| const auto attributes = getAttributes(arElem.attributes); |
There was a problem hiding this comment.
invalid case style for variable arElem
| const auto id = arElem.id; | |
| const auto attributes = getAttributes(arElem.attributes); | |
| const auto id = ar_elem.id; | |
| const auto attributes = getAttributes(ar_elem.attributes); |
| const auto id = arElem.id; | ||
| const auto attributes = getAttributes(arElem.attributes); | ||
|
|
||
| auto outerRing = getOuterRing(arElem); |
There was a problem hiding this comment.
invalid case style for variable arElem
| auto outerRing = getOuterRing(arElem); | |
| auto outerRing = getOuterRing(ar_elem); |
| continue; | ||
| } | ||
|
|
||
| Area area(id, outerRing, getInnerRing(arElem), attributes); |
There was a problem hiding this comment.
invalid case style for variable arElem
| Area area(id, outerRing, getInnerRing(arElem), attributes); | |
| Area area(id, outerRing, getInnerRing(ar_elem), attributes); |
| if (findRole(arElem.members, RoleNameString::RegulatoryElement) != arElem.members.end()) { | ||
| arWithRegulatoryElement.push_back(std::make_pair(area, &arElem)); |
There was a problem hiding this comment.
invalid case style for variable arElem
| if (findRole(arElem.members, RoleNameString::RegulatoryElement) != arElem.members.end()) { | |
| arWithRegulatoryElement.push_back(std::make_pair(area, &arElem)); | |
| if (findRole(ar_elem.members, RoleNameString::RegulatoryElement) != ar_elem.members.end()) { | |
| arWithRegulatoryElement.push_back(std::make_pair(area, &ar_elem)); |
| auto outerRing = getOuterRing(arElem); | ||
| if (outerRing.empty()) { |
There was a problem hiding this comment.
invalid case style for variable outerRing
| auto outerRing = getOuterRing(arElem); | |
| if (outerRing.empty()) { | |
| auto outer_ring = getOuterRing(arElem); | |
| if (outer_ring.empty()) { |
| continue; | ||
| } | ||
|
|
||
| Area area(id, outerRing, getInnerRing(arElem), attributes); |
There was a problem hiding this comment.
invalid case style for variable outerRing
| Area area(id, outerRing, getInnerRing(arElem), attributes); | |
| Area area(id, outer_ring, getInnerRing(arElem), attributes); |
| for (const auto & relElem : relations) { | ||
| const auto & regElem = relElem.second; |
There was a problem hiding this comment.
invalid case style for variable relElem
| for (const auto & relElem : relations) { | |
| const auto & regElem = relElem.second; | |
| for (const auto & rel_elem : relations) { | |
| const auto & regElem = rel_elem.second; |
| const auto & regElem = relElem.second; | ||
| if (!isType<AttributeValueString::RegulatoryElement>(regElem)) { |
There was a problem hiding this comment.
invalid case style for variable regElem
| const auto & regElem = relElem.second; | |
| if (!isType<AttributeValueString::RegulatoryElement>(regElem)) { | |
| const auto & reg_elem = relElem.second; | |
| if (!isType<AttributeValueString::RegulatoryElement>(reg_elem)) { |
| const auto id = regElem.id; | ||
| const auto attributes = getAttributes(regElem.attributes); |
There was a problem hiding this comment.
invalid case style for variable regElem
| const auto id = regElem.id; | |
| const auto attributes = getAttributes(regElem.attributes); | |
| const auto id = reg_elem.id; | |
| const auto attributes = getAttributes(reg_elem.attributes); |
| parserError(id, "Regulatory element has no 'subtype' tag."); | ||
| continue; | ||
| } | ||
| auto rules = getRulesForRegulatoryElement(id, regElem.members); |
There was a problem hiding this comment.
invalid case style for variable regElem
| auto rules = getRulesForRegulatoryElement(id, regElem.members); | |
| auto rules = getRulesForRegulatoryElement(id, reg_elem.members); |
| continue; | ||
| } | ||
| auto rules = getRulesForRegulatoryElement(id, regElem.members); | ||
| auto regelemData = std::make_shared<RegulatoryElementData>(id, rules, attributes); |
There was a problem hiding this comment.
invalid case style for variable regelemData
| auto regelemData = std::make_shared<RegulatoryElementData>(id, rules, attributes); | |
| auto regelem_data = std::make_shared<RegulatoryElementData>(id, rules, attributes); |
| auto regelemData = std::make_shared<RegulatoryElementData>(id, rules, attributes); | ||
| auto regelemType = type->second.value(); | ||
| try { | ||
| auto regElement = RegulatoryElementFactory::create(regelemType, regelemData); |
There was a problem hiding this comment.
invalid case style for variable regelemData
| auto regElement = RegulatoryElementFactory::create(regelemType, regelemData); | |
| auto regElement = RegulatoryElementFactory::create(regelemType, regelem_data); |
| } | ||
| auto rules = getRulesForRegulatoryElement(id, regElem.members); | ||
| auto regelemData = std::make_shared<RegulatoryElementData>(id, rules, attributes); | ||
| auto regelemType = type->second.value(); |
There was a problem hiding this comment.
invalid case style for variable regelemType
| auto regelemType = type->second.value(); | |
| auto regelem_type = type->second.value(); |
| auto regelemData = std::make_shared<RegulatoryElementData>(id, rules, attributes); | ||
| auto regelemType = type->second.value(); | ||
| try { | ||
| auto regElement = RegulatoryElementFactory::create(regelemType, regelemData); |
There was a problem hiding this comment.
invalid case style for variable regelemType
| auto regElement = RegulatoryElementFactory::create(regelemType, regelemData); | |
| auto regElement = RegulatoryElementFactory::create(regelem_type, regelemData); |
| regulatoryElements_.emplace(id, regElement); | ||
| } catch (std::exception & e) { | ||
| parserError( | ||
| id, "Creating a regulatory element of type "s + regelemType + " failed: " + e.what()); |
There was a problem hiding this comment.
invalid case style for variable regelemType
| id, "Creating a regulatory element of type "s + regelemType + " failed: " + e.what()); | |
| id, "Creating a regulatory element of type "s + regelem_type + " failed: " + e.what()); |
| auto regElement = RegulatoryElementFactory::create(regelemType, regelemData); | ||
| regulatoryElements_.emplace(id, regElement); |
There was a problem hiding this comment.
invalid case style for variable regElement
| auto regElement = RegulatoryElementFactory::create(regelemType, regelemData); | |
| regulatoryElements_.emplace(id, regElement); | |
| auto reg_element = RegulatoryElementFactory::create(regelemType, regelemData); | |
| regulatoryElements_.emplace(id, reg_element); |
| void MultiFileLoader::addRegulatoryElements( | ||
| std::vector<std::pair<PrimT, const osm::Relation *>> & addTos) | ||
| { | ||
| for (auto & addTo : addTos) { |
There was a problem hiding this comment.
invalid case style for variable addTo
| for (auto & addTo : addTos) { | |
| for (auto & add_to : addTos) { |
| addTo.second->members, RoleNameString::RegulatoryElement, [&](const osm::Role & role) { | ||
| auto regElem = getOrGetDummy(regulatoryElements_, role.second->id, addTo.first.id()); | ||
| addTo.first.addRegulatoryElement(regElem); |
There was a problem hiding this comment.
invalid case style for variable addTo
| addTo.second->members, RoleNameString::RegulatoryElement, [&](const osm::Role & role) { | |
| auto regElem = getOrGetDummy(regulatoryElements_, role.second->id, addTo.first.id()); | |
| addTo.first.addRegulatoryElement(regElem); | |
| add_to.second->members, RoleNameString::RegulatoryElement, [add_to](const osm::Role & role) { | |
| auto regElem = getOrGetDummy(regulatoryElements_, role.second->id, add_to.first.id()); | |
| add_to.first.addRegulatoryElement(regElem); |
| auto regElem = getOrGetDummy(regulatoryElements_, role.second->id, addTo.first.id()); | ||
| addTo.first.addRegulatoryElement(regElem); |
There was a problem hiding this comment.
invalid case style for variable regElem
| auto regElem = getOrGetDummy(regulatoryElements_, role.second->id, addTo.first.id()); | |
| addTo.first.addRegulatoryElement(regElem); | |
| auto reg_elem = getOrGetDummy(regulatoryElements_, role.second->id, addTo.first.id()); | |
| addTo.first.addRegulatoryElement(reg_elem); |
| for (const auto & osmAttr : osmAttributes) { | ||
| attributes.insert(std::make_pair(osmAttr.first, lanelet::Attribute(osmAttr.second))); |
There was a problem hiding this comment.
invalid case style for variable osmAttr
| for (const auto & osmAttr : osmAttributes) { | |
| attributes.insert(std::make_pair(osmAttr.first, lanelet::Attribute(osmAttr.second))); | |
| for (const auto & osm_attr : osmAttributes) { | |
| attributes.insert(std::make_pair(osm_attr.first, lanelet::Attribute(osm_attr.second))); |
| size_t numMembers = 0; | ||
| osm::forEachMember(llElem.members, role, [&](auto & /*role*/) { ++numMembers; }); | ||
| if (numMembers != 1) { |
There was a problem hiding this comment.
invalid case style for variable numMembers
| size_t numMembers = 0; | |
| osm::forEachMember(llElem.members, role, [&](auto & /*role*/) { ++numMembers; }); | |
| if (numMembers != 1) { | |
| size_t num_members = 0; | |
| osm::forEachMember(llElem.members, role, [num_members](auto & /*role*/) { ++num_members; }); | |
| if (num_members != 1) { |
| osm::forEachMember(llElem.members, role, [&](auto & /*role*/) { ++numMembers; }); | ||
| if (numMembers != 1) { | ||
| parserError(llElem.id, "Lanelet has not exactly one "s + role + " border!"); | ||
| return LineString3d(llElem.id); |
There was a problem hiding this comment.
avoid repeating the return type from the declaration; use a braced initializer list instead
| auto member = osm::findRole(llElem.members, role); | ||
| if (member->second->type() != AttributeValueString::Way) { | ||
| parserError(llElem.id, "Lanelet "s + role + " border is not of type way!"); | ||
| return LineString3d(llElem.id); |
There was a problem hiding this comment.
avoid repeating the return type from the declaration; use a braced initializer list instead
| auto outerLs = getLinestrings(area.members, RoleNameString::Outer, area.id); | ||
| if (outerLs.empty()) { |
There was a problem hiding this comment.
invalid case style for variable outerLs
| auto outerLs = getLinestrings(area.members, RoleNameString::Outer, area.id); | |
| if (outerLs.empty()) { | |
| auto outer_ls = getLinestrings(area.members, RoleNameString::Outer, area.id); | |
| if (outer_ls.empty()) { |
| parserError(area.id, "Areas must have at least one outer border!"); | ||
| return {}; | ||
| } | ||
| auto outerRings = assembleBoundary(outerLs, area.id); |
There was a problem hiding this comment.
invalid case style for variable outerLs
| auto outerRings = assembleBoundary(outerLs, area.id); | |
| auto outerRings = assembleBoundary(outer_ls, area.id); |
| auto outerRings = assembleBoundary(outerLs, area.id); | ||
| if (outerRings.size() != 1) { |
There was a problem hiding this comment.
invalid case style for variable outerRings
| auto outerRings = assembleBoundary(outerLs, area.id); | |
| if (outerRings.size() != 1) { | |
| auto outer_rings = assembleBoundary(outerLs, area.id); | |
| if (outer_rings.size() != 1) { |
| parserError(area.id, "Areas must have exactly one outer ring!"); | ||
| return {}; | ||
| } | ||
| return outerRings.front(); |
There was a problem hiding this comment.
invalid case style for variable outerRings
| return outerRings.front(); | |
| return outer_rings.front(); |
| auto innerLs = getLinestrings(area.members, RoleNameString::Inner, area.id); | ||
| return assembleBoundary(innerLs, area.id); |
There was a problem hiding this comment.
invalid case style for variable innerLs
| auto innerLs = getLinestrings(area.members, RoleNameString::Inner, area.id); | |
| return assembleBoundary(innerLs, area.id); | |
| auto inner_ls = getLinestrings(area.members, RoleNameString::Inner, area.id); | |
| return assembleBoundary(inner_ls, area.id); |
| for (const auto & memberPair : roles) { | ||
| const auto & member = memberPair.second; |
There was a problem hiding this comment.
invalid case style for variable memberPair
| for (const auto & memberPair : roles) { | |
| const auto & member = memberPair.second; | |
| for (const auto & member_pair : roles) { | |
| const auto & member = member_pair.second; |
| const auto & member = memberPair.second; | ||
| if (member->type() == AttributeValueString::Node) { | ||
| auto newMember = getOrGetDummy(points_, member->id, currElemId); | ||
| rules[memberPair.first].emplace_back(newMember); |
There was a problem hiding this comment.
invalid case style for variable memberPair
| rules[memberPair.first].emplace_back(newMember); | |
| rules[member_pair.first].emplace_back(newMember); |
| // can either be linestring or polygon | ||
| if (polygons_.find(member->id) != polygons_.end()) { | ||
| auto newMember = getOrGetDummy(polygons_, member->id, currElemId); | ||
| rules[memberPair.first].emplace_back(newMember); |
There was a problem hiding this comment.
invalid case style for variable memberPair
| rules[memberPair.first].emplace_back(newMember); | |
| rules[member_pair.first].emplace_back(newMember); |
| rules[memberPair.first].emplace_back(newMember); | ||
| } else { | ||
| auto newMember = getOrGetDummy(lineStrings_, member->id, currElemId); | ||
| rules[memberPair.first].emplace_back(newMember); |
There was a problem hiding this comment.
invalid case style for variable memberPair
| rules[memberPair.first].emplace_back(newMember); | |
| rules[member_pair.first].emplace_back(newMember); |
| " without a type tag!"); | ||
| } else if (type->second == AttributeValueString::Lanelet) { | ||
| auto newMember = getOrGetDummy(lanelets_, member->id, currElemId); | ||
| rules[memberPair.first].emplace_back(newMember); |
There was a problem hiding this comment.
invalid case style for variable memberPair
| rules[memberPair.first].emplace_back(newMember); | |
| rules[member_pair.first].emplace_back(newMember); |
| rules[memberPair.first].emplace_back(newMember); | ||
| } else if (type->second == AttributeValueString::Multipolygon) { | ||
| auto newMember = getOrGetDummy(areas_, member->id, currElemId); | ||
| rules[memberPair.first].emplace_back(newMember); |
There was a problem hiding this comment.
invalid case style for variable memberPair
| rules[memberPair.first].emplace_back(newMember); | |
| rules[member_pair.first].emplace_back(newMember); |
| auto newMember = getOrGetDummy(points_, member->id, currElemId); | ||
| rules[memberPair.first].emplace_back(newMember); |
There was a problem hiding this comment.
invalid case style for variable newMember
| auto newMember = getOrGetDummy(points_, member->id, currElemId); | |
| rules[memberPair.first].emplace_back(newMember); | |
| auto new_member = getOrGetDummy(points_, member->id, currElemId); | |
| rules[memberPair.first].emplace_back(new_member); |
| auto newMember = getOrGetDummy(polygons_, member->id, currElemId); | ||
| rules[memberPair.first].emplace_back(newMember); |
There was a problem hiding this comment.
invalid case style for variable newMember
| auto newMember = getOrGetDummy(polygons_, member->id, currElemId); | |
| rules[memberPair.first].emplace_back(newMember); | |
| auto new_member = getOrGetDummy(polygons_, member->id, currElemId); | |
| rules[memberPair.first].emplace_back(new_member); |
| auto newMember = getOrGetDummy(lineStrings_, member->id, currElemId); | ||
| rules[memberPair.first].emplace_back(newMember); |
There was a problem hiding this comment.
invalid case style for variable newMember
| auto newMember = getOrGetDummy(lineStrings_, member->id, currElemId); | |
| rules[memberPair.first].emplace_back(newMember); | |
| auto new_member = getOrGetDummy(lineStrings_, member->id, currElemId); | |
| rules[memberPair.first].emplace_back(new_member); |
| auto newMember = getOrGetDummy(lanelets_, member->id, currElemId); | ||
| rules[memberPair.first].emplace_back(newMember); |
There was a problem hiding this comment.
invalid case style for variable newMember
| auto newMember = getOrGetDummy(lanelets_, member->id, currElemId); | |
| rules[memberPair.first].emplace_back(newMember); | |
| auto new_member = getOrGetDummy(lanelets_, member->id, currElemId); | |
| rules[memberPair.first].emplace_back(new_member); |
| auto newMember = getOrGetDummy(areas_, member->id, currElemId); | ||
| rules[memberPair.first].emplace_back(newMember); |
There was a problem hiding this comment.
invalid case style for variable newMember
| auto newMember = getOrGetDummy(areas_, member->id, currElemId); | |
| rules[memberPair.first].emplace_back(newMember); | |
| auto new_member = getOrGetDummy(areas_, member->id, currElemId); | |
| rules[memberPair.first].emplace_back(new_member); |
| auto & currRing = rings.back(); | ||
| if (currRing.empty()) { | ||
| currRing.push_back(lineStrings.back()); |
There was a problem hiding this comment.
invalid case style for variable currRing
| auto & currRing = rings.back(); | |
| if (currRing.empty()) { | |
| currRing.push_back(lineStrings.back()); | |
| auto & curr_ring = rings.back(); | |
| if (curr_ring.empty()) { | |
| curr_ring.push_back(lineStrings.back()); |
| currRing.push_back(lineStrings.back()); | ||
| lineStrings.pop_back(); | ||
| } else { | ||
| const auto lastId = currRing.back().back().id(); |
There was a problem hiding this comment.
invalid case style for variable currRing
| const auto lastId = currRing.back().back().id(); | |
| const auto lastId = curr_ring.back().back().id(); |
| if (elem == lineStrings.rend()) { | ||
| parserError( | ||
| id, | ||
| "Could not complete boundary around linestring " + std::to_string(currRing.back().id())); |
There was a problem hiding this comment.
invalid case style for variable currRing
| "Could not complete boundary around linestring " + std::to_string(currRing.back().id())); | |
| "Could not complete boundary around linestring " + std::to_string(curr_ring.back().id())); |
| if (newLineString.back().id() == lastId) { | ||
| newLineString = newLineString.invert(); | ||
| } | ||
| currRing.push_back(newLineString); |
There was a problem hiding this comment.
invalid case style for variable currRing
| currRing.push_back(newLineString); | |
| curr_ring.push_back(newLineString); |
| } | ||
|
|
||
| // check if we closed the ring | ||
| if (currRing.back().back().id() == currRing.front().front().id()) { |
There was a problem hiding this comment.
invalid case style for variable currRing
| if (currRing.back().back().id() == currRing.front().front().id()) { | |
| if (curr_ring.back().back().id() == curr_ring.front().front().id()) { |
| if (!isValid(currRing)) { | ||
| reverse(currRing); | ||
| if (!isValid(currRing)) { |
There was a problem hiding this comment.
invalid case style for variable currRing
| if (!isValid(currRing)) { | |
| reverse(currRing); | |
| if (!isValid(currRing)) { | |
| if (!isValid(curr_ring)) { | |
| reverse(curr_ring); | |
| if (!isValid(curr_ring)) { |
| currRing.push_back(lineStrings.back()); | ||
| lineStrings.pop_back(); | ||
| } else { | ||
| const auto lastId = currRing.back().back().id(); |
There was a problem hiding this comment.
invalid case style for variable lastId
| const auto lastId = currRing.back().back().id(); | |
| const auto last_id = currRing.back().back().id(); |
| std::find_if(lineStrings.rbegin(), lineStrings.rend(), [lastId](const auto & elem) { | ||
| return elem.back().id() == lastId || elem.front().id() == lastId; |
There was a problem hiding this comment.
invalid case style for variable lastId
| std::find_if(lineStrings.rbegin(), lineStrings.rend(), [lastId](const auto & elem) { | |
| return elem.back().id() == lastId || elem.front().id() == lastId; | |
| std::find_if(lineStrings.rbegin(), lineStrings.rend(), [last_id](const auto & elem) { | |
| return elem.back().id() == last_id || elem.front().id() == last_id; |
| // we found the matching next linestring. add it in the correct order | ||
| auto newLineString = *elem; | ||
| lineStrings.erase(std::next(elem).base()); | ||
| if (newLineString.back().id() == lastId) { |
There was a problem hiding this comment.
invalid case style for variable lastId
| if (newLineString.back().id() == lastId) { | |
| if (newLineString.back().id() == last_id) { |
| continue; | ||
| } | ||
| // we found the matching next linestring. add it in the correct order | ||
| auto newLineString = *elem; |
There was a problem hiding this comment.
invalid case style for variable newLineString
| auto newLineString = *elem; | |
| auto new_line_string = *elem; |
| if (newLineString.back().id() == lastId) { | ||
| newLineString = newLineString.invert(); |
There was a problem hiding this comment.
invalid case style for variable newLineString
| if (newLineString.back().id() == lastId) { | |
| newLineString = newLineString.invert(); | |
| if (new_line_string.back().id() == lastId) { | |
| new_line_string = new_line_string.invert(); |
| if (newLineString.back().id() == lastId) { | ||
| newLineString = newLineString.invert(); | ||
| } | ||
| currRing.push_back(newLineString); |
There was a problem hiding this comment.
invalid case style for variable newLineString
| currRing.push_back(newLineString); | |
| currRing.push_back(new_line_string); |
| } | ||
|
|
||
| template <typename MapT> | ||
| void registerIds(const MapT & map) |
There was a problem hiding this comment.
invalid case style for function registerIds
| void registerIds(const MapT & map) | |
| void register_ids(const MapT & map) |
| registerIds(file.second.nodes); | ||
| registerIds(file.second.ways); | ||
| registerIds(file.second.relations); |
There was a problem hiding this comment.
invalid case style for function registerIds
| registerIds(file.second.nodes); | |
| registerIds(file.second.ways); | |
| registerIds(file.second.relations); | |
| register_ids(file.second.nodes); | |
| register_ids(file.second.ways); | |
| register_ids(file.second.relations); |
| registerIds(file.nodes); | ||
| registerIds(file.ways); | ||
| registerIds(file.relations); |
There was a problem hiding this comment.
invalid case style for function registerIds
| registerIds(file.nodes); | |
| registerIds(file.ways); | |
| registerIds(file.relations); | |
| register_ids(file.nodes); | |
| register_ids(file.ways); | |
| register_ids(file.relations); |
| } | ||
| } | ||
|
|
||
| void testAndPrintLocaleWarning(ErrorMessages & errors) |
There was a problem hiding this comment.
invalid case style for function testAndPrintLocaleWarning
| void testAndPrintLocaleWarning(ErrorMessages & errors) | |
| void test_and_print_locale_warning(ErrorMessages & errors) |
| throw lanelet::ParseError( | ||
| "Errors occured while parsing osm file: "s + result.description()); | ||
| } | ||
| testAndPrintLocaleWarning(osmReadErrors); |
There was a problem hiding this comment.
invalid case style for function testAndPrintLocaleWarning
| testAndPrintLocaleWarning(osmReadErrors); | |
| test_and_print_locale_warning(osmReadErrors); |
| throw lanelet::ParseError("Errors occured while parsing osm file: "s + result.description()); | ||
| } | ||
| osm::Errors osmReadErrors; | ||
| testAndPrintLocaleWarning(osmReadErrors); |
There was a problem hiding this comment.
invalid case style for function testAndPrintLocaleWarning
| testAndPrintLocaleWarning(osmReadErrors); | |
| test_and_print_locale_warning(osmReadErrors); |
| auto * decimalPoint = std::localeconv()->decimal_point; | ||
| if (decimalPoint == nullptr || *decimalPoint != '.') { |
There was a problem hiding this comment.
invalid case style for variable decimalPoint
| auto * decimalPoint = std::localeconv()->decimal_point; | |
| if (decimalPoint == nullptr || *decimalPoint != '.') { | |
| auto * decimal_point = std::localeconv()->decimal_point; | |
| if (decimal_point == nullptr || *decimal_point != '.') { |
| if (decimalPoint == nullptr || *decimalPoint != '.') { | ||
| std::stringstream ss; | ||
| ss << "Warning: Current decimal point of the C locale is set to \"" | ||
| << (decimalPoint == nullptr ? ' ' : *decimalPoint) |
There was a problem hiding this comment.
invalid case style for variable decimalPoint
| << (decimalPoint == nullptr ? ' ' : *decimalPoint) | |
| << (decimal_point == nullptr ? ' ' : *decimal_point) |
| { | ||
| std::map<std::string, osm::File> files; | ||
|
|
||
| osm::Errors osmReadErrors; |
There was a problem hiding this comment.
invalid case style for variable osmReadErrors
| osm::Errors osmReadErrors; | |
| osm::Errors osm_read_errors; |
|
|
||
| std::for_each( | ||
| lanelet2_filenames.begin(), lanelet2_filenames.end(), | ||
| [&files, &osmReadErrors](const auto & file_name) { |
There was a problem hiding this comment.
invalid case style for variable osmReadErrors
| [&files, &osmReadErrors](const auto & file_name) { | |
| [&files, &osm_read_errors](const auto & file_name) { |
| throw lanelet::ParseError( | ||
| "Errors occured while parsing osm file: "s + result.description()); | ||
| } | ||
| testAndPrintLocaleWarning(osmReadErrors); |
There was a problem hiding this comment.
invalid case style for variable osmReadErrors
| testAndPrintLocaleWarning(osmReadErrors); | |
| testAndPrintLocaleWarning(osm_read_errors); |
| } | ||
| testAndPrintLocaleWarning(osmReadErrors); | ||
|
|
||
| files[file_name] = lanelet::osm::read(doc, &osmReadErrors); |
There was a problem hiding this comment.
invalid case style for variable osmReadErrors
| files[file_name] = lanelet::osm::read(doc, &osmReadErrors); | |
| files[file_name] = lanelet::osm::read(doc, &osm_read_errors); |
| } | ||
|
|
||
| errors = buildErrorMessage( | ||
| "Errors ocurred while parsing Lanelet Map:", utils::concatenate({osmReadErrors, errors})); |
There was a problem hiding this comment.
invalid case style for variable osmReadErrors
| "Errors ocurred while parsing Lanelet Map:", utils::concatenate({osmReadErrors, errors})); | |
| "Errors ocurred while parsing Lanelet Map:", utils::concatenate({osm_read_errors, errors})); |
| osm::Errors osmReadErrors; | ||
| testAndPrintLocaleWarning(osmReadErrors); | ||
| auto file = lanelet::osm::read(doc, &osmReadErrors); |
There was a problem hiding this comment.
invalid case style for variable osmReadErrors
| osm::Errors osmReadErrors; | |
| testAndPrintLocaleWarning(osmReadErrors); | |
| auto file = lanelet::osm::read(doc, &osmReadErrors); | |
| osm::Errors osm_read_errors; | |
| testAndPrintLocaleWarning(osm_read_errors); | |
| auto file = lanelet::osm::read(doc, &osm_read_errors); |
| registerIds(file.ways); | ||
| registerIds(file.relations); | ||
| errors = buildErrorMessage( | ||
| "Errors ocurred while parsing Lanelet Map:", utils::concatenate({osmReadErrors, errors})); |
There was a problem hiding this comment.
invalid case style for variable osmReadErrors
| "Errors ocurred while parsing Lanelet Map:", utils::concatenate({osmReadErrors, errors})); | |
| "Errors ocurred while parsing Lanelet Map:", utils::concatenate({osm_read_errors, errors})); |
| auto osmNode = doc.child("osm"); | ||
| auto metainfo = osmNode.child("MetaInfo"); |
There was a problem hiding this comment.
invalid case style for variable osmNode
| auto osmNode = doc.child("osm"); | |
| auto metainfo = osmNode.child("MetaInfo"); | |
| auto osm_node = doc.child("osm"); | |
| auto metainfo = osm_node.child("MetaInfo"); |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #234 +/- ##
=========================================
- Coverage 10.46% 9.50% -0.97%
=========================================
Files 42 44 +2
Lines 3154 3473 +319
Branches 1409 1600 +191
=========================================
Hits 330 330
- Misses 2397 2716 +319
Partials 427 427
*This pull request uses carry forward flags. Click here to find out more. ☔ View full report in Codecov by Sentry. |
mitsudome-r
requested review from
kosuke55,
soblin,
Motsu-san,
mitsudome-r and
takayuki5168
as code owners
| #include <utility> | ||
| #include <vector> | ||
|
|
||
| using std::string_literals::operator""s; |
There was a problem hiding this comment.
using declarations in the global namespace in headers are prohibited
| #include <utility> | ||
| #include <vector> | ||
|
|
||
| using std::string_literals::operator""s; |
There was a problem hiding this comment.
using decl operator""s is unused
There was a problem hiding this comment.
@StepTurtle is the code in the tmp folder meant to be included in this PR? There also seems to be changes unrelated to this PR that are copied from #238, is that intended?
xmfcx
force-pushed
the
feat/add_multi_osm_parser
branch
from
ca1ed11 to
9944319
Compare
Hi @esteve |
|
This pull request has been automatically marked as stale because it has not had recent activity. |
Signed-off-by: M. Fatih Cırıt <[email protected]>
StepTurtle
force-pushed
the
feat/add_multi_osm_parser
branch
from
9944319 to
0a81e96
Compare
| * @param map [lanelet map data] | ||
| * @param msg [converted ROS message. Only "data" field is filled] | ||
| */ | ||
| void toBinMsg(const lanelet::LaneletMapPtr & map, autoware_map_msgs::msg::LaneletMapBin * msg); |
There was a problem hiding this comment.
redundant toBinMsg declaration
| void toBinMsg(const lanelet::LaneletMapPtr & map, autoware_map_msgs::msg::LaneletMapBin * msg); |
Description
I have added a new library class to facilitate the loading of multiple OSM files in lanelet2_extension. These changes were made to support dynamic lanelet loading.
Related links
Proposal Link
Tests performed
In this video, the map in background loaded with current approach and the white map load new class and cannot see any difference. Also the maps which loaded with new class tested with mission and behavior planner and cannot see any problem.
dynamic_load_map.webm
Notes for reviewers
Interface changes
Effects on system behavior
Pre-review checklist for the PR author
The PR author must check the checkboxes below when creating the PR.
In-review checklist for the PR reviewers
The PR reviewers must check the checkboxes below before approval.
Post-review checklist for the PR author
The PR author must check the checkboxes below before merging.
After all checkboxes are checked, anyone who has write access can merge the PR.