[Core] Use nearby road name for sidewalk name

Signed-off-by: Harry Bond <me@hbond.xyz>

indexer/ftypes_matcher.cpp

@@ -712,6 +712,11 @@ IsPublicTransportStopChecker::IsPublicTransportStopChecker()
   m_types.push_back(c.GetTypeByPath({"railway", "tram_stop"}));
 }
 
+IsSidewalkChecker::IsSidewalkChecker() : BaseChecker(3 /* level */)
+{
+  m_types.push_back(classif().GetTypeByPath({"highway", "footway", "sidewalk"}));
+}
+
 IsMotorwayJunctionChecker::IsMotorwayJunctionChecker()
 {
   m_types.push_back(classif().GetTypeByPath({"highway", "motorway_junction"}));

indexer/ftypes_matcher.hpp

@@ -449,6 +449,13 @@ public:
   DECLARE_CHECKER_INSTANCE(IsPublicTransportStopChecker);
 };
 
+class IsSidewalkChecker : public BaseChecker
+{
+  IsSidewalkChecker();
+public:
+  DECLARE_CHECKER_INSTANCE(IsSidewalkChecker);
+};
+
 class IsMotorwayJunctionChecker : public BaseChecker
 {
   IsMotorwayJunctionChecker();

indexer/map_object.cpp

@@ -207,5 +207,6 @@ int MapObject::GetStars() const
 bool MapObject::IsPointType() const { return m_geomType == feature::GeomType::Point; }
 bool MapObject::IsBuilding() const { return ftypes::IsBuildingChecker::Instance()(m_types); }
 bool MapObject::IsPublicTransportStop() const { return ftypes::IsPublicTransportStopChecker::Instance()(m_types); }
+bool MapObject::IsSidewalk() const { return ftypes::IsSidewalkChecker::Instance()(m_types); }
 
 }  // namespace osm

indexer/map_object.hpp

@@ -94,12 +94,15 @@ public:
   feature::GeomType GetGeomType() const { return m_geomType; };
   int8_t GetLayer() const { return m_layer; };
 
-  /// @returns true if object is of building type.
+  /// @returns true if object is a building type.
   bool IsBuilding() const;
 
   /// @returns true if object is a public transport stop type.
   bool IsPublicTransportStop() const;
 
+  /// @returns true if object is a sidewalk/pavement type.
+  bool IsSidewalk() const;
+
   void AssignMetadata(feature::Metadata & dest) const { dest = m_metadata; }
 
   /// @returns all localized POI types separated by kFieldsSeparator to display in UI.

map/framework.cpp

@@ -610,6 +610,14 @@ search::ReverseGeocoder::Address Framework::GetAddressAtPoint(m2::PointD const &
   return addr;
 }
 
+search::ReverseGeocoder::Street Framework::GetNearestStreet(m2::PointD const & pt) const
+{
+  auto const & dataSource = m_featuresFetcher.GetDataSource();
+  search::ReverseGeocoder const coder(dataSource);
+  MwmSet::MwmId const mwmId = dataSource.GetMwmIdByCountryFile(platform::CountryFile(m_infoGetter->GetRegionCountryId(pt)));
+  return coder.GetNearbyStreets(mwmId, pt)[0];
+}
+
 void Framework::FillFeatureInfo(FeatureID const & fid, place_page::Info & info) const
 {
   if (!fid.IsValid())
@@ -675,7 +683,7 @@ void Framework::FillInfoFromFeatureType(FeatureType & ft, place_page::Info & inf
   if (ftypes::IsAddressObjectChecker::Instance()(ft))
     info.SetAddress(GetAddressAtPoint(feature::GetCenter(ft)).FormatAddress());
 
-  info.SetFromFeatureType(ft);
+  info.SetFromFeatureType(ft, this);
 
   FillDescription(ft, info);
 

map/framework.hpp

@@ -621,6 +621,7 @@ private:
 
 public:
   search::ReverseGeocoder::Address GetAddressAtPoint(m2::PointD const & pt) const;
+  search::ReverseGeocoder::Street GetNearestStreet(m2::PointD const & pt) const;
 
   /// Get "best for the user" feature at given point even if it's invisible on the screen.
   /// Ignores coastlines and prefers buildings over other area features.

map/place_page_info.cpp

@@ -1,5 +1,5 @@
 #include "map/place_page_info.hpp"
-
+#include "map/framework.hpp"
 #include "map/bookmark_helpers.hpp"
 
 #include "indexer/feature_utils.hpp"
@@ -32,7 +32,7 @@ bool Info::ShouldShowAddPlace() const
   return !(IsFeature() && isPointOrBuilding);
 }
 
-void Info::SetFromFeatureType(FeatureType & ft)
+void Info::SetFromFeatureType(FeatureType & ft, Framework const * framework)
 {
   MapObject::SetFromFeatureType(ft);
   m_hasMetadata = true;
@@ -71,18 +71,15 @@ void Info::SetFromFeatureType(FeatureType & ft)
     m_uiTitle = m_primaryFeatureName;
     m_uiSecondaryTitle = out.secondary;
   }
-  else
+  else if (IsBuilding())
   {
-    if (IsBuilding())
-    {
-      emptyTitle = m_address.empty();
-      if (!emptyTitle)
-        m_uiTitle = m_address;
-      m_uiAddress.clear();    // already in main title
-    }
-    else
-      emptyTitle = true;
+    emptyTitle = m_address.empty();
+    if (!emptyTitle)
+      m_uiTitle = m_address;
+    m_uiAddress.clear();    // already in main title
   }
+  else
+    emptyTitle = true;
 
   // Assign Feature's type if main title is empty.
   if (emptyTitle)
@@ -93,7 +90,19 @@ void Info::SetFromFeatureType(FeatureType & ft)
   {
     auto const lRef = GetMetadata(feature::Metadata::FMD_LOCAL_REF);
     if (!lRef.empty())
+    {
+      // TODO: replace with std::format and add string in strings.txt
       m_uiTitle.append(" (").append(lRef).append(")");
+      emptyTitle = false;
+    }
+  }
+
+  // Fetch name from nearest road
+  if (IsSidewalk())
+  {
+    search::ReverseGeocoder::Street nearestStreet = framework -> GetNearestStreet(m_buildInfo.m_mercator);
+    m_uiTitle = nearestStreet.m_name;
+    emptyTitle = false;
   }
 
   m_uiSubtitle = FormatSubtitle(IsFeature() /* withTypes */, !emptyTitle /* withMainType */);

map/place_page_info.hpp

@@ -18,6 +18,8 @@
 #include <string>
 #include <vector>
 
+class Framework;
+
 namespace place_page
 {
 enum class OpeningMode
@@ -199,7 +201,7 @@ public:
   storage::CountriesVec const & GetTopmostCountryIds() const { return m_topmostCountryIds; }
 
   /// MapObject
-  void SetFromFeatureType(FeatureType & ft);
+  void SetFromFeatureType(FeatureType & ft, Framework const * framework);
 
   void SetWikiDescription(std::string && description) { m_description = std::move(description); }