From b4b753ce2e4c366c0662e84162f6d2b3b5efa11e Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Fri, 29 Aug 2014 12:28:10 +0200 Subject: [PATCH] rename variables in ExternalMemoryNode to be more telling and consistent --- DataStructures/ExternalMemoryNode.cpp | 6 +++--- DataStructures/ExternalMemoryNode.h | 6 +++--- Util/GraphLoader.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DataStructures/ExternalMemoryNode.cpp b/DataStructures/ExternalMemoryNode.cpp index 6a85a955d..653e421af 100644 --- a/DataStructures/ExternalMemoryNode.cpp +++ b/DataStructures/ExternalMemoryNode.cpp @@ -30,12 +30,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include ExternalMemoryNode::ExternalMemoryNode( - int lat, int lon, unsigned int node_id, bool bollard, bool traffic_light) - : NodeInfo(lat, lon, node_id), bollard(bollard), trafficLight(traffic_light) + int lat, int lon, unsigned int node_id, bool barrier, bool traffic_lights) + : NodeInfo(lat, lon, node_id), barrier(barrier), traffic_lights(traffic_lights) { } -ExternalMemoryNode::ExternalMemoryNode() : bollard(false), trafficLight(false) {} +ExternalMemoryNode::ExternalMemoryNode() : barrier(false), traffic_lights(false) {} ExternalMemoryNode ExternalMemoryNode::min_value() { diff --git a/DataStructures/ExternalMemoryNode.h b/DataStructures/ExternalMemoryNode.h index 90ce532a6..a641a6d8c 100644 --- a/DataStructures/ExternalMemoryNode.h +++ b/DataStructures/ExternalMemoryNode.h @@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. struct ExternalMemoryNode : NodeInfo { - ExternalMemoryNode(int lat, int lon, NodeID id, bool bollard, bool traffic_light); + ExternalMemoryNode(int lat, int lon, NodeID id, bool barrier, bool traffic_light); ExternalMemoryNode(); @@ -42,8 +42,8 @@ struct ExternalMemoryNode : NodeInfo static ExternalMemoryNode max_value(); - bool bollard; - bool trafficLight; + bool barrier; + bool traffic_lights; }; struct ExternalMemoryNodeSTXXLCompare diff --git a/Util/GraphLoader.h b/Util/GraphLoader.h index 107cd65c9..a7eab64f0 100644 --- a/Util/GraphLoader.h +++ b/Util/GraphLoader.h @@ -82,11 +82,11 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream, input_stream.read((char *)¤t_node, sizeof(ExternalMemoryNode)); int_to_ext_node_id_map->emplace_back(current_node.lat, current_node.lon, current_node.node_id); ext_to_int_id_map.emplace(current_node.node_id, i); - if (current_node.bollard) + if (current_node.barrier) { barrier_node_list.emplace_back(i); } - if (current_node.trafficLight) + if (current_node.traffic_lights) { traffic_light_node_list.emplace_back(i); }