Changed the name of the internal GetSigns method to ProcessSigns

valhalla · gknisely · Oct 7, 2021 · May 21, 2021 · May 21, 2021 · May 21, 2021
commit 2711fb18178e3a5779703d79e396aef250b11e6a
diff --git a/src/baldr/graphtile.cc b/src/baldr/graphtile.cc
@@ -707,9 +707,9 @@ std::string GraphTile::GetName(const uint32_t textlist_offset) const {
   }
 }
 
-// Convenience method to get the signs for an edge given the
+// Convenience method to process the signs for an edge given the
 // directed edge index.
-std::vector<SignInfo> GraphTile::GetSigns(const uint32_t idx, bool signs_on_node) const {
+std::vector<SignInfo> GraphTile::ProcessSigns(const uint32_t idx, bool signs_on_node) const {
   uint32_t count = header_->signcount();
   std::vector<SignInfo> signs;
   if (count == 0) {

diff --git a/src/mjolnir/graphfilter.cc b/src/mjolnir/graphfilter.cc
@@ -101,7 +101,7 @@ void FilterTiles(GraphReader& reader,
 
         // Get signs from the base directed edge
         if (directededge->sign()) {
-          std::vector<SignInfo> signs = tile->GetSigns(edgeid.id());
+          std::vector<SignInfo> signs = tile->ProcessSigns(edgeid.id());
           if (signs.size() == 0) {
             LOG_ERROR("Base edge should have signs, but none found");
           }
@@ -174,7 +174,7 @@ void FilterTiles(GraphReader& reader,
 
         // Get named signs from the base node
         if (nodeinfo->named_intersection()) {
-          std::vector<SignInfo> signs = tile->GetSigns(nodeid.id(), true);
+          std::vector<SignInfo> signs = tile->ProcessSigns(nodeid.id(), true);
           if (signs.size() == 0) {
             LOG_ERROR("Base node should have signs, but none found");
           }

diff --git a/src/mjolnir/graphvalidator.cc b/src/mjolnir/graphvalidator.cc
@@ -311,7 +311,7 @@ void validate(
 
       // Validate signs
       if (ni->named_intersection()) {
-        if (tile->GetSigns(i, true).size() == 0) {
+        if (tile->ProcessSigns(i, true).size() == 0) {
           LOG_ERROR("Node marked as having signs but none found");
         }
       }
@@ -326,7 +326,7 @@ void validate(
 
         // Validate signs
         if (de->sign()) {
-          if (tile->GetSigns(idx).size() == 0) {
+          if (tile->ProcessSigns(idx).size() == 0) {
             LOG_ERROR("Directed edge marked as having signs but none found");
           }
         }

diff --git a/src/mjolnir/hierarchybuilder.cc b/src/mjolnir/hierarchybuilder.cc
@@ -269,7 +269,7 @@ void FormTilesInNewLevel(GraphReader& reader,
 
       // Get signs from the base directed edge
       if (directededge->sign()) {
-        std::vector<SignInfo> signs = tile->GetSigns(base_edge_id.id());
+        std::vector<SignInfo> signs = tile->ProcessSigns(base_edge_id.id());
         if (signs.size() == 0) {
           LOG_ERROR("Base edge should have signs, but none found");
         }
@@ -358,7 +358,7 @@ void FormTilesInNewLevel(GraphReader& reader,
 
     // Get named signs from the base node
     if (baseni.named_intersection()) {
-      std::vector<SignInfo> signs = tile->GetSigns(base_node.id(), true);
+      std::vector<SignInfo> signs = tile->ProcessSigns(base_node.id(), true);
       if (signs.size() == 0) {
         LOG_ERROR("Base node should have signs, but none found");
       }

diff --git a/src/mjolnir/shortcutbuilder.cc b/src/mjolnir/shortcutbuilder.cc
@@ -637,7 +637,7 @@ uint32_t FormShortcuts(GraphReader& reader, const TileLevel& level) {
 
         // Get signs from the base directed edge
         if (directededge->sign()) {
-          std::vector<SignInfo> signs = tile->GetSigns(edgeid.id());
+          std::vector<SignInfo> signs = tile->ProcessSigns(edgeid.id());
           if (signs.size() == 0) {
             LOG_ERROR("Base edge should have signs, but none found");
           }
@@ -706,7 +706,7 @@ uint32_t FormShortcuts(GraphReader& reader, const TileLevel& level) {
       // Get named signs from the base node
       if (nodeinfo.named_intersection()) {
 
-        std::vector<SignInfo> signs = tile->GetSigns(n, true);
+        std::vector<SignInfo> signs = tile->ProcessSigns(n, true);
         if (signs.size() == 0) {
           LOG_ERROR("Base node should have signs, but none found");
         }

diff --git a/src/thor/triplegbuilder.cc b/src/thor/triplegbuilder.cc
@@ -662,7 +662,8 @@ void AddTripIntersectingEdge(const AttributesController& controller,
       GraphId beginnode = graphreader.GetBeginNodeId(intersecting_de, graphtile);
       valhalla::baldr::graph_tile_ptr t2 = graphreader.GetGraphTile(beginnode);
       size_t edge_idx = intersecting_de - t2->directededge(0);
-      std::vector<SignInfo> edge_signs = t2->GetSigns(edge_idx);
+      std::unordered_map<uint32_t, std::pair<uint8_t, std::string>> pronunciations;
+      std::vector<SignInfo> edge_signs = t2->GetSigns(edge_idx, pronunciations);
       if (!edge_signs.empty()) {
         valhalla::TripSign* sign = intersecting_edge->mutable_sign();
         AddSignInfo(controller, edge_signs, sign);
@@ -865,8 +866,7 @@ TripLeg_Edge* AddTripEdge(const AttributesController& controller,
   // Set the signs (if the directed edge has sign information) and if requested
   if (directededge->sign()) {
     // Add the edge signs
-    std::unordered_multimap<uint32_t, std::pair<uint8_t, std::string>> pronunciations;
-
+    std::unordered_map<uint32_t, std::pair<uint8_t, std::string>> pronunciations;
     std::vector<SignInfo> edge_signs = graphtile->GetSigns(idx, pronunciations);
 
     // TODO - debug output for testing - remove in the future
@@ -886,7 +886,8 @@ TripLeg_Edge* AddTripEdge(const AttributesController& controller,
   // Process the named junctions at nodes
   if (has_junction_name && start_tile) {
     // Add the node signs
-    std::vector<SignInfo> node_signs = start_tile->GetSigns(start_node_idx, true);
+    std::unordered_map<uint32_t, std::pair<uint8_t, std::string>> pronunciations;
+    std::vector<SignInfo> node_signs = start_tile->GetSigns(start_node_idx, pronunciations, true);
     if (!node_signs.empty()) {
       valhalla::TripSign* trip_sign = trip_edge->mutable_sign();
       for (const auto& sign : node_signs) {

diff --git a/test/gurka/test_build_admin.cc b/test/gurka/test_build_admin.cc
@@ -279,7 +279,7 @@ TEST(AdminTest, TestBuildAdminFromPBF) {
     const NodeInfo* X_node = X_tile->node(X_node_id);
     EXPECT_EQ(X_node->drive_on_right(), false);
     EXPECT_EQ(X_node->named_intersection(), true);
-    EXPECT_EQ(X_tile->GetSigns(X_node_id.id(), true).at(0).text(), "namae wa nan desu ka");
+    EXPECT_EQ(X_tile->ProcessSigns(X_node_id.id(), true).at(0).text(), "namae wa nan desu ka");
     AdminInfo X_admin = X_tile->admininfo(X_node->admin_index());
     EXPECT_EQ(X_admin.state_text(), "Hyogo");
     EXPECT_EQ(X_admin.country_text(), "Japan");

diff --git a/valhalla/baldr/graphtile.h b/valhalla/baldr/graphtile.h
@@ -402,7 +402,7 @@ class GraphTile {
    *                       intersection names.
    * @return  Returns a list (vector) of signs.
    */
-  std::vector<SignInfo> GetSigns(const uint32_t idx, bool signs_on_node = false) const;
+  std::vector<SignInfo> ProcessSigns(const uint32_t idx, bool signs_on_node = false) const;
 
   /**
    * TODO: Remove after updating the tests