drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-10 22:34:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core] Add branch to place page data

Browse Source 
Signed-off-by: eisa01 <eisa01@gmail.com>
This commit is contained in:
eisa01
2025-08-28 14:54:00 +02:00
committed by Konstantin Pastbin
parent 3d8a1eddc7
commit 6e8d74621f
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h
View File

@@ -42,7 +42,6 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly) BOOL isMyPosition;
- (instancetype)initWithTrackInfo:(TrackInfo * _Nonnull)trackInfo;
- (void)setBranch:(NSString * _Nullable)branch;
@end

4
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm
View File

@@ -59,9 +59,6 @@ static PlacePageDataSchedule convertOpeningHours(std::string_view rawOH)
return self;
}
- (void)setBranch:(NSString * _Nullable)branch {
_branch = branch;
}
@end
@@ -73,6 +70,7 @@ static PlacePageDataSchedule convertOpeningHours(std::string_view rawOH)
_title = rawData.GetTitle().empty() ? nil : @(rawData.GetTitle().c_str());
_secondaryTitle = rawData.GetSecondaryTitle().empty() ? nil : @(rawData.GetSecondaryTitle().c_str());
_subtitle = rawData.GetSubtitle().empty() ? nil : @(rawData.GetSubtitle().c_str());
_branch = rawData.GetBranch().empty() ? nil : @(rawData.GetBranch().c_str());
_secondarySubtitle = rawData.GetSecondarySubtitle().empty() ? nil : @(rawData.GetSecondarySubtitle().c_str());
if (!rawData.IsTrack()) {

3
iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
View File

@@ -75,9 +75,6 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) {
}];
}
_previewData = [[PlacePagePreviewData alloc] initWithRawData:rawData()];
// Set branch from infoData to previewData
[_previewData setBranch:_infoData.branch];
auto const &countryId = rawData().GetCountryId();
if (!countryId.empty()) {

4
libs/map/place_page_info.cpp
View File

@@ -97,6 +97,10 @@ void Info::SetFromFeatureType(FeatureType & ft)
m_uiSubtitle = FormatSubtitle(IsFeature() /* withTypes */, !emptyTitle /* withMainType */);
auto const branch = GetMetadata(feature::Metadata::FMD_BRANCH);
if (!branch.empty())
m_uiBranch = std::string(branch);
// apply to all types after checks
m_isHotel = ftypes::IsHotelChecker::Instance()(ft);
}

2
libs/map/place_page_info.hpp
View File

@@ -121,6 +121,7 @@ public:
/// For showing in UI
std::string const & GetTitle() const { return m_uiTitle; }
std::string const & GetBranch() const { return m_uiBranch; }
/// Convenient wrapper for secondary feature name.
std::string const & GetSecondaryTitle() const { return m_uiSecondaryTitle; }
/// Convenient wrapper for type, cuisines, elevation, stars, wifi etc.
@@ -220,6 +221,7 @@ private:
/// UI
std::string m_uiTitle;
std::string m_uiBranch;
std::string m_uiSubtitle;
std::string m_uiSecondaryTitle;
std::string m_uiAddress;