update tests with succinct logic updates

valhalla · kdiluca · Feb 8, 2021 · Feb 8, 2021 · Feb 9, 2021 · Feb 9, 2021
commit 756195d5fc76d6287826cb53cc1619d4a99b834a
diff --git a/src/odin/narrativebuilder.cc b/src/odin/narrativebuilder.cc
@@ -94,10 +94,6 @@ void NarrativeBuilder::Build(std::list<Maneuver>& maneuvers) {
           // Set instruction
           maneuver.set_instruction(FormBecomesInstruction(maneuver, prev_maneuver));
 
-          // Set verbal succinct transition instruction
-          maneuver.set_verbal_succinct_transition_instruction(
-              FormVerbalSuccinctBecomesTransitionInstruction(maneuver, prev_maneuver));
-
           // Set verbal pre transition instruction
           maneuver.set_verbal_pre_transition_instruction(
               FormVerbalBecomesInstruction(maneuver, prev_maneuver));
@@ -242,8 +238,8 @@ void NarrativeBuilder::Build(std::list<Maneuver>& maneuvers) {
           maneuver.set_instruction(FormKeepToStayOnInstruction(maneuver));
 
           // Set verbal succinct transition instruction
-          // maneuver.set_verbal_succinct_transition_instruction(
-          // FormVerbalSuccinctKeepToStayOnTransitionInstruction(maneuver));
+          maneuver.set_verbal_succinct_transition_instruction(
+              FormVerbalSuccinctKeepTransitionInstruction(maneuver));
 
           // Set verbal transition alert instruction
           maneuver.set_verbal_transition_alert_instruction(
@@ -3803,7 +3799,7 @@ std::string NarrativeBuilder::FormVerbalPostTransitionInstruction(Maneuver& mane
 
   // Assign the street names if maneuver does not contain an obvious maneuver
   std::string street_names;
-  if (!maneuver.contains_obvious_maneuver()) {
+  if (!maneuver.contains_obvious_maneuver() && !maneuver.has_long_street_name()) {
     // Use the maneuver roundabout_exit_street_names
     // if the maneuver has a combined enter/exit roundabout instruction
     // otherwise use the maneuver street names
@@ -3936,67 +3932,9 @@ std::string NarrativeBuilder::FormVerbalSuccinctDestinationTransitionInstruction
   return instruction;
 }
 
-std::string NarrativeBuilder::FormVerbalSuccinctPostTransitionInstruction(Maneuver& maneuver) {
-  // "0": "Continue for <LENGTH>.",
-
-  std::string instruction;
-  instruction.reserve(kInstructionInitialCapacity);
-  uint8_t phrase_id = 0;
-
-  // Set instruction to the determined tagged phrase
-  instruction = dictionary_.post_transition_verbal_subset.phrases.at(std::to_string(phrase_id));
-
-  // Replace phrase tags with values
-  boost::replace_all(instruction, kLengthTag,
-                     FormLength(maneuver, dictionary_.post_transition_verbal_subset.metric_lengths,
-                                dictionary_.post_transition_verbal_subset.us_customary_lengths));
-
-  // If enabled, form articulated prepositions
-  if (articulated_preposition_enabled_) {
-    FormArticulatedPrepositions(instruction);
-  }
-
-  return instruction;
-}
-
-std::string
-NarrativeBuilder::FormVerbalSuccinctBecomesTransitionInstruction(Maneuver& maneuver,
-                                                                 Maneuver* prev_maneuver,
-                                                                 uint32_t element_max_count,
-                                                                 const std::string& delim) {
-  // "0": "<PREVIOUS_STREET_NAMES> becomes <STREET_NAMES>."
-
-  std::string instruction;
-  instruction.reserve(kInstructionInitialCapacity);
-
-  // Assign the street names and the previous maneuver street names
-  std::string street_names =
-      FormStreetNames(maneuver, maneuver.street_names(), nullptr, false, element_max_count, delim,
-                      prev_maneuver->verbal_formatter());
-  std::string prev_street_names =
-      FormStreetNames(*prev_maneuver, prev_maneuver->street_names(), nullptr, false,
-                      element_max_count, delim, prev_maneuver->verbal_formatter());
-
-  // Determine which phrase to use
-  uint8_t phrase_id = 0;
-
-  // Set instruction to the determined tagged phrase
-  instruction = dictionary_.becomes_verbal_subset.phrases.at(std::to_string(phrase_id));
-
-  // Replace phrase tags with values
-  boost::replace_all(instruction, kPreviousStreetNamesTag, prev_street_names);
-  boost::replace_all(instruction, kStreetNamesTag, street_names);
-
-  // If enabled, form articulated prepositions
-  if (articulated_preposition_enabled_) {
-    FormArticulatedPrepositions(instruction);
-  }
-
-  return instruction;
-}
-
 std::string NarrativeBuilder::FormVerbalSuccinctContinueTransitionInstruction(Maneuver& maneuver) {
-  // "0": "Continue."
+  // "0": "Continue.",
+  // "1": "Continue for <LENGTH>."
 
   std::string instruction;
   instruction.reserve(kInstructionInitialCapacity);
@@ -4137,27 +4075,39 @@ std::string NarrativeBuilder::FormVerbalSuccinctRampTransitionInstruction(Maneuv
   return instruction;
 }
 
-std::string NarrativeBuilder::FormVerbalSuccinctExitTransitionInstruction(Maneuver& maneuver) {
+std::string NarrativeBuilder::FormVerbalSuccinctExitTransitionInstruction(Maneuver& maneuver,
+                                                                          const std::string& delim) {
   // "0": "Take the exit on the <RELATIVE_DIRECTION>."
+  // "1": "Take exit <NUMBER_SIGN> on the <RELATIVE_DIRECTION>.",
   // "15": "Take the exit.",
+  // "16": "Take exit <NUMBER_SIGN>."
 
   std::string instruction;
   instruction.reserve(kInstructionInitialCapacity);
   uint8_t phrase_id = 0;
+  std::string exit_number_sign;
 
   // Determine if driving side matches relative direction
   if (((maneuver.type() == DirectionsLeg_Maneuver_Type_kExitRight) && maneuver.drive_on_right()) ||
       ((maneuver.type() == DirectionsLeg_Maneuver_Type_kExitLeft) && !maneuver.drive_on_right())) {
     phrase_id = 15;
   }
 
+  if (maneuver.HasExitNumberSign()) {
+    phrase_id += 1;
+    // Assign number sign
+    exit_number_sign =
+        maneuver.signs().GetExitNumberString(0, false, delim, maneuver.verbal_formatter());
+  }
+
   // Set instruction to the determined tagged phrase
   instruction = dictionary_.exit_verbal_subset.phrases.at(std::to_string(phrase_id));
 
   // Replace phrase tags with values
   boost::replace_all(instruction, kRelativeDirectionTag,
                      FormRelativeTwoDirection(maneuver.type(),
                                               dictionary_.exit_verbal_subset.relative_directions));
+  boost::replace_all(instruction, kNumberSignTag, exit_number_sign);
 
   // If enabled, form articulated prepositions
   if (articulated_preposition_enabled_) {
@@ -4201,31 +4151,6 @@ std::string NarrativeBuilder::FormVerbalSuccinctKeepTransitionInstruction(Maneuv
   return instruction;
 }
 
-std::string
-NarrativeBuilder::FormVerbalSuccinctKeepToStayOnTransitionInstruction(Maneuver& maneuver) {
-  // "0": "Keep <RELATIVE_DIRECTION> to stay on <STREET_NAMES>."
-
-  std::string instruction;
-  instruction.reserve(kInstructionInitialCapacity);
-  uint8_t phrase_id = 0;
-
-  // Set instruction to the determined tagged phrase
-  instruction = dictionary_.keep_to_stay_on_verbal_subset.phrases.at(std::to_string(phrase_id));
-
-  // Replace phrase tags with values
-  boost::replace_all(instruction, kRelativeDirectionTag,
-                     FormRelativeThreeDirection(maneuver.type(),
-                                                dictionary_.keep_to_stay_on_verbal_subset
-                                                    .relative_directions));
-
-  // If enabled, form articulated prepositions
-  if (articulated_preposition_enabled_) {
-    FormArticulatedPrepositions(instruction);
-  }
-
-  return instruction;
-}
-
 std::string NarrativeBuilder::FormVerbalSuccinctMergeTransitionInstruction(Maneuver& maneuver) {
   // "0": "Merge."
   // "1": "Merge <RELATIVE_DIRECTION>."
@@ -4261,14 +4186,27 @@ std::string NarrativeBuilder::FormVerbalSuccinctMergeTransitionInstruction(Maneu
 std::string
 NarrativeBuilder::FormVerbalSuccinctEnterRoundaboutTransitionInstruction(Maneuver& maneuver) {
   // "0": "Enter the roundabout.",
+  // "1": "Enter the roundabout and take the <ORDINAL_VALUE> exit."
 
   std::string instruction;
   instruction.reserve(kInstructionInitialCapacity);
   uint8_t phrase_id = 0;
+  std::string ordinal_value;
+  if ((maneuver.roundabout_exit_count() >= kRoundaboutExitCountLowerBound) &&
+      (maneuver.roundabout_exit_count() <= kRoundaboutExitCountUpperBound)) {
+    // Increment for ordinal phrase
+    phrase_id += 1;
+    // Set ordinal_value
+    ordinal_value = dictionary_.enter_roundabout_verbal_subset.ordinal_values.at(
+        maneuver.roundabout_exit_count() - 1);
+  }
 
   // Set instruction to the determined tagged phrase
   instruction = dictionary_.enter_roundabout_verbal_subset.phrases.at(std::to_string(phrase_id));
 
+  // Replace phrase tags with values
+  boost::replace_all(instruction, kOrdinalValueTag, ordinal_value);
+
   // If enabled, form articulated prepositions
   if (articulated_preposition_enabled_) {
     FormArticulatedPrepositions(instruction);

diff --git a/test/instructions.cc b/test/instructions.cc
@@ -426,7 +426,8 @@ TEST(Instructions, validate_roundabout_unnamed_cycleway_instructions) {
   test_instructions({VALHALLA_SOURCE_DIR
                      "test/pinpoints/instructions/roundabout_unnamed_cycleway.pbf"},
                     expected_routes_size, expected_legs_size, expected_maneuvers_size, maneuver_index,
-                    "Enter the roundabout and take the 2nd exit.", "Enter the roundabout.",
+                    "Enter the roundabout and take the 2nd exit.",
+                    "Enter the roundabout and take the 2nd exit.",
                     "Enter the roundabout and take the 2nd exit.",
                     "Enter the roundabout and take the 2nd exit.", "");
 
@@ -474,7 +475,7 @@ TEST(Instructions, validate_turn_at_instructions) {
   // Turn left at
   test_instructions({VALHALLA_SOURCE_DIR "test/pinpoints/instructions/turn_left_at.pbf"},
                     expected_routes_size, expected_legs_size, expected_maneuvers_size, maneuver_index,
-                    "Turn left at 銀座七丁目.", "Make a left U-turn.", "Turn left at 銀座七丁目.",
+                    "Turn left at 銀座七丁目.", "Turn left.", "Turn left at 銀座七丁目.",
                     "Turn left at 銀座七丁目. Then You will arrive at 花椿通り.",
                     "Continue for 20 meters.");
 }
@@ -516,7 +517,7 @@ TEST(Instructions, validate_obvious_maneuver_instructions) {
   test_instructions({VALHALLA_SOURCE_DIR
                      "test/pinpoints/instructions/obvious_maneuver_short_continue.pbf"},
                     expected_routes_size, expected_legs_size, expected_maneuvers_size, maneuver_index,
-                    "Turn right to take the US 322 East ramp.", "Turn right.",
+                    "Turn right to take the US 322 East ramp.", "Turn right to take the ramp.",
                     "Turn right to take the U.S. 3 22 East ramp.",
                     "Turn right to take the U.S. 3 22 East ramp.", "Continue for 1 mile.");