From 88ee51ba2e927387c5e1b75378812c93cbcd943b Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Tue, 5 Dec 2017 11:14:26 +0000 Subject: [PATCH] const-correctness --- .../guidance/segregated_intersection_classification.hpp | 2 +- include/extractor/node_based_graph_factory.hpp | 6 +++++- .../guidance/segregated_intersection_classification.cpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/extractor/guidance/segregated_intersection_classification.hpp b/include/extractor/guidance/segregated_intersection_classification.hpp index ac9fab69f..bebb59eb2 100644 --- a/include/extractor/guidance/segregated_intersection_classification.hpp +++ b/include/extractor/guidance/segregated_intersection_classification.hpp @@ -20,7 +20,7 @@ namespace guidance // - middle edges between two osm ways in one logic road (U-turn) // - staggered intersections (X-cross) // - square/circle intersections -std::unordered_set findSegregatedNodes(NodeBasedGraphFactory &factory, const util::NameTable& names); +std::unordered_set findSegregatedNodes(const NodeBasedGraphFactory &factory, const util::NameTable& names); } } diff --git a/include/extractor/node_based_graph_factory.hpp b/include/extractor/node_based_graph_factory.hpp index 91afe2035..07facfdbe 100644 --- a/include/extractor/node_based_graph_factory.hpp +++ b/include/extractor/node_based_graph_factory.hpp @@ -41,9 +41,13 @@ class NodeBasedGraphFactory std::vector &turn_restrictions, std::vector &conditional_turn_restrictions); - auto const &GetGraph() { return compressed_output_graph; } + auto const &GetGraph() const { return compressed_output_graph; } auto const &GetBarriers() const { return barriers; } auto const &GetTrafficSignals() const { return traffic_signals; } + auto const &GetCompressedEdges() const { return compressed_edge_container; } + auto const &GetCoordinates() const { return coordinates; } + auto const &GetAnnotationData() const { return annotation_data; } + auto const &GetOsmNodes() const { return osm_node_ids; } auto &GetCompressedEdges() { return compressed_edge_container; } auto &GetCoordinates() { return coordinates; } auto &GetAnnotationData() { return annotation_data; } diff --git a/src/extractor/guidance/segregated_intersection_classification.cpp b/src/extractor/guidance/segregated_intersection_classification.cpp index aac67b76f..5a0b2ef0e 100644 --- a/src/extractor/guidance/segregated_intersection_classification.cpp +++ b/src/extractor/guidance/segregated_intersection_classification.cpp @@ -125,7 +125,7 @@ bool IsSegregated(std::vector v1, return edgeLength <= threshold; } -std::unordered_set findSegregatedNodes(NodeBasedGraphFactory &factory, +std::unordered_set findSegregatedNodes(const NodeBasedGraphFactory &factory, const util::NameTable &names) {