Merge branch 'cc-engineering-geocoder.hierarchy-concurrent-read' into geocoder.hierarchy-concurrent-read

2019-02-08 17:17:13 +03:00 · 2019-02-08 17:17:13 +03:00 · 8122433ac8
commit 8122433ac8
parent d1ce5c1395 eba53b3adc
118 changed files with 1674 additions and 1223 deletions
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@ -463,6 +463,13 @@
    <activity
      android:name="com.mapswithme.maps.bookmarks.PlaceDescriptionActivity"
      android:label="@string/place_description_title"/>
+    <activity
+      android:name="com.mapswithme.maps.ugc.routes.EditCategoryNameActivity"
+      android:label="@string/name"/>
+    <activity
+      android:name="com.mapswithme.maps.ugc.routes.EditCategoryDescriptionActivity"
+      android:label="@string/description_guide"/>
+
    <service
      android:name="com.mapswithme.maps.background.WorkerService"
      android:permission="android.permission.BIND_JOB_SERVICE"
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@ -7,6 +7,7 @@

 #include "map/chart_generator.hpp"
 #include "map/everywhere_search_params.hpp"
+#include "map/notifications/notification_queue.hpp"
 #include "map/user_mark.hpp"

 #include "partners_api/ads_engine.hpp"
@ -55,6 +56,7 @@

 using namespace std;
 using namespace std::placeholders;
+using namespace notifications;

 unique_ptr<android::Framework> g_framework;

@ -759,14 +761,6 @@ void CallStartPurchaseTransactionListener(shared_ptr<jobject> listener, bool suc
 }

 /// @name JNI EXPORTS
-//@{
-JNIEXPORT jstring JNICALL
-Java_com_mapswithme_maps_Framework_nativeGetNameAndAddress(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon)
-{
-  search::AddressInfo const info = frm()->GetAddressInfoAtPoint(MercatorBounds::FromLatLon(lat, lon));
-  return jni::ToJavaString(env, info.FormatNameAndAddress());
-}
-
 JNIEXPORT void JNICALL
 Java_com_mapswithme_maps_Framework_nativeClearApiPoints(JNIEnv * env, jclass clazz)
 {
@ -1941,34 +1935,34 @@ Java_com_mapswithme_maps_Framework_nativeGetAccessToken(JNIEnv * env, jclass)

 JNIEXPORT jobject JNICALL
 Java_com_mapswithme_maps_Framework_nativeGetMapObject(JNIEnv * env, jclass,
-                                                      jobject notificationMapObject)
+                                                      jobject notificationCandidate)
 {
-  eye::MapObject mapObject;
+  NotificationCandidate notification(NotificationCandidate::Type::UgcReview);
  auto const getBestTypeId =
-      jni::GetMethodID(env, notificationMapObject, "getBestType", "()Ljava/lang/String;");
+      jni::GetMethodID(env, notificationCandidate, "getFeatureBestType", "()Ljava/lang/String;");
  auto const bestType =
-      static_cast<jstring>(env->CallObjectMethod(notificationMapObject, getBestTypeId));
-  mapObject.SetBestType(jni::ToNativeString(env, bestType));
+      static_cast<jstring>(env->CallObjectMethod(notificationCandidate, getBestTypeId));
+  notification.SetBestFeatureType(jni::ToNativeString(env, bestType));

  auto const getMercatorPosXId =
-      jni::GetMethodID(env, notificationMapObject, "getMercatorPosX", "()D");
+      jni::GetMethodID(env, notificationCandidate, "getMercatorPosX", "()D");
  auto const getMercatorPosYId =
-      jni::GetMethodID(env, notificationMapObject, "getMercatorPosY", "()D");
+      jni::GetMethodID(env, notificationCandidate, "getMercatorPosY", "()D");

  auto const posX =
-      static_cast<double>(env->CallDoubleMethod(notificationMapObject, getMercatorPosXId));
+      static_cast<double>(env->CallDoubleMethod(notificationCandidate, getMercatorPosXId));
  auto const posY =
-      static_cast<double>(env->CallDoubleMethod(notificationMapObject, getMercatorPosYId));
-  mapObject.SetPos({posX, posY});
+      static_cast<double>(env->CallDoubleMethod(notificationCandidate, getMercatorPosYId));
+  notification.SetPos({posX, posY});

  auto const getDefaultNameId =
-      jni::GetMethodID(env, notificationMapObject, "getDefaultName", "()Ljava/lang/String;");
+      jni::GetMethodID(env, notificationCandidate, "getDefaultName", "()Ljava/lang/String;");
  auto const defaultName =
-      static_cast<jstring>(env->CallObjectMethod(notificationMapObject, getDefaultNameId));
-  mapObject.SetDefaultName(jni::ToNativeString(env, defaultName));
+      static_cast<jstring>(env->CallObjectMethod(notificationCandidate, getDefaultNameId));
+  notification.SetDefaultName(jni::ToNativeString(env, defaultName));

  place_page::Info info;
-  if (frm()->MakePlacePageInfo(mapObject, info))
+  if (frm()->MakePlacePageInfo(notification, info))
    return usermark_helper::CreateMapObject(env, info);

  return nullptr;
--- a/android/jni/com/mapswithme/maps/LightFramework.cpp
+++ b/android/jni/com/mapswithme/maps/LightFramework.cpp
@ -98,26 +98,21 @@ Java_com_mapswithme_maps_LightFramework_nativeGetNotification(JNIEnv * env, jcla
  if (!notification)
    return nullptr;

+  auto const & n = notification.get();
  // Type::UgcReview is only supported.
-  CHECK_EQUAL(notification.get().m_type, notifications::NotificationCandidate::Type::UgcReview, ());
+  CHECK_EQUAL(n.GetType(), notifications::NotificationCandidate::Type::UgcReview, ());

  static jclass const candidateId =
-      jni::GetGlobalClassRef(env, "com/mapswithme/maps/background/NotificationCandidate");
-  static jclass const mapObjectId =
-      jni::GetGlobalClassRef(env, "com/mapswithme/maps/background/NotificationCandidate$MapObject");
+      jni::GetGlobalClassRef(env, "com/mapswithme/maps/background/NotificationCandidate$UgcReview");
  static jmethodID const candidateCtor = jni::GetConstructorID(
-      env, candidateId, "(ILcom/mapswithme/maps/background/NotificationCandidate$MapObject;)V");
-  static jmethodID const mapObjectCtor = jni::GetConstructorID(
-      env, mapObjectId, "(DDLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+      env, candidateId,
+      "(DDLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");

-  auto const & srcObject = notification.get().m_mapObject;
-  ASSERT(srcObject, ());
-  auto const readableName = jni::ToJavaString(env, srcObject->GetReadableName());
-  auto const defaultName = jni::ToJavaString(env, srcObject->GetDefaultName());
-  auto const type = jni::ToJavaString(env, srcObject->GetBestType());
-  auto const mapObject = env->NewObject(mapObjectId, mapObjectCtor, srcObject->GetPos().x,
-                                        srcObject->GetPos().y, readableName, defaultName, type);
-  return env->NewObject(candidateId, candidateCtor, static_cast<jint>(notification.get().m_type),
-                        mapObject);
+  auto const readableName = jni::ToJavaString(env, n.GetReadableName());
+  auto const defaultName = jni::ToJavaString(env, n.GetDefaultName());
+  auto const type = jni::ToJavaString(env, n.GetBestFeatureType());
+  auto const address = jni::ToJavaString(env, n.GetAddress());
+  return env->NewObject(candidateId, candidateCtor, n.GetPos().x, n.GetPos().y, readableName,
+                        defaultName, type, address);
 }
 }  // extern "C"
--- a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp
+++ b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp
@ -9,7 +9,6 @@

 namespace usermark_helper
 {
-using search::AddressInfo;
 using feature::Metadata;

 void InjectMetadata(JNIEnv * env, jclass const clazz, jobject const mapObject, feature::Metadata const & metadata)
--- a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
+++ b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
@ -85,7 +85,7 @@ void PrepareClassRefs(JNIEnv * env)
    jni::GetMethodID(env, bookmarkManagerInstance, "onImportFinished", "(Ljava/lang/String;JZ)V");
  g_onTagsReceivedMethod =
    jni::GetMethodID(env, bookmarkManagerInstance, "onTagsReceived",
-                     "(Z[Lcom/mapswithme/maps/bookmarks/data/CatalogTagsGroup;)V");
+                     "(Z[Lcom/mapswithme/maps/bookmarks/data/CatalogTagsGroup;I)V");
  g_onCustomPropertiesReceivedMethod =
    jni::GetMethodID(env, bookmarkManagerInstance, "onCustomPropertiesReceived",
                     "(Z[Lcom/mapswithme/maps/bookmarks/data/CatalogCustomProperty;)V");
@ -111,7 +111,7 @@ void PrepareClassRefs(JNIEnv * env)
  g_bookmarkCategoryConstructor =
      jni::GetConstructorID(env, g_bookmarkCategoryClass,
                            "(JLjava/lang/String;Ljava/lang/String;"
-                            "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIZZZI)V");
+                            "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIZZZILjava/lang/String;)V");

  g_catalogTagClass =
    jni::GetGlobalClassRef(env, "com/mapswithme/maps/bookmarks/data/CatalogTag");
@ -282,7 +282,8 @@ void OnImportFinished(JNIEnv * env, std::string const & serverId, kml::MarkGroup
  jni::HandleJavaException(env);
 }

-void OnTagsReceived(JNIEnv * env, bool successful, BookmarkCatalog::TagGroups const & groups)
+void OnTagsReceived(JNIEnv * env, bool successful, BookmarkCatalog::TagGroups const & groups,
+                    uint32_t maxTagsCount)
 {
  ASSERT(g_bookmarkManagerClass, ());
  ASSERT(g_catalogTagClass, ());
@ -309,7 +310,7 @@ void OnTagsReceived(JNIEnv * env, bool successful, BookmarkCatalog::TagGroups co
                            static_cast<jfloat>(tag.m_color[1]),
                            static_cast<jfloat>(tag.m_color[2]));
    }));
-  }));
+  }), static_cast<jint>(maxTagsCount));
  jni::HandleJavaException(env);
 }

@ -889,9 +890,9 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeRequestCatalogTags
 {
  auto & bm = frm()->GetBookmarkManager();
  bm.GetCatalog().RequestTagGroups(languages::GetCurrentNorm(),
-    [env](bool successful, BookmarkCatalog::TagGroups const & groups)
+    [env](bool successful, BookmarkCatalog::TagGroups const & groups, uint32_t maxTagsCount)
  {
-    OnTagsReceived(env, successful, groups);
+    OnTagsReceived(env, successful, groups, maxTagsCount);
  });
 }

@ -925,12 +926,14 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategor
    auto const annotation = GetPreferredBookmarkStr(data.m_annotation);
    auto const description = GetPreferredBookmarkStr(data.m_description);
    auto const accessRules = data.m_accessRules;
+    auto const serverId = manager.GetCategoryServerId(item);

    jni::TScopedLocalRef preferBookmarkStrRef(env, jni::ToJavaString(env, preferBookmarkStr));
    jni::TScopedLocalRef authorIdRef(env, jni::ToJavaString(env, data.m_authorId));
    jni::TScopedLocalRef authorNameRef(env, jni::ToJavaString(env, data.m_authorName));
    jni::TScopedLocalRef annotationRef(env, jni::ToJavaString(env, annotation));
    jni::TScopedLocalRef descriptionRef(env, jni::ToJavaString(env, description));
+    jni::TScopedLocalRef serverIdRef(env, jni::ToJavaString(env, serverId));

    return env->NewObject(g_bookmarkCategoryClass,
                          g_bookmarkCategoryConstructor,
@ -945,7 +948,8 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategor
                          static_cast<jboolean>(isFromCatalog),
                          static_cast<jboolean>(isMyCategory),
                          static_cast<jboolean>(isVisible),
-                          static_cast<jint>(accessRules));
+                          static_cast<jint>(accessRules),
+                          serverIdRef.get());
  };
  return ToJavaArray(env, g_bookmarkCategoryClass, categories, bookmarkConverter);
 }
--- a/android/res/layout/fragment_bookmark_category_restriction.xml
+++ b/android/res/layout/fragment_bookmark_category_restriction.xml
@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:orientation="vertical"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+  <android.support.v7.widget.Toolbar
+    android:id="@+id/toolbar"
+    style="@style/MwmWidget.ToolbarStyle"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:background="?colorPrimary"
+    android:gravity="end|center_vertical"
+    android:theme="@style/MwmWidget.ToolbarTheme"
+    tools:ignore="UnusedAttribute">
+  </android.support.v7.widget.Toolbar>
+
+  <LinearLayout
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginTop="@dimen/margin_base">
+    <include layout="@layout/list_divider"/>
+    <LinearLayout
+      android:orientation="vertical"
+      android:paddingStart="@dimen/margin_base"
+      android:paddingEnd="@dimen/margin_base"
+      android:paddingRight="@dimen/margin_base"
+      android:paddingLeft="@dimen/margin_base"
+      android:paddingBottom="@dimen/bookmark_hide_btn_padding_top"
+      android:paddingTop="@dimen/margin_half_plus"
+      android:background="?attr/cardBackground"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
+      <com.mapswithme.maps.widget.CustomTextInputLayout
+        android:layout_width="match_parent"
+        android:layout_weight="1"
+        android:layout_height="0dp">
+        <EditText
+          android:id="@+id/edit_text_field"
+          android:textAppearance="?android:attr/textAppearanceMedium"
+          android:hint="@string/name_placeholder"
+          android:textColorHint="?attr/iconTintDisabled"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"/>
+      </com.mapswithme.maps.widget.CustomTextInputLayout>
+      <TextView
+        android:id="@+id/characters_amount"
+        android:layout_gravity="end"
+        android:gravity="end"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+    </LinearLayout>
+    <include layout="@layout/list_divider"/>
+    <TextView
+      android:id="@+id/summary"
+      android:gravity="center_vertical"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingTop="@dimen/margin_base"
+      android:paddingStart="@dimen/margin_base"
+      android:paddingRight="@dimen/margin_base"
+      android:paddingEnd="@dimen/margin_base"
+      android:paddingLeft="@dimen/margin_base"
+      android:paddingBottom="@dimen/margin_base"
+      tools:ignore="UnusedAttribute"/>
+  </LinearLayout>
+</LinearLayout>
--- a/android/res/layout/fragment_confirmation.xml
+++ b/android/res/layout/fragment_confirmation.xml
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
  android:orientation="vertical"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
@ -12,13 +13,15 @@
    android:layout_height="wrap_content">
    <TextView
      android:id="@+id/title"
-      android:textAppearance="@style/MwmTheme.DialogTitleBase"
+      android:textAppearance="?android:attr/textAppearanceLarge"
      android:gravity="center|start"
+      android:fontFamily="@string/robotoMedium"
      android:layout_gravity="center_vertical"
      android:textStyle="bold"
      android:layout_weight="1"
      android:layout_height="wrap_content"
-      android:layout_width="0dp"/>
+      android:layout_width="0dp"
+      tools:ignore="UnusedAttribute"/>
    <ImageView
      android:id="@+id/image"
      android:layout_gravity="center_vertical"
--- a/android/res/layout/fragment_ugc_routes_properties.xml
+++ b/android/res/layout/fragment_ugc_routes_properties.xml
@ -6,6 +6,7 @@
  android:fillViewport="true">
  <LinearLayout
    android:orientation="vertical"
+    android:layout_marginTop="@dimen/margin_base"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    <ProgressBar
@ -21,16 +22,6 @@
      android:orientation="vertical"
      android:layout_width="match_parent"
      android:layout_height="wrap_content">
-      <TextView
-        android:text="@string/custom_props_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/margin_base"
-        android:paddingBottom="@dimen/margin_base"
-        android:paddingRight="@dimen/margin_half_double_plus"
-        android:paddingEnd="@dimen/margin_half_double_plus"
-        android:paddingLeft="@dimen/margin_half_double_plus"
-        android:paddingStart="@dimen/margin_half_double_plus"/>
      <include layout="@layout/list_divider"/>
      <TextView
        android:text="@string/custom_props_desc"
--- a/android/res/layout/fragment_ugc_routes_sharing_options.xml
+++ b/android/res/layout/fragment_ugc_routes_sharing_options.xml
@ -34,11 +34,13 @@
          android:gravity="center_vertical"
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
+          android:fontFamily="@string/robotoMedium"
          android:text="@string/limited_access"
          android:paddingStart="@dimen/margin_base"
          android:paddingRight="@dimen/margin_base"
          android:paddingEnd="@dimen/margin_base"
-          android:paddingLeft="@dimen/margin_base"/>
+          android:paddingLeft="@dimen/margin_base"
+          tools:ignore="UnusedAttribute"/>
        <include layout="@layout/list_divider"/>
        <RelativeLayout
          xmlns:android="http://schemas.android.com/apk/res/android"
@ -146,11 +148,13 @@
          android:gravity="center_vertical"
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
+          android:fontFamily="@string/robotoMedium"
          android:text="@string/public_access"
          android:paddingStart="@dimen/margin_base"
          android:paddingRight="@dimen/margin_base"
          android:paddingEnd="@dimen/margin_base"
-          android:paddingLeft="@dimen/margin_base"/>
+          android:paddingLeft="@dimen/margin_base"
+          tools:ignore="UnusedAttribute"/>
        <include layout="@layout/list_divider"/>
        <RelativeLayout
          android:layout_width="match_parent"
@ -257,17 +261,18 @@
        android:orientation="vertical"
        android:layout_width="match_parent"
        android:layout_height="wrap_content">
-        <!--FIXME text id-->
        <TextView
          android:minHeight="@dimen/height_block_base"
          android:gravity="center_vertical"
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
+          android:fontFamily="@string/robotoMedium"
          android:text="@string/edit_on_web"
          android:paddingStart="@dimen/margin_base"
          android:paddingRight="@dimen/margin_base"
          android:paddingEnd="@dimen/margin_base"
-          android:paddingLeft="@dimen/margin_base"/>
+          android:paddingLeft="@dimen/margin_base"
+          tools:targetApi="jelly_bean"/>
        <include layout="@layout/list_divider"/>
        <LinearLayout
          android:id="@+id/edit_on_web_btn_container"
@ -279,14 +284,14 @@
          <TextView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:text="@string/upload_and_publish_desc"/>
+            android:text="@string/web_editor_description"/>
          <Button
            android:id="@+id/edit_on_web_btn"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="@dimen/margin_base"
            style="@style/MwmWidget.Button.Primary"
-            android:text="@string/edit_on_web"
+            android:text="@string/edit_on_web_confirm"
            android:textAppearance="?android:attr/textAppearanceLarge"/>
        </LinearLayout>
        <include layout="@layout/list_divider"/>
--- a/android/res/menu/menu_bookmark_category_restriction.xml
+++ b/android/res/menu/menu_bookmark_category_restriction.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+  <item
+    app:showAsAction="always"
+    android:id="@+id/done"
+    android:title="@string/done"
+    android:icon="@drawable/ic_done"/>
+</menu>
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@ -1582,6 +1582,8 @@
 	<string name="html_error_upload_message_try_again">[html_error_upload_message_try_again]</string>
 	<!-- FIXME. Your guide couldn't be uploaded -->
 	<string name="html_error_upload_title_try_again">[html_error_upload_title_try_again]</string>
+	<!-- FIXME. -->
+	<string name="notification_leave_review_v2_android_short_title">Review and help travellers!</string>

 	<!-- SECTION:  Partners  -->
 	<string name="sponsored_partner1_action">Outlets</string>
@ -2056,7 +2058,7 @@
 	<string name="type.leisure.ice_rink">leisure-ice_rink</string>
 	<string name="type.leisure.landscape_reserve">leisure-landscape_reserve</string>
 	<string name="type.leisure.marina">leisure-marina</string>
-	<string name="type.leisure.nature_reserve">Reserve</string>
+	<string name="type.leisure.nature_reserve">Nature reserve</string>
 	<string name="type.leisure.park">Park</string>
 	<string name="type.leisure.park.no.access">Park</string>
 	<string name="type.leisure.park.permissive">Park</string>
--- a/android/src/com/mapswithme/maps/Framework.java
+++ b/android/src/com/mapswithme/maps/Framework.java
@ -514,7 +514,7 @@ public class Framework

  @Nullable
  public static native MapObject nativeGetMapObject(
-      @NonNull NotificationCandidate.MapObject mapObject);
+      @NonNull NotificationCandidate notificationCandidate);

  public static native void nativeSetPowerManagerFacility(int facilityType, boolean state);
  public static native int nativeGetPowerManagerScheme();
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@ -355,12 +355,12 @@ public class MwmActivity extends BaseMwmFragmentActivity

  @NonNull
  public static Intent createLeaveReviewIntent(@NonNull Context context,
-                                               @NonNull NotificationCandidate.MapObject mapObject)
+                                               @NonNull NotificationCandidate.UgcReview nc)
  {
    return new Intent(context, MwmActivity.class)
      .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
      .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-      .putExtra(MwmActivity.EXTRA_TASK, new MwmActivity.ShowUGCEditorTask(mapObject));
+      .putExtra(MwmActivity.EXTRA_TASK, new MwmActivity.ShowUGCEditorTask(nc));
  }

  @Override
@ -1183,7 +1183,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
  }

  @Override
-  public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups)
+  public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups,
+                             int tagsLimit)
  {
    //TODO(@alexzatsepin): Implement me if necessary
  }
@ -2686,18 +2687,22 @@ public class MwmActivity extends BaseMwmFragmentActivity
  public static class ShowUGCEditorTask implements MapTask
  {
    private static final long serialVersionUID = 1636712824900113568L;
-    @NonNull
-    private final NotificationCandidate.MapObject mMapObject;
+    // Nullable because of possible serialization from previous incompatible version of class.
+    @Nullable
+    private final NotificationCandidate.UgcReview mNotificationCandidate;

-    ShowUGCEditorTask(@NonNull NotificationCandidate.MapObject mapObject)
+    ShowUGCEditorTask(@Nullable NotificationCandidate.UgcReview notificationCandidate)
    {
-      mMapObject = mapObject;
+      mNotificationCandidate = notificationCandidate;
    }

    @Override
    public boolean run(@NonNull MwmActivity target)
    {
-      MapObject mapObject = Framework.nativeGetMapObject(mMapObject);
+      if (mNotificationCandidate == null)
+        return false;
+
+      MapObject mapObject = Framework.nativeGetMapObject(mNotificationCandidate);

      if (mapObject == null)
        return false;
--- a/android/src/com/mapswithme/maps/background/NotificationCandidate.java
+++ b/android/src/com/mapswithme/maps/background/NotificationCandidate.java
@ -1,17 +1,16 @@
 package com.mapswithme.maps.background;

-import android.os.Parcel;
-import android.os.Parcelable;
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;

 import java.io.Serializable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

-public class NotificationCandidate
+public class NotificationCandidate implements Serializable
 {
+  private static final long serialVersionUID = -7020549752940235436L;
+
  // This constants should be compatible with notifications::NotificationCandidate::Type enum
  // from c++ side.
  static final int TYPE_UGC_AUTH = 0;
@ -19,11 +18,14 @@ public class NotificationCandidate

  @Retention(RetentionPolicy.SOURCE)
  @IntDef({ TYPE_UGC_AUTH, TYPE_UGC_REVIEW })
-  @interface NotificationType {}
-
-  public static class MapObject implements Parcelable, Serializable
+  @interface NotificationType
  {
-    private static final long serialVersionUID = -7443680760782198916L;
+  }
+
+  public static class UgcReview extends NotificationCandidate
+  {
+    private static final long serialVersionUID = 5469867251355445859L;
+
    private final double mMercatorPosX;
    private final double mMercatorPosY;
    @NonNull
@ -31,57 +33,22 @@ public class NotificationCandidate
    @NonNull
    private final String mDefaultName;
    @NonNull
-    private final String mBestType;
-
-    public static final Creator<MapObject> CREATOR = new Creator<MapObject>()
-    {
-      @Override
-      public MapObject createFromParcel(Parcel in)
-      {
-        return new MapObject(in);
-      }
-
-      @Override
-      public MapObject[] newArray(int size)
-      {
-        return new MapObject[size];
-      }
-    };
+    private final String mFeatureBestType;
+    @NonNull
+    private final String mAddress;

    @SuppressWarnings("unused")
-    MapObject(double posX, double posY, @NonNull String readableName, @NonNull String defaultName,
-              @NonNull String bestType)
+    UgcReview(double posX, double posY, @NonNull String readableName, @NonNull String defaultName,
+              @NonNull String bestType, @NonNull String address)
    {
+      super(TYPE_UGC_REVIEW);
+
      mMercatorPosX = posX;
      mMercatorPosY = posY;
      mReadableName = readableName;
      mDefaultName = defaultName;
-      mBestType = bestType;
-    }
-
-    protected MapObject(Parcel in)
-    {
-      mMercatorPosX = in.readDouble();
-      mMercatorPosY = in.readDouble();
-      mReadableName = in.readString();
-      mDefaultName = in.readString();
-      mBestType = in.readString();
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags)
-    {
-      dest.writeDouble(mMercatorPosX);
-      dest.writeDouble(mMercatorPosY);
-      dest.writeString(mReadableName);
-      dest.writeString(mDefaultName);
-      dest.writeString(mBestType);
-    }
-
-    @Override
-    public int describeContents()
-    {
-      return 0;
+      mFeatureBestType = bestType;
+      mAddress = address;
    }

    @SuppressWarnings("unused")
@ -110,39 +77,28 @@ public class NotificationCandidate

    @NonNull
    @SuppressWarnings("unused")
-    public String getBestType()
+    public String getFeatureBestType()
    {
-      return mBestType;
+      return mFeatureBestType;
+    }
+
+    @NonNull
+    public String getAddress()
+    {
+      return mAddress;
    }
  }

  @NotificationType
  private final int mType;

-  @Nullable
-  private MapObject mMapObject;
-
-  @SuppressWarnings("unused")
-  NotificationCandidate(@NotificationType int type)
+  private NotificationCandidate(@NotificationType int type)
  {
    mType = type;
  }

-  @SuppressWarnings("unused")
-  NotificationCandidate(@NotificationType int type, @Nullable MapObject mapObject)
-  {
-    this(type);
-    mMapObject = mapObject;
-  }
-
  public int getType()
  {
    return mType;
  }
-
-  @Nullable
-  public MapObject getMapObject()
-  {
-    return mMapObject;
-  }
 }
--- a/android/src/com/mapswithme/maps/background/NotificationService.java
+++ b/android/src/com/mapswithme/maps/background/NotificationService.java
@ -79,13 +79,13 @@ public class NotificationService extends JobIntentService

    NotificationCandidate candidate = LightFramework.nativeGetNotification();

-    if (candidate == null || candidate.getMapObject() == null)
+    if (candidate == null)
      return false;

    if (candidate.getType() == NotificationCandidate.TYPE_UGC_REVIEW)
    {
      Notifier notifier = Notifier.from(getApplication());
-      notifier.notifyLeaveReview(candidate.getMapObject());
+      notifier.notifyLeaveReview((NotificationCandidate.UgcReview) candidate);
      return true;
    }

--- a/android/src/com/mapswithme/maps/background/Notifier.java
+++ b/android/src/com/mapswithme/maps/background/Notifier.java
@ -32,7 +32,7 @@ public final class Notifier
  private final Application mContext;

  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({ ID_NONE, ID_DOWNLOAD_FAILED, ID_IS_NOT_AUTHENTICATED })
+  @IntDef({ ID_NONE, ID_DOWNLOAD_FAILED, ID_IS_NOT_AUTHENTICATED, ID_LEAVE_REVIEW })
  public @interface NotificationId
  {
  }
@ -80,9 +80,9 @@ public final class Notifier
    Statistics.INSTANCE.trackEvent(Statistics.EventName.UGC_NOT_AUTH_NOTIFICATION_SHOWN);
  }

-  void notifyLeaveReview(@NonNull NotificationCandidate.MapObject mapObject)
+  void notifyLeaveReview(@NonNull NotificationCandidate.UgcReview source)
  {
-    Intent reviewIntent = MwmActivity.createLeaveReviewIntent(mContext, mapObject);
+    Intent reviewIntent = MwmActivity.createLeaveReviewIntent(mContext, source);
    reviewIntent.putExtra(EXTRA_CANCEL_NOTIFICATION, Notifier.ID_LEAVE_REVIEW);
    reviewIntent.putExtra(EXTRA_NOTIFICATION_CLICKED,
                          Statistics.EventName.UGC_REVIEW_NOTIFICATION_CLICKED);
@ -91,14 +91,18 @@ public final class Notifier
        PendingIntent.getActivity(mContext, 0, reviewIntent, PendingIntent.FLAG_UPDATE_CURRENT);

    String channel = NotificationChannelFactory.createProvider(mContext).getUGCChannel();
-    NotificationCompat.Builder builder =
-        getBuilder(mContext.getString(R.string.notification_leave_review_title,
-                                      mapObject.getReadableName()),
-                   mContext.getString(R.string.notification_leave_review_content,
-                                      mapObject.getReadableName()),
-                   pi, channel);
+    String content = source.getAddress().isEmpty()
+                     ? source.getReadableName()
+                     : source.getReadableName() + ", " + source.getAddress();

-    builder.addAction(0, mContext.getString(R.string.leave_a_review), pi);
+    NotificationCompat.Builder builder =
+        getBuilder(mContext.getString(R.string.notification_leave_review_v2_android_short_title),
+                   content, pi, channel)
+        .setStyle(new NotificationCompat.BigTextStyle()
+                       .setBigContentTitle(
+                         mContext.getString(R.string.notification_leave_review_v2_title))
+                       .bigText(content))
+        .addAction(0, mContext.getString(R.string.leave_a_review), pi);

    getNotificationManager().notify(ID_LEAVE_REVIEW, builder.build());

--- a/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java
@ -215,7 +215,8 @@ public class CachedBookmarkCategoriesFragment extends BaseBookmarkCategoriesFrag
    }

    @Override
-    public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups)
+    public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups,
+                               int tagsLimit)
    {
      //TODO(@alexzatsepin): Implement me if necessary
    }
--- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkCategory.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkCategory.java
@ -33,13 +33,15 @@ public class BookmarkCategory implements Parcelable
  private final int mAccessRulesIndex;
  private final boolean mIsMyCategory;
  private final boolean mIsVisible;
+  @NonNull
+  private final String mServerId;


  public BookmarkCategory(long id, @NonNull String name, @NonNull String authorId,
                          @NonNull String authorName, @NonNull String annotation,
                          @NonNull String description, int tracksCount, int bookmarksCount,
                          boolean fromCatalog, boolean isMyCategory, boolean isVisible,
-                          int accessRulesIndex)
+                          int accessRulesIndex, @NonNull String serverId)
  {
    mId = id;
    mName = name;
@ -48,6 +50,7 @@ public class BookmarkCategory implements Parcelable
    mTracksCount = tracksCount;
    mBookmarksCount = bookmarksCount;
    mIsMyCategory = isMyCategory;
+    mServerId = serverId;
    mTypeIndex = fromCatalog && !isMyCategory ? Type.DOWNLOADED.ordinal() : Type.PRIVATE.ordinal();
    mIsVisible = isVisible;
    mAuthor = TextUtils.isEmpty(authorId) || TextUtils.isEmpty(authorName)
@ -142,6 +145,12 @@ public class BookmarkCategory implements Parcelable
    return mDescription;
  }

+  @NonNull
+  public String getServerId()
+  {
+    return mServerId;
+  }
+
  @NonNull
  public CountAndPlurals getPluralsCountTemplate()
  {
@ -300,6 +309,7 @@ public class BookmarkCategory implements Parcelable
    sb.append(", mIsMyCategory=").append(mIsMyCategory);
    sb.append(", mIsVisible=").append(mIsVisible);
    sb.append(", mAccessRules=").append(getAccessRules());
+    sb.append(", mServerId=").append(mServerId);
    sb.append('}');
    return sb.toString();
  }
@ -362,6 +372,7 @@ public class BookmarkCategory implements Parcelable
    dest.writeByte(this.mIsMyCategory ? (byte) 1 : (byte) 0);
    dest.writeByte(this.mIsVisible ? (byte) 1 : (byte) 0);
    dest.writeInt(this.mAccessRulesIndex);
+    dest.writeString(this.mServerId);
  }

  protected BookmarkCategory(Parcel in)
@ -377,6 +388,7 @@ public class BookmarkCategory implements Parcelable
    this.mIsMyCategory = in.readByte() != 0;
    this.mIsVisible = in.readByte() != 0;
    this.mAccessRulesIndex = in.readInt();
+    this.mServerId = in.readString();
  }

  public static final Creator<BookmarkCategory> CREATOR = new Creator<BookmarkCategory>()
@ -402,7 +414,7 @@ public class BookmarkCategory implements Parcelable
    ACCESS_RULES_P2P(R.string.access_rules_p_to_p, R.drawable.ic_public_inline),
    ACCESS_RULES_PAID(R.string.access_rules_paid, R.drawable.ic_public_inline),
    //TODO(@alexzatsepin): Set correct resources.
-    ACCESS_RULES_AUTHOR_ONLY(R.string.access_rules_p_to_p, R.drawable.ic_public_inline);
+    ACCESS_RULES_AUTHOR_ONLY(R.string.access_rules_p_to_p, R.drawable.ic_lock);

    private final int mResId;
    private final int mDrawableResId;
--- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
@ -270,12 +270,14 @@ public enum BookmarkManager
  // Called from JNI.
  @SuppressWarnings("unused")
  @MainThread
-  public void onTagsReceived(boolean successful, @NonNull CatalogTagsGroup[] tagsGroups)
+  public void onTagsReceived(boolean successful, @NonNull CatalogTagsGroup[] tagsGroups,
+                             int maxTagsCount)
  {
+    //TODO(@yoksnod): Implement maxTagsCount usage.
    List<CatalogTagsGroup> unmodifiableData = Collections.unmodifiableList(Arrays.asList(tagsGroups));
    for (BookmarksCatalogListener listener : mCatalogListeners)
    {
-      listener.onTagsReceived(successful, unmodifiableData);
+      listener.onTagsReceived(successful, unmodifiableData, maxTagsCount);
    }
  }

@ -858,10 +860,10 @@ public enum BookmarkManager

    /**
     * The method is called when the tags were received from the server.
-     *  @param successful is the result of the receiving.
+     * @param successful is the result of the receiving.
     * @param tagsGroups is the tags collection.
     */
-    void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups);
+    void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups, int tagsLimit);

    /**
     * The method is called when the custom properties were received from the server.
@ -905,7 +907,8 @@ public enum BookmarkManager
    }

    @Override
-    public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups)
+    public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups,
+                               int tagsLimit)
    {
      /* do noting by default */
    }
--- a/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java
+++ b/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java
@ -0,0 +1,178 @@
+package com.mapswithme.maps.ugc.routes;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.mapswithme.maps.R;
+import com.mapswithme.maps.base.BaseMwmToolbarFragment;
+import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
+
+import java.util.Locale;
+import java.util.Objects;
+
+public abstract class BaseEditUserBookmarkCategoryFragment extends BaseMwmToolbarFragment
+{
+  public static final String BUNDLE_BOOKMARK_CATEGORY = "category";
+  private static final String FORMAT_TEMPLATE = "%d / %d";
+  private static final String TEXT_LENGTH_LIMIT = "text_length_limit";
+  private static final int DEFAULT_TEXT_LENGTH_LIMIT = 42;
+  private static final String DOUBLE_BREAK_LINE_CHAR = "\n\n";
+
+  @SuppressWarnings("NullableProblems")
+  @NonNull
+  private EditText mEditText;
+
+  @SuppressWarnings("NullableProblems")
+  @NonNull
+  private TextView mCharactersAmountText;
+  private int mTextLimit;
+
+  @SuppressWarnings("NullableProblems")
+  @NonNull
+  private BookmarkCategory mCategory;
+
+  @Override
+  public void onCreate(@Nullable Bundle savedInstanceState)
+  {
+    super.onCreate(savedInstanceState);
+    Bundle args = Objects.requireNonNull(getArguments());
+    mCategory = Objects.requireNonNull(args.getParcelable(BUNDLE_BOOKMARK_CATEGORY));
+    mTextLimit = args.getInt(TEXT_LENGTH_LIMIT, getDefaultTextLengthLimit());
+  }
+
+  protected int getDefaultTextLengthLimit()
+  {
+    return DEFAULT_TEXT_LENGTH_LIMIT;
+  }
+
+  @Nullable
+  @Override
+  public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+                           @Nullable Bundle savedInstanceState)
+  {
+    View root = inflater.inflate(R.layout.fragment_bookmark_category_restriction, container,
+                                    false);
+    setHasOptionsMenu(true);
+    mEditText = root.findViewById(R.id.edit_text_field);
+    InputFilter[] inputFilters = { new InputFilter.LengthFilter(mTextLimit) };
+    mEditText.setHint(getTitleText());
+    mEditText.setFilters(inputFilters);
+    mEditText.setText(getEditableText());
+    mEditText.addTextChangedListener(new TextRestrictionWatcher());
+    mCharactersAmountText = root.findViewById(R.id.characters_amount);
+    mCharactersAmountText.setText(makeFormattedCharsAmount(getEditableText(), mTextLimit));
+    TextView summaryView = root.findViewById(R.id.summary);
+    summaryView.setText(getTopSummaryText());
+    summaryView.append(DOUBLE_BREAK_LINE_CHAR);
+    summaryView.append(getBottomSummaryText());
+    return root;
+  }
+
+  @NonNull
+  protected abstract  CharSequence getTopSummaryText();
+
+  @NonNull
+  protected abstract CharSequence getBottomSummaryText();
+
+  @StringRes
+  protected abstract int getTitleText();
+
+  @Override
+  public void onCreateOptionsMenu(Menu menu, MenuInflater inflater)
+  {
+    inflater.inflate(R.menu.menu_bookmark_category_restriction, menu);
+  }
+
+  @Override
+  public void onPrepareOptionsMenu(Menu menu)
+  {
+    super.onPrepareOptionsMenu(menu);
+    MenuItem item = menu.findItem(R.id.done);
+    item.setVisible(mEditText.getEditableText().length() > 0);
+  }
+
+  @Override
+  public void onActivityResult(int requestCode, int resultCode, Intent data)
+  {
+    super.onActivityResult(requestCode, resultCode, data);
+    if (resultCode == Activity.RESULT_OK)
+    {
+      getActivity().setResult(Activity.RESULT_OK, data);
+      getActivity().finish();
+    }
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item)
+  {
+    if (item.getItemId() == R.id.done)
+    {
+      onDoneOptionItemClicked();
+      return true;
+    }
+
+    return super.onOptionsItemSelected(item);
+  }
+
+  @NonNull
+  protected BookmarkCategory getCategory()
+  {
+    return mCategory;
+  }
+
+  @NonNull
+  protected EditText getEditText()
+  {
+    return mEditText;
+  }
+
+  protected abstract void onDoneOptionItemClicked();
+
+  @NonNull
+  protected abstract CharSequence getEditableText();
+
+  @NonNull
+  private static String makeFormattedCharsAmount(@Nullable CharSequence s, int limit)
+  {
+    return String.format(Locale.US, FORMAT_TEMPLATE, s == null ? 0 : Math.min(s.length(), limit), limit);
+  }
+
+  private class TextRestrictionWatcher implements TextWatcher
+  {
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after)
+    {
+      /* Do nothing by default. */
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count)
+    {
+      if (s.length() == 0 || s.length() == 1)
+        getActivity().invalidateOptionsMenu();
+    }
+
+    @Override
+    public void afterTextChanged(Editable s)
+    {
+      String src = makeFormattedCharsAmount(s, mTextLimit);
+      mCharactersAmountText.setText(src);
+    }
+  }
+}
--- a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionActivity.java
+++ b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionActivity.java
@ -0,0 +1,14 @@
+package com.mapswithme.maps.ugc.routes;
+
+import android.support.v4.app.Fragment;
+
+import com.mapswithme.maps.base.BaseMwmFragmentActivity;
+
+public class EditCategoryDescriptionActivity extends BaseMwmFragmentActivity
+{
+  @Override
+  protected Class<? extends Fragment> getFragmentClass()
+  {
+    return EditCategoryDescriptionFragment.class;
+  }
+}
--- a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java
+++ b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java
@ -0,0 +1,55 @@
+package com.mapswithme.maps.ugc.routes;
+
+import android.content.Intent;
+import android.support.annotation.NonNull;
+
+import com.mapswithme.maps.R;
+import com.mapswithme.maps.bookmarks.data.BookmarkManager;
+
+public class EditCategoryDescriptionFragment extends BaseEditUserBookmarkCategoryFragment
+{
+  public static final int REQUEST_CODE_CUSTOM_PROPS = 100;
+  private static final int TEXT_LIMIT = 500;
+
+  @Override
+  protected int getDefaultTextLengthLimit()
+  {
+    return TEXT_LIMIT;
+  }
+
+  @NonNull
+  @Override
+  protected CharSequence getTopSummaryText()
+  {
+    return getString(R.string.description_comment1);
+  }
+
+  @NonNull
+  @Override
+  protected CharSequence getBottomSummaryText()
+  {
+    return "";
+  }
+
+  @Override
+  protected int getTitleText()
+  {
+    return R.string.description_title;
+  }
+
+  @Override
+  protected void onDoneOptionItemClicked()
+  {
+    BookmarkManager.INSTANCE.setCategoryDescription(getCategory().getId(),
+                                                    getEditText().getText().toString().trim());
+    Intent intent = new Intent(getContext(), UgcRoutePropertiesActivity.class);
+    startActivityForResult(intent, REQUEST_CODE_CUSTOM_PROPS);
+  }
+
+  @NonNull
+  @Override
+  protected CharSequence getEditableText()
+  {
+    return getCategory().getDescription();
+  }
+}
--- a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameActivity.java
+++ b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameActivity.java
@ -0,0 +1,14 @@
+package com.mapswithme.maps.ugc.routes;
+
+import android.support.v4.app.Fragment;
+
+import com.mapswithme.maps.base.BaseMwmFragmentActivity;
+
+public class EditCategoryNameActivity extends BaseMwmFragmentActivity
+{
+  @Override
+  protected Class<? extends Fragment> getFragmentClass()
+  {
+    return EditCategoryNameFragment.class;
+  }
+}
--- a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameFragment.java
+++ b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameFragment.java
@ -0,0 +1,54 @@
+package com.mapswithme.maps.ugc.routes;
+
+import android.content.Intent;
+import android.support.annotation.NonNull;
+
+import com.mapswithme.maps.R;
+import com.mapswithme.maps.bookmarks.data.BookmarkManager;
+
+public class EditCategoryNameFragment extends BaseEditUserBookmarkCategoryFragment
+{
+  public static final int REQ_CODE_EDIT_DESCRIPTION = 75;
+
+  @Override
+  protected int getTitleText()
+  {
+    return R.string.name_title;
+  }
+
+  @Override
+  @NonNull
+  protected CharSequence getTopSummaryText()
+  {
+    return getString(R.string.name_comment2);
+  }
+
+  @NonNull
+  @Override
+  protected CharSequence getBottomSummaryText()
+  {
+    return getString(R.string.name_comment2);
+  }
+
+  @Override
+  protected void onDoneOptionItemClicked()
+  {
+    BookmarkManager.INSTANCE.setCategoryName(getCategory().getId(),
+                                             getEditText().getText().toString().trim());
+    openNextScreen();
+  }
+
+  private void openNextScreen()
+  {
+    Intent intent = new Intent(getContext(), EditCategoryDescriptionActivity.class);
+    intent.putExtra(BaseEditUserBookmarkCategoryFragment.BUNDLE_BOOKMARK_CATEGORY, getCategory());
+    startActivityForResult(intent, REQ_CODE_EDIT_DESCRIPTION);
+  }
+
+  @NonNull
+  @Override
+  protected CharSequence getEditableText()
+  {
+    return getCategory().getName();
+  }
+}
--- a/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderFragment.java
+++ b/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderFragment.java
@ -78,7 +78,7 @@ public class SendLinkPlaceholderFragment extends BaseAuthFragment implements Boo
  private void shareLink()
  {
    String emailBody = getString(R.string.edit_your_guide_email_body) + BODY_STRINGS_SEPARATOR +
-                       BookmarkManager.INSTANCE.getCatalogDeeplink(mCategory.getId());
+                       BookmarkManager.INSTANCE.getWebEditorUrl(mCategory.getServerId());

    ShareCompat.IntentBuilder.from(getActivity())
                             .setType(TargetUtils.TYPE_TEXT_PLAIN)
@ -93,14 +93,14 @@ public class SendLinkPlaceholderFragment extends BaseAuthFragment implements Boo
  public void onUploadFinished(@NonNull BookmarkManager.UploadResult uploadResult, @NonNull
      String description, long originCategoryId, long resultCategoryId)
  {
+    hideProgress();
+
    if (uploadResult == BookmarkManager.UploadResult.UPLOAD_RESULT_SUCCESS)
      onUploadSucceeded();
    else if (uploadResult == BookmarkManager.UploadResult.UPLOAD_RESULT_AUTH_ERROR)
      authorize();
    else
      onUploadFailed();
-
-    hideProgress();
  }

  private void onUploadFailed()
@ -120,6 +120,7 @@ public class SendLinkPlaceholderFragment extends BaseAuthFragment implements Boo
  private void onUploadSucceeded()
  {
    mCategory = BookmarkManager.INSTANCE.getAllCategoriesSnapshot().refresh(mCategory);
+    shareLink();
  }

  @Override
@ -149,7 +150,8 @@ public class SendLinkPlaceholderFragment extends BaseAuthFragment implements Boo
  }

  @Override
-  public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups)
+  public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups,
+                             int tagsLimit)
  {
    /* do noting by default */
  }
--- a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsFragment.java
+++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsFragment.java
@ -96,12 +96,6 @@ public class UgcRouteEditSettingsFragment extends BaseMwmToolbarFragment
    UgcRouteSharingOptionsActivity.startForResult(getActivity(), mCategory);
  }

-  @Override
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
-  {
-    super.onViewCreated(view, savedInstanceState);
-  }
-
  @Override
  public void onCreateOptionsMenu(Menu menu, MenuInflater inflater)
  {
--- a/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java
+++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java
@ -161,7 +161,8 @@ public class UgcRoutePropertiesFragment extends BaseMwmFragment implements Bookm
  }

  @Override
-  public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups)
+  public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups,
+                             int tagsLimit)
  {
    /* Do noting by default */
  }
@ -256,11 +257,6 @@ public class UgcRoutePropertiesFragment extends BaseMwmFragment implements Bookm
        getActivity().setResult(Activity.RESULT_OK, intent);
        getActivity().finish();
      }
-      else if (resultCode == Activity.RESULT_CANCELED)
-      {
-        getActivity().setResult(Activity.RESULT_CANCELED);
-        getActivity().finish();
-      }
    }
  }

--- a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsFragment.java
+++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsFragment.java
@ -47,7 +47,6 @@ public class UgcRouteTagsFragment extends BaseMwmFragment implements BookmarkMan
  private static final String BUNDLE_SELECTED_TAGS = "bundle_saved_tags";
  private static final String ERROR_LOADING_DIALOG_TAG = "error_loading_dialog";
  private static final int ERROR_LOADING_DIALOG_REQ_CODE = 205;
-  private static final int TAGS_LIMIT = 1;

  @SuppressWarnings("NullableProblems")
  @NonNull
@ -192,7 +191,8 @@ public class UgcRouteTagsFragment extends BaseMwmFragment implements BookmarkMan
  }

  @Override
-  public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups)
+  public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups,
+                             int tagsLimit)
  {
    UiUtils.showIf(successful && tagsGroups.size() != 0, mTagsContainer);
    UiUtils.hide(mProgress);
@ -202,7 +202,7 @@ public class UgcRouteTagsFragment extends BaseMwmFragment implements BookmarkMan
      showErrorLoadingDialog();
      return;
    }
-    installTags(tagsGroups, TAGS_LIMIT);
+    installTags(tagsGroups, tagsLimit);
  }

  @Override
--- a/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java
+++ b/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java
@ -45,18 +45,18 @@ public class UgcSharingOptionsFragment extends BaseToolbarAuthFragment implement
 {
  public static final int REQ_CODE_CUSTOM_PROPERTIES = 101;
  private static final int REQ_CODE_NO_NETWORK_CONNECTION_DIALOG = 103;
-  private static final int REQ_CODE_ERROR_BROKEN_FILE_DIALOG = 104;
  private static final int REQ_CODE_ERROR_COMMON = 106;
  private static final int REQ_CODE_ERROR_NOT_ENOUGH_BOOKMARKS = 107;
  private static final int REQ_CODE_UPLOAD_CONFIRMATION_DIALOG = 108;
  private static final int REQ_CODE_ERROR_HTML_FORMATTING_DIALOG = 109;
+  private static final int REQ_CODE_UPDATE_CONFIRMATION_DIALOG = 110;

  private static final String BUNDLE_CURRENT_MODE = "current_mode";
  private static final String NO_NETWORK_CONNECTION_DIALOG_TAG = "no_network_connection_dialog";
  private static final String NOT_ENOUGH_BOOKMARKS_DIALOG_TAG = "not_enough_bookmarks_dialog";
-  private static final String ERROR_BROKEN_FILE_DIALOG_TAG = "error_broken_file_dialog";
  private static final String ERROR_COMMON_DIALOG_TAG = "error_common_dialog";
  private static final String UPLOAD_CONFIRMATION_DIALOG_TAG = "upload_confirmation_dialog";
+  private static final String UPDATE_CONFIRMATION_DIALOG_TAG = "update_confirmation_dialog";
  private static final String ERROR_HTML_FORMATTING_DIALOG_TAG = "error_html_formatting_dialog";
  private static final int MIN_REQUIRED_CATEGORY_SIZE = 3;

@ -212,10 +212,10 @@ public class UgcSharingOptionsFragment extends BaseToolbarAuthFragment implement
  {
    View getDirectLinkView = root.findViewById(R.id.get_direct_link_text);
    getDirectLinkView.setOnClickListener(directLinkListener -> onGetDirectLinkClicked());
-    mUpdateGuideDirectLinkBtn.setOnClickListener(directLinkListener -> onGetDirectLinkClicked());
+    mUpdateGuideDirectLinkBtn.setOnClickListener(v -> onUpdateDirectLinkClicked());
    View uploadAndPublishView = root.findViewById(R.id.upload_and_publish_text);
    uploadAndPublishView.setOnClickListener(uploadListener -> onUploadAndPublishBtnClicked());
-    mUpdateGuidePublicAccessBtn.setOnClickListener(uploadListener -> onUploadAndPublishBtnClicked());
+    mUpdateGuidePublicAccessBtn.setOnClickListener(v -> onUpdatePublicAccessClicked());
    mShareDirectLinkBtn.setOnClickListener(v -> onDirectLinkShared());
    View sharePublishedBtn = mPublishingCompletedStatusContainer.findViewById(R.id.share_published_category_btn);
    sharePublishedBtn.setOnClickListener(v -> onPublishedCategoryShared());
@ -223,6 +223,29 @@ public class UgcSharingOptionsFragment extends BaseToolbarAuthFragment implement
    editOnWebBtn.setOnClickListener(v -> onEditOnWebClicked());
  }

+  private void onUpdatePublicAccessClicked()
+  {
+    mCurrentMode = BookmarkCategory.AccessRules.ACCESS_RULES_PUBLIC;
+    onUpdateClickedInternal();
+  }
+
+  private void onUpdateDirectLinkClicked()
+  {
+    mCurrentMode = BookmarkCategory.AccessRules.ACCESS_RULES_DIRECT_LINK;
+    onUpdateClickedInternal();
+  }
+
+  private void onUpdateClickedInternal()
+  {
+    if (isNetworkConnectionAbsent())
+    {
+      showNoNetworkConnectionDialog();
+      return;
+    }
+
+    showUpdateCategoryConfirmationDialog();
+  }
+
  private void onEditOnWebClicked()
  {
    Intent intent = new Intent(getContext(), SendLinkPlaceholderActivity.class)
@ -238,7 +261,7 @@ public class UgcSharingOptionsFragment extends BaseToolbarAuthFragment implement

  private void shareCategory()
  {
-    String deepLink = BookmarkManager.INSTANCE.getCatalogDeeplink(mCategory.getId());
+    String deepLink = BookmarkManager.INSTANCE.getWebEditorUrl(mCategory.getServerId());
    Intent intent = new Intent(Intent.ACTION_SEND)
        .setType(TargetUtils.TYPE_TEXT_PLAIN)
        .putExtra(Intent.EXTRA_TEXT, getString(R.string.share_bookmarks_email_body_link, deepLink));
@ -278,12 +301,14 @@ public class UgcSharingOptionsFragment extends BaseToolbarAuthFragment implement

  private void openTagsScreen()
  {
-    Intent intent = new Intent(getContext(), UgcRoutePropertiesActivity.class);
+    Intent intent = new Intent(getContext(), EditCategoryNameActivity.class);
+    intent.putExtra(EditCategoryNameFragment.BUNDLE_BOOKMARK_CATEGORY, mCategory);
    startActivityForResult(intent, REQ_CODE_CUSTOM_PROPERTIES);
  }

  private void onUploadAndPublishBtnClicked()
  {
+    /* FIXME */
 /*    if (mCategory.size() < MIN_REQUIRED_CATEGORY_SIZE)
    {
      showNotEnoughBookmarksDialog();
@ -429,7 +454,8 @@ public class UgcSharingOptionsFragment extends BaseToolbarAuthFragment implement
  }

  @Override
-  public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups)
+  public void onTagsReceived(boolean successful, @NonNull List<CatalogTagsGroup> tagsGroups,
+                             int tagsLimit)
  {

  }
@ -465,7 +491,7 @@ public class UgcSharingOptionsFragment extends BaseToolbarAuthFragment implement
                                        uploadResult.ordinal());
    if (uploadResult == BookmarkManager.UploadResult.UPLOAD_RESULT_MALFORMED_DATA_ERROR)
    {
-      showErrorBrokenFileDialog();
+      showHtmlFormattingError();
      return;
    }

@ -507,13 +533,6 @@ public class UgcSharingOptionsFragment extends BaseToolbarAuthFragment implement
                                      " Current value = " + mCategory.getAccessRules());
  }

-  private void showErrorBrokenFileDialog()
-  {
-    showUploadErrorDialog(R.string.unable_upload_error_subtitle_broken,
-                          REQ_CODE_ERROR_BROKEN_FILE_DIALOG,
-                          ERROR_BROKEN_FILE_DIALOG_TAG);
-  }
-
  private void showUploadErrorDialog(@StringRes int subtitle, int reqCode, @NonNull String tag)
  {
    showErrorDialog(R.string.unable_upload_errorr_title, subtitle, reqCode, tag);
@ -521,8 +540,8 @@ public class UgcSharingOptionsFragment extends BaseToolbarAuthFragment implement

  private void showNotEnoughBookmarksDialog()
  {
-    /* FIXME */
-    showErrorDialog(R.string.not_enough_memory, R.string.not_enough_memory,
+    showErrorDialog(R.string.error_public_not_enought_title,
+                    R.string.error_public_not_enought_subtitle,
                    REQ_CODE_ERROR_NOT_ENOUGH_BOOKMARKS, NOT_ENOUGH_BOOKMARKS_DIALOG_TAG);
  }

@ -550,7 +569,8 @@ public class UgcSharingOptionsFragment extends BaseToolbarAuthFragment implement
  {
    if (requestCode == REQ_CODE_NO_NETWORK_CONNECTION_DIALOG)
      Utils.showSystemSettings(getContext());
-    else if (requestCode == REQ_CODE_UPLOAD_CONFIRMATION_DIALOG)
+    else if (requestCode == REQ_CODE_UPLOAD_CONFIRMATION_DIALOG
+             || requestCode == REQ_CODE_UPDATE_CONFIRMATION_DIALOG)
      requestUpload();
  }

@ -566,9 +586,10 @@ public class UgcSharingOptionsFragment extends BaseToolbarAuthFragment implement

  }

-  private void showConfirmationDialog(int reqCode, String tag, @StringRes int acceptBtn,
-                                      @StringRes int declineBtn, @StringRes int title,
-                                      @StringRes int description)
+  private void showConfirmationDialog(@StringRes int title, @StringRes int description,
+                                      @StringRes int acceptBtn,
+                                      @StringRes int declineBtn,
+                                      String tag, int reqCode)
  {
    AlertDialog dialog = new AlertDialog.Builder()
        .setTitleId(title)
@ -586,27 +607,46 @@ public class UgcSharingOptionsFragment extends BaseToolbarAuthFragment implement

  private void showHtmlFormattingError()
  {
-    showConfirmationDialog(REQ_CODE_ERROR_HTML_FORMATTING_DIALOG,
-                           ERROR_HTML_FORMATTING_DIALOG_TAG, R.string.common_check_internet_connection_dialog_title,
-                           R.string.common_check_internet_connection_dialog_title,
-                           R.string.try_again, R.string.cancel);
+    showConfirmationDialog(R.string.html_format_error_title,
+                           R.string.html_format_error_subtitle,
+                           R.string.edit_on_web,
+                           R.string.cancel,
+                           ERROR_HTML_FORMATTING_DIALOG_TAG,
+                           REQ_CODE_ERROR_HTML_FORMATTING_DIALOG
+                          );
  }

  private void showUploadCatalogConfirmationDialog()
  {
-    /*FIXME text later*/
-    showConfirmationDialog(REQ_CODE_UPLOAD_CONFIRMATION_DIALOG,
-                           UPLOAD_CONFIRMATION_DIALOG_TAG, R.string.common_check_internet_connection_dialog_title,
-                           R.string.common_check_internet_connection_dialog_title,
-                           R.string.try_again, R.string.cancel);
+    showConfirmationDialog(R.string.bookmark_public_upload_alert_title,
+                           R.string.bookmark_public_upload_alert_subtitle,
+                           R.string.bookmark_public_upload_alert_ok_button,
+                           R.string.cancel,
+                           UPLOAD_CONFIRMATION_DIALOG_TAG, REQ_CODE_UPLOAD_CONFIRMATION_DIALOG
+                          );
+  }
+
+  private void showUpdateCategoryConfirmationDialog()
+  {
+    AlertDialog dialog = new AlertDialog.Builder()
+        .setTitleId(R.string.any_access_update_alert_title)
+        .setMessageId(R.string.any_access_update_alert_message)
+        .setPositiveBtnId(R.string.any_access_update_alert_update)
+        .setNegativeBtnId(R.string.cancel)
+        .setReqCode(REQ_CODE_UPDATE_CONFIRMATION_DIALOG)
+        .setFragManagerStrategyType(AlertDialog.FragManagerStrategyType.ACTIVITY_FRAGMENT_MANAGER)
+        .build();
+    dialog.setTargetFragment(this, REQ_CODE_UPDATE_CONFIRMATION_DIALOG);
+    dialog.show(this, UPDATE_CONFIRMATION_DIALOG_TAG);
  }

  private void showUnresolvedConflictsErrorDialog()
  {
-    /*FIXME text later*/
-    showConfirmationDialog(REQ_CODE_UPLOAD_CONFIRMATION_DIALOG,
-                           UPLOAD_CONFIRMATION_DIALOG_TAG, R.string.common_check_internet_connection_dialog_title,
-                           R.string.common_check_internet_connection_dialog_title,
-                           R.string.try_again, R.string.cancel);
+    showConfirmationDialog(R.string.public_or_limited_access_after_edit_online_error_title,
+                           R.string.public_or_limited_access_after_edit_online_error_message,
+                           R.string.edit_on_web,
+                           R.string.cancel,
+                           UPLOAD_CONFIRMATION_DIALOG_TAG, REQ_CODE_UPLOAD_CONFIRMATION_DIALOG
+                          );
  }
 }
--- a/coding/serdes_json.hpp
+++ b/coding/serdes_json.hpp
@ -170,6 +170,12 @@ public:
    });
  }

+  template <typename Optional>
+  void operator()(Optional const & opt, Optional const &, char const * name = nullptr)
+  {
+    (*this)(opt, name);
+  }
+
 protected:
  template <typename Fn>
  void NewScopeWith(base::JSONPtr json_object, char const * name, Fn && fn)
@ -370,6 +376,19 @@ public:
    RestoreContext(outerContext);
  }

+  template <typename Optional>
+  void operator()(Optional & opt, Optional const & defaultValue, char const * name = nullptr)
+  {
+    auto json = base::GetJSONOptionalField(m_json, name);
+    if (!json)
+    {
+      opt = defaultValue;
+      return;
+    }
+
+    (*this)(opt, name);
+  }
+
 protected:
  json_t * SaveContext(char const * name = nullptr)
  {
--- a/data/categories.txt
+++ b/data/categories.txt
@ -2250,35 +2250,35 @@ sw:^Sehemu ya kusali
 fa:معبد

 amenity-place_of_worship-christian|amenity-place_of_worship
-en:^Church|place of worship|temple|U+1F64F|U+26EA|U+271D|U+2626
+en:^Church|place of worship|temple|cathedral|basilica|U+1F64F|U+26EA|U+271D|U+2626
 ru:^Храм|костел|церковь|собор
 ar:^كنيسة|مكان عبادة|معبد
-cs:^Chrám|kostel|posvátné místo
+cs:^Chrám|kostel|posvátné místo|bazilika
 da:^Kirke|tempel|kultsted
 nl:^Kerk|tempel|kathedraal|gebedsplaats|gebedshuis
 fi:^Kirkko|uskonnollinen kohde
-fr:^Église|lieu de culte|temple
+fr:^Église|lieu de culte|temple|basilique
 de:^Kirche|Dom|3Kathedrale|4Münster|Anbetungsstätte|Tempel
 hu:^Templom
 id:^Gereja|tempat ibadah
-it:^Chiesa|duomo|cattedrale|tempio
+it:^Chiesa|duomo|cattedrale|tempio|basilica
 ja:^教会|寺院|神社|仏閣|神殿|お寺
 ko:^교회|예배 장소|사찰
 nb:^Kirke|gudshus
-pl:^Kościół|świątynia
-pt:^Igreja|local de culto|templo|vistas
-pt-BR:^Igreja|local de culto|templo
+pl:^Kościół|świątynia|bazylika
+pt:^Igreja|local de culto|templo|vistas|basílica
+pt-BR:^Igreja|local de culto|templo|basílica
 ro:^Biserică|loc de cult|templu
-es:^Iglesia|templo|lugar de culto
+es:^Iglesia|templo|lugar de culto|basílica
 sv:^Kyrka|plats för tillbedjan|tempel
 th:^โบสถ์|สถานที่ประกอบพิธีกรรม
 tr:^Kilise|ibadet yerleri|tapınak
-uk:^Церква|пам’ятні місця
+uk:^Церква|пам’ятні місця|собор
 vi:^Chùa|nhà thờ
 zh-Hans:^教堂|礼拜场所|庙|景点
 zh-Hant:^教堂|寺廟|禱告|寺|禪寺|旅遊景點
 el:^Εκκλησία|τόπος λατρείας|ναός|αξιοθέατα
-sk:^Chrám|kostol|svätyňa|posvätné miesto
+sk:^Chrám|kostol|svätyňa|posvätné miesto|bazilika
 fa:کلیسا

 amenity-place_of_worship-muslim|amenity-place_of_worship
@ -2676,7 +2676,7 @@ en:^Ruins|U+1F5FF
 ru:^Руины|развалины
 ar:^آثار|أماكن جذابة|مناظر|سياحة
 cs:^Ruiny|zřícenina
-da:^Ruiner|bunker
+da:^Ruiner
 nl:^Ruïne|attractie
 fi:^Rauniot
 fr:^Ruines|attraction
@ -9269,19 +9269,163 @@ el:^Χριστούγεννα ή Ρεβεγιόν πρωτοχρονιάς
 boundary-national_park|@tourism
 en:National Park
 ru:Национальный парк
+ar:منتزه وطني
+cs:Národní park
+da:National park
+de:Naturschutzpark
+el:Εθνικό πάρκο
+es:Parque nacional
+fi:Kansallispuisto
+fr:Parc national
+hu:Nemzeti park
+id:Taman Nasional
+it:Parco nazionale
+ja:国立公園
+ko:국립 공원
+nb:Nasonalpark
+nl:Nationaal park
+pl:Park narodowy
+pt:Parque nacional
+pt-BR:Parque nacional
+ro:Parcul național
+sk:Národný park
+sv:Nationalpark
+sw:Hifadhi ya taifa
+th:อุทยานแห่งชาติ
+tr:Ulusal park
+uk:Національний парк
+vi:Công viên quốc gia
+zh-Hans:国家公园
+zh-Hant:國家公園
+fa:پارک ملی

 leisure-nature_reserve|@tourism
 en:Nature reserve
 ru:Заповедник
+ar:محمية
+cs:Rezervace
+da:Reservat
+de:Naturschutzgebiet
+el:Φυσικό απόθεμα
+es:Territorio reservado
+fi:Luonnonsuojelualue
+fr:Réserve naturelle
+hu:Védett terület
+id:Cagar Alam
+it:Riserva
+ja:自然保護区
+ko:천연보호구역
+nb:Reservat
+nl:Reserve
+pl:Rezerwat przyrody
+pt:Reserva natural
+pt-BR:Reserva Florestal
+ro:Rezervație naturală
+sk:Rezervácia
+sv:Naturreservat
+sw:Hifadhi
+th:เขตอนุรักษ์ธรรมชาติ
+tr:Doğal koruma alanı
+uk:Заповідник
+vi:Giữ chỗ
+zh-Hans:野生动物园
+zh-Hant:自然保護區

 natural-cape
 en:Cape
 ru:Мыс
+ar:رأس
+cs:Mys
+da:Tange
+de:Kap
+el:Ακρωτήρι
+es:Cabo
+fi:Niemeke
+fr:Cap
+hu:Hegytető
+id:Tanjung
+it:Capo
+ja:岬
+ko:곶
+nb:Kapp
+nl:Kaap
+pl:Przylądek
+pt:Cabo
+pt-BR:Cabo
+ro:Mantie
+sk:Mys
+sv:Udde
+sw:Rasi
+th:พื้นที่ยื่นเข้าไปในน้ำ
+tr:Burun
+uk:Мис
+vi:Áo choàng
+zh-Hans:海角
+zh-Hant:海角
+fa:دماغه

 natural-geyser
 en:Geyser
 ru:Гейзер
+ar:نبع ماء حار
+cs:Gejzír
+da:Gejser
+de:Geysir
+el:Θερμοπίδακας
+es:Geiser
+fi:Geysir
+fr:Geyser
+hu:Gejzír
+id:Geiser
+it:Geyser
+ja:間欠泉
+ko:온천
+nb:Gaysir
+nl:Geiser
+pl:Gejzer
+pt:Geiser
+pt-BR:Gêiser
+ro:Gheizer
+sk:Gejzír
+sv:Gejser
+sw:Chemchem ya maji moto
+th:นำ้พุร้อน
+tr:Gayzer
+uk:Гейзер
+vi:Suối nước nóng
+zh-Hans:间歇泉
+zh-Hant:間歇泉
+fa:چشمه آب گرم

 natural-glacier|@tourism
 en:Glacier
 ru:Ледник
+ar:كتلة جليدية
+cs:Ledovec
+da:Gletsjer
+de:Gletscher
+el:Παγετώνας
+es:Glaciar
+fi:Jäätikkö
+fr:Glacier
+hu:Gleccser
+id:Gletser
+it:Ghiacciaio
+ja:氷河
+ko:빙하
+nb:Isbre
+nl:Gletsjer
+pl:Lodowiec
+pt:Glaciar
+pt-BR:Geleira
+ro:Ghețar
+sk:Ľadovec
+sv:Glaciär
+sw:Mto barafu
+th:ธารน้ำแข็ง
+tr:Buzul
+uk:Льодовик
+vi:Sông băng
+zh-Hans:冰川
+zh-Hant:冰川
+fa:یخچال طبیعی
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@ -37264,6 +37264,11 @@
  [html_error_upload_message_try_again]
    comment = FIXME. Please make sure that names and description
    en = [html_error_upload_message_try_again]
+
  [html_error_upload_title_try_again]
    comment = FIXME. Your guide couldn't be uploaded
    en = [html_error_upload_title_try_again]
+
+  [notification_leave_review_v2_android_short_title]
+    comment = FIXME.
+    en = Review and help travellers!
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@ -10940,7 +10940,7 @@
    en = leisure-marina

  [type.leisure.nature_reserve]
-    en = Reserve
+    en = Nature reserve
    ru = Заповедник
    ar = محمية
    cs = Rezervace
--- a/generator/regions/collector_region_info.cpp
+++ b/generator/regions/collector_region_info.cpp
@ -73,7 +73,7 @@ void CollectorRegionInfo::FillRegionData(base::GeoObjectId const & osmId, OsmEle
    auto const adminLevel = std::stoi(al);
    // Administrative level is in the range [1 ... 12].
    // https://wiki.openstreetmap.org/wiki/Tag:boundary=administrative
-    rd.m_adminLevel = (adminLevel >= 1 || adminLevel <= 12) ?
+    rd.m_adminLevel = (adminLevel >= 1 && adminLevel <= 12) ?
                        static_cast<AdminLevel>(adminLevel) : AdminLevel::Unknown;
  }
  catch (std::exception const & e)  // std::invalid_argument, std::out_of_range
--- a/geocoder/geocoder.cpp
+++ b/geocoder/geocoder.cpp
@ -136,9 +136,9 @@ bool Geocoder::Context::IsTokenUsed(size_t id) const
 bool Geocoder::Context::AllTokensUsed() const { return m_numUsedTokens == m_tokens.size(); }

 void Geocoder::Context::AddResult(base::GeoObjectId const & osmId, double certainty, Type type,
-                                  vector<Type> && allTypes, bool allTokensUsed)
+                                  vector<Type> const & allTypes, bool allTokensUsed)
 {
-  m_beam.Add(BeamKey(osmId, type, move(allTypes), allTokensUsed), certainty);
+  m_beam.Add(BeamKey(osmId, type, allTypes, allTokensUsed), certainty);
 }

 void Geocoder::Context::FillResults(vector<Result> & results) const
@ -284,10 +284,7 @@ void Geocoder::Go(Context & ctx, Type type) const
      }

      for (auto const & docId : curLayer.m_entries)
-      {
-        ctx.AddResult(m_index.GetDoc(docId).m_osmId, certainty, type, move(allTypes),
-                      ctx.AllTokensUsed());
-      }
+        ctx.AddResult(m_index.GetDoc(docId).m_osmId, certainty, type, allTypes, ctx.AllTokensUsed());

      ctx.GetLayers().emplace_back(move(curLayer));
      SCOPE_GUARD(pop, [&] { ctx.GetLayers().pop_back(); });
@ -303,30 +300,32 @@ void Geocoder::FillBuildingsLayer(Context & ctx, Tokens const & subquery, Layer
 {
  if (ctx.GetLayers().empty())
    return;
-  auto const & layer = ctx.GetLayers().back();
-  if (layer.m_type != Type::Street)
-    return;

  auto const & subqueryHN = MakeHouseNumber(subquery);

  if (!search::house_numbers::LooksLikeHouseNumber(subqueryHN, false /* isPrefix */))
    return;

-  // We've already filled a street layer and now see something that resembles
-  // a house number. While it still can be something else (a zip code, for example)
-  // let's stay on the safer side and set the house number bit.
-  ctx.SetHouseNumberBit();
+  for_each(ctx.GetLayers().rbegin(), ctx.GetLayers().rend(), [&, this] (auto const & layer) {
+    if (layer.m_type != Type::Street && layer.m_type != Type::Locality)
+      return;

-  for (auto const & streetDocId : layer.m_entries)
-  {
-    m_index.ForEachBuildingOnStreet(streetDocId, [&](Index::DocId const & buildingDocId) {
-      auto const & bld = m_index.GetDoc(buildingDocId);
-      auto const bt = static_cast<size_t>(Type::Building);
-      auto const & realHN = MakeHouseNumber(bld.m_address[bt]);
-      if (search::house_numbers::HouseNumbersMatch(realHN, subqueryHN, false /* queryIsPrefix */))
-        curLayer.m_entries.emplace_back(buildingDocId);
-    });
-  }
+    // We've already filled a street/location layer and now see something that resembles
+    // a house number. While it still can be something else (a zip code, for example)
+    // let's stay on the safer side and set the house number bit.
+    ctx.SetHouseNumberBit();
+
+    for (auto const & docId : layer.m_entries)
+    {
+      m_index.ForEachRelatedBuilding(docId, [&](Index::DocId const & buildingDocId) {
+        auto const & bld = m_index.GetDoc(buildingDocId);
+        auto const bt = static_cast<size_t>(Type::Building);
+        auto const & realHN = MakeHouseNumber(bld.m_address[bt]);
+        if (search::house_numbers::HouseNumbersMatch(realHN, subqueryHN, false /* queryIsPrefix */))
+          curLayer.m_entries.emplace_back(buildingDocId);
+      });
+    }
+  });
 }

 void Geocoder::FillRegularLayer(Context const & ctx, Type type, Tokens const & subquery,
--- a/geocoder/geocoder.hpp
+++ b/geocoder/geocoder.hpp
@ -53,10 +53,10 @@ public:
  public:
    struct BeamKey
    {
-      BeamKey(base::GeoObjectId osmId, Type type, std::vector<Type> && allTypes, bool allTokensUsed)
+      BeamKey(base::GeoObjectId osmId, Type type, std::vector<Type> const & allTypes, bool allTokensUsed)
        : m_osmId(osmId)
        , m_type(type)
-        , m_allTypes(std::move(allTypes))
+        , m_allTypes(allTypes)
        , m_allTokensUsed(allTokensUsed)
      {
        base::SortUnique(m_allTypes);
@ -89,7 +89,7 @@ public:
    bool AllTokensUsed() const;

    void AddResult(base::GeoObjectId const & osmId, double certainty, Type type,
-                   std::vector<Type> && allTypes, bool allTokensUsed);
+                   std::vector<Type> const & allTypes, bool allTokensUsed);

    void FillResults(std::vector<Result> & results) const;

--- a/geocoder/geocoder_tests/geocoder_tests.cpp
+++ b/geocoder/geocoder_tests/geocoder_tests.cpp
@ -153,11 +153,29 @@ UNIT_TEST(Geocoder_MismatchedLocality)
  TestGeocoder(geocoder, "Moscow Street 3", {});
 }

+UNIT_TEST(Geocoder_LocalityBuilding)
+{
+  string const kData = R"#(
+10 {"properties": {"address": {"locality": "Zelenograd"}}}
+
+22 {"properties": {"address": {"building": "2", "locality": "Zelenograd"}}}
+
+31 {"properties": {"address": {"street": "Street", "locality": "Zelenograd"}}}
+32 {"properties": {"address": {"building": "2", "street": "Street", "locality": "Zelenograd"}}}
+)#";
+
+  ScopedFile const regionsJsonFile("regions.jsonl", kData);
+  Geocoder geocoder(regionsJsonFile.GetFullPath());
+
+  base::GeoObjectId const building2(22);
+
+  TestGeocoder(geocoder, "Zelenograd 2", {{building2, 1.0}});
+}
+
 UNIT_TEST(Geocoder_EmptyFileConcurrentRead)
 {
  ScopedFile const regionsJsonFile("regions.jsonl", "");
-  HierarchyReader reader{regionsJsonFile.GetFullPath()};
-  Geocoder geocoder(reader.Read(8 /* reader threads */));
+  Geocoder geocoder(regionsJsonFile.GetFullPath(), 8 /* reader threads */);

  TEST_EQUAL(geocoder.GetHierarchy().GetEntries().size(), 0, ());
 }
@ -178,8 +196,7 @@ UNIT_TEST(Geocoder_BigFileConcurrentRead)
  }

  ScopedFile const regionsJsonFile("regions.jsonl", s.str());
-  HierarchyReader reader{regionsJsonFile.GetFullPath()};
-  Geocoder geocoder(reader.Read(8 /* reader threads */));
+  Geocoder geocoder(regionsJsonFile.GetFullPath(), 8 /* reader threads */);

  TEST_EQUAL(geocoder.GetHierarchy().GetEntries().size(), kEntryCount, ());
 }
--- a/geocoder/index.cpp
+++ b/geocoder/index.cpp
@ -57,6 +57,9 @@ void Index::AddEntries()
    if (doc.m_type == Type::Count)
      continue;

+    if (doc.m_type == Type::Building)
+      continue;
+
    if (doc.m_type == Type::Street)
    {
      AddStreet(docId, doc);
@ -114,15 +117,25 @@ void Index::AddHouses(unsigned int loadThreadsCount)
        if (buildingDoc.m_type != Type::Building)
          continue;

-        size_t const streetType = static_cast<size_t>(Type::Street);
+        auto const & street = buildingDoc.m_address[static_cast<size_t>(Type::Street)];
+        auto const & locality = buildingDoc.m_address[static_cast<size_t>(Type::Locality)];

-        ForEachDocId(buildingDoc.m_address[streetType], [&](DocId const & streetCandidate) {
-          auto const & streetDoc = GetDoc(streetCandidate);
+        Tokens const * relationName = nullptr;

-          if (streetDoc.IsParentTo(buildingDoc))
+        if (!street.empty())
+          relationName = &street;
+        else if (!locality.empty())
+          relationName = &locality;
+
+        if (!relationName)
+          continue;
+
+        ForEachDocId(*relationName, [&](DocId const & candidate) {
+          auto const & candidateDoc = GetDoc(candidate);
+          if (candidateDoc.IsParentTo(buildingDoc))
          {
            auto && lock = lock_guard<std::mutex>(mutex);
-            m_buildingsOnStreet[streetCandidate].emplace_back(docId);
+            m_relatedBuildings[candidate].emplace_back(docId);
          }
        });

--- a/geocoder/index.hpp
+++ b/geocoder/index.hpp
@ -42,12 +42,12 @@ public:
  }

  // Calls |fn| for DocIds of buildings that are located on the
-  // street whose DocId is |streetDocId|.
+  // street/locality whose DocId is |docId|.
  template <typename Fn>
-  void ForEachBuildingOnStreet(DocId const & streetDocId, Fn && fn) const
+  void ForEachRelatedBuilding(DocId const & docId, Fn && fn) const
  {
-    auto const it = m_buildingsOnStreet.find(streetDocId);
-    if (it == m_buildingsOnStreet.end())
+    auto const it = m_relatedBuildings.find(docId);
+    if (it == m_relatedBuildings.end())
      return;

    for (DocId const & docId : it->second)
@ -66,14 +66,14 @@ private:
  // with and without synonyms of the word "street".
  void AddStreet(DocId const & docId, Doc const & e);

-  // Fills the |m_buildingsOnStreet| field.
+  // Fills the |m_relatedBuildings| field.
  void AddHouses(unsigned int loadThreadsCount);

  std::vector<Doc> const & m_docs;

  std::unordered_map<std::string, std::vector<DocId>> m_docIdsByTokens;

-  // Lists of houses grouped by the streets they belong to.
-  std::unordered_map<DocId, std::vector<DocId>> m_buildingsOnStreet;
+  // Lists of houses grouped by the streets/localities they belong to.
+  std::unordered_map<DocId, std::vector<DocId>> m_relatedBuildings;
 };
 }  // namespace geocoder
--- a/indexer/indexer_tests/interval_index_test.cpp
+++ b/indexer/indexer_tests/interval_index_test.cpp
@ -29,7 +29,7 @@ struct CellIdFeaturePairForTest
  uint32_t m_value;
 };

-auto IndexValueInserter(auto & values)
+auto IndexValueInserter(vector<uint32_t> & values)
 {
  return [inserter = base::MakeBackInsertFunctor(values)] (uint64_t, auto value) { inserter(value); };
 };
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@ -458,15 +458,18 @@ using namespace osm_auth_ios;
  if (notificationCandidate)
  {
    auto const notification = notificationCandidate.get();
-    if (notification.m_type == notifications::NotificationCandidate::Type::UgcReview &&
-        notification.m_mapObject)
+    if (notification.GetType() == notifications::NotificationCandidate::Type::UgcReview)
    {
+      auto const place = notification.GetAddress().empty()
+                   ? notification.GetReadableName()
+                   : notification.GetReadableName() + ", " + notification.GetAddress();
+                   
      [LocalNotificationManager.sharedManager
-       showReviewNotificationForPlace:@(notification.m_mapObject->GetReadableName().c_str())
+       showReviewNotificationForPlace:@(place.c_str())
       onTap:^{
         [Statistics logEvent:kStatUGCReviewNotificationClicked];
         place_page::Info info;
-         if (GetFramework().MakePlacePageInfo(*notification.m_mapObject, info))
+         if (GetFramework().MakePlacePageInfo(notification, info))
           [[MapViewController sharedController].controlsManager showPlacePageReview:info];
     }];
    }
--- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
+++ b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
@ -624,8 +624,9 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
 }

 - (void)loadTags:(LoadTagsCompletionBlock)completionBlock {
-  auto onTagsCompletion = [completionBlock](bool success, BookmarkCatalog::TagGroups const & tagGroups)
+  auto onTagsCompletion = [completionBlock](bool success, BookmarkCatalog::TagGroups const & tagGroups, uint32_t maxTagsCount)
  {
+    //TODO(@beloal): Implement maxTagsCount usage.
    if (success)
    {
      NSMutableArray * groups = [NSMutableArray new];
--- a/iphone/Maps/Core/Notifications/LocalNotificationManager.mm
+++ b/iphone/Maps/Core/Notifications/LocalNotificationManager.mm
@ -140,9 +140,8 @@ using namespace storage;
  self.onReviewNotification = onReviewNotification;

  UILocalNotification * notification = [[UILocalNotification alloc] init];
-  notification.alertTitle = [NSString stringWithCoreFormat:L(@"notification_leave_review_title")
-                                                 arguments:@[place]];
-  notification.alertBody = L(@"notification_leave_review_content");
+  notification.alertTitle = L(@"notification_leave_review_v2_title");
+  notification.alertBody = place;
  notification.alertAction = L(@"leave_a_review");
  notification.soundName = UILocalNotificationDefaultSoundName;
  notification.userInfo = @{kLocalNotificationNameKey : kReviewNotificationValue};
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

@ -3685,7 +3688,7 @@

 "type.leisure.marina" = "leisure-marina";

-"type.leisure.nature_reserve" = "Reserve";
+"type.leisure.nature_reserve" = "Nature reserve";

 "type.leisure.park" = "Park";

--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

@ -3685,7 +3688,7 @@

 "type.leisure.marina" = "leisure-marina";

-"type.leisure.nature_reserve" = "Reserve";
+"type.leisure.nature_reserve" = "Nature reserve";

 "type.leisure.park" = "Park";

--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

@ -3685,7 +3688,7 @@

 "type.leisure.marina" = "leisure-marina";

-"type.leisure.nature_reserve" = "Reserve";
+"type.leisure.nature_reserve" = "Nature reserve";

 "type.leisure.park" = "گردشگری";

--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@ -2739,6 +2739,9 @@
 /* FIXME. Your guide couldn't be uploaded */
 "html_error_upload_title_try_again" = "[html_error_upload_title_try_again]";

+/* FIXME. */
+"notification_leave_review_v2_android_short_title" = "Review and help travellers!";
+

 /**********  Partners  **********/

--- a/map/CMakeLists.txt
+++ b/map/CMakeLists.txt
@ -10,7 +10,6 @@ include_directories(
 set(
  SRC
  ../api/src/c/api-client.c
-  address_finder.cpp
  api_mark_point.cpp
  api_mark_point.hpp
  benchmark_tools.hpp
@ -32,6 +31,7 @@ set(
  bookmark_manager.cpp
  bookmark_manager.hpp
  bookmarks_search_params.hpp
+  caching_address_getter.hpp
  chart_generator.cpp
  chart_generator.hpp
  cloud.cpp
@ -80,6 +80,9 @@ set(
  mwm_url.hpp
  notifications/notification_manager.cpp
  notifications/notification_manager.hpp
+  notifications/notification_manager_delegate.cpp
+  notifications/notification_manager_delegate.hpp
+  notifications/notification_queue.cpp
  notifications/notification_queue.hpp
  notifications/notification_queue_serdes.cpp
  notifications/notification_queue_serdes.hpp
--- a/map/address_finder.cpp
+++ b/map/address_finder.cpp
@ -1,540 +0,0 @@
-#include "map/framework.hpp"
-
-#include "search/result.hpp"
-#include "search/reverse_geocoder.hpp"
-
-#include "drape_frontend/visual_params.hpp"
-
-#include "indexer/categories_holder.hpp"
-#include "indexer/classificator.hpp"
-#include "indexer/feature_algo.hpp"
-#include "indexer/feature_visibility.hpp"
-
-#include "platform/preferred_languages.hpp"
-
-/*
-namespace
-{
-  class FeatureInfoT
-  {
-  public:
-    FeatureInfoT(double d, feature::TypesHolder & types,
-                 string & name, string & house, m2::PointD const & pt)
-      : m_types(types), m_pt(pt), m_dist(d)
-    {
-      m_name.swap(name);
-      m_house.swap(house);
-    }
-
-    bool operator<(FeatureInfoT const & rhs) const
-    {
-      return (m_dist < rhs.m_dist);
-    }
-
-    void Swap(FeatureInfoT & rhs)
-    {
-      swap(m_dist, rhs.m_dist);
-      swap(m_pt, rhs.m_pt);
-      m_name.swap(rhs.m_name);
-      m_house.swap(rhs.m_house);
-      swap(m_types, rhs.m_types);
-    }
-
-    string m_name, m_house;
-    feature::TypesHolder m_types;
-    m2::PointD m_pt;
-    double m_dist;
-  };
-
-  void swap(FeatureInfoT & i1, FeatureInfoT & i2)
-  {
-    i1.Swap(i2);
-  }
-
-//  string DebugPrint(FeatureInfoT const & info)
-//  {
-//    return ("Name = " + info.m_name +
-//            " House = " + info.m_house +
-//            " Distance = " + strings::to_string(info.m_dist));
-//  }
-
-  class DoGetFeatureInfoBase
-  {
-  protected:
-    virtual bool IsInclude(double dist, feature::TypesHolder const & types) const = 0;
-    virtual double GetResultDistance(double d, feature::TypesHolder const & types) const = 0;
-    virtual double NeedProcess(feature::TypesHolder const & types) const
-    {
-      // feature should be visible in needed scale
-      pair<int, int> const r = feature::GetDrawableScaleRange(types);
-      return base::between_s(r.first, r.second, m_scale);
-    }
-
-    /// @return epsilon value for distance compare according to priority:
-    /// point feature is better than linear, that is better than area.
-    static double GetCompareEpsilonImpl(feature::EGeomType type, double eps)
-    {
-      using namespace feature;
-      switch (type)
-      {
-      case GEOM_POINT: return 0.0 * eps;
-      case GEOM_LINE: return 1.0 * eps;
-      case GEOM_AREA: return 2.0 * eps;
-      default:
-        ASSERT ( false, () );
-        return numeric_limits<double>::max();
-      }
-    }
-
-  public:
-    DoGetFeatureInfoBase(m2::PointD const & pt, int scale)
-      : m_pt(pt), m_scale(scale)
-    {
-      m_coastType = classif().GetCoastType();
-    }
-
-    void operator() (FeatureType const & f)
-    {
-      feature::TypesHolder types(f);
-      if (!types.Has(m_coastType) && NeedProcess(types))
-      {
-        // Convert from meters to degrees for backward compatibility.
-        double const d = feature::GetMinDistanceMeters(f, m_pt, m_scale) * MercatorBounds::degreeInMeters;
-        ASSERT_GREATER_OR_EQUAL(d, 0.0, ());
-
-        if (IsInclude(d, types))
-        {
-          string name;
-          f.GetReadableName(name);
-          string house = f.GetHouseNumber();
-
-          // if geom type is not GEOM_POINT, result center point doesn't matter in future use
-          m2::PointD const pt =
-              (types.GetGeoType() == feature::GEOM_POINT) ? f.GetCenter() : m2::PointD();
-
-          // name, house are assigned like move semantics
-          m_cont.push_back(FeatureInfoT(GetResultDistance(d, types), types, name, house, pt));
-        }
-      }
-    }
-
-    void SortResults()
-    {
-      sort(m_cont.begin(), m_cont.end());
-    }
-
-  private:
-    m2::PointD m_pt;
-    uint32_t m_coastType;
-
-  protected:
-    int m_scale;
-    vector<FeatureInfoT> m_cont;
-  };
-
-  class DoGetFeatureTypes : public DoGetFeatureInfoBase
-  {
-  protected:
-    virtual bool IsInclude(double dist, feature::TypesHolder const & types) const
-    {
-      return (dist <= m_eps);
-    }
-    virtual double GetResultDistance(double d, feature::TypesHolder const & types) const
-    {
-      return (d + GetCompareEpsilonImpl(types.GetGeoType(), m_eps));
-    }
-
-  public:
-    DoGetFeatureTypes(m2::PointD const & pt, double eps, int scale)
-      : DoGetFeatureInfoBase(pt, scale), m_eps(eps)
-    {
-    }
-
-    void GetFeatureTypes(size_t count, vector<string> & types)
-    {
-      SortResults();
-
-      Classificator const & c = classif();
-
-      for (size_t i = 0; i < min(count, m_cont.size()); ++i)
-        for (uint32_t t : m_cont[i].m_types)
-          types.push_back(c.GetReadableObjectName(t));
-    }
-
-  private:
-    double m_eps;
-  };
-}
-
-void Framework::GetFeatureTypes(m2::PointD const & pxPoint, vector<string> & types) const
-{
-  m2::AnyRectD rect;
-  m_currentModelView.GetTouchRect(pxPoint, df::VisualParams::Instance().GetTouchRectRadius(), rect);
-
-  // This scale should fit in geometry scales range.
-  int const scale = min(GetDrawScale(), scales::GetUpperScale());
-
-  DoGetFeatureTypes getTypes(rect.GlobalCenter(), rect.GetMaxSize() / 2.0, scale);
-  m_model.ForEachFeature(rect.GetGlobalRect(), getTypes, scale);
-
-  getTypes.GetFeatureTypes(5, types);
-}
-
-namespace
-{
-  class DoGetAddressBase : public DoGetFeatureInfoBase
-  {
-  public:
-    class TypeChecker
-    {
-      vector<uint32_t> m_localities, m_streets, m_buildings;
-      int m_localityScale;
-
-      template <size_t count, size_t ind>
-      void FillMatch(char const * (& arr)[count][ind], vector<uint32_t> & vec)
-      {
-        static_assert(count > 0, "");
-        static_assert(ind > 0, "");
-
-        Classificator const & c = classif();
-
-        vec.reserve(count);
-        for (size_t i = 0; i < count; ++i)
-        {
-          vector<string> v(arr[i], arr[i] + ind);
-          vec.push_back(c.GetTypeByPath(v));
-        }
-      }
-
-      static bool IsMatchImpl(vector<uint32_t> const & vec, feature::TypesHolder const & types)
-      {
-        for (uint32_t t : types)
-        {
-          ftype::TruncValue(t, 2);
-          if (find(vec.begin(), vec.end(), t) != vec.end())
-            return true;
-        }
-
-        return false;
-      }
-
-    public:
-      TypeChecker()
-      {
-        char const * arrLocalities[][2] = {
-          { "place", "city" },
-          { "place", "town" },
-          { "place", "village" },
-          { "place", "hamlet" }
-        };
-
-        char const * arrStreet[][2] = {
-          { "highway", "primary" },
-          { "highway", "secondary" },
-          { "highway", "residential" },
-          { "highway", "tertiary" },
-          { "highway", "living_street" },
-          { "highway", "service" }
-        };
-
-        char const * arrBuilding[][1] = {
-          { "building" }
-        };
-
-        FillMatch(arrLocalities, m_localities);
-        m_localityScale = 0;
-        for (size_t i = 0; i < m_localities.size(); ++i)
-        {
-          m_localityScale = max(m_localityScale,
-                                feature::GetDrawableScaleRange(m_localities[i]).first);
-        }
-
-        FillMatch(arrStreet, m_streets);
-        FillMatch(arrBuilding, m_buildings);
-      }
-
-      int GetLocalitySearchScale() const { return m_localityScale; }
-
-      bool IsLocality(feature::TypesHolder const & types) const
-      {
-        return IsMatchImpl(m_localities, types);
-      }
-      bool IsStreet(feature::TypesHolder const & types) const
-      {
-        return IsMatchImpl(m_streets, types);
-      }
-
-      bool IsBuilding(feature::TypesHolder const & types) const
-      {
-        return IsMatchImpl(m_buildings, types);
-      }
-
-      double GetLocalityDivideFactor(feature::TypesHolder const & types) const
-      {
-        double arrF[] = { 10.0, 10.0, 1.0, 1.0 };
-        ASSERT_EQUAL ( ARRAY_SIZE(arrF), m_localities.size(), () );
-
-        for (uint32_t t : types)
-        {
-          ftype::TruncValue(t, 2);
-
-          auto j = find(m_localities.begin(), m_localities.end(), t);
-          if (j != m_localities.end())
-            return arrF[distance(m_localities.begin(), j)];
-        }
-
-        return 1.0;
-      }
-    };
-
-  protected:
-    TypeChecker const & m_checker;
-
-  public:
-    DoGetAddressBase(m2::PointD const & pt, int scale, TypeChecker const & checker)
-      : DoGetFeatureInfoBase(pt, scale), m_checker(checker)
-    {
-    }
-  };
-
-  class DoGetAddressInfo : public DoGetAddressBase
-  {
-  protected:
-    virtual bool IsInclude(double dist, feature::TypesHolder const & types) const
-    {
-      // 0 - point, 1 - linear, 2 - area;
-      return (dist <= m_arrEps[types.GetGeoType()]);
-    }
-
-    virtual double GetResultDistance(double d, feature::TypesHolder const & types) const
-    {
-      return (d + GetCompareEpsilonImpl(types.GetGeoType(), 5.0 * MercatorBounds::degreeInMeters));
-    }
-
-    virtual double NeedProcess(feature::TypesHolder const & types) const
-    {
-      using namespace feature;
-
-      if (m_scale > -1)
-      {
-        // we need features with texts for address lookup
-        pair<int, int> const r = GetDrawableScaleRangeForRules(types, RULE_ANY_TEXT | RULE_SYMBOL);
-        return base::between_s(r.first, r.second, m_scale);
-      }
-      else
-        return true;
-    }
-
-    static void GetReadableTypes(search::Engine const * eng, int8_t locale,
-                                 feature::TypesHolder & types,
-                                 search::AddressInfo & info)
-    {
-      types.SortBySpec();
-
-      // Try to add types from categories.
-      for (uint32_t t : types)
-      {
-        string s;
-        if (eng->GetNameByType(t, locale, s))
-          info.m_types.push_back(s);
-      }
-
-      // If nothing added - return raw classificator types.
-      if (info.m_types.empty())
-      {
-        Classificator const & c = classif();
-        for (uint32_t t : types)
-          info.m_types.push_back(c.GetReadableObjectName(t));
-      }
-    }
-
-  public:
-    DoGetAddressInfo(m2::PointD const & pt, int scale, TypeChecker const & checker,
-                     double const (&arrRadius) [3])
-      : DoGetAddressBase(pt, scale, checker)
-    {
-      for (size_t i = 0; i < 3; ++i)
-      {
-        // use average value to convert meters to degrees
-        m2::RectD const r = MercatorBounds::RectByCenterXYAndSizeInMeters(pt, arrRadius[i]);
-        m_arrEps[i] = (r.SizeX() + r.SizeY()) / 2.0;
-      }
-    }
-
-    void FillAddress(search::Engine const * eng, search::AddressInfo & info)
-    {
-      int8_t const locale = CategoriesHolder::MapLocaleToInteger(languages::GetCurrentOrig());
-
-      SortResults();
-
-      for (size_t i = 0; i < m_cont.size(); ++i)
-      {
-        /// @todo Make logic better.
-        /// Now we skip linear objects to get only POI's here (don't mix with streets or roads).
-        /// But there are linear types that may be interesting for POI (rivers).
-        if (m_cont[i].m_types.GetGeoType() != feature::GEOM_LINE)
-        {
-          info.m_name = m_cont[i].m_name;
-
-          GetReadableTypes(eng, locale, m_cont[i].m_types, info);
-
-          if (!info.m_name.empty())
-            break;
-        }
-      }
-    }
-
-  private:
-    double m_arrEps[3];
-  };
-
-  class DoGetLocality : public DoGetAddressBase
-  {
-  protected:
-    virtual bool IsInclude(double dist, feature::TypesHolder const & types) const
-    {
-      return (dist <= m_eps);
-    }
-
-    virtual double GetResultDistance(double d, feature::TypesHolder const & types) const
-    {
-      // This routine is needed for quality of locality prediction.
-      // Hamlet may be the nearest point, but it's a part of a City. So use the divide factor
-      // for distance, according to feature type.
-      return (d / m_checker.GetLocalityDivideFactor(types));
-    }
-
-    virtual double NeedProcess(feature::TypesHolder const & types) const
-    {
-      return (types.GetGeoType() == feature::GEOM_POINT && m_checker.IsLocality(types));
-    }
-
-  public:
-    DoGetLocality(m2::PointD const & pt, int scale, TypeChecker const & checker,
-                  m2::RectD const & rect)
-      : DoGetAddressBase(pt, scale, checker)
-    {
-      // use maximum value to convert meters to degrees
-      m_eps = max(rect.SizeX(), rect.SizeY());
-    }
-
-    void FillLocality(search::AddressInfo & info, Framework const & fm)
-    {
-      SortResults();
-      //LOG(LDEBUG, (m_cont));
-
-      for (size_t i = 0; i < m_cont.size(); ++i)
-      {
-        if (!m_cont[i].m_name.empty() && fm.GetCountryName(m_cont[i].m_pt) == info.m_country)
-        {
-          info.m_city = m_cont[i].m_name;
-          break;
-        }
-      }
-    }
-
-  private:
-    double m_eps;
-  };
-}
-
-namespace
-{
-  /// Global instance for type checker.
-  /// @todo Possible need to add synhronization.
-  typedef DoGetAddressBase::TypeChecker CheckerT;
-  CheckerT * g_checker = 0;
-
-  CheckerT & GetChecker()
-  {
-    if (g_checker == 0)
-      g_checker = new CheckerT();
-    return *g_checker;
-  }
-}
-*/
-
-search::AddressInfo Framework::GetAddressInfoAtPoint(m2::PointD const & pt) const
-{
-  double const kDistanceThresholdMeters = 0.5;
-
-  search::AddressInfo info;
-
-  search::ReverseGeocoder const coder(m_model.GetDataSource());
-  search::ReverseGeocoder::Address addr;
-  coder.GetNearbyAddress(pt, addr);
-
-  // We do not init nearby address info for points that are located
-  // outside of the nearby building.
-  if (addr.GetDistance() < kDistanceThresholdMeters)
-  {
-    info.m_house = addr.GetHouseNumber();
-    info.m_street = addr.GetStreetName();
-    info.m_distanceMeters = addr.GetDistance();
-  }
-
-  return info;
-}
-
-search::AddressInfo Framework::GetFeatureAddressInfo(FeatureID const & fid) const
-{
-  FeatureType ft;
-  if (!GetFeatureByID(fid, ft))
-    return {};
-  return GetFeatureAddressInfo(ft);
-}
-
-search::AddressInfo Framework::GetFeatureAddressInfo(FeatureType & ft) const
-{
-  search::AddressInfo info;
-  // @TODO(vng): insert correct implementation from new search.
-  //info.m_country = GetCountryName(feature::GetCenter(ft));
-  // @TODO(vng): Temporarily commented - it's slow and not used in UI.
-  //GetLocality(pt, info);
-
-  search::ReverseGeocoder const coder(m_model.GetDataSource());
-  search::ReverseGeocoder::Address addr;
-  if (coder.GetExactAddress(ft, addr))
-  {
-    info.m_house = addr.GetHouseNumber();
-    info.m_street = addr.GetStreetName();
-  }
-
-  // TODO(vng): Why AddressInfo is responsible for types and names? Refactor out.
-  string defaultName, intName;
-  ft.GetPreferredNames(defaultName, intName);
-  info.m_name = defaultName.empty() ? intName : defaultName;
-  info.m_types = GetPrintableFeatureTypes(ft);
-
-  return info;
-}
-
-vector<string> Framework::GetPrintableFeatureTypes(FeatureType & ft) const
-{
-  vector<string> results;
-
-  feature::TypesHolder types(ft);
-  types.SortBySpec();
-  auto const & c = classif();
-  for (uint32_t type : types)
-    results.push_back(c.GetReadableObjectName(type));
-  return results;
-}
-
-/*
-void Framework::GetLocality(m2::PointD const & pt, search::AddressInfo & info) const
-{
-  CheckerT & checker = GetChecker();
-
-  int const scale = checker.GetLocalitySearchScale();
-  LOG(LDEBUG, ("Locality scale = ", scale));
-
-  // radius to search localities
-  m2::RectD const rect = MercatorBounds::RectByCenterXYAndSizeInMeters(pt, 20000.0);
-  DoGetLocality getLocality(pt, scale, checker, rect);
-
-  m_model.ForEachFeature(rect, getLocality, scale);
-
-  getLocality.FillLocality(info, *this);
-}
-*/
--- a/map/bookmark_catalog.cpp
+++ b/map/bookmark_catalog.cpp
@ -39,7 +39,7 @@ std::string BuildTagsUrl(std::string const & language)
 {
  if (kCatalogEditorServer.empty())
    return {};
-  return kCatalogEditorServer + "editor/tags/?lang=" + language;
+  return kCatalogEditorServer + "editor/v2/tags/?lang=" + language;
 }

 std::string BuildCustomPropertiesUrl(std::string const & language)
@ -88,11 +88,20 @@ struct TagData
                  visitor(m_subtags, "subtags"))
 };

+struct TagsMeta
+{
+  uint32_t m_maxTags;
+
+  DECLARE_VISITOR(visitor(m_maxTags, "max_for_bundle"))
+};
+
 struct TagsResponseData
 {
  std::vector<TagData> m_tags;
+  TagsMeta m_meta;

-  DECLARE_VISITOR(visitor(m_tags))
+  DECLARE_VISITOR(visitor(m_tags, "data"),
+                  visitor(m_meta, "meta"))
 };

 BookmarkCatalog::Tag::Color ExtractColor(std::string const & c)
@ -293,7 +302,7 @@ void BookmarkCatalog::RequestTagGroups(std::string const & language,
  if (tagsUrl.empty())
  {
    if (callback)
-      callback(false /* success */, {});
+      callback(false /* success */, {}, 0 /* maxTagsCount */);
    return;
  }

@ -305,6 +314,7 @@ void BookmarkCatalog::RequestTagGroups(std::string const & language,
    if (request.RunHttpRequest())
    {
      auto const resultCode = request.ErrorCode();
+      uint32_t maxTagsCount = 0;
      if (resultCode >= 200 && resultCode < 300)  // Ok.
      {
        TagsResponseData tagsResponseData;
@ -317,7 +327,7 @@ void BookmarkCatalog::RequestTagGroups(std::string const & language,
        {
          LOG(LWARNING, ("Tags request deserialization error:", ex.Msg()));
          if (callback)
-            callback(false /* success */, {});
+            callback(false /* success */, {}, 0 /* maxTagsCount */);
          return;
        }

@ -337,9 +347,11 @@ void BookmarkCatalog::RequestTagGroups(std::string const & language,
            group.m_tags.push_back(std::move(tag));
          }
          result.push_back(std::move(group));
+
+          maxTagsCount = tagsResponseData.m_meta.m_maxTags;
        }
        if (callback)
-          callback(true /* success */, result);
+          callback(true /* success */, result, maxTagsCount);
        return;
      }
      else
@ -348,7 +360,7 @@ void BookmarkCatalog::RequestTagGroups(std::string const & language,
      }
    }
    if (callback)
-      callback(false /* success */, {});
+      callback(false /* success */, {}, 0 /* maxTagsCount */);
  });
 }

--- a/map/bookmark_catalog.hpp
+++ b/map/bookmark_catalog.hpp
@ -46,8 +46,8 @@ public:
  };

  using TagGroups = std::vector<TagGroup>;
-  using TagGroupsCallback = platform::SafeCallback<void(bool success, TagGroups const &)>;
-
+  using TagGroupsCallback = platform::SafeCallback<void(bool success, TagGroups const &,
+                                                        uint32_t maxTagsCount)>;
  using CustomProperties = std::vector<CustomProperty>;
  using CustomPropertiesCallback = platform::SafeCallback<void(bool success, CustomProperties const &)>;

--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@ -2363,6 +2363,16 @@ bool BookmarkManager::IsCategoryFromCatalog(kml::MarkGroupId categoryId) const
  return cat->IsCategoryFromCatalog();
 }

+std::string BookmarkManager::GetCategoryServerId(kml::MarkGroupId categoryId) const
+{
+  CHECK_THREAD_CHECKER(m_threadChecker, ());
+  auto cat = GetBmCategory(categoryId);
+  if (cat == nullptr)
+    return {};
+
+  return cat->GetServerId();
+}
+
 std::string BookmarkManager::GetCategoryCatalogDeeplink(kml::MarkGroupId categoryId) const
 {
  auto cat = GetBmCategory(categoryId);
--- a/map/bookmark_manager.hpp
+++ b/map/bookmark_manager.hpp
@ -311,6 +311,7 @@ public:
  void ImportDownloadedFromCatalog(std::string const & id, std::string const & filePath);
  void UploadToCatalog(kml::MarkGroupId categoryId, kml::AccessRules accessRules);
  bool IsCategoryFromCatalog(kml::MarkGroupId categoryId) const;
+  std::string GetCategoryServerId(kml::MarkGroupId categoryId) const;
  std::string GetCategoryCatalogDeeplink(kml::MarkGroupId categoryId) const;
  BookmarkCatalog const & GetCatalog() const;

--- a/map/caching_address_getter.hpp
+++ b/map/caching_address_getter.hpp
@ -0,0 +1,34 @@
+#pragma once
+
+#include "search/reverse_geocoder.hpp"
+
+// TODO: get rid of this class when version 8.6 will not be supported.
+// TODO: because of fast algorithm and new mwm section which were implemented for 9.0.
+// Note: this class is NOT thread-safe.
+class CachingAddressGetter
+{
+public:
+  search::ReverseGeocoder::Address GetAddressAtPoint(DataSource const & dataSource,
+                                                     m2::PointD const & pt) const
+  {
+    if (pt.EqualDxDy(m_cache.m_point, kMwmPointAccuracy))
+      return m_cache.m_address;
+
+    double const kDistanceThresholdMeters = 0.5;
+    m_cache.m_point = pt;
+    m_cache.m_address = {};
+
+    search::ReverseGeocoder const coder(dataSource);
+    coder.GetNearbyAddress(pt, kDistanceThresholdMeters, m_cache.m_address);
+
+    return m_cache.m_address;
+  }
+private:
+  struct Cache
+  {
+    m2::PointD m_point;
+    search::ReverseGeocoder::Address m_address;
+  };
+
+  mutable Cache m_cache;
+};
--- a/map/framework.cpp
+++ b/map/framework.cpp
@ -6,6 +6,8 @@
 #include "map/ge0_parser.hpp"
 #include "map/geourl_process.hpp"
 #include "map/gps_tracker.hpp"
+#include "map/notifications/notification_manager_delegate.hpp"
+#include "map/notifications/notification_queue.hpp"
 #include "map/taxi_delegate.hpp"
 #include "map/user_mark.hpp"
 #include "map/utils.hpp"
@ -29,7 +31,6 @@
 #include "search/geometry_utils.hpp"
 #include "search/intermediate_result.hpp"
 #include "search/locality_finder.hpp"
-#include "search/reverse_geocoder.hpp"

 #include "storage/country_info_getter.hpp"
 #include "storage/downloader_search_params.hpp"
@ -115,6 +116,7 @@
 using namespace storage;
 using namespace routing;
 using namespace location;
+using namespace notifications;

 using platform::CountryFile;
 using platform::LocalCountryFile;
@ -381,6 +383,9 @@ void Framework::Migrate(bool keepDownloaded)
  InitDiscoveryManager();
  InitTaxiEngine();
  RegisterAllMaps();
+  m_notificationManager.SetDelegate(
+    std::make_unique<NotificationManagerDelegate>(m_model.GetDataSource(), *m_cityFinder,
+                                                  m_addressGetter, *m_ugcApi));

  m_trafficManager.SetCurrentDataVersion(GetStorage().GetCurrentDataVersion());
  if (m_drapeEngine && m_isRenderingEnabled)
@ -425,7 +430,6 @@ Framework::Framework(FrameworkParams const & params)
  , m_descriptionsLoader(std::make_unique<descriptions::Loader>(m_model.GetDataSource()))
  , m_purchase(std::make_unique<Purchase>())
  , m_tipsApi(static_cast<TipsApi::Delegate &>(*this))
-  , m_notificationManager(static_cast<notifications::NotificationManager::Delegate &>(*this))
 {
  CHECK(IsLittleEndian(), ("Only little-endian architectures are supported."));

@ -548,6 +552,9 @@ Framework::Framework(FrameworkParams const & params)
  InitTransliteration();
  LOG(LDEBUG, ("Transliterators initialized"));

+  m_notificationManager.SetDelegate(
+    std::make_unique<NotificationManagerDelegate>(m_model.GetDataSource(), *m_cityFinder,
+                                                  m_addressGetter, *m_ugcApi));
  m_notificationManager.Load();
  m_notificationManager.TrimExpired();

@ -806,6 +813,11 @@ void Framework::ResetBookmarkInfo(Bookmark const & bmk, place_page::Info & info)
  FillPointInfo(bmk.GetPivot(), {} /* customTitle */, info);
 }

+search::ReverseGeocoder::Address Framework::GetAddressAtPoint(m2::PointD const & pt) const
+{
+  return m_addressGetter.GetAddressAtPoint(m_model.GetDataSource(), pt);
+}
+
 void Framework::FillFeatureInfo(FeatureID const & fid, place_page::Info & info) const
 {
  if (!fid.IsValid())
@ -878,7 +890,7 @@ void Framework::FillInfoFromFeatureType(FeatureType & ft, place_page::Info & inf
  info.SetLocalizedWifiString(m_stringsBundle.GetString("wifi"));

  if (ftypes::IsAddressObjectChecker::Instance()(ft))
-    info.SetAddress(GetAddressInfoAtPoint(feature::GetCenter(ft)).FormatHouseAndStreet());
+    info.SetAddress(GetAddressAtPoint(feature::GetCenter(ft)).FormatAddress());

  info.SetFromFeatureType(ft);

@ -3804,18 +3816,22 @@ double Framework::GetLastBackgroundTime() const
  return m_startBackgroundTime;
 }

-bool Framework::MakePlacePageInfo(eye::MapObject const & mapObject, place_page::Info & info) const
+bool Framework::MakePlacePageInfo(NotificationCandidate const & notification,
+                                  place_page::Info & info) const
 {
-  m2::RectD rect = MercatorBounds::RectByCenterXYAndOffset(mapObject.GetPos(), kMwmPointAccuracy);
+  if (notification.GetType() != NotificationCandidate::Type::UgcReview)
+    return false;
+
+  m2::RectD rect = MercatorBounds::RectByCenterXYAndOffset(notification.GetPos(), kMwmPointAccuracy);
  bool found = false;

-  m_model.GetDataSource().ForEachInRect([this, &info, &mapObject, &found](FeatureType & ft)
+  m_model.GetDataSource().ForEachInRect([this, &info, &notification, &found](FeatureType & ft)
  {
-   if (found || !feature::GetCenter(ft).EqualDxDy(mapObject.GetPos(), kMwmPointAccuracy))
+   if (found || !feature::GetCenter(ft).EqualDxDy(notification.GetPos(), kMwmPointAccuracy))
     return;

   auto const foundMapObject = utils::MakeEyeMapObject(ft);
-   if (!foundMapObject.IsEmpty() && mapObject.AlmostEquals(foundMapObject))
+   if (!foundMapObject.IsEmpty() && notification.IsSameMapObject(foundMapObject))
   {
     FillInfoFromFeatureType(ft, info);
     found = true;
--- a/map/framework.hpp
+++ b/map/framework.hpp
@ -5,6 +5,7 @@
 #include "map/booking_filter_processor.hpp"
 #include "map/bookmark.hpp"
 #include "map/bookmark_manager.hpp"
+#include "map/caching_address_getter.hpp"
 #include "map/discovery/discovery_manager.hpp"
 #include "map/displacement_mode_manager.hpp"
 #include "map/feature_vec_model.hpp"
@ -51,6 +52,7 @@
 #include "search/mode.hpp"
 #include "search/query_saver.hpp"
 #include "search/result.hpp"
+#include "search/reverse_geocoder.hpp"

 #include "storage/downloading_policy.hpp"
 #include "storage/storage.hpp"
@ -125,6 +127,11 @@ namespace descriptions
 class Loader;
 }

+namespace notifications
+{
+class NotificationCandidate;
+}
+
 /// Uncomment line to make fixed position settings and
 /// build version for screenshots.
 //#define FIXED_LOCATION
@ -144,7 +151,6 @@ struct FrameworkParams
 class Framework : public SearchAPI::Delegate,
                  public RoutingManager::Delegate,
                  public TipsApi::Delegate,
-                  public notifications::NotificationManager::Delegate,
                  private power_management::PowerManager::Subscriber
 {
  DISALLOW_COPY(Framework);
@ -262,8 +268,7 @@ public:
  booking::Api const * GetBookingApi(platform::NetworkPolicy const & policy) const;
  taxi::Engine * GetTaxiEngine(platform::NetworkPolicy const & policy);
  locals::Api * GetLocalsApi(platform::NetworkPolicy const & policy);
-  // NotificationManager::Delegate override.
-  ugc::Api * GetUGCApi() override { return m_ugcApi.get(); }
+  ugc::Api * GetUGCApi() { return m_ugcApi.get(); }
  ugc::Api const * GetUGCApi() const { return m_ugcApi.get(); }

  df::DrapeApi & GetDrapeApi() { return m_drapeApi; }
@ -669,8 +674,6 @@ public:
  url_scheme::SearchRequest GetParsedSearchRequest() const;

 private:
-  // TODO(vng): Uncomment when needed.
-  //void GetLocality(m2::PointD const & pt, search::AddressInfo & info) const;
  /// @returns true if command was handled by editor.
  bool ParseEditorDebugCommand(search::SearchParams const & params);

@ -693,17 +696,8 @@ public:
  void FillBookmarkInfo(Bookmark const & bmk, place_page::Info & info) const;
  void ResetBookmarkInfo(Bookmark const & bmk, place_page::Info & info) const;

-  /// @returns address of nearby building with house number in approx 1km distance.
-  search::AddressInfo GetAddressInfoAtPoint(m2::PointD const & pt) const;
+  search::ReverseGeocoder::Address GetAddressAtPoint(m2::PointD const & pt) const;

-  /// @returns Valid street address only if it was specified in OSM for given feature;
-  /// @todo This functions are used in desktop app only. Should we really need them?
-  //@{
-  search::AddressInfo GetFeatureAddressInfo(FeatureType & ft) const;
-  search::AddressInfo GetFeatureAddressInfo(FeatureID const & fid) const;
-  //@}
-
-  vector<string> GetPrintableFeatureTypes(FeatureType & ft) 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.
  /// @returns nullptr if no feature was found at the given mercator point.
@ -864,6 +858,7 @@ public:

 private:
  unique_ptr<search::CityFinder> m_cityFinder;
+  CachingAddressGetter m_addressGetter;
  unique_ptr<ads::Engine> m_adsEngine;
  // The order matters here: storage::CountryInfoGetter and
  // search::CityFinder must be initialized before
@ -915,7 +910,8 @@ public:
  bool HaveTransit(m2::PointD const & pt) const override;
  double GetLastBackgroundTime() const override;

-  bool MakePlacePageInfo(eye::MapObject const & mapObject, place_page::Info & info) const;
+  bool MakePlacePageInfo(notifications::NotificationCandidate const & notification,
+                         place_page::Info & info) const;

  power_management::PowerManager & GetPowerManager() { return m_powerManager; }

--- a/map/map_tests/bookmarks_test.cpp
+++ b/map/map_tests/bookmarks_test.cpp
@ -448,14 +448,10 @@ namespace

  void CheckPlace(Framework const & fm, double lat, double lon, POIInfo const & poi)
  {
-    search::AddressInfo const info = fm.GetAddressInfoAtPoint(MercatorBounds::FromLatLon(lat, lon));
+    auto const info = fm.GetAddressAtPoint(MercatorBounds::FromLatLon(lat, lon));

-    TEST_EQUAL(info.m_street, poi.m_street, ());
-    TEST_EQUAL(info.m_house, poi.m_house, ());
-    // TODO(AlexZ): AddressInfo should contain addresses only. Refactor.
-    //TEST_EQUAL(info.m_name, poi.m_name, ());
-    //TEST_EQUAL(info.m_types.size(), 1, ());
-    //TEST_EQUAL(info.GetBestType(), poi.m_type, ());
+    TEST_EQUAL(info.m_street.m_name, poi.m_street, ());
+    TEST_EQUAL(info.m_building.m_name, poi.m_house, ());
  }
 }

--- a/map/map_tests/notification_tests.cpp
+++ b/map/map_tests/notification_tests.cpp
@ -13,15 +13,30 @@
 #include <utility>

 using namespace notifications;
+using namespace std::chrono;

 namespace notifications
 {
 class NotificationManagerForTesting : public NotificationManager
 {
 public:
-  explicit NotificationManagerForTesting(NotificationManager::Delegate & delegate)
-    : NotificationManager(delegate)
+  class NotificationManagerDelegate : public NotificationManager::Delegate
  {
+  public:
+    ugc::Api & GetUGCApi() override
+    {
+      UNREACHABLE();
+    }
+
+    string GetAddress(m2::PointD const & pt) override
+    {
+      return {};
+    }
+  };
+
+  NotificationManagerForTesting()
+  {
+    SetDelegate(std::make_unique<NotificationManagerDelegate>());
  }

  Queue & GetEditableQueue() { return m_queue; }
@ -30,6 +45,11 @@ public:
  {
    ProcessUgcRateCandidates(poi);
  }
+
+  static void SetCreatedTime(NotificationCandidate & dst, Time time)
+  {
+    dst.m_created = time;
+  }
 };
 }  // namespace notifications

@ -44,54 +64,35 @@ public:
  }
 };

-class DelegateForTesting : public NotificationManager::Delegate
-{
-public:
-  // NotificationManager::Delegate overrides:
-  ugc::Api * GetUGCApi() override
-  {
-    return nullptr;
-  }
-};
-
 Queue MakeDefaultQueueForTesting()
 {
  Queue queue;

  {
-    NotificationCandidate notification;
-    notification.m_type = NotificationCandidate::Type::UgcReview;
+    eye::MapObject mapObject;
+    mapObject.SetBestType("cafe");
+    mapObject.SetPos({15.686299, 73.704084});
+    mapObject.SetReadableName("Baba");

-    notification.m_mapObject = std::make_unique<eye::MapObject>();
-    notification.m_mapObject->SetBestType("cafe");
-    notification.m_mapObject->SetPos({15.686299, 73.704084});
-    notification.m_mapObject->SetReadableName("Baba");
-
-    queue.m_candidates.emplace_back(std::move(notification));
+    queue.m_candidates.emplace_back(mapObject, "");
  }

  {
-    NotificationCandidate notification;
-    notification.m_type = NotificationCandidate::Type::UgcReview;
+    eye::MapObject mapObject;
+    mapObject.SetBestType("shop");
+    mapObject.SetPos({12.923975, 100.776627});
+    mapObject.SetReadableName("7eleven");

-    notification.m_mapObject = std::make_unique<eye::MapObject>();
-    notification.m_mapObject->SetBestType("shop");
-    notification.m_mapObject->SetPos({12.923975, 100.776627});
-    notification.m_mapObject->SetReadableName("7eleven");
-
-    queue.m_candidates.emplace_back(std::move(notification));
+    queue.m_candidates.emplace_back(mapObject, "");
  }

  {
-    NotificationCandidate notification;
-    notification.m_type = NotificationCandidate::Type::UgcReview;
+    eye::MapObject mapObject;
+    mapObject.SetBestType("viewpoint");
+    mapObject.SetPos({-45.943995, 167.619933});
+    mapObject.SetReadableName("Waiau");

-    notification.m_mapObject = std::make_unique<eye::MapObject>();
-    notification.m_mapObject->SetBestType("viewpoint");
-    notification.m_mapObject->SetPos({-45.943995, 167.619933});
-    notification.m_mapObject->SetReadableName("Waiau");
-
-    queue.m_candidates.emplace_back(std::move(notification));
+    queue.m_candidates.emplace_back(mapObject, "");
  }

  return queue;
@ -107,11 +108,10 @@ void CompareWithDefaultQueue(Queue const & lhs)
  {
    auto const & lhsItem = lhs.m_candidates[i];
    auto const & rhsItem = rhs.m_candidates[i];
-    TEST_EQUAL(lhsItem.m_type, rhsItem.m_type, ());
-    TEST(lhsItem.m_mapObject, ());
-    TEST_EQUAL(lhsItem.m_mapObject->GetBestType(), rhsItem.m_mapObject->GetBestType(), ());
-    TEST_EQUAL(lhsItem.m_mapObject->GetReadableName(), rhsItem.m_mapObject->GetReadableName(), ());
-    TEST_EQUAL(lhsItem.m_mapObject->GetPos(), lhsItem.m_mapObject->GetPos(), ());
+    TEST_EQUAL(lhsItem.GetType(), rhsItem.GetType(), ());
+    TEST_EQUAL(lhsItem.GetBestFeatureType(), rhsItem.GetBestFeatureType(), ());
+    TEST_EQUAL(lhsItem.GetReadableName(), rhsItem.GetReadableName(), ());
+    TEST_EQUAL(lhsItem.GetPos(), lhsItem.GetPos(), ());
  }
 }

@ -144,8 +144,7 @@ UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_QueueSaveLoadTest)

 UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_UgcRateCheckRouteToInSameGeoTrigger)
 {
-  DelegateForTesting delegate;
-  NotificationManagerForTesting notificationManager(delegate);
+  NotificationManagerForTesting notificationManager;

  eye::MapObject mapObject;
  mapObject.SetPos(MercatorBounds::FromLatLon({59.909299, 10.769807}));
@ -160,12 +159,14 @@ UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_UgcRateCheckRouteToInSam
  notificationManager.OnMapObjectEvent(mapObject);

  TEST_EQUAL(notificationManager.GetEditableQueue().m_candidates.size(), 1, ());
-  notificationManager.GetEditableQueue().m_candidates[0].m_created = event.m_eventTime;
+
+  auto & candidate = notificationManager.GetEditableQueue().m_candidates[0];
+  NotificationManagerForTesting::SetCreatedTime(candidate, event.m_eventTime);

  auto result = notificationManager.GetNotification();

  TEST(result.is_initialized(), ());
-  TEST_EQUAL(result.get().m_type, NotificationCandidate::Type::UgcReview, ());
+  TEST_EQUAL(result.get().GetType(), NotificationCandidate::Type::UgcReview, ());

  result = notificationManager.GetNotification();
  TEST(!result.is_initialized(), ());
@ -173,8 +174,7 @@ UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_UgcRateCheckRouteToInSam

 UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_UgcRateCheckUgcNotSavedTrigger)
 {
-  DelegateForTesting delegate;
-  NotificationManagerForTesting notificationManager(delegate);
+  NotificationManagerForTesting notificationManager;

  eye::MapObject mapObject;
  mapObject.SetPos(MercatorBounds::FromLatLon({59.909299, 10.769807}));
@ -207,13 +207,13 @@ UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_UgcRateCheckUgcNotSavedT

  TEST(!result.is_initialized(), ());

-  notificationManager.GetEditableQueue().m_candidates[0].m_created =
-      notifications::Clock::now() - std::chrono::hours(25);
+  auto & candidate = notificationManager.GetEditableQueue().m_candidates[0];
+  NotificationManagerForTesting::SetCreatedTime(candidate, Clock::now() - hours(25));

  result = notificationManager.GetNotification();

  TEST(result.is_initialized(), ());
-  TEST_EQUAL(result.get().m_type, NotificationCandidate::Type::UgcReview, ());
+  TEST_EQUAL(result.get().GetType(), NotificationCandidate::Type::UgcReview, ());

  result = notificationManager.GetNotification();
  TEST(!result.is_initialized(), ());
@ -242,8 +242,7 @@ UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_UgcRateCheckUgcNotSavedT

 UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_UgcRateCheckPlannedTripTrigger)
 {
-  DelegateForTesting delegate;
-  NotificationManagerForTesting notificationManager(delegate);
+  NotificationManagerForTesting notificationManager;

  eye::MapObject mapObject;
  mapObject.SetPos(MercatorBounds::FromLatLon({59.909299, 10.769807}));
@ -287,13 +286,13 @@ UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_UgcRateCheckPlannedTripT

  TEST(!result.is_initialized(), ());

-  notificationManager.GetEditableQueue().m_candidates[0].m_created =
-      notifications::Clock::now() - std::chrono::hours(25);
+  auto & candidate = notificationManager.GetEditableQueue().m_candidates[0];
+  NotificationManagerForTesting::SetCreatedTime(candidate, Clock::now() - hours(25));

  result = notificationManager.GetNotification();

  TEST(result.is_initialized(), ());
-  TEST_EQUAL(result.get().m_type, NotificationCandidate::Type::UgcReview, ());
+  TEST_EQUAL(result.get().GetType(), NotificationCandidate::Type::UgcReview, ());

  result = notificationManager.GetNotification();
  TEST(!result.is_initialized(), ());
--- a/map/notifications/notification_manager.cpp
+++ b/map/notifications/notification_manager.cpp
@ -104,9 +104,9 @@ bool CheckPlannedTripTrigger(eye::MapObject const & poi)

 namespace notifications
 {
-NotificationManager::NotificationManager(NotificationManager::Delegate & delegate)
-  : m_delegate(delegate)
+void NotificationManager::SetDelegate(std::unique_ptr<Delegate> delegate)
 {
+  m_delegate = std::move(delegate);
 }

 void NotificationManager::Load()
@ -136,10 +136,10 @@ void NotificationManager::TrimExpired()

  candidates.erase(std::remove_if(candidates.begin(), candidates.end(), [](auto const & item)
  {
-    if (item.m_used.time_since_epoch().count() != 0)
-      return Clock::now() - item.m_used >= eye::Eye::GetMapObjectEventsExpirePeriod();
+    if (item.IsUsed())
+      return Clock::now() - item.GetLastUsedTime() >= eye::Eye::GetMapObjectEventsExpirePeriod();

-    return Clock::now() - item.m_created >= kCandidatesExpirePeriod;
+    return Clock::now() - item.GetCreatedTime() >= kCandidatesExpirePeriod;
  }), candidates.end());

  if (sizeBefore != candidates.size())
@ -161,7 +161,7 @@ boost::optional<NotificationCandidate> NotificationManager::GetNotification()
  if (it == candidates.end())
    return {};

-  it->m_used = Clock::now();
+  it->MarkAsUsed();
  m_queue.m_lastNotificationProvidedTime = Clock::now();

  VERIFY(Save(), ());
@ -176,15 +176,13 @@ size_t NotificationManager::GetCandidatesCount() const

 void NotificationManager::OnMapObjectEvent(eye::MapObject const & poi)
 {
-  CHECK(m_delegate.GetUGCApi(), ());
  CHECK_GREATER(poi.GetEvents().size(), 0, ());

-  auto const bestType = classif().GetTypeByReadableObjectName(poi.GetBestType());
-
  if (poi.GetEvents().back().m_type == eye::MapObject::Event::Type::UgcSaved)
    return ProcessUgcRateCandidates(poi);

-  m_delegate.GetUGCApi()->HasUGCForPlace(bestType, poi.GetPos(), [this, poi] (bool result)
+  auto const bestType = classif().GetTypeByReadableObjectName(poi.GetBestType());
+  m_delegate->GetUGCApi().HasUGCForPlace(bestType, poi.GetPos(), [this, poi] (bool result)
  {
    if (!result)
      ProcessUgcRateCandidates(poi);
@ -202,16 +200,16 @@ void NotificationManager::ProcessUgcRateCandidates(eye::MapObject const & poi)
 {
  CHECK_GREATER(poi.GetEvents().size(), 0, ());

+  if (poi.IsEmpty())
+    return;
+
  auto it = m_queue.m_candidates.begin();
  for (; it != m_queue.m_candidates.end(); ++it)
  {
-    if (it->m_type != NotificationCandidate::Type::UgcReview || !it->m_mapObject ||
-        it->m_used.time_since_epoch().count() != 0)
-    {
+    if (it->GetType() != NotificationCandidate::Type::UgcReview || it->IsUsed())
      continue;
-    }

-    if (it->m_mapObject->AlmostEquals(poi))
+    if (it->IsSameMapObject(poi))
    {
      if (poi.GetEvents().back().m_type == eye::MapObject::Event::Type::UgcSaved)
      {
@ -229,12 +227,7 @@ void NotificationManager::ProcessUgcRateCandidates(eye::MapObject const & poi)
  if (CheckUgcNotSavedTrigger(poi) || CheckRouteToInSameGeoTrigger(poi) ||
      CheckPlannedTripTrigger(poi))
  {
-    NotificationCandidate candidate;
-    candidate.m_type = NotificationCandidate::Type::UgcReview;
-    candidate.m_created = Clock::now();
-    candidate.m_mapObject = std::make_shared<eye::MapObject>(poi);
-    candidate.m_mapObject->GetEditableEvents().clear();
-    m_queue.m_candidates.emplace_back(std::move(candidate));
+    m_queue.m_candidates.emplace_back(poi, m_delegate->GetAddress(poi.GetPos()));

    VERIFY(Save(), ());
  }
@ -245,9 +238,8 @@ Candidates::iterator NotificationManager::GetUgcRateCandidate()
  auto it = m_queue.m_candidates.begin();
  for (; it != m_queue.m_candidates.end(); ++it)
  {
-    if (it->m_used.time_since_epoch().count() == 0 &&
-        it->m_type == NotificationCandidate::Type::UgcReview &&
-        Clock::now() - it->m_created >= kMinTimeSinceLastEventForUgcRate)
+    if (!it->IsUsed() && it->GetType() == NotificationCandidate::Type::UgcReview &&
+        Clock::now() - it->GetCreatedTime() >= kMinTimeSinceLastEventForUgcRate)
    {
      return it;
    }
--- a/map/notifications/notification_manager.hpp
+++ b/map/notifications/notification_manager.hpp
@ -7,6 +7,7 @@
 #include "metrics/eye.hpp"

 #include <ctime>
+#include <memory>
 #include <string>

 #include <boost/optional.hpp>
@ -22,10 +23,11 @@ public:
  {
  public:
    virtual ~Delegate() = default;
-    virtual ugc::Api * GetUGCApi() = 0;
+    virtual ugc::Api & GetUGCApi() = 0;
+    virtual std::string GetAddress(m2::PointD const & pt) = 0;
  };

-  explicit NotificationManager(Delegate & delegate);
+  void SetDelegate(std::unique_ptr<Delegate> delegate);

  void Load();
  void TrimExpired();
@ -41,17 +43,18 @@ private:
  void ProcessUgcRateCandidates(eye::MapObject const & poi);
  Candidates::iterator GetUgcRateCandidate();

-  Delegate & m_delegate;
+  std::unique_ptr<Delegate> m_delegate;
  // Notification candidates queue.
  Queue m_queue;
 };
 }  // namespace notifications
+
 namespace lightweight
 {
 class NotificationManager
 {
 public:
-  NotificationManager() : m_manager(m_delegate) { m_manager.Load(); }
+  NotificationManager() { m_manager.Load(); }

  boost::optional<notifications::NotificationCandidate> GetNotification()
  {
@ -65,17 +68,6 @@ public:
  }

 private:
-  class EmptyDelegate : public notifications::NotificationManager::Delegate
-  {
-  public:
-    // NotificationManager::Delegate overrides:
-    ugc::Api * GetUGCApi() override
-    {
-      return nullptr;
-    }
-  };
-
-  EmptyDelegate m_delegate;
  notifications::NotificationManager m_manager;
 };
 }  // namespace lightweight
--- a/map/notifications/notification_manager_delegate.cpp
+++ b/map/notifications/notification_manager_delegate.cpp
@ -0,0 +1,47 @@
+#include "notification_manager_delegate.hpp"
+
+#include "ugc/api.hpp"
+
+#include "map/caching_address_getter.hpp"
+
+#include "search/city_finder.hpp"
+
+#include "indexer/feature_decl.hpp"
+
+#include "platform/preferred_languages.hpp"
+
+#include "coding/string_utf8_multilang.hpp"
+
+namespace notifications
+{
+NotificationManagerDelegate::NotificationManagerDelegate(DataSource const & dataSource,
+                                                         search::CityFinder & cityFinder,
+                                                         CachingAddressGetter & addressGetter,
+                                                         ugc::Api & ugcApi)
+  : m_dataSource(dataSource)
+  , m_cityFinder(cityFinder)
+  , m_addressGetter(addressGetter)
+  , m_ugcApi(ugcApi)
+{
+}
+
+ugc::Api & NotificationManagerDelegate::GetUGCApi()
+{
+  return m_ugcApi;
+}
+
+std::string NotificationManagerDelegate::GetAddress(m2::PointD const & pt)
+{
+  auto const address = m_addressGetter.GetAddressAtPoint(m_dataSource, pt).FormatAddress();
+  auto const langIndex = StringUtf8Multilang::GetLangIndex(languages::GetCurrentNorm());
+  auto const city = m_cityFinder.GetCityName(pt, langIndex);
+
+  if (address.empty())
+    return city;
+
+  if (city.empty())
+    return address;
+
+  return address + ", " + city;
+}
+}  // namespace notifications
--- a/map/notifications/notification_manager_delegate.hpp
+++ b/map/notifications/notification_manager_delegate.hpp
@ -0,0 +1,40 @@
+#pragma once
+
+#include "map/notifications/notification_manager.hpp"
+
+#include "geometry/point2d.hpp"
+
+#include <string>
+
+class DataSource;
+class CachingAddressGetter;
+
+namespace search
+{
+class CityFinder;
+}
+
+namespace ugc
+{
+class Api;
+}
+
+namespace notifications
+{
+class NotificationManagerDelegate : public NotificationManager::Delegate
+{
+public:
+  NotificationManagerDelegate(DataSource const & dataSource, search::CityFinder & cityFinder,
+                              CachingAddressGetter & addressGetter, ugc::Api & ugcApi);
+
+  // NotificationManager::Delegate overrides:
+  ugc::Api & GetUGCApi() override;
+  std::string GetAddress(m2::PointD const & pt) override;
+
+private:
+  DataSource const & m_dataSource;
+  search::CityFinder & m_cityFinder;
+  CachingAddressGetter & m_addressGetter;
+  ugc::Api & m_ugcApi;
+};
+}  // namespace notifications
--- a/map/notifications/notification_queue.cpp
+++ b/map/notifications/notification_queue.cpp
@ -0,0 +1,140 @@
+#include "map/notifications/notification_queue.hpp"
+
+#include "base/assert.hpp"
+
+namespace notifications
+{
+NotificationCandidate::NotificationCandidate(Type type)
+  : m_type(type)
+  , m_created(Clock::now())
+{
+}
+
+NotificationCandidate::NotificationCandidate(eye::MapObject const & poi,
+                                             std::string const & address)
+  : m_type(NotificationCandidate::Type::UgcReview)
+  , m_created(Clock::now())
+  , m_mapObject(std::make_shared<eye::MapObject>(poi))
+  , m_address(address)
+{
+  CHECK(!poi.IsEmpty(), ());
+
+  m_mapObject->GetEditableEvents().clear();
+}
+
+NotificationCandidate::Type NotificationCandidate::GetType() const
+{
+  return m_type;
+}
+
+Time NotificationCandidate::GetCreatedTime() const
+{
+  return m_created;
+}
+
+Time NotificationCandidate::GetLastUsedTime() const
+{
+  return m_used;
+}
+
+bool NotificationCandidate::IsUsed() const
+{
+  return m_used.time_since_epoch().count() != 0;
+}
+
+void NotificationCandidate::MarkAsUsed()
+{
+  CHECK_EQUAL(m_used.time_since_epoch().count(), 0, ());
+
+  m_used = Clock::now();
+}
+
+bool NotificationCandidate::IsSameMapObject(eye::MapObject const & rhs) const
+{
+  CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ());
+
+  return m_mapObject->AlmostEquals(rhs);
+}
+
+std::string const & NotificationCandidate::GetBestFeatureType() const
+{
+  CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ());
+
+  return m_mapObject->GetBestType();
+}
+
+m2::PointD const & NotificationCandidate::GetPos() const
+{
+  CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ());
+
+  return m_mapObject->GetPos();
+}
+
+std::string const & NotificationCandidate::GetDefaultName() const
+{
+  CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ());
+
+  return m_mapObject->GetDefaultName();
+}
+
+std::string const & NotificationCandidate::GetReadableName() const
+{
+  CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ());
+
+  return m_mapObject->GetReadableName();
+}
+
+std::string const & NotificationCandidate::GetAddress() const
+{
+  CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ());
+
+  return m_address;
+}
+
+void NotificationCandidate::SetBestFeatureType(std::string const & bestFeatureType)
+{
+  CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ());
+
+  if (!m_mapObject)
+    m_mapObject = std::make_shared<eye::MapObject>();
+
+  m_mapObject->SetBestType(bestFeatureType);
+}
+
+void NotificationCandidate::SetPos(m2::PointD const & pt)
+{
+  CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ());
+
+  if (!m_mapObject)
+    m_mapObject = std::make_shared<eye::MapObject>();
+
+  m_mapObject->SetPos(pt);
+}
+
+void NotificationCandidate::SetDefaultName(std::string const & name)
+{
+  CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ());
+
+  if (!m_mapObject)
+    m_mapObject = std::make_shared<eye::MapObject>();
+
+  m_mapObject->SetDefaultName(name);
+}
+
+void NotificationCandidate::SetReadableName(std::string const & name)
+{
+  CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ());
+
+  if (!m_mapObject)
+    m_mapObject = std::make_shared<eye::MapObject>();
+
+  m_mapObject->SetReadableName(name);
+}
+
+void NotificationCandidate::SetAddress(std::string const & address)
+{
+  CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ());
+
+  m_address = address;
+}
+}  // namespace notifications
--- a/map/notifications/notification_queue.hpp
+++ b/map/notifications/notification_queue.hpp
@ -11,8 +11,11 @@ namespace notifications
 using Clock = std::chrono::system_clock;
 using Time = Clock::time_point;

-struct NotificationCandidate
+class NotificationCandidate
 {
+public:
+  friend class NotificationManagerForTesting;
+
  enum class Type : uint8_t
  {
    UgcAuth = 0,
@ -20,12 +23,42 @@ struct NotificationCandidate
  };

  DECLARE_VISITOR(visitor(m_type, "type"), visitor(m_created, "created_time"),
-                  visitor(m_used, "used"), visitor(m_mapObject, "object"));
+                  visitor(m_used, "used"), visitor(m_mapObject, "object"),
+                  visitor(m_address, std::string(""), "address"));

+  NotificationCandidate() = default;
+  NotificationCandidate(Type type);
+  // Constructs candidate with type Type::UgcReview.
+  NotificationCandidate(eye::MapObject const & poi, std::string const & address);
+
+  Type GetType() const;
+  Time GetCreatedTime() const;
+  Time GetLastUsedTime() const;
+  bool IsUsed() const;
+  void MarkAsUsed();
+
+  // Methods for Type::UgcReview type.
+  // It is possible to use inheritance, but our serialization/deserialization
+  // mechanism is not support it.
+  bool IsSameMapObject(eye::MapObject const & rhs) const;
+  std::string const & GetBestFeatureType() const;
+  m2::PointD const & GetPos() const;
+  std::string const & GetDefaultName() const;
+  std::string const & GetReadableName() const;
+  std::string const & GetAddress() const;
+
+  void SetBestFeatureType(std::string const & bestFeatureType);
+  void SetPos(m2::PointD const & pt);
+  void SetDefaultName(std::string const & name);
+  void SetReadableName(std::string const & name);
+  void SetAddress(std::string const & address);
+
+private:
  Type m_type;
  Time m_created;
  Time m_used;
  std::shared_ptr<eye::MapObject> m_mapObject;
+  std::string m_address;
 };

 using Candidates = std::deque<NotificationCandidate>;
--- a/map/utils.cpp
+++ b/map/utils.cpp
@ -4,6 +4,7 @@

 #include "indexer/feature.hpp"
 #include "indexer/feature_algo.hpp"
+#include "indexer/feature_decl.hpp"

 namespace utils
 {
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@ -8,6 +8,7 @@
 #include "map/framework.hpp"

 #include "search/result.hpp"
+#include "search/reverse_geocoder.hpp"

 #include "storage/index.hpp"

@ -35,6 +36,28 @@

 using namespace qt::common;

+namespace
+{
+search::ReverseGeocoder::Address GetFeatureAddressInfo(Framework const & framework,
+                                                       FeatureType & ft)
+{
+  search::ReverseGeocoder const coder(framework.GetDataSource());
+  search::ReverseGeocoder::Address address;
+  coder.GetExactAddress(ft, address);
+
+  return address;
+}
+
+search::ReverseGeocoder::Address GetFeatureAddressInfo(Framework const & framework,
+                                                       FeatureID const & fid)
+{
+  FeatureType ft;
+  if (!framework.GetFeatureByID(fid, ft))
+    return {};
+  return GetFeatureAddressInfo(framework, ft);
+}
+}  // namespace
+
 namespace qt
 {
 DrawWidget::DrawWidget(Framework & framework, bool apiOpenGLES3, QWidget * parent)
@ -459,11 +482,11 @@ void DrawWidget::OnRouteRecommendation(RoutingManager::Recommendation recommenda

 void DrawWidget::ShowPlacePage(place_page::Info const & info)
 {
-  search::AddressInfo address;
+  search::ReverseGeocoder::Address address;
  if (info.IsFeature())
-    address = m_framework.GetFeatureAddressInfo(info.GetID());
+    address = GetFeatureAddressInfo(m_framework, info.GetID());
  else
-    address = m_framework.GetAddressInfoAtPoint(info.GetMercator());
+    address = m_framework.GetAddressAtPoint(info.GetMercator());

  PlacePageDialog dlg(this, info, address);
  if (dlg.exec() == QDialog::Accepted)
@ -497,24 +520,27 @@ void DrawWidget::ShowInfoPopup(QMouseEvent * e, m2::PointD const & pt)
  QMenu menu;
  auto const addStringFn = [&menu](string const & s)
  {
+    if (s.empty())
+      return;
+
    menu.addAction(QString::fromUtf8(s.c_str()));
  };

  m_framework.ForEachFeatureAtPoint([&](FeatureType & ft)
  {
-    search::AddressInfo const info = m_framework.GetFeatureAddressInfo(ft);
-
    string concat;
-    for (auto const & type : info.m_types)
+    auto types = feature::TypesHolder(ft);
+    types.SortBySpec();
+    for (auto const & type : types.ToObjectNames())
      concat += type + " ";
    addStringFn(concat);

-    if (!info.m_name.empty())
-      addStringFn(info.m_name);
+    std::string name;
+    ft.GetReadableName(name);
+    addStringFn(name);

-    string const addr = info.FormatAddress();
-    if (!addr.empty())
-      addStringFn(addr);
+    auto const info = GetFeatureAddressInfo(m_framework, ft);
+    addStringFn(info.FormatAddress());

    menu.addSeparator();
  }, m_framework.PtoG(pt));
--- a/qt/place_page_dialog.cpp
+++ b/qt/place_page_dialog.cpp
@ -1,8 +1,6 @@
 #include "qt/place_page_dialog.hpp"

 #include "map/place_page_info.hpp"
-// For search::AddressInfo.
-#include "search/result.hpp"

 #include <QtWidgets/QDialogButtonBox>
 #include <QtWidgets/QGridLayout>
@ -20,7 +18,7 @@ string GenerateStars(int count)
 }

 PlacePageDialog::PlacePageDialog(QWidget * parent, place_page::Info const & info,
-                                 search::AddressInfo const & address)
+                                 search::ReverseGeocoder::Address const & address)
  : QDialog(parent)
 {
  QGridLayout * grid = new QGridLayout();
--- a/qt/place_page_dialog.hpp
+++ b/qt/place_page_dialog.hpp
@ -1,22 +1,20 @@
 #pragma once

+#include "search/reverse_geocoder.hpp"
+
 #include <QtWidgets/QDialog>

 namespace place_page
 {
 class Info;
 }
-namespace search
-{
-struct AddressInfo;
-}

 class PlacePageDialog : public QDialog
 {
  Q_OBJECT
 public:
  PlacePageDialog(QWidget * parent, place_page::Info const & info,
-                  search::AddressInfo const & address);
+                  search::ReverseGeocoder::Address const & address);

 private slots:
  void OnClose();
--- a/routing/index_graph_starter.hpp
+++ b/routing/index_graph_starter.hpp
@ -100,6 +100,11 @@ public:
                                         GetPoint(to, true /* front */));
  }

+  RouteWeight HeuristicCostEstimate(Vertex const & from, m2::PointD const & to) const
+  {
+    return m_graph.HeuristicCostEstimate(GetPoint(from, true /* front */), to);
+  }
+
  RouteWeight CalcSegmentWeight(Segment const & segment) const;
  double CalcSegmentETA(Segment const & segment) const;

--- a/routing/index_graph_starter_joints.cpp
+++ b/routing/index_graph_starter_joints.cpp
@ -1,5 +1,7 @@
 #include "routing/index_graph_starter_joints.hpp"

+#include "base/assert.hpp"
+
 #include <algorithm>
 #include <utility>

@ -18,6 +20,9 @@ void IndexGraphStarterJoints::Init(Segment const & startSegment, Segment const &
  m_startSegment = startSegment;
  m_endSegment = endSegment;

+  m_startPoint = m_starter.GetPoint(m_startSegment, true /* front */);
+  m_endPoint = m_starter.GetPoint(m_endSegment, true /* front */);
+
  CHECK(m_starter.GetGraph().GetMode() == WorldGraph::Mode::Joints ||
        m_starter.GetGraph().GetMode() == WorldGraph::Mode::JointSingleMwm, ());

@ -59,7 +64,10 @@ RouteWeight IndexGraphStarterJoints::HeuristicCostEstimate(JointSegment const &
  else
    fromSegment = from.GetSegment(false /* start */);

-  return m_starter.HeuristicCostEstimate(fromSegment, toSegment);
+  ASSERT(toSegment == m_startSegment || toSegment == m_endSegment, ("Invariant violated."));
+
+  return toSegment == m_startSegment ? m_starter.HeuristicCostEstimate(fromSegment, m_startPoint)
+                                     : m_starter.HeuristicCostEstimate(fromSegment, m_endPoint);
 }

 m2::PointD const & IndexGraphStarterJoints::GetPoint(JointSegment const & jointSegment, bool start)
--- a/routing/index_graph_starter_joints.hpp
+++ b/routing/index_graph_starter_joints.hpp
@ -97,6 +97,9 @@ private:
  Segment m_startSegment;
  Segment m_endSegment;

+  m2::PointD m_startPoint;
+  m2::PointD m_endPoint;
+
  // See comments in |GetEdgeList()| about |m_savedWeight|.
  std::map<JointSegment, Weight> m_savedWeight;

--- a/routing/single_vehicle_world_graph.cpp
+++ b/routing/single_vehicle_world_graph.cpp
@ -130,6 +130,12 @@ RouteWeight SingleVehicleWorldGraph::HeuristicCostEstimate(Segment const & from,
  return HeuristicCostEstimate(GetPoint(from, true /* front */), GetPoint(to, true /* front */));
 }

+
+RouteWeight SingleVehicleWorldGraph::HeuristicCostEstimate(Segment const & from, m2::PointD const & to)
+{
+  return HeuristicCostEstimate(GetPoint(from, true /* front */), to);
+}
+
 RouteWeight SingleVehicleWorldGraph::HeuristicCostEstimate(m2::PointD const & from,
                                                           m2::PointD const & to)
 {
--- a/routing/single_vehicle_world_graph.hpp
+++ b/routing/single_vehicle_world_graph.hpp
@ -49,6 +49,7 @@ public:
  void GetIngoingEdgesList(Segment const & segment, std::vector<SegmentEdge> & edges) override;
  RouteWeight HeuristicCostEstimate(Segment const & from, Segment const & to) override;
  RouteWeight HeuristicCostEstimate(m2::PointD const & from, m2::PointD const & to) override;
+  RouteWeight HeuristicCostEstimate(Segment const & from, m2::PointD const & to) override;
  RouteWeight CalcSegmentWeight(Segment const & segment) override;
  RouteWeight CalcLeapWeight(m2::PointD const & from, m2::PointD const & to) const override;
  RouteWeight CalcOffroadWeight(m2::PointD const & from, m2::PointD const & to) const override;
--- a/routing/transit_world_graph.cpp
+++ b/routing/transit_world_graph.cpp
@ -122,6 +122,11 @@ RouteWeight TransitWorldGraph::HeuristicCostEstimate(Segment const & from, Segme
  return HeuristicCostEstimate(GetPoint(from, true /* front */), GetPoint(to, true /* front */));
 }

+RouteWeight TransitWorldGraph::HeuristicCostEstimate(Segment const & from, m2::PointD const & to)
+{
+  return HeuristicCostEstimate(GetPoint(from, true /* front */), to);
+}
+
 RouteWeight TransitWorldGraph::HeuristicCostEstimate(m2::PointD const & from, m2::PointD const & to)
 {
  return RouteWeight(m_estimator->CalcHeuristic(from, to));
--- a/Show more
+++ b/Show more