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

properly restore local edits of charge sockets

Browse Source 
fixes #2368

Signed-off-by: Séverin Lemaignan <severin@guakamole.org>
This commit is contained in:
Séverin Lemaignan
2025-11-24 23:28:15 +01:00
committed by map-per
parent eaa56e5127
commit 3b0b4520a1
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/indexer/editable_map_object.cpp
View File

@@ -720,7 +720,17 @@ void EditableMapObject::ApplyJournalEntry(JournalEntry const & entry)
MetadataID type; MetadataID type;
if (feature::Metadata::TypeFromString(tagModData.key, type)) if (feature::Metadata::TypeFromString(tagModData.key, type))
{ {
m_metadata.Set(type, tagModData.new_value); if (type == MetadataID::FMD_CHARGE_SOCKETS)
{
// Charge sockets need special handling: we need to aggregate the new entry
// to existing ones, not just replace the whole string.
ChargeSocketsHelper helper(GetChargeSockets());
helper.AggregateChargeSocketKey(tagModData.key, tagModData.new_value);
m_metadata.Set(type, helper.ToString());
}
else
m_metadata.Set(type, tagModData.new_value);
if (type == MetadataID::FMD_INTERNET) if (type == MetadataID::FMD_INTERNET)
{ {
uint32_t const wifiType = ftypes::IsWifiChecker::Instance().GetType(); uint32_t const wifiType = ftypes::IsWifiChecker::Instance().GetType();

2
libs/indexer/feature_charge_sockets.hpp
View File

@@ -30,7 +30,7 @@ public:
ChargeSocketsHelper(ChargeSocketDescriptors const & sockets) : m_chargeSockets(sockets), m_dirty(true) {} ChargeSocketsHelper(ChargeSocketDescriptors const & sockets) : m_chargeSockets(sockets), m_dirty(true) {}
/** Create a ChareSocketsHelper instance from an existing list of sockets /** Create a ChargeSocketsHelper instance from an existing list of sockets
* stored as "<type>|<nb>|[<power>];..." * stored as "<type>|<nb>|[<power>];..."
* *
* For instance: * For instance: