Removed Cian, added Luggage Hero

android/jni/CMakeLists.txt

@@ -41,7 +41,6 @@ set(
   com/mapswithme/maps/bookmarks/data/Bookmark.cpp
   com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
   com/mapswithme/maps/bookmarks/data/BookmarkCategory.cpp
-  com/mapswithme/maps/cian/Cian.cpp
   com/mapswithme/maps/discovery/DiscoveryManager.cpp
   com/mapswithme/maps/discovery/Locals.cpp
   com/mapswithme/maps/DisplayedCategories.cpp

android/jni/com/mapswithme/maps/Framework.cpp

@@ -599,17 +599,6 @@ void Framework::UploadUGC()
   m_work.UploadUGC(nullptr /* onCompleteUploading */);
 }
 
-uint64_t Framework::GetRentNearby(JNIEnv * env, jobject policy, ms::LatLon const & latlon,
-                              cian::Api::RentNearbyCallback const & onSuccess,
-                              cian::Api::ErrorCallback const & onError)
-{
-  auto const cianApi = m_work.GetCianApi(ToNativeNetworkPolicy(env, policy));
-  if (!cianApi)
-    return 0;
-
-  return cianApi->GetRentNearby(latlon, onSuccess, onError);
-}
-
 int Framework::ToDoAfterUpdate() const
 {
   return (int) m_work.ToDoAfterUpdate();

android/jni/com/mapswithme/maps/Framework.hpp

@@ -206,10 +206,6 @@ namespace android
     void SetUGCUpdate(FeatureID const & fid, ugc::UGCUpdate const & ugc);
     void UploadUGC();
 
-    uint64_t GetRentNearby(JNIEnv * env, jobject policy, ms::LatLon const & latlon,
-                       cian::Api::RentNearbyCallback const & onSuccess,
-                       cian::Api::ErrorCallback const & onError);
-
     int ToDoAfterUpdate() const;
 
     uint64_t GetLocals(JNIEnv * env, jobject policy, double lat, double lon,

android/jni/com/mapswithme/maps/cian/Cian.cpp

@@ -1,100 +0,0 @@
-#include "com/mapswithme/maps/Framework.hpp"
-
-#include "com/mapswithme/core/jni_helper.hpp"
-#include "partners_api/cian_api.hpp"
-
-#include "base/logging.cpp"
-
-namespace
-{
-jclass g_cianClass;
-jclass g_rentPlaceClass;
-jclass g_rentOfferClass;
-jmethodID g_rentPlaceConstructor;
-jmethodID g_rentOfferConstructor;
-jmethodID g_cianCallback;
-jmethodID g_cianSuccessCallback;
-jmethodID g_cianErrorCallback;
-uint64_t g_requestId;
-std::string g_id;
-
-void PrepareClassRefs(JNIEnv * env)
-{
-  if (g_cianClass)
-    return;
-
-  g_cianClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/cian/Cian");
-  g_rentPlaceClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/cian/RentPlace");
-  g_rentOfferClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/cian/RentOffer");
-
-  g_rentPlaceConstructor =
-      jni::GetConstructorID(env, g_rentPlaceClass,
-                            "(DD[Lcom/mapswithme/maps/cian/RentOffer;)V");
-
-  g_rentOfferConstructor =
-      jni::GetConstructorID(env, g_rentOfferClass,
-                            "(Ljava/lang/String;IDIILjava/lang/String;Ljava/lang/String;)V");
-
-  g_cianSuccessCallback =
-      jni::GetStaticMethodID(env, g_cianClass, "onRentPlacesReceived",
-                             "([Lcom/mapswithme/maps/cian/RentPlace;Ljava/lang/String;)V");
-  g_cianErrorCallback =
-      jni::GetStaticMethodID(env, g_cianClass, "onErrorReceived",
-                             "(I)V");
-}
-
-void OnRentPlacesReceived(std::vector<cian::RentPlace> const & places, uint64_t const requestId)
-{
-  if (g_requestId != requestId)
-    return;
-
-  JNIEnv * env = jni::GetEnv();
-
-  auto const offerBuilder = [](JNIEnv * env, cian::RentOffer const & item)
-  {
-    jni::TScopedLocalRef jFlatType(env, jni::ToJavaString(env, item.m_flatType));
-    jni::TScopedLocalRef jUrl(env, jni::ToJavaString(env, item.m_url));
-    jni::TScopedLocalRef jAddress(env, jni::ToJavaString(env, item.m_address));
-    return env->NewObject(g_rentOfferClass, g_rentOfferConstructor, jFlatType.get(),
-                          item.m_roomsCount, item.m_priceRur, item.m_floorNumber,
-                          item.m_floorsCount, jUrl.get(), jAddress.get());
-  };
-
-  auto const placeBuilder = [offerBuilder](JNIEnv * env, cian::RentPlace const & item)
-  {
-    return env->NewObject(g_rentPlaceClass, g_rentPlaceConstructor, item.m_latlon.lat,
-                          item.m_latlon.lon,
-                          jni::ToJavaArray(env, g_rentOfferClass, item.m_offers, offerBuilder));
-  };
-
-  jni::TScopedLocalObjectArrayRef jPlaces(env, jni::ToJavaArray(env, g_rentPlaceClass, places,
-                                          placeBuilder));
-  jni::TScopedLocalRef jId(env, jni::ToJavaString(env, g_id));
-
-  env->CallStaticVoidMethod(g_cianClass, g_cianSuccessCallback, jPlaces.get(), jId.get());
-}
-
-void OnErrorReceived(int httpCode, uint64_t const requestId)
-{
-  if (g_requestId != requestId)
-    return;
-
-  JNIEnv * env = jni::GetEnv();
-
-  env->CallStaticVoidMethod(g_cianClass, g_cianErrorCallback, httpCode);
-}
-}  // namespace
-
-extern "C" {
-
-JNIEXPORT void JNICALL Java_com_mapswithme_maps_cian_Cian_nativeGetRentNearby(
-    JNIEnv * env, jclass clazz, jobject policy, jdouble lat, jdouble lon, jstring id)
-{
-  PrepareClassRefs(env);
-
-  g_id = jni::ToNativeString(env, id);
-  ms::LatLon const pos(lat, lon);
-  g_requestId = g_framework->GetRentNearby(env, policy, pos, &OnRentPlacesReceived,
-                                                   &OnErrorReceived);
-}
-}  // extern "C"

android/res/layout/card_loading.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
-  android:layout_height="@dimen/cian_product_height"
+  android:layout_height="@dimen/luggage_product_height"
   android:orientation="vertical"
   android:gravity="center_horizontal">
   <ProgressBar
@@ -39,12 +39,12 @@
   <TextView
     android:id="@+id/button"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/cian_details_height"
+    android:layout_height="@dimen/luggage_details_height"
     android:textAppearance="@style/MwmTextAppearance.Button"
     android:textSize="@dimen/text_size_caption"
     android:fontFamily="@string/robotoMedium"
     android:gravity="center"
     android:background="?windowBackgroundForced"
-    android:text="@string/preloader_cian_button"
+    android:text="@string/preloader_viator_button"
     tools:targetApi="jelly_bean"/>
 </LinearLayout>

android/res/layout/item_cian_loading.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:paddingLeft="@dimen/margin_quarter"
-  android:paddingRight="@dimen/margin_half_plus"
-  android:paddingTop="@dimen/margin_quarter"
-  android:paddingBottom="@dimen/margin_quarter"
-  android:clipToPadding="false">
-  <android.support.v7.widget.CardView
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <include
-      layout="@layout/card_loading"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/cian_product_height"/>
-  </android.support.v7.widget.CardView>
-</FrameLayout>

android/res/layout/item_cian_more.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="@dimen/cian_product_width"
-  android:layout_height="@dimen/cian_product_height"
-  android:padding="@dimen/margin_quarter"
-  android:clipToPadding="false"
-  android:foreground="?clickableBackground">
-  <ImageView
-    android:id="@+id/iv__image"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_centerInParent="true"
-    android:src="?attr/sponsoredGalleryMore"/>
-  <TextView
-    android:id="@+id/tv__title"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half_plus"
-    android:layout_below="@id/iv__image"
-    android:layout_centerHorizontal="true"
-    android:textAppearance="@style/MwmTextAppearance.Body2"
-    android:fontFamily="@string/robotoMedium"
-    android:textColor="?colorAccent"
-    android:textAllCaps="true"
-    tools:text="More"
-    tools:targetApi="jelly_bean"/>
-</RelativeLayout>

android/res/layout/item_cian_product.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_height="wrap_content"
-  android:layout_width="wrap_content"
-  android:padding="@dimen/margin_quarter"
-  android:clipToPadding="false">
-  <android.support.v7.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-    <LinearLayout
-      android:layout_width="@dimen/cian_product_width"
-      android:layout_height="@dimen/cian_product_height"
-      android:orientation="vertical"
-      android:foreground="?clickableBackground">
-      <TextView
-        android:id="@+id/tv__price"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_half_plus"
-        android:layout_marginLeft="@dimen/margin_half_plus"
-        android:layout_marginRight="@dimen/margin_half_plus"
-        android:textAppearance="@style/MwmTextAppearance.Body4"
-        android:textColor="?colorAccent"
-        android:maxLines="1"
-        android:ellipsize="end"
-        tools:text="370 000 ₽/мес."/>
-      <TextView
-        android:id="@+id/tv__title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_quarter"
-        android:layout_marginLeft="@dimen/margin_half_plus"
-        android:layout_marginRight="@dimen/margin_half_plus"
-        android:textAppearance="@style/MwmTextAppearance.Body3.Primary"
-        android:fontFamily="@string/robotoMedium"
-        android:maxLines="1"
-        android:ellipsize="end"
-        tools:text="3-комн. кв, 215 м²"
-        tools:targetApi="jelly_bean"/>
-      <TextView
-        android:id="@+id/tv__address"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginTop="@dimen/margin_quarter"
-        android:layout_marginLeft="@dimen/margin_half_plus"
-        android:layout_marginRight="@dimen/margin_half_plus"
-        android:textAppearance="@style/MwmTextAppearance.Body4"
-        android:ellipsize="end"
-        tools:text="Чапаевский пер., 3"/>
-      <TextView
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/cian_details_height"
-        android:textAppearance="@style/MwmTextAppearance.Button"
-        android:textSize="@dimen/text_size_caption"
-        android:fontFamily="@string/robotoMedium"
-        android:gravity="center"
-        android:background="?windowBackgroundForced"
-        android:text="@string/details"
-        tools:targetApi="jelly_bean"/>
-    </LinearLayout>
-  </android.support.v7.widget.CardView>
-</FrameLayout>

android/res/layout/item_search_category_luggage.xml

@@ -23,5 +23,5 @@
     android:layout_gravity="center_vertical"
     android:layout_marginEnd="@dimen/margin_base"
     android:layout_marginRight="@dimen/margin_base"
-    android:src="?cianLogo"/>
+    android:src="?luggageLogo"/>
 </LinearLayout>

android/res/layout/item_viator_product.xml

@@ -62,7 +62,7 @@
         android:textSize="@dimen/text_size_body_4"
         tools:visibility="visible"/>
       <TextView
-        android:id="@id/tv__price"
+        android:id="@+id/tv__price"
         android:layout_below="@id/ratingView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

android/res/values/dimens.xml

@@ -213,10 +213,10 @@
   <dimen name="viator_product_width">160dp</dimen>
   <dimen name="viator_product_image_height">80dp</dimen>
 
-  <!-- Cian-->
-  <dimen name="cian_product_height">140dp</dimen>
-  <dimen name="cian_product_width">160dp</dimen>
-  <dimen name="cian_details_height">44dp</dimen>
+  <!-- Luggage-->
+  <dimen name="luggage_product_height">140dp</dimen>
+  <dimen name="luggage_product_width">160dp</dimen>
+  <dimen name="luggage_details_height">44dp</dimen>
 
   <!-- Rating-->
   <dimen name="rating_view_height">40dp</dimen>

android/res/values/themes-attrs.xml

@@ -87,7 +87,7 @@
 
     <attr name="sponsoredGalleryMore" format="reference"/>
 
-    <attr name="cianLogo" format="reference"/>
+    <attr name="luggageLogo" format="reference"/>
     <attr name="viatorLogo" format="reference" />
 
     <attr name="ratingButtonBackground" format="reference"/>

android/res/values/themes-base.xml

@@ -104,7 +104,7 @@
     <item name="tagBackground">@drawable/bg_tag</item>
 
     <item name="sponsoredGalleryMore">@drawable/ic_sponsored_gallery_more</item>
-    <item name="cianLogo">@drawable/logo_cian_light</item>
+    <item name="luggageLogo">@drawable/logo_luggagehero_light</item>
     <item name="viatorLogo">@drawable/ic_logo_viator_light</item>
 
     <item name="ratingButtonBackground">@drawable/bg_rating_button</item>
@@ -223,7 +223,7 @@
     <item name="tagBackground">@drawable/bg_tag_night</item>
 
     <item name="sponsoredGalleryMore">@drawable/ic_sponsored_gallery_more_night</item>
-    <item name="cianLogo">@drawable/logo_cian_dark</item>
+    <item name="luggageLogo">@drawable/logo_luggagehero_dark</item>
     <item name="viatorLogo">@drawable/ic_logo_viator_dark</item>
 
     <item name="ratingButtonBackground">@drawable/bg_rating_button_night</item>

android/src/com/mapswithme/maps/cian/Cian.java

@@ -1,64 +0,0 @@
-package com.mapswithme.maps.cian;
-
-import android.support.annotation.NonNull;
-
-import com.mapswithme.maps.bookmarks.data.FeatureId;
-import com.mapswithme.util.NetworkPolicy;
-
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-import java.util.Map;
-
-public final class Cian
-{
-  @NonNull
-  private static WeakReference<com.mapswithme.maps.cian.Cian.CianListener> sCianListener = new WeakReference<>(null);
-  @NonNull
-  private static final Map<FeatureId, RentPlace[]> sProductsCache = new HashMap<>();
-
-  public static void setCianListener(@NonNull com.mapswithme.maps.cian.Cian.CianListener listener)
-  {
-    sCianListener = new WeakReference<>(listener);
-  }
-
-  private static void onRentPlacesReceived(@NonNull RentPlace[] places, @NonNull String id)
-  {
-    sProductsCache.put(FeatureId.fromString(id), places);
-    com.mapswithme.maps.cian.Cian.CianListener listener = sCianListener.get();
-    if (listener != null)
-      listener.onRentPlacesReceived(places);
-  }
-
-  private static void onErrorReceived(int httpCode)
-  {
-    com.mapswithme.maps.cian.Cian.CianListener listener = sCianListener.get();
-    if (listener != null)
-      listener.onErrorReceived(httpCode);
-  }
-
-  private Cian() {}
-
-  public static void getRentNearby(@NonNull NetworkPolicy policy,double lat, double lon,
-                                   @NonNull FeatureId id)
-  {
-    RentPlace[] products = sProductsCache.get(id);
-    if (products != null && products.length > 0)
-      onRentPlacesReceived(products, id.toString());
-
-    nativeGetRentNearby(policy, lat, lon, id.toString());
-  }
-
-  public static boolean hasCache(@NonNull FeatureId id)
-  {
-    return sProductsCache.containsKey(id);
-  }
-
-  public interface CianListener
-  {
-    void onRentPlacesReceived(@NonNull RentPlace[] places);
-    void onErrorReceived(int httpCode);
-  }
-
-  private static native void nativeGetRentNearby(@NonNull NetworkPolicy policy, double lat,
-                                                 double lon, @NonNull String id);
-}

android/src/com/mapswithme/maps/cian/RentOffer.java

@@ -1,146 +0,0 @@
-package com.mapswithme.maps.cian;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.NonNull;
-
-public final class RentOffer implements Parcelable
-{
-  @NonNull
-  private final String mFlatType;
-  private final int mRoomsCount;
-  private final double mPrice;
-  private final int mFloorNumber;
-  private final int mFloorsCount;
-  @NonNull
-  private final String mUrl;
-  @NonNull
-  private final String mAddress;
-
-  public static final Creator<RentOffer> CREATOR = new Creator<RentOffer>()
-  {
-    @Override
-    public RentOffer createFromParcel(Parcel in)
-    {
-      return new RentOffer(in);
-    }
-
-    @Override
-    public RentOffer[] newArray(int size)
-    {
-      return new RentOffer[size];
-    }
-  };
-
-  public RentOffer(@NonNull String flatType, int roomsCount, double price, int floorNumber,
-                   int floorsCount, @NonNull String url, @NonNull String address)
-  {
-    mFlatType = flatType;
-    mRoomsCount = roomsCount;
-    mPrice = price;
-    mFloorNumber = floorNumber;
-    mFloorsCount = floorsCount;
-    mUrl = url;
-    mAddress = address;
-  }
-
-  private RentOffer(Parcel in)
-  {
-    mFlatType = in.readString();
-    mRoomsCount = in.readInt();
-    mPrice = in.readInt();
-    mFloorNumber = in.readInt();
-    mFloorsCount = in.readInt();
-    mUrl = in.readString();
-    mAddress = in.readString();
-  }
-
-  @Override
-  public int describeContents()
-  {
-    return 0;
-  }
-
-  @Override
-  public void writeToParcel(Parcel dest, int flags)
-  {
-    dest.writeString(mFlatType);
-    dest.writeInt(mRoomsCount);
-    dest.writeDouble(mPrice);
-    dest.writeInt(mFloorNumber);
-    dest.writeInt(mFloorsCount);
-    dest.writeString(mUrl);
-    dest.writeString(mAddress);
-  }
-
-  @NonNull
-  public String getFlatType()
-  {
-    return mFlatType;
-  }
-
-  public int getRoomsCount()
-  {
-    return mRoomsCount;
-  }
-
-  public double getPrice()
-  {
-    return mPrice;
-  }
-
-  public int getFloorNumber()
-  {
-    return mFloorNumber;
-  }
-
-  public int getFloorsCount()
-  {
-    return mFloorsCount;
-  }
-
-  @NonNull
-  public String getUrl()
-  {
-    return mUrl;
-  }
-
-  @NonNull
-  public String getAddress()
-  {
-    return mAddress;
-  }
-
-  @Override
-  public boolean equals(Object o)
-  {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    RentOffer rentOffer = (RentOffer) o;
-
-    if (mRoomsCount != rentOffer.mRoomsCount) return false;
-    if (Double.compare(rentOffer.mPrice, mPrice) != 0) return false;
-    if (mFloorNumber != rentOffer.mFloorNumber) return false;
-    if (mFloorsCount != rentOffer.mFloorsCount) return false;
-    if (!mFlatType.equals(rentOffer.mFlatType)) return false;
-    if (!mUrl.equals(rentOffer.mUrl)) return false;
-    return mAddress.equals(rentOffer.mAddress);
-  }
-
-  @Override
-  public int hashCode()
-  {
-    int result;
-    long temp;
-    result = mFlatType.hashCode();
-    result = 31 * result + mRoomsCount;
-    temp = Double.doubleToLongBits(mPrice);
-    result = 31 * result + (int) (temp ^ (temp >>> 32));
-    result = 31 * result + mFloorNumber;
-    result = 31 * result + mFloorsCount;
-    result = 31 * result + mUrl.hashCode();
-    result = 31 * result + mAddress.hashCode();
-    return result;
-  }
-}

android/src/com/mapswithme/maps/cian/RentPlace.java

@@ -1,102 +0,0 @@
-package com.mapswithme.maps.cian;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.NonNull;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class RentPlace implements Parcelable
-{
-  private final double mLat;
-  private final double mLon;
-  @NonNull
-  private final List<RentOffer> mOffers;
-
-  public static final Creator<RentPlace> CREATOR = new Creator<RentPlace>()
-  {
-    @Override
-    public RentPlace createFromParcel(Parcel in)
-    {
-      return new RentPlace(in);
-    }
-
-    @Override
-    public RentPlace[] newArray(int size)
-    {
-      return new RentPlace[size];
-    }
-  };
-
-  public RentPlace(double lat, double lon, @NonNull RentOffer[] offers)
-  {
-    mLat = lat;
-    mLon = lon;
-    mOffers = new ArrayList<>(Arrays.asList(offers));
-  }
-
-  private RentPlace(Parcel in)
-  {
-    mLat = in.readDouble();
-    mLon = in.readDouble();
-    mOffers = in.createTypedArrayList(RentOffer.CREATOR);
-  }
-
-  @Override
-  public int describeContents()
-  {
-    return 0;
-  }
-
-  @Override
-  public void writeToParcel(Parcel dest, int flags)
-  {
-    dest.writeDouble(mLat);
-    dest.writeDouble(mLon);
-    dest.writeTypedList(mOffers);
-  }
-
-  public double getLat()
-  {
-    return mLat;
-  }
-
-  public double getLon()
-  {
-    return mLon;
-  }
-
-  @NonNull
-  public List<RentOffer> getOffers()
-  {
-    return mOffers;
-  }
-
-  @Override
-  public boolean equals(Object o)
-  {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    RentPlace rentPlace = (RentPlace) o;
-
-    if (Double.compare(rentPlace.mLat, mLat) != 0) return false;
-    if (Double.compare(rentPlace.mLon, mLon) != 0) return false;
-    return mOffers.equals(rentPlace.mOffers);
-  }
-
-  @Override
-  public int hashCode()
-  {
-    int result;
-    long temp;
-    temp = Double.doubleToLongBits(mLat);
-    result = (int) (temp ^ (temp >>> 32));
-    temp = Double.doubleToLongBits(mLon);
-    result = 31 * result + (int) (temp ^ (temp >>> 32));
-    result = 31 * result + mOffers.hashCode();
-    return result;
-  }
-}

android/src/com/mapswithme/maps/gallery/Holders.java

@@ -24,7 +24,6 @@ import com.mapswithme.util.Utils;
 
 import java.util.List;
 
-import static com.mapswithme.maps.gallery.Items.CianItem;
 import static com.mapswithme.maps.gallery.Items.ViatorItem;
 
 public class Holders
@@ -97,50 +96,6 @@ public class Holders
     }
   }
 
-  public static final class CianProductViewHolder extends BaseViewHolder<CianItem>
-  {
-    @NonNull
-    TextView mPrice;
-    @NonNull
-    TextView mAddress;
-
-    public CianProductViewHolder(@NonNull View itemView, @NonNull List<CianItem> items,
-                                 @NonNull GalleryAdapter<?, CianItem> adapter)
-    {
-      super(itemView, items, adapter);
-      mPrice = (TextView) itemView.findViewById(R.id.tv__price);
-      mAddress = (TextView) itemView.findViewById(R.id.tv__address);
-    }
-
-    @Override
-    public void bind(@NonNull CianItem item)
-    {
-      super.bind(item);
-      UiUtils.setTextAndHideIfEmpty(mPrice, item.mPrice);
-      UiUtils.setTextAndHideIfEmpty(mAddress, item.mAddress);
-    }
-  }
-
-  public static final class CianMoreItemViewHolder<T extends CianItem> extends BaseViewHolder<T>
-  {
-
-    public CianMoreItemViewHolder(@NonNull View itemView, @NonNull List<T> items,
-                                  @NonNull GalleryAdapter<?, T> adapter)
-    {
-      super(itemView, items, adapter);
-    }
-
-    @Override
-    protected void onItemSelected(@NonNull T item, int position)
-    {
-      ItemSelectedListener<T> listener = mAdapter.getListener();
-      if (listener == null || TextUtils.isEmpty(item.getUrl()))
-        return;
-
-      listener.onMoreItemSelected(item);
-    }
-  }
-
   public static class LocalExpertViewHolder extends BaseViewHolder<Items.LocalExpertItem>
   {
     @NonNull

android/src/com/mapswithme/maps/gallery/Items.java

@@ -52,38 +52,6 @@ public class Items
     }
   }
 
-  public static class CianItem extends RegularAdapterStrategy.Item
-  {
-    @NonNull
-    final String mPrice;
-    @NonNull
-    final String mAddress;
-
-    public CianItem(@NonNull String title, @NonNull String url, @NonNull String price,
-                    @NonNull String address)
-    {
-      super(TYPE_PRODUCT, title, url, null);
-      mPrice = price;
-      mAddress = address;
-    }
-
-    CianItem(@Constants.ViewType int type, @NonNull String title, @Nullable String url)
-    {
-      super(type, title, url, null);
-      mPrice = "";
-      mAddress = "";
-    }
-  }
-
-  public static class CianMoreItem extends CianItem
-  {
-
-    public CianMoreItem(@Nullable String url)
-    {
-      super(TYPE_MORE, MwmApplication.get().getString(R.string.placepage_more_button), url);
-    }
-  }
-
   public static class LocalExpertItem extends RegularAdapterStrategy.Item
   {
     @Nullable

android/src/com/mapswithme/maps/gallery/impl/CianAdapterStrategy.java

@@ -1,74 +0,0 @@
-package com.mapswithme.maps.gallery.impl;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.mapswithme.maps.MwmApplication;
-import com.mapswithme.maps.R;
-import com.mapswithme.maps.cian.RentOffer;
-import com.mapswithme.maps.cian.RentPlace;
-import com.mapswithme.maps.gallery.GalleryAdapter;
-import com.mapswithme.maps.gallery.Holders;
-import com.mapswithme.maps.gallery.Items;
-import com.mapswithme.maps.gallery.RegularAdapterStrategy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class CianAdapterStrategy extends RegularAdapterStrategy<Items.CianItem>
-{
-
-  CianAdapterStrategy(@NonNull RentPlace[] items, @Nullable String moreUrl)
-  {
-    super(convertItems(items), new Items.CianMoreItem(moreUrl));
-  }
-
-  CianAdapterStrategy(@NonNull List<Items.CianItem> items,
-                      @Nullable Items.CianItem moreItem)
-  {
-    super(items, moreItem);
-  }
-
-  @NonNull
-  @Override
-  protected Holders.BaseViewHolder<Items.CianItem> createProductViewHodler
-      (@NonNull ViewGroup parent, int viewType, @NonNull GalleryAdapter<?, Items.CianItem> adapter)
-  {
-    View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_cian_product, parent,
-                                                                 false);
-    return new Holders.CianProductViewHolder(view, mItems, adapter);
-  }
-
-  @NonNull
-  @Override
-  protected Holders.BaseViewHolder<Items.CianItem> createMoreProductsViewHolder
-      (@NonNull ViewGroup parent, int viewType, @NonNull GalleryAdapter<?, Items.CianItem> adapter)
-  {
-    View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_cian_more, parent,
-                                                                 false);
-    return new Holders.CianMoreItemViewHolder<>(view, mItems, adapter);
-  }
-
-  @NonNull
-  private static List<Items.CianItem> convertItems(@NonNull RentPlace[] items)
-  {
-    List<Items.CianItem> viewItems = new ArrayList<>();
-    for (RentPlace place : items)
-    {
-      if (place.getOffers().isEmpty())
-        continue;
-
-      RentOffer product = place.getOffers().get(0);
-      Context context = MwmApplication.get();
-      String title = context.getString(R.string.room, Integer.toString(product.getRoomsCount()));
-      String price = Integer.toString((int) product.getPrice()) + " "
-                     + context.getString(R.string.rub_month);
-      viewItems.add(new Items.CianItem(title, product.getUrl(), price, product.getAddress()));
-    }
-    return viewItems;
-  }
-}

android/src/com/mapswithme/maps/gallery/impl/CianErrorAdapterStrategy.java

@@ -1,43 +0,0 @@
-package com.mapswithme.maps.gallery.impl;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.mapswithme.maps.R;
-import com.mapswithme.maps.gallery.ErrorAdapterStrategy;
-
-class CianErrorAdapterStrategy extends ErrorAdapterStrategy
-{
-  CianErrorAdapterStrategy(@Nullable String url)
-  {
-    super(url);
-  }
-
-  @Override
-  protected int getTitle()
-  {
-    return R.string.preloader_cian_title;
-  }
-
-  @Override
-  protected int getSubtitle()
-  {
-    return R.string.preloader_cian_message;
-  }
-
-  @NonNull
-  @Override
-  protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent)
-  {
-    return inflater.inflate(R.layout.item_cian_loading, parent, false);
-  }
-
-  @Override
-  protected int getLabelForDetailsView()
-  {
-    return R.string.preloader_cian_button;
-  }
-}

android/src/com/mapswithme/maps/gallery/impl/CianLoadingAdapterStrategy.java

@@ -1,43 +0,0 @@
-package com.mapswithme.maps.gallery.impl;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.mapswithme.maps.R;
-import com.mapswithme.maps.gallery.LoadingAdapterStrategy;
-
-class CianLoadingAdapterStrategy extends LoadingAdapterStrategy
-{
-  CianLoadingAdapterStrategy(@Nullable String url)
-  {
-    super(url);
-  }
-
-  @Override
-  protected int getTitle()
-  {
-    return R.string.preloader_cian_title;
-  }
-
-  @Override
-  protected int getSubtitle()
-  {
-    return R.string.preloader_cian_message;
-  }
-
-  @NonNull
-  @Override
-  protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent)
-  {
-    return inflater.inflate(R.layout.item_cian_loading, parent, false);
-  }
-
-  @Override
-  protected int getLabelForDetailsView()
-  {
-    return R.string.preloader_cian_button;
-  }
-}

android/src/com/mapswithme/maps/gallery/impl/Factory.java

@@ -3,7 +3,6 @@ package com.mapswithme.maps.gallery.impl;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.mapswithme.maps.cian.RentPlace;
 import com.mapswithme.maps.discovery.LocalExpert;
 import com.mapswithme.maps.gallery.GalleryAdapter;
 import com.mapswithme.maps.gallery.ItemSelectedListener;
@@ -17,7 +16,6 @@ import com.mapswithme.util.statistics.Statistics;
 
 import static com.mapswithme.util.statistics.GalleryState.OFFLINE;
 import static com.mapswithme.util.statistics.GalleryState.ONLINE;
-import static com.mapswithme.util.statistics.GalleryType.CIAN;
 import static com.mapswithme.util.statistics.GalleryType.LOCAL_EXPERTS;
 import static com.mapswithme.util.statistics.GalleryType.VIATOR;
 
@@ -46,21 +44,6 @@ public class Factory
     return new GalleryAdapter<>(new ViatorErrorAdapterStrategy(url), listener);
   }
 
-  @NonNull
-  public static GalleryAdapter createCianLoadingAdapter
-      (@Nullable String url, @Nullable ItemSelectedListener<Items.Item> listener)
-  {
-    return new GalleryAdapter<>(new CianLoadingAdapterStrategy(url), listener);
-  }
-
-  @NonNull
-  public static GalleryAdapter createCianErrorAdapter(@Nullable String url,
-                                                      @Nullable ItemSelectedListener<Items.Item>
-                                                          listener)
-  {
-    return new GalleryAdapter<>(new CianErrorAdapterStrategy(url), listener);
-  }
-
   @NonNull
   public static GalleryAdapter createViatorAdapter(@NonNull ViatorProduct[] products,
                                                    @Nullable String cityUrl,
@@ -72,15 +55,6 @@ public class Factory
     return new GalleryAdapter<>(new ViatorAdapterStrategy(products, cityUrl), listener);
   }
 
-  @NonNull
-  public static GalleryAdapter createCianAdapter(@NonNull RentPlace[] products, @NonNull String url,
-                                                 @Nullable ItemSelectedListener<Items.CianItem> listener,
-                                                 @NonNull GalleryPlacement placement)
-  {
-    trackProductGalleryShownOrError(products, CIAN, ONLINE, placement);
-    return new GalleryAdapter<>(new CianAdapterStrategy(products, url), listener);
-  }
-
   @NonNull
   public static GalleryAdapter createSearchBasedAdapter(@NonNull SearchResult[] results,
                                                         @Nullable ItemSelectedListener<Items

android/src/com/mapswithme/maps/search/CategoriesAdapter.java

@@ -24,6 +24,8 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
   private final LayoutInflater mInflater;
   private final Resources mResources;
 
+  static final String LUGGAGE_CATEGORY = "luggagehero";
+
   interface OnCategorySelectedListener
   {
     void onCategorySelected(String category);
@@ -49,12 +51,12 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
       mCategoryResIds[i] = resources.getIdentifier(key, "string", packageName);
       if (mCategoryResIds[i] == 0)
       {
-        // TODO: remove this code after "cian" feature is obsoleted.
-        if (key.equals("cian"))
+        if (key.equals(LUGGAGE_CATEGORY))
         {
-          Statistics.INSTANCE.trackSponsoredEventByType(
-              Statistics.EventName.SEARCH_SPONSOR_CATEGORY_SHOWN, Sponsored.TYPE_CIAN);
-          mCategoryResIds[i] = R.string.real_estate;
+          Statistics.INSTANCE.trackSponsoredEventForCustomProvider(
+              Statistics.EventName.SEARCH_SPONSOR_CATEGORY_SHOWN,
+              Statistics.ParamValue.LUGGAGE_HERO);
+          mCategoryResIds[i] = R.string.luggage_storage;
         }
         else
         {
@@ -79,8 +81,8 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
   @Override
   public int getItemViewType(int position)
   {
-    if (mCategoryResIds[position] == R.string.real_estate)
-      return R.layout.item_search_category_cian;
+    if (mCategoryResIds[position] == R.string.luggage_storage)
+      return R.layout.item_search_category_luggage;
     return R.layout.item_search_category;
   }
 
@@ -88,9 +90,9 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
   public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
   {
     final View view;
-    if (viewType == R.layout.item_search_category_cian)
+    if (viewType == R.layout.item_search_category_luggage)
     {
-      view = mInflater.inflate(R.layout.item_search_category_cian, parent, false);
+      view = mInflater.inflate(R.layout.item_search_category_luggage, parent, false);
       return new ViewHolder(view, (TextView) view.findViewById(R.id.tv__category));
     }
 
@@ -112,8 +114,8 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
 
   private String getSuggestionFromCategory(int resId)
   {
-    if (resId == R.string.real_estate)
-      return "cian ";
+    if (resId == R.string.luggage_storage)
+      return LUGGAGE_CATEGORY + ' ';
     return mResources.getString(resId) + ' ';
   }
 

android/src/com/mapswithme/maps/search/SearchFragment.java

@@ -128,7 +128,7 @@ public class SearchFragment extends BaseMwmFragment
         return;
       }
 
-      if (mCianCategorySelected)
+      if (mLuggageCategorySelected)
         return;
 
       if (mAdsLoader != null && !isInteractiveSearch() && query.length() >= MIN_QUERY_LENGTH_FOR_AD)
@@ -209,7 +209,7 @@ public class SearchFragment extends BaseMwmFragment
 
   private final LastPosition mLastPosition = new LastPosition();
   private boolean mSearchRunning;
-  private boolean mCianCategorySelected;
+  private boolean mLuggageCategorySelected;
   private String mInitialQuery;
   @Nullable
   private String mInitialLocale;
@@ -673,15 +673,17 @@ public class SearchFragment extends BaseMwmFragment
   @Override
   public void onCategorySelected(String category)
   {
-    if (!TextUtils.isEmpty(category) && category.equals("cian "))
+    if (!TextUtils.isEmpty(category) &&
+        category.equals(CategoriesAdapter.LUGGAGE_CATEGORY + ' '))
     {
-      mCianCategorySelected = true;
+      mLuggageCategorySelected = true;
       mToolbarController.setQuery(category);
 
-      Statistics.INSTANCE.trackSponsoredEventByType(
-          Statistics.EventName.SEARCH_SPONSOR_CATEGORY_SELECTED, Sponsored.TYPE_CIAN);
+      Statistics.INSTANCE.trackSponsoredEventForCustomProvider(
+          Statistics.EventName.SEARCH_SPONSOR_CATEGORY_SELECTED,
+          Statistics.ParamValue.LUGGAGE_HERO);
       showAllResultsOnMap();
-      mCianCategorySelected = false;
+      mLuggageCategorySelected = false;
     }
     else
     {

android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java

@@ -49,11 +49,8 @@ import com.mapswithme.maps.api.ParsedMwmRequest;
 import com.mapswithme.maps.bookmarks.data.Bookmark;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
 import com.mapswithme.maps.bookmarks.data.DistanceAndAzimut;
-import com.mapswithme.maps.bookmarks.data.FeatureId;
 import com.mapswithme.maps.bookmarks.data.MapObject;
 import com.mapswithme.maps.bookmarks.data.Metadata;
-import com.mapswithme.maps.cian.Cian;
-import com.mapswithme.maps.cian.RentPlace;
 import com.mapswithme.maps.downloader.CountryItem;
 import com.mapswithme.maps.downloader.DownloaderStatusIcon;
 import com.mapswithme.maps.downloader.MapManager;
@@ -128,8 +125,7 @@ public class PlacePageView extends RelativeLayout
                BottomPlacePageAnimationController.OnBannerOpenListener,
                EditBookmarkFragment.EditBookmarkListener,
                BannerController.BannerListener,
-               Viator.ViatorListener,
-               Cian.CianListener
+               Viator.ViatorListener
 {
   private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
   private static final String TAG = PlacePageView.class.getSimpleName();
@@ -646,7 +642,6 @@ public class PlacePageView extends RelativeLayout
     Sponsored.setPriceListener(this);
     Sponsored.setInfoListener(this);
     Viator.setViatorListener(this);
-    Cian.setCianListener(this);
   }
 
   private void initHotelRatingView()
@@ -836,22 +831,6 @@ public class PlacePageView extends RelativeLayout
       updateViatorView(products, mSponsored.getUrl());
   }
 
-  @Override
-  public void onRentPlacesReceived(@NonNull RentPlace[] places)
-  {
-    if (mSponsored != null)
-      updateCianView(places, mSponsored.getUrl());
-  }
-
-  @Override
-  public void onErrorReceived(int errorCode)
-  {
-    String url = mSponsored != null ? mSponsored.getUrl() : "";
-    mRvSponsoredProducts.setAdapter(Factory.createCianErrorAdapter(url, mDefaultGalleryItemListener));
-    Statistics.INSTANCE.trackGalleryError(GalleryType.CIAN, GalleryPlacement.PLACEPAGE,
-                                          String.valueOf(errorCode));
-  }
-
   private void initSponsoredGalleryView()
   {
     mSponsoredGalleryView = findViewById(R.id.ll__place_sponsored_gallery);
@@ -885,29 +864,12 @@ public class PlacePageView extends RelativeLayout
     }
   }
 
-  private void updateCianView(@NonNull final RentPlace[] products, @NonNull final String url)
-  {
-    if (products.length == 0)
-    {
-      mRvSponsoredProducts.setAdapter(Factory.createCianErrorAdapter(url, mDefaultGalleryItemListener));
-      Statistics.INSTANCE.trackGalleryError(GalleryType.CIAN, GalleryPlacement.PLACEPAGE,
-                                            Statistics.ParamValue.NO_PRODUCTS);
-    }
-    else
-    {
-      ItemSelectedListener<Items.CianItem> listener
-          = createSponsoredProductItemListener(GalleryType.CIAN);
-      mRvSponsoredProducts.setAdapter(Factory.createCianAdapter(products, url, listener,
-                                                                GalleryPlacement.PLACEPAGE));
-    }
-  }
-
   private void updateGallerySponsoredLogo(@Sponsored.SponsoredType int type)
   {
-    if (type != Sponsored.TYPE_VIATOR && type != Sponsored.TYPE_CIAN)
+    if (type != Sponsored.TYPE_VIATOR)
       throw new AssertionError("Unsupported type: " + type);
 
-    int logoAttr = type == Sponsored.TYPE_CIAN ? R.attr.cianLogo : R.attr.viatorLogo;
+    int logoAttr = R.attr.viatorLogo;
     TypedArray array = getActivity().getTheme().obtainStyledAttributes(new int[] {logoAttr});
     int attributeResourceId = array.getResourceId(0 /* index */, 0 /* defValue */);
     Drawable drawable = getResources().getDrawable(attributeResourceId);
@@ -917,8 +879,7 @@ public class PlacePageView extends RelativeLayout
 
   private void updateGallerySponsoredTitle(@Sponsored.SponsoredType int type)
   {
-    mTvSponsoredTitle.setText(type == Sponsored.TYPE_CIAN ? R.string.subtitle_rent
-                                                          : R.string.place_page_viator_title);
+    mTvSponsoredTitle.setText(R.string.place_page_viator_title);
   }
 
   private void hideSponsoredGalleryViews()
@@ -1240,41 +1201,26 @@ public class PlacePageView extends RelativeLayout
     }
 
     boolean isViator = mSponsored.getType() == Sponsored.TYPE_VIATOR;
-    boolean isCian = mSponsored.getType() == Sponsored.TYPE_CIAN;
 
-    if (!isViator && !isCian)
+    if (!isViator)
       return;
 
     updateGallerySponsoredLogo(mSponsored.getType());
     updateGallerySponsoredTitle(mSponsored.getType());
     UiUtils.show(mSponsoredGalleryView);
 
-    boolean hasInCache = isCian ? Cian.hasCache(mMapObject.getFeatureId())
-                                : Viator.hasCache(mSponsored.getId());
+    boolean hasInCache = Viator.hasCache(mSponsored.getId());
     final String url = !TextUtils.isEmpty(mSponsored.getUrl()) ? mSponsored.getUrl()
                                                                : mSponsored.getDescriptionUrl();
     if (!ConnectionState.isConnected() && !hasInCache)
     {
-      if (isCian)
-      {
-        updateCianView(new RentPlace[]{}, url);
-        return;
-      }
-
       updateViatorView(new ViatorProduct[]{}, url);
       return;
     }
 
-    if (isViator)
-    {
-      mRvSponsoredProducts.setAdapter(Factory.createViatorLoadingAdapter(url,
-                                                                         mDefaultGalleryItemListener));
-      Viator.requestViatorProducts(policy, mSponsored.getId(), currencyCode);
-      return;
-    }
-
-    mRvSponsoredProducts.setAdapter(Factory.createCianLoadingAdapter(url, mDefaultGalleryItemListener));
-    Cian.getRentNearby(policy, mMapObject.getLat(), mMapObject.getLon(), mMapObject.getFeatureId());
+    mRvSponsoredProducts.setAdapter(Factory.createViatorLoadingAdapter(url,
+                                                                       mDefaultGalleryItemListener));
+    Viator.requestViatorProducts(policy, mSponsored.getId(), currencyCode);
   }
 
   private boolean isNetworkNeeded()
@@ -1436,11 +1382,8 @@ public class PlacePageView extends RelativeLayout
 
       if (mSponsored.getType() != Sponsored.TYPE_BOOKING)
         hideHotelViews();
-      if (mSponsored.getType() != Sponsored.TYPE_VIATOR
-          && mSponsored.getType() != Sponsored.TYPE_CIAN)
-      {
+      if (mSponsored.getType() != Sponsored.TYPE_VIATOR)
         hideSponsoredGalleryViews();
-      }
     }
 
     refreshMetadataOrHide(mapObject.getMetadata(Metadata.MetadataType.FMD_PHONE_NUMBER), mPhone, mTvPhone);
@@ -1921,10 +1864,8 @@ public class PlacePageView extends RelativeLayout
         if (!TextUtils.isEmpty(url))
         {
           Utils.openUrl(getContext(), url);
-          GalleryType type = mSponsored.getType() == Sponsored.TYPE_CIAN ? GalleryType.CIAN
-                                                                         : GalleryType.VIATOR;
           Statistics.INSTANCE.trackGalleryEvent(Statistics.EventName.PP_SPONSOR_LOGO_SELECTED,
-                                                type, GalleryPlacement.PLACEPAGE);
+              GalleryType.VIATOR, GalleryPlacement.PLACEPAGE);
         }
         break;
     }

android/src/com/mapswithme/maps/widget/placepage/Sponsored.java

@@ -26,13 +26,11 @@ public final class Sponsored
   public static final int TYPE_BOOKING = 1;
   public static final int TYPE_OPENTABLE = 2;
   public static final int TYPE_VIATOR = 3;
-  public static final int TYPE_CIAN = 4;
-  public static final int TYPE_PARTNER = 5;
-  public static final int TYPE_HOLIDAY = 6;
+  public static final int TYPE_PARTNER = 4;
+  public static final int TYPE_HOLIDAY = 5;
 
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({ TYPE_NONE, TYPE_BOOKING, TYPE_OPENTABLE,
-            TYPE_VIATOR, TYPE_CIAN, TYPE_PARTNER, TYPE_HOLIDAY })
+  @IntDef({ TYPE_NONE, TYPE_BOOKING, TYPE_OPENTABLE, TYPE_VIATOR, TYPE_PARTNER, TYPE_HOLIDAY })
   public @interface SponsoredType {}
 
   private static class Price

android/src/com/mapswithme/util/statistics/GalleryType.java

@@ -13,15 +13,6 @@ public enum GalleryType
           return Statistics.ParamValue.VIATOR;
         }
       },
-  CIAN
-      {
-        @NonNull
-        @Override
-        public String getProvider()
-        {
-          return Statistics.ParamValue.CIAN;
-        }
-      },
   LOCAL_EXPERTS
       {
         @NonNull

android/src/com/mapswithme/util/statistics/Statistics.java

@@ -95,7 +95,6 @@ import static com.mapswithme.util.statistics.Statistics.EventParam.STATE;
 import static com.mapswithme.util.statistics.Statistics.EventParam.TYPE;
 import static com.mapswithme.util.statistics.Statistics.EventParam.VALUE;
 import static com.mapswithme.util.statistics.Statistics.ParamValue.BOOKING_COM;
-import static com.mapswithme.util.statistics.Statistics.ParamValue.CIAN;
 import static com.mapswithme.util.statistics.Statistics.ParamValue.HOLIDAY;
 import static com.mapswithme.util.statistics.Statistics.ParamValue.OPENTABLE;
 import static com.mapswithme.util.statistics.Statistics.ParamValue.SEARCH_BOOKING_COM;
@@ -358,7 +357,6 @@ public enum Statistics
     static final String LOCALS_EXPERTS = "Locals.Maps.Me";
     static final String SEARCH_RESTAURANTS = "Search.Restaurants";
     static final String SEARCH_ATTRACTIONS = "Search.Attractions";
-    static final String CIAN = "Cian.Ru";
     static final String HOLIDAY = "Holiday";
     public static final String NO_PRODUCTS = "no_products";
     static final String ADD = "add";
@@ -367,6 +365,8 @@ public enum Statistics
     static final String PLACEPAGE_PREVIEW = "placepage_preview";
     static final String PLACEPAGE = "placepage";
     public static final String FACEBOOK = "facebook";
+
+    public static final String LUGGAGE_HERO = "LuggageHero";
   }
 
   // Initialized once in constructor and does not change until the process restarts.
@@ -774,7 +774,7 @@ public enum Statistics
                                              .add(PLACEMENT, placement.toString())
                                              .add(STATE, state.toString()));
 
-    if (type == GalleryType.CIAN && state == GalleryState.ONLINE)
+    if (state == GalleryState.ONLINE)
       MyTracker.trackEvent(PP_SPONSORED_SHOWN + "_" + type.getProvider());
   }
 
@@ -807,9 +807,9 @@ public enum Statistics
                                     .get());
   }
 
-  public void trackSponsoredEventByType(@NonNull String eventName, @Sponsored.SponsoredType int type)
+  public void trackSponsoredEventForCustomProvider(@NonNull String eventName,
+                                                   @NonNull String provider)
   {
-    String provider = convertToSponsor(type);
     trackEvent(eventName, Statistics.params().add(PROVIDER, provider).get());
     MyTracker.trackEvent(eventName + "_" + provider);
   }
@@ -834,8 +834,6 @@ public enum Statistics
         return VIATOR;
       case Sponsored.TYPE_OPENTABLE:
         return OPENTABLE;
-      case Sponsored.TYPE_CIAN:
-        return CIAN;
       case Sponsored.TYPE_HOLIDAY:
         return HOLIDAY;
       case Sponsored.TYPE_NONE:

iphone/Maps/Common/Statistics/StatisticsStrings.h

@@ -59,7 +59,6 @@ static NSString * const kStatChangeRoutingMode = @"Change routing mode";
 static NSString * const kStatCharging = @"charging";
 static NSString * const kStatCheckIn = @"check_in";
 static NSString * const kStatCheckOut = @"check_out";
-static NSString * const kStatCian = @"Cian.ru";
 static NSString * const kStatClear = @"Clear";
 static NSString * const kStatClose = @"Close";
 static NSString * const kStatCollapse = @"Collapse";
@@ -162,6 +161,7 @@ static NSString * const kStatLocals = @"Locals";
 static NSString * const kStatLocalsProvider = @"Locals.Maps.Me";
 static NSString * const kStatLocation = @"Location";
 static NSString * const kStatLogout = @"Logout";
+static NSString * const kStatLuggageHero = @"LuggageHero";
 static NSString * const kStatMap = @"map";
 static NSString * const kStatMapDataSize = @"map_data_size";
 static NSString * const kStatMapSearch = @"Map search";

iphone/Maps/Core/Search/MWMSearch.mm

@@ -12,7 +12,7 @@
 #include "map/everywhere_search_params.hpp"
 #include "map/viewport_search_params.hpp"
 
-extern NSString * const kCianCategory;
+extern NSString * const kLuggageCategory;
 
 namespace
 {

iphone/Maps/Images.xcassets/Search/Categories/ic_cian_dark.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "ic_cian_dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_cian_dark@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_cian_dark@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Search/Categories/ic_cian_light.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "ic_cian_light.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_cian_light@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_cian_light@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Search/Categories/ic_luggagehero_dark.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_luggagehero_dark.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/Search/Categories/ic_luggagehero_light.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_luggagehero_light.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/logo_cian.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "logo_cian.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "logo_cian@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "logo_cian@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/logo_luggage.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "logo_luggage.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Maps.xcodeproj/project.pbxproj

@@ -142,11 +142,6 @@
 		347A4C5E1C4E76C9006BA66E /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 340DC82B1C4E72C700EAA2CC /* liboauthcpp.a */; };
 		347BFA901F27909200E5531F /* MenuArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347BFA8E1F27909200E5531F /* MenuArea.swift */; };
 		347E039A1FAC5F1D00426032 /* UIWindow+InputLanguage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347E03981FAC5F1D00426032 /* UIWindow+InputLanguage.swift */; };
-		347E1A891F1F5DD7002BF7A8 /* CianItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347E1A871F1F5DD7002BF7A8 /* CianItemModel.swift */; };
-		347E1A8E1F1F71F1002BF7A8 /* PPCianCarouselCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347E1A8C1F1F71F1002BF7A8 /* PPCianCarouselCell.swift */; };
-		347E1A921F1F72AD002BF7A8 /* PPCianCarouselCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347E1A901F1F72AD002BF7A8 /* PPCianCarouselCell.xib */; };
-		347E1A971F1F7404002BF7A8 /* CianElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347E1A941F1F7404002BF7A8 /* CianElement.swift */; };
-		347E1A9A1F1F7404002BF7A8 /* CianElement.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347E1A951F1F7404002BF7A8 /* CianElement.xib */; };
 		34845DAF1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */; };
 		34845DB31E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */; };
 		34845DB71E166084003D55B9 /* Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DB51E166084003D55B9 /* Common.swift */; };
@@ -927,11 +922,6 @@
 		347D15C71F82362900E86251 /* GoogleSignIn.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleSignIn.framework; path = GoogleSignIn/GoogleSignIn.framework; sourceTree = "<group>"; };
 		347D15C81F82362900E86251 /* GoogleSignInDependencies.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleSignInDependencies.framework; path = GoogleSignIn/GoogleSignInDependencies.framework; sourceTree = "<group>"; };
 		347E03981FAC5F1D00426032 /* UIWindow+InputLanguage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIWindow+InputLanguage.swift"; sourceTree = "<group>"; };
-		347E1A871F1F5DD7002BF7A8 /* CianItemModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CianItemModel.swift; sourceTree = "<group>"; };
-		347E1A8C1F1F71F1002BF7A8 /* PPCianCarouselCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PPCianCarouselCell.swift; sourceTree = "<group>"; };
-		347E1A901F1F72AD002BF7A8 /* PPCianCarouselCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PPCianCarouselCell.xib; sourceTree = "<group>"; };
-		347E1A941F1F7404002BF7A8 /* CianElement.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CianElement.swift; sourceTree = "<group>"; };
-		347E1A951F1F7404002BF7A8 /* CianElement.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CianElement.xib; sourceTree = "<group>"; };
 		34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloaderNoResultsEmbedViewController.swift; sourceTree = "<group>"; };
 		34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchNoResultsViewController.swift; sourceTree = "<group>"; };
 		34845DB51E166084003D55B9 /* Common.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Common.swift; sourceTree = "<group>"; };
@@ -2489,18 +2479,6 @@
 			path = TextToSpeech;
 			sourceTree = "<group>";
 		};
-		347E1A861F1F5DD7002BF7A8 /* Cian */ = {
-			isa = PBXGroup;
-			children = (
-				347E1A871F1F5DD7002BF7A8 /* CianItemModel.swift */,
-				347E1A8C1F1F71F1002BF7A8 /* PPCianCarouselCell.swift */,
-				347E1A901F1F72AD002BF7A8 /* PPCianCarouselCell.xib */,
-				347E1A941F1F7404002BF7A8 /* CianElement.swift */,
-				347E1A951F1F7404002BF7A8 /* CianElement.xib */,
-			);
-			path = Cian;
-			sourceTree = "<group>";
-		};
 		3486B5041E27A4B50069C126 /* Notifications */ = {
 			isa = PBXGroup;
 			children = (
@@ -3467,7 +3445,6 @@
 				F68224981E5B0FE100BC1C18 /* BookingCells */,
 				F6E2FCA91E097B9F0083EBEC /* BookmarkCell */,
 				F6E2FCAF1E097B9F0083EBEC /* ButtonCell */,
-				347E1A861F1F5DD7002BF7A8 /* Cian */,
 				346DB81C1E5C4F6700E3123E /* Gallery */,
 				F6E2FCB31E097B9F0083EBEC /* OpeningHoursCell */,
 				F6E2FCC11E097B9F0083EBEC /* RegularCell */,
@@ -4120,7 +4097,6 @@
 				F6E2FEEE1E097BA00083EBEC /* MWMSearchView.xib in Resources */,
 				344532511F714FD70059FBCC /* UGCAddReviewController.xib in Resources */,
 				3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */,
-				347E1A921F1F72AD002BF7A8 /* PPCianCarouselCell.xib in Resources */,
 				346DB82B1E5C4F6700E3123E /* GalleryCell.xib in Resources */,
 				F6E2FE2E1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */,
 				349B92711DF0526D007779DD /* MWMToast.xib in Resources */,
@@ -4145,7 +4121,6 @@
 				6741A94D1BF340DE002C974C /* resources-xxhdpi_clear in Resources */,
 				6741A9551BF340DE002C974C /* resources-xxhdpi_dark in Resources */,
 				340E1EF51E2F614400CE49BF /* SearchFilters.storyboard in Resources */,
-				347E1A9A1F1F7404002BF7A8 /* CianElement.xib in Resources */,
 				F682249F1E5B105900BC1C18 /* PPHotelDescriptionCell.xib in Resources */,
 				340E1EF81E2F614400CE49BF /* Settings.storyboard in Resources */,
 				6741A9421BF340DE002C974C /* sound-strings in Resources */,
@@ -4233,7 +4208,6 @@
 				343064411E9FDC7300DC7665 /* SearchIndex.swift in Sources */,
 				F6664BFA1E6459CB00E703C2 /* PPFacilityCell.swift in Sources */,
 				348B926D1FF3B5E100379009 /* UIView+Animation.swift in Sources */,
-				347E1A8E1F1F71F1002BF7A8 /* PPCianCarouselCell.swift in Sources */,
 				F6E2FDE91E097BA00083EBEC /* MWMObjectsCategorySelectorController.mm in Sources */,
 				3472B5EF200F8F7600DC6CD5 /* BackgroundUGCUpload.swift in Sources */,
 				6741A9A81BF340DE002C974C /* MWMFacebookAlert.mm in Sources */,
@@ -4264,7 +4238,6 @@
 				340475501E081A4600C92850 /* fabric_logging_ios.mm in Sources */,
 				34F4073E1E9E1AFF00E57AC0 /* MPNativeAd+MWM.mm in Sources */,
 				F6E2FED01E097BA00083EBEC /* MWMSearchFilterViewController.mm in Sources */,
-				347E1A971F1F7404002BF7A8 /* CianElement.swift in Sources */,
 				34D4FA671E265749003F53EF /* WhatsNewController.swift in Sources */,
 				34D3B01B1E389D05004100F9 /* MWMButtonCell.mm in Sources */,
 				3486B5161E27AD3B0069C126 /* Framework.cpp in Sources */,
@@ -4347,7 +4320,6 @@
 				F6558DA21E642CC0002203AE /* MWMFacilitiesController.mm in Sources */,
 				34AB664A1FC5AA330078E451 /* RouteManageriPadPresentationController.swift in Sources */,
 				349D1ACF1E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.mm in Sources */,
-				347E1A891F1F5DD7002BF7A8 /* CianItemModel.swift in Sources */,
 				F6E2FF451E097BA00083EBEC /* SettingsTableViewLinkCell.swift in Sources */,
 				34C9BD0A1C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */,
 				3472B5F3200F906800DC6CD5 /* BackgroundDownloadMapNotification.swift in Sources */,

iphone/Maps/UI/PlacePage/MWMPlacePageData.h

@@ -12,7 +12,6 @@
 
 @class MWMPlacePageData;
 @class MWMUGCReviewVM;
-@class MWMCianItemModel;
 
 struct BookmarkAndCategory;
 struct FeatureID;
@@ -92,8 +91,7 @@ enum class HotelReviewsRow
 
 enum class SpecialProject
 {
-  Viator,
-  Cian
+  Viator
 };
 
 enum class MetainfoRows
@@ -135,12 +133,10 @@ enum class OpeningHours
 };
 
 using NewSectionsAreReady = void (^)(NSRange const & range, MWMPlacePageData * data, BOOL isSection);
-using CianIsReady = void (^)(NSArray<MWMCianItemModel *> * items);
 }  // namespace place_page
 
 @class MWMGalleryItemModel;
 @class MWMViatorItemModel;
-@class MWMCianItemModel;
 @class MWMUGCViewModel;
 @class MWMUGCReviewModel;
 @class MWMUGCRatingValueType;
@@ -152,7 +148,6 @@ using CianIsReady = void (^)(NSArray<MWMCianItemModel *> * items);
 @property(copy, nonatomic) MWMVoidBlock refreshPreviewCallback;
 @property(copy, nonatomic) place_page::NewSectionsAreReady sectionsAreReadyCallback;
 @property(copy, nonatomic) MWMVoidBlock bannerIsReadyCallback;
-@property(copy, nonatomic) place_page::CianIsReady cianIsReadyCallback;
 @property(nonatomic, readonly) MWMUGCViewModel * ugc;
 
 // ready callback will be called from main queue.
@@ -202,9 +197,6 @@ using CianIsReady = void (^)(NSArray<MWMCianItemModel *> * items);
 - (void)fillOnlineViatorSection;
 - (NSArray<MWMViatorItemModel *> *)viatorItems;
 
-// CIAN
-- (void)fillOnlineCianSection;
-
 // Route points
 - (RouteMarkType)routeMarkType;
 - (size_t)intermediateIndex;
@@ -251,7 +243,6 @@ using CianIsReady = void (^)(NSArray<MWMCianItemModel *> * items);
 - (BOOL)isBooking;
 - (BOOL)isOpentable;
 - (BOOL)isViator;
-- (BOOL)isCian;
 - (BOOL)isPartner;
 - (BOOL)isHolidayObject;
 - (BOOL)isBookingSearch;

iphone/Maps/UI/PlacePage/MWMPlacePageData.mm

@@ -50,8 +50,6 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
   std::vector<HotelReviewsRow> m_hotelReviewsRows;
 
   booking::HotelInfo m_hotelInfo;
-
-  uint64_t m_cianRequestId;
 }
 
 - (instancetype)initWithPlacePageInfo:(Info const &)info
@@ -183,7 +181,7 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
   NSAssert(!m_previewRows.empty(), @"Preview row's can't be empty!");
 
   if (network_policy::CanUseNetwork() && ![MWMSettings adForbidden] && m_info.HasBanner() &&
-      ![self isViator] && ![self isCian])
+      ![self isViator])
   {
     __weak auto wSelf = self;
     [[MWMBannersCache cache]
@@ -338,68 +336,6 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
   });
 }
 
-- (void)fillOnlineCianSection
-{
-  if (![self isCian])
-    return;
-
-  [self insertSpecialProjectsSectionWithProject:SpecialProject::Cian];
-
-  if (Platform::ConnectionStatus() == Platform::EConnectionType::CONNECTION_NONE)
-  {
-    self.cianIsReadyCallback(@[]);
-    return;
-  }
-
-  network_policy::CallPartnersApi([self](platform::NetworkPolicy const & canUseNetwork) {
-    auto api = GetFramework().GetCianApi(canUseNetwork);
-    if (!api)
-    {
-      self.cianIsReadyCallback(@[]);
-      return;
-    }
-    auto const latLon = [self latLon];
-
-    __weak auto wSuccessSelf = self;
-    __weak auto wErrorSelf = self;
-    m_cianRequestId = api->GetRentNearby(
-        latLon,
-        [wSuccessSelf](std::vector<cian::RentPlace> const & places, uint64_t const requestId) {
-          __strong auto self = wSuccessSelf;
-          if (!self || self->m_cianRequestId != requestId)
-            return;
-          NSMutableArray<MWMCianItemModel *> * items = [@[] mutableCopy];
-          for (auto const & p : places)
-          {
-            auto const & offers = p.m_offers;
-            NSCAssert(!offers.empty(), @"Cian misses offers for place.");
-            if (offers.empty())
-              continue;
-            auto const & firstOffer = offers.front();
-
-            auto pageURL = [NSURL URLWithString:@(firstOffer.m_url.c_str())];
-            if (!pageURL)
-              continue;
-            auto item =
-                [[MWMCianItemModel alloc] initWithRoomsCount:firstOffer.m_roomsCount
-                                                    priceRur:firstOffer.m_priceRur
-                                                     pageURL:pageURL
-                                                     address:@(firstOffer.m_address.c_str())];
-            [items addObject:item];
-          }
-
-          dispatch_async(dispatch_get_main_queue(),
-                         [self, items] { self.cianIsReadyCallback(items); });
-        },
-        [wErrorSelf](int code, uint64_t const requestId) {
-          __strong auto self = wErrorSelf;
-          if (!self || self->m_cianRequestId != requestId)
-            return;
-          dispatch_async(dispatch_get_main_queue(), [self] { self.cianIsReadyCallback(@[]); });
-        });
-  });
-}
-
 - (float)ratingRawValue
 {
   return m_info.GetRatingRawValue();
@@ -845,7 +781,6 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
 - (BOOL)isBooking { return m_info.GetSponsoredType() == SponsoredType::Booking; }
 - (BOOL)isOpentable { return m_info.GetSponsoredType() == SponsoredType::Opentable; }
 - (BOOL)isViator { return m_info.GetSponsoredType() == SponsoredType::Viator; }
-- (BOOL)isCian { return m_info.GetSponsoredType() == SponsoredType::Cian; }
 - (BOOL)isPartner { return m_info.GetSponsoredType() == SponsoredType::Partner; }
 - (BOOL)isHolidayObject { return m_info.GetSponsoredType() == SponsoredType::Holiday; }
 - (BOOL)isBookingSearch { return !m_info.GetBookingSearchUrl().empty(); }

iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm

@@ -253,8 +253,6 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName)
     parameters[kStatProvider] = kStatViator;
   else if (data.isBooking)
     parameters[kStatProvider] = kStatBooking;
-  else if (data.isCian)
-    parameters[kStatProvider] = kStatCian;
   else if (data.isPartner)
     parameters[kStatProvider] = data.partnerName;
   else if (data.isHolidayObject)

iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Cian/CianElement.swift

@@ -1,179 +0,0 @@
-final class CianElement: UICollectionViewCell {
-  enum State {
-    case pending(onButtonAction: () -> Void)
-    case offer(model: CianItemModel?, onButtonAction: (CianItemModel?) -> Void)
-    case error(onButtonAction: () -> Void)
-  }
-
-  @IBOutlet private var contentViews: [UIView]!
-
-  @IBOutlet private weak var pendingView: UIView!
-  @IBOutlet private weak var offerView: UIView!
-  @IBOutlet private weak var more: UIButton!
-  @IBOutlet private weak var price: UILabel! {
-    didSet {
-      price.font = UIFont.medium14()
-      price.textColor = UIColor.linkBlue()
-    }
-  }
-
-  @IBOutlet private weak var descr: UILabel! {
-    didSet {
-      descr.font = UIFont.medium14()
-      descr.textColor = UIColor.blackPrimaryText()
-    }
-  }
-
-  @IBOutlet private weak var address: UILabel! {
-    didSet {
-      address.font = UIFont.regular12()
-      address.textColor = UIColor.blackSecondaryText()
-    }
-  }
-
-  @IBOutlet private weak var details: UIButton! {
-    didSet {
-      details.setTitleColor(UIColor.linkBlue(), for: .normal)
-      details.setBackgroundColor(UIColor.blackOpaque(), for: .normal)
-    }
-  }
-
-  private var isLastCell = false {
-    didSet {
-      more.isHidden = !isLastCell
-      price.isHidden = isLastCell
-      descr.isHidden = isLastCell
-      address.isHidden = isLastCell
-      details.isHidden = isLastCell
-    }
-  }
-
-  @IBOutlet private weak var pendingSpinnerView: UIImageView! {
-    didSet {
-      pendingSpinnerView.tintColor = UIColor.linkBlue()
-    }
-  }
-
-  @IBOutlet private weak var pendingTitleTopOffset: NSLayoutConstraint!
-  @IBOutlet private weak var pendingTitle: UILabel! {
-    didSet {
-      pendingTitle.font = UIFont.medium14()
-      pendingTitle.textColor = UIColor.blackPrimaryText()
-      pendingTitle.text = L("preloader_cian_title")
-    }
-  }
-
-  @IBOutlet private weak var pendingDescription: UILabel! {
-    didSet {
-      pendingDescription.font = UIFont.regular12()
-      pendingDescription.textColor = UIColor.blackSecondaryText()
-      pendingDescription.text = L("preloader_cian_message")
-    }
-  }
-
-  @IBAction func onButtonAction() {
-    switch state! {
-    case let .pending(action): action()
-    case let .offer(model, action): action(model)
-    case let .error(action): action()
-    }
-  }
-
-  var state: State! {
-    didSet {
-      setupAppearance()
-      let visibleView: UIView
-      let pendingSpinnerViewAlpha: CGFloat
-      switch state! {
-      case .pending:
-        pendingSpinnerViewAlpha = 1
-        visibleView = self.pendingView
-      case .offer:
-        pendingSpinnerViewAlpha = 1
-        visibleView = self.offerView
-      case .error:
-        pendingSpinnerViewAlpha = 0
-        visibleView = self.pendingView
-      }
-
-      animateConstraints(animations: {
-        self.contentViews.forEach { $0.isHidden = false }
-        switch self.state! {
-        case .pending: self.configPending()
-        case let .offer(model, _): self.configOffer(model: model)
-        case .error: self.configError()
-        }
-        self.pendingSpinnerView.alpha = pendingSpinnerViewAlpha
-        self.contentViews.forEach { $0.alpha = 0 }
-        visibleView.alpha = 1
-      }, completion: {
-        self.contentViews.forEach { $0.isHidden = true }
-        visibleView.isHidden = false
-      })
-    }
-  }
-
-  private var isSpinning = false {
-    didSet {
-      let animationKey = "SpinnerAnimation"
-      if isSpinning {
-        let animation = CABasicAnimation(keyPath: "transform.rotation.z")
-        animation.fromValue = NSNumber(value: 0)
-        animation.toValue = NSNumber(value: 2 * Double.pi)
-        animation.duration = 0.8
-        animation.repeatCount = Float.infinity
-        pendingSpinnerView.layer.add(animation, forKey: animationKey)
-      } else {
-        pendingSpinnerView.layer.removeAnimation(forKey: animationKey)
-      }
-    }
-  }
-
-  private func setupAppearance() {
-    backgroundColor = UIColor.white()
-    layer.cornerRadius = 6
-    layer.borderWidth = 1
-    layer.borderColor = UIColor.blackDividers().cgColor
-  }
-
-  private func configPending() {
-    isSpinning = true
-    details.setTitle(L("preloader_cian_button"), for: .normal)
-    pendingTitleTopOffset.priority = UILayoutPriority.defaultLow
-  }
-
-  private func configError() {
-    isSpinning = false
-    details.setTitle(L("preloader_cian_button"), for: .normal)
-    pendingTitleTopOffset.priority = UILayoutPriority.defaultHigh
-  }
-
-  private func configOffer(model: CianItemModel?) {
-    isSpinning = false
-    if let model = model {
-      isLastCell = false
-
-      let priceFormatter = NumberFormatter()
-      priceFormatter.usesGroupingSeparator = true
-      if let priceString = priceFormatter.string(from: NSNumber(value: model.priceRur)) {
-        price.text = "\(priceString) \(L("rub_month"))"
-      } else {
-        price.isHidden = true
-      }
-
-      let descrFormat = L("room").replacingOccurrences(of: "%s", with: "%@")
-      descr.text = String(format: descrFormat, arguments: ["\(model.roomsCount)"])
-
-      address.text = model.address
-
-      details.setTitle(L("details"), for: .normal)
-    } else {
-      isLastCell = true
-
-      more.setBackgroundImage(UIColor.isNightMode() ? #imageLiteral(resourceName: "btn_float_more_dark") : #imageLiteral(resourceName: "btn_float_more_light"), for: .normal)
-
-      backgroundColor = UIColor.clear
-      layer.borderColor = UIColor.clear.cgColor
-    }
-  }
-}

iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Cian/CianElement.xib

@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" contentMode="center" reuseIdentifier="CianElement" id="M3h-Po-OZ2" customClass="CianElement" customModule="cm_beta" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="359" height="136"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                <rect key="frame" x="0.0" y="0.0" width="359" height="136"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="R2W-is-Sf4">
-                        <rect key="frame" x="0.0" y="0.0" width="359" height="84"/>
-                        <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="id6-AH-H9j">
-                                <rect key="frame" x="149.5" y="38" width="60" height="60"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="60" id="IsD-NU-jC0"/>
-                                    <constraint firstAttribute="width" secondItem="id6-AH-H9j" secondAttribute="height" multiplier="1:1" id="awE-Lv-XH6"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                <connections>
-                                    <action selector="onButtonAction" destination="M3h-Po-OZ2" eventType="touchUpInside" id="UZ2-Xs-jFs"/>
-                                </connections>
-                            </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="370 000 ₽/мес." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uEh-dd-pal">
-                                <rect key="frame" x="12" y="12" width="335" height="14.5"/>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3-комн. кв, 215 м²" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1xd-1l-F1k">
-                                <rect key="frame" x="12" y="30.5" width="335" height="17"/>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="4 hours" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qgX-Wx-Mv7">
-                                <rect key="frame" x="12" y="51.5" width="335" height="14.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="uEh-dd-pal" firstAttribute="top" secondItem="R2W-is-Sf4" secondAttribute="top" constant="12" id="0Lv-tX-jvl"/>
-                            <constraint firstAttribute="trailing" secondItem="1xd-1l-F1k" secondAttribute="trailing" constant="12" id="7aI-4e-kBF"/>
-                            <constraint firstItem="qgX-Wx-Mv7" firstAttribute="top" secondItem="1xd-1l-F1k" secondAttribute="bottom" constant="4" id="BRa-ep-j27"/>
-                            <constraint firstItem="1xd-1l-F1k" firstAttribute="top" secondItem="uEh-dd-pal" secondAttribute="bottom" constant="4" id="BW5-Uu-LYC"/>
-                            <constraint firstItem="qgX-Wx-Mv7" firstAttribute="leading" secondItem="R2W-is-Sf4" secondAttribute="leading" constant="12" id="Be3-IH-cbd"/>
-                            <constraint firstAttribute="trailing" secondItem="qgX-Wx-Mv7" secondAttribute="trailing" constant="12" id="Fh5-aY-6vZ"/>
-                            <constraint firstAttribute="trailing" secondItem="uEh-dd-pal" secondAttribute="trailing" constant="12" id="aZW-4Q-ddT"/>
-                            <constraint firstItem="1xd-1l-F1k" firstAttribute="leading" secondItem="R2W-is-Sf4" secondAttribute="leading" constant="12" id="bKq-2Q-zSl"/>
-                            <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="qgX-Wx-Mv7" secondAttribute="bottom" id="j5h-7y-MWw"/>
-                            <constraint firstItem="uEh-dd-pal" firstAttribute="leading" secondItem="R2W-is-Sf4" secondAttribute="leading" constant="12" id="xCA-IE-FEs"/>
-                        </constraints>
-                    </view>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kn4-Ib-zJ0">
-                        <rect key="frame" x="0.0" y="0.0" width="359" height="84"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wFD-SC-Cp3">
-                                <rect key="frame" x="0.0" y="7" width="359" height="71.5"/>
-                                <subviews>
-                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic24PxSpinner" translatesAutoresizingMaskIntoConstraints="NO" id="71a-Dw-JIt">
-                                        <rect key="frame" x="167" y="0.0" width="24" height="24"/>
-                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="24" id="TvY-TT-UE3"/>
-                                            <constraint firstAttribute="height" constant="24" id="oHc-Go-jJr"/>
-                                        </constraints>
-                                    </imageView>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WXZ-8d-bkC">
-                                        <rect key="frame" x="0.0" y="36" width="359" height="17"/>
-                                        <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qs4-kW-kiT">
-                                        <rect key="frame" x="0.0" y="57" width="359" height="14.5"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstAttribute="trailing" secondItem="WXZ-8d-bkC" secondAttribute="trailing" id="6fC-SI-oPu"/>
-                                    <constraint firstItem="WXZ-8d-bkC" firstAttribute="top" secondItem="wFD-SC-Cp3" secondAttribute="top" priority="250" id="F84-HV-lEa"/>
-                                    <constraint firstItem="WXZ-8d-bkC" firstAttribute="leading" secondItem="wFD-SC-Cp3" secondAttribute="leading" id="FBt-gj-wRw"/>
-                                    <constraint firstItem="qs4-kW-kiT" firstAttribute="top" secondItem="WXZ-8d-bkC" secondAttribute="bottom" constant="4" id="GBu-s4-0g4"/>
-                                    <constraint firstItem="71a-Dw-JIt" firstAttribute="top" secondItem="wFD-SC-Cp3" secondAttribute="top" priority="500" identifier="topPendingSpinner" id="aLX-u2-pTz"/>
-                                    <constraint firstAttribute="bottom" secondItem="qs4-kW-kiT" secondAttribute="bottom" id="cGc-6o-H4Q"/>
-                                    <constraint firstItem="WXZ-8d-bkC" firstAttribute="top" secondItem="71a-Dw-JIt" secondAttribute="bottom" constant="12" id="g77-WF-Hw7"/>
-                                    <constraint firstItem="71a-Dw-JIt" firstAttribute="centerX" secondItem="wFD-SC-Cp3" secondAttribute="centerX" identifier="centerPendingSpinner" id="gPh-4z-DL6"/>
-                                    <constraint firstAttribute="trailing" secondItem="qs4-kW-kiT" secondAttribute="trailing" id="gPi-5Z-wkw"/>
-                                    <constraint firstItem="qs4-kW-kiT" firstAttribute="leading" secondItem="wFD-SC-Cp3" secondAttribute="leading" id="iHe-t3-hr4"/>
-                                </constraints>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="wFD-SC-Cp3" firstAttribute="leading" secondItem="kn4-Ib-zJ0" secondAttribute="leading" id="JcD-GE-MYz"/>
-                            <constraint firstAttribute="trailing" secondItem="wFD-SC-Cp3" secondAttribute="trailing" id="VDj-oc-LHk"/>
-                            <constraint firstItem="wFD-SC-Cp3" firstAttribute="centerY" secondItem="kn4-Ib-zJ0" secondAttribute="centerY" id="cL8-aA-Zrg"/>
-                        </constraints>
-                    </view>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Fh-ba-07y">
-                        <rect key="frame" x="0.0" y="92" width="359" height="44"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="44" id="bzP-y6-5of"/>
-                        </constraints>
-                        <state key="normal" title="Button"/>
-                        <connections>
-                            <action selector="onButtonAction" destination="M3h-Po-OZ2" eventType="touchUpInside" id="55y-0U-n4N"/>
-                        </connections>
-                    </button>
-                </subviews>
-            </view>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-            <constraints>
-                <constraint firstItem="kn4-Ib-zJ0" firstAttribute="top" secondItem="M3h-Po-OZ2" secondAttribute="top" id="0Ka-Hc-cQp"/>
-                <constraint firstAttribute="trailing" secondItem="R2W-is-Sf4" secondAttribute="trailing" id="4WN-aq-2LI"/>
-                <constraint firstItem="id6-AH-H9j" firstAttribute="centerY" secondItem="M3h-Po-OZ2" secondAttribute="centerY" id="4sT-eH-I6T"/>
-                <constraint firstAttribute="trailing" secondItem="9Fh-ba-07y" secondAttribute="trailing" id="86Q-eA-QPL"/>
-                <constraint firstItem="R2W-is-Sf4" firstAttribute="leading" secondItem="M3h-Po-OZ2" secondAttribute="leading" id="IyY-jn-Oo3"/>
-                <constraint firstItem="kn4-Ib-zJ0" firstAttribute="leading" secondItem="M3h-Po-OZ2" secondAttribute="leading" id="NKP-12-cA2"/>
-                <constraint firstItem="9Fh-ba-07y" firstAttribute="leading" secondItem="M3h-Po-OZ2" secondAttribute="leading" id="Owb-m1-eXn"/>
-                <constraint firstItem="9Fh-ba-07y" firstAttribute="top" secondItem="R2W-is-Sf4" secondAttribute="bottom" constant="8" id="XoP-TP-0vI"/>
-                <constraint firstItem="R2W-is-Sf4" firstAttribute="top" secondItem="M3h-Po-OZ2" secondAttribute="top" id="YIF-er-YjM"/>
-                <constraint firstAttribute="bottom" secondItem="9Fh-ba-07y" secondAttribute="bottom" id="ZZL-IH-9aB"/>
-                <constraint firstItem="id6-AH-H9j" firstAttribute="centerX" secondItem="M3h-Po-OZ2" secondAttribute="centerX" id="fW1-aZ-Wf5"/>
-                <constraint firstAttribute="trailing" secondItem="kn4-Ib-zJ0" secondAttribute="trailing" id="gGM-zs-IN0"/>
-                <constraint firstItem="9Fh-ba-07y" firstAttribute="top" secondItem="kn4-Ib-zJ0" secondAttribute="bottom" constant="8" id="zOJ-sz-Igp"/>
-            </constraints>
-            <connections>
-                <outlet property="address" destination="qgX-Wx-Mv7" id="e49-3B-GAx"/>
-                <outlet property="descr" destination="1xd-1l-F1k" id="KhV-pr-C3K"/>
-                <outlet property="details" destination="9Fh-ba-07y" id="dHf-Nj-K9g"/>
-                <outlet property="more" destination="id6-AH-H9j" id="ckh-cS-xmJ"/>
-                <outlet property="offerView" destination="R2W-is-Sf4" id="gKM-Xm-lzP"/>
-                <outlet property="pendingDescription" destination="qs4-kW-kiT" id="aav-TU-fRL"/>
-                <outlet property="pendingSpinnerView" destination="71a-Dw-JIt" id="jgt-P8-5pA"/>
-                <outlet property="pendingTitle" destination="WXZ-8d-bkC" id="wId-fi-ceF"/>
-                <outlet property="pendingTitleTopOffset" destination="F84-HV-lEa" id="Qn8-vt-Vjg"/>
-                <outlet property="pendingView" destination="kn4-Ib-zJ0" id="OQh-kH-Nda"/>
-                <outlet property="price" destination="uEh-dd-pal" id="Vxg-yi-Zu8"/>
-                <outletCollection property="contentViews" destination="R2W-is-Sf4" collectionClass="NSMutableArray" id="3wv-Mx-ff5"/>
-                <outletCollection property="contentViews" destination="kn4-Ib-zJ0" collectionClass="NSMutableArray" id="llM-Co-3Ta"/>
-            </connections>
-            <point key="canvasLocation" x="42.5" y="118"/>
-        </collectionViewCell>
-    </objects>
-    <resources>
-        <image name="ic24PxSpinner" width="24" height="24"/>
-    </resources>
-</document>

iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Cian/CianItemModel.swift

@@ -1,14 +0,0 @@
-@objc(MWMCianItemModel)
-final class CianItemModel: NSObject {
-  let roomsCount: UInt
-  let priceRur: UInt
-  let pageURL: URL
-  let address: String
-
-  @objc init(roomsCount: UInt, priceRur: UInt, pageURL: URL, address: String) {
-    self.roomsCount = roomsCount
-    self.priceRur = priceRur
-    self.pageURL = pageURL
-    self.address = address
-  }
-}

iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Cian/PPCianCarouselCell.swift

@@ -1,130 +0,0 @@
-import MyTrackerSDK
-
-@objc(MWMPPCianCarouselCell)
-final class PPCianCarouselCell: MWMTableViewCell {
-  @IBOutlet private weak var title: UILabel! {
-    didSet {
-      title.text = L("subtitle_rent")
-      title.font = UIFont.bold14()
-      title.textColor = UIColor.blackSecondaryText()
-    }
-  }
-
-  @IBOutlet private weak var more: UIButton! {
-    didSet {
-      more.setImage(#imageLiteral(resourceName: "logo_cian"), for: .normal)
-      more.titleLabel?.font = UIFont.regular17()
-      more.setTitleColor(UIColor.linkBlue(), for: .normal)
-    }
-  }
-
-  @IBOutlet private weak var collectionView: UICollectionView!
-  @objc var data: [CianItemModel]? {
-    didSet {
-      updateCollectionView { [weak self] in
-        self?.collectionView.reloadSections(IndexSet(integer: 0))
-      }
-    }
-  }
-
-  fileprivate let kMaximumNumberOfElements = 5
-  fileprivate var delegate: MWMPlacePageButtonsProtocol?
-
-  fileprivate var statisticsParameters: [AnyHashable: Any] { return [kStatProvider: kStatCian,
-                                                                     kStatPlacement : kStatPlacePage] }
-
-  @objc func config(delegate d: MWMPlacePageButtonsProtocol?) {
-    delegate = d
-    collectionView.contentOffset = .zero
-    collectionView.delegate = self
-    collectionView.dataSource = self
-    collectionView.register(cellClass: CianElement.self)
-    collectionView.reloadData()
-
-    isSeparatorHidden = true
-    backgroundColor = UIColor.clear
-  }
-
-  fileprivate func isLastCell(_ indexPath: IndexPath) -> Bool {
-    return indexPath.item == collectionView.numberOfItems(inSection: indexPath.section) - 1
-  }
-
-  override func didMoveToSuperview() {
-    super.didMoveToSuperview()
-    updateCollectionView(nil)
-  }
-
-  private func updateCollectionView(_ updates: (() -> Void)?) {
-    guard let sv = superview else { return }
-    let layout = collectionView.collectionViewLayout as! UICollectionViewFlowLayout
-    let screenSize = { sv.size.width - layout.sectionInset.left - layout.sectionInset.right }
-    let itemHeight: CGFloat = 136
-    let itemWidth: CGFloat
-    if let data = data {
-      if data.isEmpty {
-        itemWidth = screenSize()
-      } else {
-        itemWidth = 160
-      }
-    } else {
-      itemWidth = screenSize()
-    }
-    layout.itemSize = CGSize(width: itemWidth, height: itemHeight)
-    collectionView.performBatchUpdates(updates, completion: nil)
-  }
-
-  @IBAction
-  fileprivate func onMore() {
-    MRMyTracker.trackEvent(withName: "Placepage_SponsoredGallery_LogoItem_selected_Cian.Ru")
-    Statistics.logEvent(kStatPlacepageSponsoredLogoSelected, withParameters: statisticsParameters)
-    delegate?.openSponsoredURL(nil)
-  }
-}
-
-extension PPCianCarouselCell: UICollectionViewDelegate, UICollectionViewDataSource {
-  func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-    let cell = collectionView.dequeueReusableCell(withCellClass: CianElement.self,
-                                                  indexPath: indexPath) as! CianElement
-    if let data = data {
-      if data.isEmpty {
-        cell.state = .error(onButtonAction: { [unowned self] in
-          Statistics.logEvent(kStatPlacepageSponsoredError, withParameters: self.statisticsParameters)
-          self.delegate?.openSponsoredURL(nil)
-        })
-      } else {
-        let model = isLastCell(indexPath) ? nil : data[indexPath.item]
-        var params = statisticsParameters
-        params[kStatItem] = indexPath.row + 1
-        params[kStatDestination] = kStatExternal
-        cell.state = .offer(model: model,
-                            onButtonAction: { [unowned self] model in
-                              let isMore = model == nil
-                              MRMyTracker.trackEvent(withName: isMore ? "Placepage_SponsoredGallery_MoreItem_selected_Cian.Ru" :
-                                "Placepage_SponsoredGallery_ProductItem_selected_Cian.Ru")
-                              Statistics.logEvent(isMore ? kStatPlacepageSponsoredMoreSelected : kStatPlacepageSponsoredItemSelected,
-                                                  withParameters: params)
-                              self.delegate?.openSponsoredURL(model?.pageURL)
-        })
-      }
-    } else {
-      cell.state = .pending(onButtonAction: { [unowned self] in
-        MRMyTracker.trackEvent(withName: "Placepage_SponsoredGallery_MoreItem_selected_Cian.Ru")
-        Statistics.logEvent(kStatPlacepageSponsoredMoreSelected, withParameters: self.statisticsParameters)
-        self.delegate?.openSponsoredURL(nil)
-      })
-    }
-    return cell
-  }
-
-  func collectionView(_: UICollectionView, numberOfItemsInSection _: Int) -> Int {
-    if let data = data {
-      if data.isEmpty {
-        return 1
-      } else {
-        return min(data.count, kMaximumNumberOfElements) + 1
-      }
-    } else {
-      return 1
-    }
-  }
-}

iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Cian/PPCianCarouselCell.xib

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="Sg7-wE-7Ir" customClass="MWMPPCianCarouselCell">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="189"/>
-            <autoresizingMask key="autoresizingMask"/>
-            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sg7-wE-7Ir" id="aSG-gb-Vaa">
-                <rect key="frame" x="0.0" y="0.0" width="375" height="188.5"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="АРЕНДА" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NuY-qA-4Ql">
-                        <rect key="frame" x="12" y="8" width="57" height="24"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                        <nil key="textColor"/>
-                        <nil key="highlightedColor"/>
-                    </label>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IOV-53-Iu8">
-                        <rect key="frame" x="283" y="-4" width="84" height="48"/>
-                        <inset key="contentEdgeInsets" minX="8" minY="8" maxX="8" maxY="8"/>
-                        <state key="normal" image="logo_cian"/>
-                        <connections>
-                            <action selector="onMore" destination="Sg7-wE-7Ir" eventType="touchUpInside" id="dnJ-Bo-GZI"/>
-                        </connections>
-                    </button>
-                    <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="5Cw-QQ-VRc">
-                        <rect key="frame" x="0.0" y="48" width="375" height="136"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="height" priority="900" constant="136" id="BgC-ps-kiz"/>
-                        </constraints>
-                        <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="8" minimumInteritemSpacing="8" id="KiF-3P-pUG">
-                            <size key="itemSize" width="160" height="136"/>
-                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                            <inset key="sectionInset" minX="4" minY="0.0" maxX="4" maxY="0.0"/>
-                        </collectionViewFlowLayout>
-                    </collectionView>
-                </subviews>
-                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                <constraints>
-                    <constraint firstAttribute="trailing" secondItem="IOV-53-Iu8" secondAttribute="trailing" constant="8" id="Ds4-FQ-jlE"/>
-                    <constraint firstItem="NuY-qA-4Ql" firstAttribute="leading" secondItem="aSG-gb-Vaa" secondAttribute="leading" constant="12" id="Nla-eg-pwx"/>
-                    <constraint firstItem="5Cw-QQ-VRc" firstAttribute="leading" secondItem="aSG-gb-Vaa" secondAttribute="leading" id="Nlk-Ll-dRR"/>
-                    <constraint firstItem="NuY-qA-4Ql" firstAttribute="top" secondItem="aSG-gb-Vaa" secondAttribute="top" constant="8" id="Q2k-bj-mpj"/>
-                    <constraint firstItem="IOV-53-Iu8" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="NuY-qA-4Ql" secondAttribute="trailing" constant="4" id="S4Z-Wf-UEB"/>
-                    <constraint firstItem="5Cw-QQ-VRc" firstAttribute="top" secondItem="NuY-qA-4Ql" secondAttribute="bottom" constant="16" id="XAJ-ca-Jjm"/>
-                    <constraint firstItem="IOV-53-Iu8" firstAttribute="centerY" secondItem="NuY-qA-4Ql" secondAttribute="centerY" id="eVg-i4-sM7"/>
-                    <constraint firstAttribute="trailing" secondItem="5Cw-QQ-VRc" secondAttribute="trailing" id="qgf-Dc-kSN"/>
-                    <constraint firstAttribute="bottom" secondItem="5Cw-QQ-VRc" secondAttribute="bottom" constant="4.5" id="yac-xe-eNm"/>
-                </constraints>
-            </tableViewCellContentView>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-            <connections>
-                <outlet property="collectionView" destination="5Cw-QQ-VRc" id="IdD-9L-EmF"/>
-                <outlet property="more" destination="IOV-53-Iu8" id="dPs-eC-7ds"/>
-                <outlet property="title" destination="NuY-qA-4Ql" id="tdT-p5-qIJ"/>
-            </connections>
-            <point key="canvasLocation" x="41.5" y="86.5"/>
-        </tableViewCell>
-    </objects>
-    <resources>
-        <image name="logo_cian" width="68" height="32"/>
-    </resources>
-</document>

iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm

@@ -57,7 +57,6 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
 
 @property(weak, nonatomic) MWMPlacePageTaxiCell * taxiCell;
 @property(weak, nonatomic) MWMPPViatorCarouselCell * viatorCell;
-@property(weak, nonatomic) MWMPPCianCarouselCell * cianCell;
 
 @property(nonatomic) BOOL buttonsSectionEnabled;
 
@@ -94,7 +93,6 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
   [tv registerWithCellClass:[MWMPPHotelDescriptionCell class]];
   [tv registerWithCellClass:[MWMPPHotelCarouselCell class]];
   [tv registerWithCellClass:[MWMPPViatorCarouselCell class]];
-  [tv registerWithCellClass:[MWMPPCianCarouselCell class]];
   [tv registerWithCellClass:[MWMPPReviewHeaderCell class]];
   [tv registerWithCellClass:[MWMPPReviewCell class]];
   [tv registerWithCellClass:[MWMPPFacilityCell class]];
@@ -120,7 +118,6 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
   dispatch_async(dispatch_get_main_queue(), ^{
     [data fillOnlineBookingSections];
     [data fillOnlineViatorSection];
-    [data fillOnlineCianSection];
   });
 }
 
@@ -418,15 +415,6 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
       self.viatorCell = c;
       return c;
     }
-    case SpecialProject::Cian:
-    {
-      Class cls = [MWMPPCianCarouselCell class];
-      auto c = static_cast<MWMPPCianCarouselCell *>(
-          [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
-      [c configWithDelegate:delegate];
-      self.cianCell = c;
-      return c;
-    }
     }
   }
   case Sections::HotelPhotos:
@@ -624,13 +612,6 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
     [Statistics logEvent:kStatPlacepageSponsoredShow
           withParameters:@{kStatProvider: kStatViator, kStatPlacement: kStatPlacePage}];
   });
-
-  checkCell(self.cianCell, ^{
-    self.cianCell = nil;
-    [MRMyTracker trackEventWithName:@"Placepage_SponsoredGallery_shown_Cian.Ru"];
-    [Statistics logEvent:kStatPlacepageSponsoredShow
-          withParameters:@{kStatProvider : kStatCian, kStatPlacement: kStatPlacePage}];
-  });
 }
 
 #pragma mark - MWMOpeningHoursLayoutHelper
@@ -730,10 +711,6 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
     [self.previewLayoutHelper insertRowAtTheEnd];
   };
 
-  data.cianIsReadyCallback = ^(NSArray<MWMCianItemModel *> * items) {
-    self.cianCell.data = items;
-  };
-
   [self.actionBar configureWithData:data];
   [self.previewLayoutHelper configWithData:data];
   auto const & metaInfo = data.metainfoRows;

iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm

@@ -6,7 +6,7 @@
 
 #include "Framework.h"
 
-extern NSString * const kCianCategory = @"cian";
+extern NSString * const kLuggageCategory = @"luggagehero";
 
 @implementation MWMSearchCategoriesManager
 {
@@ -54,10 +54,10 @@ extern NSString * const kCianCategory = @"cian";
     forRowAtIndexPath:(NSIndexPath *)indexPath
 {
   NSString * string = @(m_categories[indexPath.row].c_str());
-  if ([string isEqualToString:kCianCategory])
+  if ([string isEqualToString:kLuggageCategory])
   {
-    [MRMyTracker trackEventWithName:@"Search_SponsoredCategory_shown_Cian"];
-    [Statistics logEvent:kStatSearchSponsoredShow withParameters:@{kStatProvider : kStatCian}];
+    [MRMyTracker trackEventWithName:@"Search_SponsoredCategory_shown_LuggageHero"];
+    [Statistics logEvent:kStatSearchSponsoredShow withParameters:@{kStatProvider : kStatLuggageHero}];
   }
 }
 
@@ -70,11 +70,11 @@ extern NSString * const kCianCategory = @"cian";
   [delegate searchText:[L(string) stringByAppendingString:@" "]
         forInputLocale:[[AppInfo sharedInfo] languageId]];
   [delegate dismissKeyboard];
-  if ([string isEqualToString:kCianCategory])
+  if ([string isEqualToString:kLuggageCategory])
   {
     delegate.state = MWMSearchManagerStateMapSearch;
-    [MRMyTracker trackEventWithName:@"Search_SponsoredCategory_selected_Cian"];
-    [Statistics logEvent:kStatSearchSponsoredSelect withParameters:@{kStatProvider : kStatCian}];
+    [MRMyTracker trackEventWithName:@"Search_SponsoredCategory_selected_LuggageHero"];
+    [Statistics logEvent:kStatSearchSponsoredSelect withParameters:@{kStatProvider : kStatLuggageHero}];
   }
 }
 

iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm

@@ -2,7 +2,7 @@
 #import "MWMCommon.h"
 #import "UIImageView+Coloring.h"
 
-extern NSString * const kCianCategory;
+extern NSString * const kLuggageCategory;
 
 @interface MWMSearchCategoryCell ()
 
@@ -29,11 +29,11 @@ extern NSString * const kCianCategory;
   UILabel * label = self.label;
   label.textColor = [UIColor blackPrimaryText];
   self.icon.mwm_name = [NSString stringWithFormat:@"ic_%@", category];
-  if ([category isEqualToString:kCianCategory])
+  if ([category isEqualToString:kLuggageCategory])
   {
-    label.text = L(@"real_estate");
+    label.text = L(@"luggage_storage");
     self.adIcon.hidden = NO;
-    self.adIcon.mwm_name = @"logo_cian";
+    self.adIcon.image = [UIImage imageNamed:@"logo_luggage"];
   }
   else
   {