drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-23 22:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core] Regex refactoring

Browse Source 
Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
This commit is contained in:
x7z4w
2025-11-03 21:16:16 +00:00
parent a62f6c0ef6
commit 0a3a4ebd9a
17 changed files with 134 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libs/routing/turns_tts_text.cpp
View File

@@ -7,9 +7,10 @@
#include "base/string_utils.hpp"
#include <regex>
#include <string>
#include <boost/regex.hpp>
namespace routing::turns::sound
{
@@ -200,9 +201,10 @@ std::string GetTtsText::GetTurnNotification(Notification const & notification) c
// if the first pronounceable character of the street is a vowel, use "az" instead of "a"
// 1, 5, and 1000 start with vowels but not 10 or 100 (numbers are combined as in English: 5*, 5**, 1*, 1**, 1***,
// etc)
static std::regex const rHun("^[5aeiouyáéíóúöüőű]|^1$|^1[^\\d]|^1\\d\\d\\d[^\\d]", std::regex_constants::icase);
std::smatch ma;
if (std::regex_search(streetOut, ma, rHun) && ma.size() > 0)
static boost::regex const rHun("^[5aeiouyáéíóúöüőű]|^1$|^1[^\\d]|^1\\d\\d\\d[^\\d]",
boost::regex_constants::icase);
boost::smatch ma;
if (boost::regex_search(streetOut, ma, rHun) && ma.size() > 0)
{
if (ontoStr == "a")
ontoStr.push_back('z');
@@ -211,21 +213,18 @@ std::string GetTtsText::GetTurnNotification(Notification const & notification) c
}
}
char ttsOut[1024];
std::snprintf(ttsOut, std::size(ttsOut), distDirOntoStreetStr.c_str(),
distStr.c_str(), // in 100 feet
dirStr.c_str(), // turn right / take exit
ontoStr.c_str(), // onto / null
streetOut.c_str(), // Main Street / 543:: M4: Queens Parkway, London
dirVerb.c_str() // (optional "turn right" verb)
);
std::string ttsOut = distDirOntoStreetStr + distStr + // in 100 feet
dirStr + // turn right / take exit
ontoStr + // onto / null
streetOut + // Main Street / 543:: M4: Queens Parkway, London
dirVerb; // (optional "turn right" verb)
// remove floating punctuation
static std::regex const rP(" [,\\.:;]+ ");
std::string cleanOut = std::regex_replace(ttsOut, rP, " ");
static boost::regex const rP(" [,\\.:;]+ ");
std::string cleanOut = boost::regex_replace(ttsOut, rP, " ");
// remove repetitious spaces or colons
static std::regex const rS("[ :]{2,99}");
cleanOut = std::regex_replace(cleanOut, rS, " ");
static boost::regex const rS("[ :]{2,99}");
cleanOut = boost::regex_replace(cleanOut, rS, " ");
// trim leading spaces
strings::Trim(cleanOut);

1
libs/routing/turns_tts_text_i18n.cpp
View File

@@ -2,7 +2,6 @@
#include "base/string_utils.hpp"
#include "unicode/uchar.h"
#include <regex>
#include <string>
namespace routing::turns::sound