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

[android] add support for editing charging stations details

Browse Source 
While here, uncluttered a little the charging station editor,
removing fields like the POI address which is basically irrelevant for
charging stations.

Signed-off-by: Séverin Lemaignan <severin@guakamole.org>
This commit is contained in:
Séverin Lemaignan
2025-09-29 17:53:11 +02:00
committed by x7z4w
parent 509ff4de72
commit d168855ef5
19 changed files with 899 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/editor/editor_config.cpp
View File

@@ -46,7 +46,12 @@ static std::unordered_map<std::string, EType> const kNamesToFMD = {
{"drive_through", EType::FMD_DRIVE_THROUGH},
{"website_menu", EType::FMD_WEBSITE_MENU},
{"self_service", EType::FMD_SELF_SERVICE},
{"outdoor_seating", EType::FMD_OUTDOOR_SEATING}
{"outdoor_seating", EType::FMD_OUTDOOR_SEATING},
// TODO(skadge): this won't work, obv
{"socket_type1_count", EType::FMD_CHARGE_SOCKETS},
{"socket_type1_output", EType::FMD_CHARGE_SOCKETS},
{"socket_type2_count", EType::FMD_CHARGE_SOCKETS},
{"socket_type2_output", EType::FMD_CHARGE_SOCKETS},
/// @todo Add description?
};

24
libs/indexer/editable_map_object.cpp
View File

@@ -2,6 +2,8 @@
#include "indexer/classificator.hpp"
#include "indexer/edit_journal.hpp"
#include "indexer/feature_charge_sockets.hpp"
#include "indexer/feature_meta.hpp"
#include "indexer/ftypes_matcher.hpp"
#include "indexer/postcodes_matcher.hpp"
#include "indexer/validate_and_format_contacts.hpp"
@@ -158,6 +160,7 @@ void EditableMapObject::ForEachMetadataItem(function<void(string_view tag, strin
case MetadataID::FMD_EXTERNAL_URI:
case MetadataID::FMD_WHEELCHAIR: // Value is runtime only, data is taken from the classificator types, should not
// be used to update the OSM database
case MetadataID::FMD_CHARGE_SOCKETS: // multiple keys; handled via the edit journal
break;
default: fn(ToString(type), value); break;
}
@@ -325,6 +328,14 @@ void EditableMapObject::SetOpeningHours(std::string oh)
m_metadata.Set(MetadataID::FMD_OPEN_HOURS, std::move(oh));
}
void EditableMapObject::SetChargeSockets(std::string sockets)
{
// parse the list of sockets provided by the frontend, and re-generate the
// socket list, thus ensuring it is valid & sorted.
ChargeSocketsHelper helper(sockets);
m_metadata.Set(MetadataID::FMD_CHARGE_SOCKETS, helper.ToString());
}
void EditableMapObject::SetInternet(feature::Internet internet)
{
m_metadata.Set(MetadataID::FMD_INTERNET, DebugPrint(internet));
@@ -761,6 +772,10 @@ void EditableMapObject::LogDiffInJournal(EditableMapObject const & unedited_emo)
for (uint8_t i = 0; i < static_cast<uint8_t>(feature::Metadata::FMD_COUNT); ++i)
{
auto const type = static_cast<feature::Metadata::EType>(i);
// CHARGE_SOCKETS have multiple keys/values; handled separately further down
if (type == feature::Metadata::FMD_CHARGE_SOCKETS)
continue;
std::string_view const & value = GetMetadata(type);
std::string_view const & old_value = unedited_emo.GetMetadata(type);
@@ -811,6 +826,15 @@ void EditableMapObject::LogDiffInJournal(EditableMapObject const & unedited_emo)
if (cuisinesModified)
m_journal.AddTagChange("cuisine", strings::JoinStrings(old_cuisines, ";"), strings::JoinStrings(new_cuisines, ";"));
// charge sockets
auto chargeSocketsDiff = ChargeSocketsHelper(GetChargeSockets()).Diff(unedited_emo.GetChargeSockets());
for (auto const & kvdiff : chargeSocketsDiff)
{
std::string key, old_value, new_value;
std::tie(key, old_value, new_value) = kvdiff;
m_journal.AddTagChange(key, old_value, new_value);
}
}
bool AreObjectsEqualIgnoringStreet(EditableMapObject const & lhs, EditableMapObject const & rhs)

1
libs/indexer/editable_map_object.hpp
View File

@@ -108,6 +108,7 @@ public:
bool UpdateMetadataValue(std::string_view key, std::string value);
void SetOpeningHours(std::string oh);
void SetChargeSockets(std::string sockets);
void SetInternet(feature::Internet internet);
/// @param[in] cuisine is a vector of osm cuisine ids.