drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core] Use hyphens instead of colons for address ranges

Browse Source 
Signed-off-by: zyphlar <zyphlar@gmail.com>
This commit is contained in:
zyphlar
2025-07-15 23:18:18 -07:00
committed by Konstantin Pastbin
parent 24a4edd904
commit 57e86d72e9
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indexer/feature_utils.cpp
View File

@@ -375,6 +375,17 @@ void GetReadableName(NameParamsIn const & in, NameParamsOut & out)
GetReadableNameImpl(in, in.IsNativeOrSimilarLang(), out);
}
string const GetReadableAddress(string const & address) {
// Instead of housenumber range strings like 123:456, hyphenate like 123 - 456
string out = address;
size_t pos = 0;
while ((pos = out.find(":", pos)) != string::npos) {
out.replace(pos, 1, "\u2009\u2013\u2009"); // thin space + en-dash + thin space
break;
}
return out;
}
/*
int8_t GetNameForSearchOnBooking(RegionData const & regionData, StringUtf8Multilang const & src, string & name)
{

3
indexer/feature_utils.hpp
View File

@@ -121,6 +121,9 @@ namespace feature
/// - country language name.
void GetReadableName(NameParamsIn const & in, NameParamsOut & out);
/// Format house numbers etc to be more human-readable instead of using symbols like 123:456
std::string const GetReadableAddress(std::string const & address);
/// Returns language id as return result and name for search on booking in the @name parameter,
/// the priority is the following:
/// - default name;

2
map/place_page_info.cpp
View File

@@ -51,7 +51,7 @@ void Info::SetFromFeatureType(FeatureType & ft)
bool emptyTitle = false;
m_primaryFeatureName = out.GetPrimary();
m_uiAddress = m_address;
m_uiAddress = feature::GetReadableAddress(m_address);
if (IsBookmark())
{

5
search/ranker.cpp
View File

@@ -12,6 +12,7 @@
#include "indexer/data_source.hpp"
#include "indexer/feature_algo.hpp"
#include "indexer/feature_data.hpp"
#include "indexer/feature_utils.hpp"
#include "indexer/ftypes_matcher.hpp"
#include "indexer/road_shields_parser.hpp"
#include "indexer/search_string_utils.hpp"
@@ -304,7 +305,7 @@ ftypes::LocalityType GetLocalityIndex(feature::TypesHolder const & types)
// TODO: Format street and house number according to local country's rules.
string FormatStreetAndHouse(ReverseGeocoder::Address const & addr)
{
return addr.GetStreetName() + ", " + addr.GetHouseNumber();
return addr.GetStreetName() + ", " + feature::GetReadableAddress(addr.GetHouseNumber());
}
// TODO: Share common formatting code for search results and place page.
@@ -512,7 +513,7 @@ private:
{
string streetName;
m_ranker.GetBestMatchName(*streetFeature, streetName);
name = streetName + ", " + addr.GetHouseNumber();
name = streetName + ", " + feature::GetReadableAddress(addr.GetHouseNumber());
}
}
}