pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[LP][bookmarks] Show metainformatioin for LP bookmarks the same way as for ordinary feature. MAPSME-14904

Browse source
This commit is contained in:
Anatoliy Tomilov 2020-11-24 18:49:42 +05:00 • committed by Alexander Boriskov
parent 817d7f6290
commit cd2f929b3a
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/jni/com/mapswithme/maps/UserMarkHelper.cpp
View file

@ -187,7 +187,7 @@ jobject CreateBookmark(JNIEnv *env, const place_page::Info &info,
info.CanBeRated(), info.CanBeReviewed(), jratings.get(), hotelType.get(), priceRate,
popularity.get(), jDescription.get(), info.IsTopChoice(), jrawTypes.get());
if (info.IsFeature())
if (info.HasMetadata())
InjectMetadata(env, g_mapObjectClazz, mapObject, info.GetMetadata());
return mapObject;
}
@ -298,11 +298,11 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
return CreateMapObject(
env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(), info.GetID().m_index, kPoi,
info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.m_lat, ll.m_lon,
info.GetAddress(), info.IsFeature() ? info.GetMetadata() : Metadata(), "", jbanners.get(),
info.GetAddress(), info.HasMetadata() ? info.GetMetadata() : Metadata(), "", jbanners.get(),
jTaxiTypes.get(), info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get(),
info.GetOpeningMode(), info.ShouldShowUGC(), info.CanBeRated(), info.CanBeReviewed(),
jratings.get(), hotelType.get(), priceRate, popularity.get(),
info.GetDescription(), info.GetRoadType(), info.IsTopChoice(), jrawTypes.get());
jratings.get(), hotelType.get(), priceRate, popularity.get(), info.GetDescription(),
info.GetRoadType(), info.IsTopChoice(), jrawTypes.get());
}
jobjectArray ToBannersArray(JNIEnv * env, std::vector<ads::Banner> const & banners)

3
map/place_page_info.cpp
View file

@ -60,6 +60,8 @@ bool Info::ShouldShowUGC() const
void Info::SetFromFeatureType(FeatureType & ft)
{
MapObject::SetFromFeatureType(ft);
m_hasMetadata = true;
std::string primaryName;
std::string secondaryName;
GetPrefferedNames(primaryName, secondaryName);
@ -247,6 +249,7 @@ void Info::SetFromBookmarkProperties(kml::Properties const & p)
m_metadata.Set(feature::Metadata::EType::FMD_URL, url->second);
if (auto const isTopChoice = p.find("is_top_choice"); isTopChoice != p.end())
m_isTopChoice = isTopChoice->second == "1";
m_hasMetadata = true;
}
void Info::SetBookmarkId(kml::MarkId bookmarkId)

3
map/place_page_info.hpp
View file

@ -153,6 +153,7 @@ public:
bool IsRoutePoint() const { return m_isRoutePoint; }
bool IsRoadType() const { return m_roadType != RoadWarningMarkType::Count; }
bool IsGuide() const { return m_isGuide; }
bool HasMetadata() const { return m_hasMetadata; }
/// Edit and add
bool ShouldShowAddPlace() const;
@ -364,6 +365,8 @@ private:
kml::TrackId m_trackId = kml::kInvalidTrackId;
/// Whether to show "Must See".
bool m_isTopChoice = false;
/// Whether to treat it as plain feature.
bool m_hasMetadata = false;
/// Guide
bool m_isGuide = false;