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

[core] Switch to ankerl::unordered_dense

Browse Source 
Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
This commit is contained in:
x7z4w
2025-11-24 17:34:56 +00:00
parent 03132c6877
commit ef6522ed28
282 changed files with 4386 additions and 1456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
libs/indexer/road_shields_parser.cpp
View File

@@ -8,9 +8,10 @@
#include <algorithm>
#include <array>
#include <cctype>
#include <unordered_map>
#include <utility>
#include "3party/ankerl/unordered_dense.h"
/*
* TODO : why all this parsing happens in the run-time? The most of it should be moved to the generator.
* E.g. now the ref contains
@@ -43,7 +44,7 @@ std::array<std::string, 13> const kModifiers = {{"alt", "alternate", "bus", "bus
"connector", "loop", "scenic", "spur", "temporary", "toll", "truck"}};
// Shields based on a network tag in a route=road relation.
std::unordered_map<std::string, RoadShieldType> const kRoadNetworkShields = {
ankerl::unordered_dense::map<std::string, RoadShieldType> const kRoadNetworkShields = {
// International road networks.
{"e-road", RoadShieldType::Generic_Green}, // E 105
{"asianhighway", RoadShieldType::Hidden}, // AH8. Blue, but usually not posted.
@@ -127,7 +128,7 @@ public:
RoadShieldsSetT GetRoadShields() const
{
RoadShieldsSetT result, defaultShields;
uint8_t index = 0;
strings::Tokenize(m_baseRoadNumber, ";", [&](std::string_view rawText)
{
@@ -291,7 +292,12 @@ public:
struct Entry
{
Entry() = default;
Entry(std::string_view name, RoadShieldType type, bool isRedundant = false, bool shouldTrimName = false) : m_name(name), m_type(type), m_isRedundant(isRedundant), m_shouldTrimName(shouldTrimName) {}
Entry(std::string_view name, RoadShieldType type, bool isRedundant = false, bool shouldTrimName = false)
: m_name(name)
, m_type(type)
, m_isRedundant(isRedundant)
, m_shouldTrimName(shouldTrimName)
{}
std::string_view m_name;
RoadShieldType m_type = RoadShieldType::Default;
@@ -328,11 +334,10 @@ public:
strings::ReplaceFirst(name, std::string{p.m_name}, "");
strings::Trim(name);
}
if (index != 1 && p.m_isRedundant) {
if (index != 1 && p.m_isRedundant)
type = RoadShieldType::Hidden;
} else {
else
type = p.m_type;
}
idx = i;
}
}
@@ -352,7 +357,14 @@ public:
struct Entry
{
Entry() = default;
Entry(std::string_view name, HighwayClass highwayClass, RoadShieldType type, bool isRedundant = false, bool shouldTrimName = false) : m_name(name), m_type(type), m_highwayClass(highwayClass), m_isRedundant(isRedundant), m_shouldTrimName(shouldTrimName) {}
Entry(std::string_view name, HighwayClass highwayClass, RoadShieldType type, bool isRedundant = false,
bool shouldTrimName = false)
: m_name(name)
, m_type(type)
, m_highwayClass(highwayClass)
, m_isRedundant(isRedundant)
, m_shouldTrimName(shouldTrimName)
{}
std::string_view m_name;
RoadShieldType m_type = RoadShieldType::Default;
@@ -364,18 +376,19 @@ public:
using ShieldTypes = buffer_vector<Entry, 8>;
HighwayClassRoadShieldParser(std::string const & baseRoadNumber, HighwayClass highwayClass, ShieldTypes && types, RoadShieldType defaultType = RoadShieldType::Default)
: RoadShieldParser(baseRoadNumber)
, m_highwayClass(highwayClass)
, m_types(std::move(types))
, m_defaultType(defaultType)
HighwayClassRoadShieldParser(std::string const & baseRoadNumber, HighwayClass highwayClass, ShieldTypes && types,
RoadShieldType defaultType = RoadShieldType::Default)
: RoadShieldParser(baseRoadNumber)
, m_highwayClass(highwayClass)
, m_types(std::move(types))
, m_defaultType(defaultType)
{}
RoadShield ParseRoadShield(std::string_view rawText, uint8_t index) const override
{
if (rawText.size() > kMaxRoadShieldBytesSize)
return RoadShield();
if (index == 1)
{
for (auto const & p : m_types)
@@ -392,11 +405,12 @@ public:
}
}
}
SimpleRoadShieldParser::ShieldTypes simpleShieldTypes = {};
for (auto const & p : m_types)
{
simpleShieldTypes.push_back(SimpleRoadShieldParser::Entry(p.m_name, p.m_type, p.m_isRedundant, p.m_shouldTrimName));
simpleShieldTypes.push_back(
SimpleRoadShieldParser::Entry(p.m_name, p.m_type, p.m_isRedundant, p.m_shouldTrimName));
}
return SimpleRoadShieldParser(m_baseRoadNumber, std::move(simpleShieldTypes)).ParseRoadShield(rawText, index);
}
@@ -564,8 +578,8 @@ class TurkeyRoadShieldParser : public SimpleRoadShieldParser
{
public:
explicit TurkeyRoadShieldParser(std::string const & baseRoadNumber)
: SimpleRoadShieldParser(baseRoadNumber, {{"O", RoadShieldType::Highway_Hexagon_Turkey},
{"D", RoadShieldType::Generic_Blue}})
: SimpleRoadShieldParser(baseRoadNumber,
{{"O", RoadShieldType::Highway_Hexagon_Turkey}, {"D", RoadShieldType::Generic_Blue}})
{}
};
@@ -573,7 +587,7 @@ class HungaryRoadShieldParser : public SimpleRoadShieldParser
{
public:
explicit HungaryRoadShieldParser(std::string const & baseRoadNumber)
: SimpleRoadShieldParser(baseRoadNumber, {{"M", RoadShieldType::Hungary_Blue}}, RoadShieldType::Hungary_Green)
: SimpleRoadShieldParser(baseRoadNumber, {{"M", RoadShieldType::Hungary_Blue}}, RoadShieldType::Hungary_Green)
{}
};
@@ -794,14 +808,14 @@ class CyprusRoadShieldParser : public SimpleRoadShieldParser
{
public:
explicit CyprusRoadShieldParser(std::string const & baseRoadNumber)
: SimpleRoadShieldParser(baseRoadNumber, {// North Cyprus.
: SimpleRoadShieldParser(baseRoadNumber, { // North Cyprus.
{"D.", RoadShieldType::Generic_Blue}, // White font.
{"GM.", RoadShieldType::Generic_White_Bordered}, // Blue font.
{"GZ.", RoadShieldType::Generic_White_Bordered}, // Blue font.
{"GR.", RoadShieldType::Generic_White_Bordered}, // Blue font.
{"LF.", RoadShieldType::Generic_White_Bordered}, // Blue font.
{"İK.", RoadShieldType::Generic_White_Bordered}, // Blue font.
// South Cyprus.
// South Cyprus.
{"A", RoadShieldType::Generic_Green}, // Yellow font. Hexagon.
{"B", RoadShieldType::Generic_Blue}, // Yellow font.
{"E", RoadShieldType::Generic_Blue}, // Yellow font.
@@ -861,7 +875,7 @@ RoadShieldsSetT GetRoadShields(FeatureType & f)
auto const & highwayClass = ftypes::GetHighwayClass(feature::TypesHolder(f));
if (highwayClass == HighwayClass::Undefined)
return {};
// Find out country name.
std::string mwmName = f.GetID().GetMwmName();
ASSERT(!mwmName.empty(), (f.GetID()));
@@ -873,7 +887,8 @@ RoadShieldsSetT GetRoadShields(FeatureType & f)
return GetRoadShields(mwmName, ref, highwayClass);
}
RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const & roadNumber, HighwayClass const & highwayClass)
RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const & roadNumber,
HighwayClass const & highwayClass)
{
if (mwmName == "US")
return USRoadShieldParser(roadNumber).GetRoadShields();