From 62f97fa3dfd838b7e1c37601364dc29751a510e5 Mon Sep 17 00:00:00 2001 From: Arnaud Vergnet Date: Sat, 2 Jul 2022 17:37:17 +0200 Subject: [PATCH 1/3] [framework] Fill transit mark place page with feature info Signed-off-by: Arnaud Vergnet --- map/framework.cpp | 8 +++++++- map/framework.hpp | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/map/framework.cpp b/map/framework.cpp index ac7411fcf1..985db2540f 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -755,6 +755,12 @@ void Framework::FillRouteMarkInfo(RouteMarkPoint const & rmp, place_page::Info & info.SetIntermediateIndex(rmp.GetIntermediateIndex()); } +void Framework::FillTransitMarkInfo(TransitMark const & transitMark, place_page::Info & info) const +{ + FillFeatureInfo(transitMark.GetFeatureID(), info); + /// @todo Add useful info in PP for TransitMark (public transport). +} + void Framework::FillRoadTypeMarkInfo(RoadWarningMark const & roadTypeMark, place_page::Info & info) const { if (roadTypeMark.GetFeatureID().IsValid()) @@ -2176,7 +2182,7 @@ std::optional Framework::BuildPlacePageInfo( } case UserMark::Type::TRANSIT: { - /// @todo Add useful info in PP for TransitMark (public transport). + FillTransitMarkInfo(*static_cast(mark), outInfo); break; } default: diff --git a/map/framework.hpp b/map/framework.hpp index bad029ccc7..b887a2d5d7 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -606,6 +606,7 @@ private: void FillSearchResultInfo(SearchMarkPoint const & smp, place_page::Info & info) const; void FillMyPositionInfo(place_page::Info & info, place_page::BuildInfo const & buildInfo) const; void FillRouteMarkInfo(RouteMarkPoint const & rmp, place_page::Info & info) const; + void FillTransitMarkInfo(TransitMark const & transitMark, place_page::Info & info) const; void FillRoadTypeMarkInfo(RoadWarningMark const & roadTypeMark, place_page::Info & info) const; void FillPointInfoForBookmark(Bookmark const & bmk, place_page::Info & info) const; void FillBookmarkInfo(Bookmark const & bmk, place_page::Info & info) const; -- 2.45.3 From 06122434905a8cd1f700de75907090cfdc5488f3 Mon Sep 17 00:00:00 2001 From: "S. Kozyr" Date: Tue, 5 Jul 2022 11:51:16 +0300 Subject: [PATCH 2/3] Added filtering not only by english but in translated label too Signed-off-by: S. Kozyr --- android/jni/com/mapswithme/util/StringUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/jni/com/mapswithme/util/StringUtils.cpp b/android/jni/com/mapswithme/util/StringUtils.cpp index 589a18f3c2..f0c25ebcb1 100644 --- a/android/jni/com/mapswithme/util/StringUtils.cpp +++ b/android/jni/com/mapswithme/util/StringUtils.cpp @@ -44,7 +44,7 @@ Java_com_mapswithme_util_StringUtils_nativeFilterContainsNormalized(JNIEnv * env for (int i = 0; i < length; i++) { std::string str = jni::ToNativeString(env, (jstring) env->GetObjectArrayElement(src, i)); - if (search::ContainsNormalized(str, substr)) + if (search::ContainsNormalized(str, substr) || search::ContainsNormalized(osm::Cuisines::Instance().Translate(str), substr)) filtered.push_back(str); } -- 2.45.3 From f13f51043495e4cbb9885f023f7edbc3e04acc52 Mon Sep 17 00:00:00 2001 From: "S. Kozyr" Date: Tue, 5 Jul 2022 12:56:13 +0300 Subject: [PATCH 3/3] Moved osm::Cuisines::Instance() out of the loop. Signed-off-by: S. Kozyr --- android/jni/com/mapswithme/util/StringUtils.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/jni/com/mapswithme/util/StringUtils.cpp b/android/jni/com/mapswithme/util/StringUtils.cpp index f0c25ebcb1..4f48ffbcb2 100644 --- a/android/jni/com/mapswithme/util/StringUtils.cpp +++ b/android/jni/com/mapswithme/util/StringUtils.cpp @@ -39,12 +39,13 @@ Java_com_mapswithme_util_StringUtils_nativeFilterContainsNormalized(JNIEnv * env { std::string substr = jni::ToNativeString(env, jSubstr); int const length = env->GetArrayLength(src); + auto const & cuisines = osm::Cuisines::Instance(); std::vector filtered; filtered.reserve(length); for (int i = 0; i < length; i++) { std::string str = jni::ToNativeString(env, (jstring) env->GetObjectArrayElement(src, i)); - if (search::ContainsNormalized(str, substr) || search::ContainsNormalized(osm::Cuisines::Instance().Translate(str), substr)) + if (search::ContainsNormalized(str, substr) || search::ContainsNormalized(cuisines.Translate(str), substr)) filtered.push_back(str); } -- 2.45.3