Fix downloading behaviour in place page

1 files changed, 12 insertions, 3 deletions

diff --git a/map/framework.cpp b/map/framework.cpp
index d5932d178d..f63743f6e5 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -709,13 +709,22 @@ void Framework::FillFeatureInfo(FeatureID const & fid, place_page::Info & info)
   FillInfoFromFeatureType(ft, info);
 
   // Fill countryId for place page info
+  uint32_t const placeContinentType = classif().GetTypeByPath({"place", "continent"});
+  if (info.GetTypes().Has(placeContinentType))
+    return;
+
   info.m_countryId = m_infoGetter->GetRegionCountryId(info.GetMercator());
 
-  uint32_t placeCountryType = classif().GetTypeByPath({"place", "country"});
-  if (info.GetTypes().Has(placeCountryType))
+  uint32_t const placeCountryType = classif().GetTypeByPath({"place", "country"});
+  uint32_t const placeStateType = classif().GetTypeByPath({"place", "state"});
+
+  bool const isState = info.GetTypes().Has(placeStateType);
+  bool const isCountry = info.GetTypes().Has(placeCountryType);
+  if (isCountry || isState)
   {
+    size_t const level = isState ? 1 : 0;
     TCountriesVec countries;
-    Storage().GetTopmostNodesFor(info.m_countryId, countries);
+    Storage().GetTopmostNodesFor(info.m_countryId, countries, level);
     if (countries.size() == 1)
       info.m_countryId = countries.front();
   }