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

sort the charging socket information from most to least powerful

Browse Source 
Signed-off-by: Séverin Lemaignan <severin@guakamole.org>
This commit is contained in:
Séverin Lemaignan
2025-09-22 20:14:01 +02:00
committed by x7z4w
parent eb264889e3
commit e7f766084f
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libs/indexer/map_object.cpp
View File

@@ -186,6 +186,11 @@ ChargeSocketDescriptors MapObject::GetChargeSockets() const
if (s.empty()) if (s.empty())
return sockets; return sockets;
// pre-set order of socket types preference (from high-power to low-power).
static std::vector<std::string> const kSocketTypeOrder = {"type2_combo", "chademo", "nacs",
"type1", "type2_cable", "type2"};
size_t const unknownTypeOrder = kSocketTypeOrder.size();
auto tokens = strings::Tokenize(s, ";"); auto tokens = strings::Tokenize(s, ";");
for (auto token : tokens) for (auto token : tokens)
@@ -226,6 +231,22 @@ ChargeSocketDescriptors MapObject::GetChargeSockets() const
sockets.push_back(desc); sockets.push_back(desc);
} }
// Sort sockets: first by type, then by power (descending).
std::sort(sockets.begin(), sockets.end(), [&](ChargeSocketDescriptor const & a, ChargeSocketDescriptor const & b)
{
auto const itA = std::find(kSocketTypeOrder.begin(), kSocketTypeOrder.end(), a.type);
auto const orderA =
(itA == kSocketTypeOrder.end()) ? unknownTypeOrder : std::distance(kSocketTypeOrder.begin(), itA);
auto const itB = std::find(kSocketTypeOrder.begin(), kSocketTypeOrder.end(), b.type);
auto const orderB =
(itB == kSocketTypeOrder.end()) ? unknownTypeOrder : std::distance(kSocketTypeOrder.begin(), itB);
if (orderA != orderB)
return orderA < orderB;
return a.power > b.power; // Sort by power in descending order for sockets of the same type
});
return sockets; return sockets;
} }