diff --git a/.clang-format b/.clang-format index a2c6c11af3..1b9bd71b2e 100644 --- a/.clang-format +++ b/.clang-format @@ -53,15 +53,9 @@ IncludeCategories: - Regex: '^"openlr/openlr_tests/' Priority: 4770 - - Regex: '^"local_ads/local_ads_tests/' - Priority: 4780 - - Regex: '^"descriptions/descriptions_tests/' Priority: 4790 - - Regex: '^"metrics/metrics_tests/' - Priority: 4800 - - Regex: '^"ugc/ugc_tests' Priority: 4810 @@ -218,11 +212,6 @@ IncludeCategories: - Regex: '^"openlr/' Priority: 47100 - - Regex: '^"local_ads/pylocal_ads/' - Priority: 47209 - - Regex: '^"local_ads/' - Priority: 47210 - - Regex: '^"descriptions/' Priority: 47300 @@ -258,11 +247,6 @@ IncludeCategories: - Regex: '^"partners_api/' Priority: 47900 - - Regex: '^"metrics/metrics_tests_support/' - Priority: 48009 - - Regex: '^"metrics/' - Priority: 48010 - - Regex: '^"traffic/pytraffic/' Priority: 48109 - Regex: '^"traffic/' @@ -318,7 +302,7 @@ IncludeCategories: - Regex: '^"geometry/' Priority: 49600 - + - Regex: '^"base/' Priority: 49700 @@ -413,12 +397,12 @@ DerivePointerAlignment: false DisableFormat: false ExperimentalAutoDetectBinPacking: false FixNamespaceComments: true -ForEachMacros: +ForEachMacros: - foreach - Q_FOREACH - BOOST_FOREACH IncludeBlocks: Preserve -IncludeCategories: +IncludeCategories: - Regex: '^<.*\.h>' Priority: 1 - Regex: '^<.*' diff --git a/.gitignore b/.gitignore index 0cd0ab49b4..7a6903c758 100644 --- a/.gitignore +++ b/.gitignore @@ -115,8 +115,6 @@ data/stats data/*/*.bftsegbits data/*/*.bftsegnodes data/*/*.offsets -# metrics -data/metric/* # notifications data/notifications/* diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ad15419b3..61cc6f2807 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -311,7 +311,6 @@ add_subdirectory(geometry) add_subdirectory(indexer) add_subdirectory(kml) add_subdirectory(map) -add_subdirectory(metrics) add_subdirectory(partners_api) add_subdirectory(platform) add_subdirectory(routing) diff --git a/android/jni/CMakeLists.txt b/android/jni/CMakeLists.txt index 0eb04d94c3..bcd7ba108d 100644 --- a/android/jni/CMakeLists.txt +++ b/android/jni/CMakeLists.txt @@ -60,7 +60,6 @@ set( com/mapswithme/maps/LocationState.cpp com/mapswithme/maps/MapFragment.cpp com/mapswithme/maps/MapManager.cpp - com/mapswithme/maps/metrics/UserActionsLogger.cpp com/mapswithme/maps/MwmApplication.cpp com/mapswithme/maps/onboarding/Onboarding.cpp com/mapswithme/maps/PrivateVariables.cpp @@ -132,7 +131,6 @@ target_link_libraries( editor transit indexer - metrics platform partners_api web_api diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 372add223f..dfdc110673 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -11,7 +11,6 @@ #include "map/chart_generator.hpp" #include "map/everywhere_search_params.hpp" -#include "map/notifications/notification_queue.hpp" #include "map/user_mark.hpp" #include "map/purchase.hpp" @@ -65,7 +64,6 @@ using namespace std; using namespace std::placeholders; -using namespace notifications; unique_ptr g_framework; @@ -92,7 +90,6 @@ namespace } jobject g_placePageActivationListener = nullptr; -int const kUndefinedTip = -1; android::AndroidVulkanContextFactory * CastFactory(drape_ptr const & f) { @@ -832,15 +829,6 @@ void Framework::GetPromoPoiGallery(JNIEnv * env, jobject policy, onError); } -promo::AfterBooking Framework::GetPromoAfterBooking(JNIEnv * env, jobject policy) -{ - auto api = NativeFramework()->GetPromoApi(ToNativeNetworkPolicy(env, policy)); - if (api == nullptr) - return {}; - - return api->GetAfterBooking(languages::GetCurrentNorm()); -} - std::string Framework::GetPromoCityUrl(JNIEnv * env, jobject policy, jdouble lat, jdouble lon) { auto api = NativeFramework()->GetPromoApi(ToNativeNetworkPolicy(env, policy)); @@ -2104,29 +2092,6 @@ Java_com_mapswithme_maps_Framework_nativeSetActiveSubscription(JNIEnv *, jclass, static_cast(isTrial)); } -JNIEXPORT jint JNICALL -Java_com_mapswithme_maps_Framework_nativeGetCurrentTipIndex(JNIEnv * env, jclass) -{ - auto const & tipsApi = frm()->GetTipsApi(); - auto const tip = tipsApi.GetTip(); - if (!tip) - return kUndefinedTip; - return static_cast(*tip); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_Framework_nativeBindUser(JNIEnv * env, jclass, jobject listener) -{ - auto listenerRef = jni::make_global_ref(listener); - auto & user = frm()->GetUser(); - user.BindUser([listenerRef](bool success) - { - auto e = jni::GetEnv(); - jmethodID const callback = jni::GetMethodID(e, *listenerRef, "onUserBound", "(Z)V"); - e->CallVoidMethod(*listenerRef, callback, static_cast(success)); - }); -} - JNIEXPORT jstring JNICALL Java_com_mapswithme_maps_Framework_nativeGetAccessToken(JNIEnv * env, jclass) { @@ -2134,40 +2099,6 @@ Java_com_mapswithme_maps_Framework_nativeGetAccessToken(JNIEnv * env, jclass) return jni::ToJavaString(env, user.GetAccessToken()); } -JNIEXPORT jobject JNICALL -Java_com_mapswithme_maps_Framework_nativeGetMapObject(JNIEnv * env, jclass, - jobject notificationCandidate) -{ - NotificationCandidate notification(NotificationCandidate::Type::UgcReview); - auto const getBestTypeId = - jni::GetMethodID(env, notificationCandidate, "getFeatureBestType", "()Ljava/lang/String;"); - auto const bestType = - static_cast(env->CallObjectMethod(notificationCandidate, getBestTypeId)); - notification.SetBestFeatureType(jni::ToNativeString(env, bestType)); - - auto const getMercatorPosXId = - jni::GetMethodID(env, notificationCandidate, "getMercatorPosX", "()D"); - auto const getMercatorPosYId = - jni::GetMethodID(env, notificationCandidate, "getMercatorPosY", "()D"); - - auto const posX = - static_cast(env->CallDoubleMethod(notificationCandidate, getMercatorPosXId)); - auto const posY = - static_cast(env->CallDoubleMethod(notificationCandidate, getMercatorPosYId)); - notification.SetPos({posX, posY}); - - auto const getDefaultNameId = - jni::GetMethodID(env, notificationCandidate, "getDefaultName", "()Ljava/lang/String;"); - auto const defaultName = - static_cast(env->CallObjectMethod(notificationCandidate, getDefaultNameId)); - notification.SetDefaultName(jni::ToNativeString(env, defaultName)); - - if (frm()->MakePlacePageForNotification(notification)) - return usermark_helper::CreateMapObject(env, frm()->GetCurrentPlacePageInfo()); - - return nullptr; -} - JNIEXPORT void JNICALL Java_com_mapswithme_maps_Framework_nativeSetPowerManagerFacility(JNIEnv *, jclass, jint facilityType, jboolean state) diff --git a/android/jni/com/mapswithme/maps/LightFramework.cpp b/android/jni/com/mapswithme/maps/LightFramework.cpp index c804bc5d9f..0e7f806c97 100644 --- a/android/jni/com/mapswithme/maps/LightFramework.cpp +++ b/android/jni/com/mapswithme/maps/LightFramework.cpp @@ -1,5 +1,4 @@ #include "map/framework_light.hpp" -#include "map/framework_light_delegate.hpp" #include "base/assert.hpp" @@ -34,33 +33,4 @@ Java_com_mapswithme_maps_LightFramework_nativeMakeFeatureId(JNIEnv * env, jclass return jni::ToJavaString(env, featureId); } - -JNIEXPORT jobject JNICALL -Java_com_mapswithme_maps_LightFramework_nativeGetNotification(JNIEnv * env, jclass clazz) -{ - lightweight::Framework framework(lightweight::REQUEST_TYPE_NOTIFICATION); - if (g_framework) - framework.SetDelegate(std::make_unique(*g_framework->NativeFramework())); - auto const notification = framework.GetNotification(); - - if (!notification) - return nullptr; - - auto const & n = *notification; - // Type::UgcReview is only supported. - CHECK_EQUAL(n.GetType(), notifications::NotificationCandidate::Type::UgcReview, ()); - - static jclass const candidateId = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/background/NotificationCandidate$UgcReview"); - static jmethodID const candidateCtor = jni::GetConstructorID( - env, candidateId, - "(DDLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); - - auto const readableName = jni::ToJavaString(env, n.GetReadableName()); - auto const defaultName = jni::ToJavaString(env, n.GetDefaultName()); - auto const type = jni::ToJavaString(env, n.GetBestFeatureType()); - auto const address = jni::ToJavaString(env, n.GetAddress()); - return env->NewObject(candidateId, candidateCtor, n.GetPos().x, n.GetPos().y, readableName, - defaultName, type, address); -} } // extern "C" diff --git a/android/jni/com/mapswithme/maps/MapManager.cpp b/android/jni/com/mapswithme/maps/MapManager.cpp index 021ab44cf9..1738e78982 100644 --- a/android/jni/com/mapswithme/maps/MapManager.cpp +++ b/android/jni/com/mapswithme/maps/MapManager.cpp @@ -444,7 +444,6 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeDelete(JNIEnv * env, jclass StartBatchingCallbacks(); auto const countryId = jni::ToNativeString(env, root); GetStorage().DeleteNode(countryId); - g_framework->NativeFramework()->GetNotificationManager().DeleteCandidatesForCountry(countryId); EndBatchingCallbacks(env); } diff --git a/android/jni/com/mapswithme/maps/metrics/UserActionsLogger.cpp b/android/jni/com/mapswithme/maps/metrics/UserActionsLogger.cpp deleted file mode 100644 index 0bd2dad4bf..0000000000 --- a/android/jni/com/mapswithme/maps/metrics/UserActionsLogger.cpp +++ /dev/null @@ -1,123 +0,0 @@ -#include -#include - -#include "com/mapswithme/core/jni_helper.hpp" -#include "com/mapswithme/platform/Platform.hpp" - -#include "map/utils.hpp" - -#include "metrics/eye.hpp" -#include "metrics/eye_info.hpp" - -namespace -{ -void RegisterEventIfPossible(eye::MapObject::Event::Type const type) -{ - ::Framework * frm = g_framework->NativeFramework(); - if (!frm->HasPlacePageInfo()) - return; - - auto & info = g_framework->GetPlacePageInfo(); - auto const userPos = g_framework->NativeFramework()->GetCurrentPosition(); - - utils::RegisterEyeEventIfPossible(type, userPos, info); -} - -void RegisterTransitionToBooking() -{ - ::Framework * frm = g_framework->NativeFramework(); - if (!frm->HasPlacePageInfo()) - return; - - auto & info = g_framework->GetPlacePageInfo(); - eye::Eye::Event::TransitionToBooking(info.GetMercator()); -} -} // namespace - -extern "C" -{ -JNIEXPORT void JNICALL Java_com_mapswithme_maps_metrics_UserActionsLogger_nativeTipClicked( - JNIEnv * env, jclass, jint type, jint event) -{ - auto const & typeValue = static_cast(type); - auto const & eventValue = static_cast(event); - eye::Eye::Event::TipClicked(typeValue, eventValue); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_metrics_UserActionsLogger_nativeBookingFilterUsed(JNIEnv * env, jclass clazz) -{ - eye::Eye::Event::BookingFilterUsed(); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_metrics_UserActionsLogger_nativeDiscoveryShown(JNIEnv * env, jclass clazz) -{ - eye::Eye::Event::DiscoveryShown(); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_metrics_UserActionsLogger_nativeBookmarksCatalogShown(JNIEnv * env, - jclass clazz) -{ - eye::Eye::Event::BoomarksCatalogShown(); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_metrics_UserActionsLogger_nativeDiscoveryItemClicked(JNIEnv * env, - jclass clazz, - jint eventType) -{ - auto const & event = static_cast(eventType); - eye::Eye::Event::DiscoveryItemClicked(event); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_metrics_UserActionsLogger_nativeAddToBookmark(JNIEnv *, jclass) -{ - RegisterEventIfPossible(eye::MapObject::Event::Type::AddToBookmark); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_metrics_UserActionsLogger_nativeUgcEditorOpened(JNIEnv *, jclass) -{ - RegisterEventIfPossible(eye::MapObject::Event::Type::UgcEditorOpened); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_metrics_UserActionsLogger_nativeUgcSaved(JNIEnv *, jclass) -{ - RegisterEventIfPossible(eye::MapObject::Event::Type::UgcSaved); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_metrics_UserActionsLogger_nativeBookingBookClicked(JNIEnv *, jclass) -{ - RegisterTransitionToBooking(); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_metrics_UserActionsLogger_nativeBookingMoreClicked(JNIEnv *, jclass) -{ - RegisterTransitionToBooking(); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_metrics_UserActionsLogger_nativeBookingReviewsClicked(JNIEnv *, jclass) -{ - RegisterTransitionToBooking(); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_metrics_UserActionsLogger_nativeBookingDetailsClicked(JNIEnv *, jclass) -{ - RegisterTransitionToBooking(); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_metrics_UserActionsLogger_nativePromoAfterBookingShown(JNIEnv * env, - jclass, jstring id) -{ - eye::Eye::Event::PromoAfterBookingShown(jni::ToNativeString(env, id)); -} -} diff --git a/android/jni/com/mapswithme/maps/promo/Promo.cpp b/android/jni/com/mapswithme/maps/promo/Promo.cpp index b9ce1d3c88..f6d9f80a4d 100644 --- a/android/jni/com/mapswithme/maps/promo/Promo.cpp +++ b/android/jni/com/mapswithme/maps/promo/Promo.cpp @@ -182,25 +182,6 @@ Java_com_mapswithme_maps_promo_Promo_nativeRequestPoiGallery(JNIEnv * env, jclas std::bind(OnError, g_lastRequestId)); } -JNIEXPORT jobject JNICALL -Java_com_mapswithme_maps_promo_Promo_nativeGetPromoAfterBooking(JNIEnv * env, jclass, - jobject policy) -{ - PrepareClassRefs(env); - - auto const result = g_framework->GetPromoAfterBooking(env, policy); - - if (result.IsEmpty()) - return nullptr; - - auto const id = jni::ToJavaString(env, result.m_id); - auto const promoUrl = jni::ToJavaString(env, result.m_promoUrl); - auto const pictureUrl = jni::ToJavaString(env, result.m_pictureUrl); - - - return env->NewObject(g_afterBooking, g_afterBookingConstructor, id, promoUrl, pictureUrl); -} - JNIEXPORT jstring JNICALL Java_com_mapswithme_maps_promo_Promo_nativeGetCityUrl(JNIEnv * env, jclass, jobject policy, jdouble lat, jdouble lon) diff --git a/android/src/com/mapswithme/maps/Framework.java b/android/src/com/mapswithme/maps/Framework.java index d0548e6541..bbc0916ac7 100644 --- a/android/src/com/mapswithme/maps/Framework.java +++ b/android/src/com/mapswithme/maps/Framework.java @@ -15,7 +15,6 @@ import com.mapswithme.maps.api.ParsedSearchRequest; import com.mapswithme.maps.api.ParsedUrlMwmRequest; import com.mapswithme.maps.api.ParsingResult; import com.mapswithme.maps.auth.AuthorizationListener; -import com.mapswithme.maps.background.NotificationCandidate; import com.mapswithme.maps.bookmarks.data.DistanceAndAzimut; import com.mapswithme.maps.bookmarks.data.FeatureId; import com.mapswithme.maps.bookmarks.data.MapObject; @@ -498,16 +497,10 @@ public class Framework public static native int nativeGetCurrentTipIndex(); - public static native void nativeBindUser(@NonNull UserBindingListener listener); - @Nullable public static native String nativeGetAccessToken(); - @Nullable - public static native MapObject nativeGetMapObject( - @NonNull NotificationCandidate notificationCandidate); - - public static native void nativeSetPowerManagerFacility(int facilityType, boolean state); + public static native void nativeSetPowerManagerFacility(int facilityType, boolean state); public static native int nativeGetPowerManagerScheme(); public static native void nativeSetPowerManagerScheme(int schemeType); public static native void nativeSetViewportCenter(double lat, double lon, int zoom, diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 8c8d0a0a51..9808be4c2b 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -34,7 +34,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.mapswithme.maps.Framework.PlacePageActivationListener; import com.mapswithme.maps.api.ParsedMwmRequest; import com.mapswithme.maps.background.AppBackgroundTracker; -import com.mapswithme.maps.background.NotificationCandidate; import com.mapswithme.maps.background.Notifier; import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.base.CustomNavigateUpListener; @@ -83,7 +82,6 @@ import com.mapswithme.maps.maplayer.subway.SubwayManager; import com.mapswithme.maps.maplayer.traffic.OnTrafficLayerToggleListener; import com.mapswithme.maps.maplayer.traffic.TrafficManager; import com.mapswithme.maps.maplayer.traffic.widget.TrafficButton; -import com.mapswithme.maps.metrics.UserActionsLogger; import com.mapswithme.maps.news.OnboardingStep; import com.mapswithme.maps.onboarding.IntroductionDialogFragment; import com.mapswithme.maps.onboarding.IntroductionScreenFactory; @@ -319,29 +317,6 @@ public class MwmActivity extends BaseMwmFragmentActivity .putExtra(DownloadResourcesLegacyActivity.EXTRA_COUNTRY, countryId); } -// @NonNull -// public static Intent createAuthenticateIntent(@NonNull Context context) -// { -// ArrayList params = new ArrayList<>(); -// params.add(new KeyValue(Statistics.EventParam.FROM, Statistics.ParamValue.NOTIFICATION)); -// -// return new Intent(context, MwmActivity.class) -// .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION) -// .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) -// .putExtra(MwmActivity.EXTRA_TASK, -// new Factory.ShowDialogTask(PassportAuthDialogFragment.class.getName(), params)); -// } - - @NonNull - public static Intent createLeaveReviewIntent(@NonNull Context context, - @NonNull NotificationCandidate.UgcReview nc) - { - return new Intent(context, MwmActivity.class) - .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION) - .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) - .putExtra(MwmActivity.EXTRA_TASK, new Factory.ShowUGCEditorTask(nc)); - } - @Override public void onRenderingCreated() { @@ -2460,7 +2435,6 @@ public class MwmActivity extends BaseMwmFragmentActivity return; } - UserActionsLogger.logTipClickedEvent(mTutorial, TutorialAction.GOT_IT_CLICKED); mTutorial = null; } @@ -2483,33 +2457,8 @@ public class MwmActivity extends BaseMwmFragmentActivity addTask(new Factory.ShowTutorialTask()); } - private boolean tryToShowPromoAfterBooking() - { - NetworkPolicy policy = NetworkPolicy.newInstance(NetworkPolicy.getCurrentNetworkUsageStatus()); - PromoAfterBooking promo = Promo.nativeGetPromoAfterBooking(policy); - if (promo == null) - return false; - - String dialogName = PromoBookingDialogFragment.class.getName(); - if (getSupportFragmentManager().findFragmentByTag(dialogName) != null) - return true; - - final Bundle args = new Bundle(); - args.putString(PromoBookingDialogFragment.EXTRA_CITY_GUIDES_URL, promo.getGuidesUrl()); - args.putString(PromoBookingDialogFragment.EXTRA_CITY_IMAGE_URL, promo.getImageUrl()); - - final DialogFragment fragment = (DialogFragment) Fragment.instantiate(this, dialogName, args); - fragment.show(getSupportFragmentManager(), dialogName); - - UserActionsLogger.logPromoAfterBookingShown(promo.getId()); - return true; - } - private void tryToShowAdditionalViewOnTop() { - if (tryToShowPromoAfterBooking()) - return; - tryToShowTutorial(); } diff --git a/android/src/com/mapswithme/maps/background/NotificationCandidate.java b/android/src/com/mapswithme/maps/background/NotificationCandidate.java deleted file mode 100644 index b9b4774650..0000000000 --- a/android/src/com/mapswithme/maps/background/NotificationCandidate.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.mapswithme.maps.background; - -import androidx.annotation.IntDef; -import androidx.annotation.NonNull; - -import java.io.Serializable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -public class NotificationCandidate implements Serializable -{ - private static final long serialVersionUID = -7020549752940235436L; - - // This constants should be compatible with notifications::NotificationCandidate::Type enum - // from c++ side. - static final int TYPE_UGC_AUTH = 0; - static final int TYPE_UGC_REVIEW = 1; - - @Retention(RetentionPolicy.SOURCE) - @IntDef({ TYPE_UGC_AUTH, TYPE_UGC_REVIEW }) - @interface NotificationType - { - } - - public static class UgcReview extends NotificationCandidate - { - private static final long serialVersionUID = 5469867251355445859L; - - private final double mMercatorPosX; - private final double mMercatorPosY; - @NonNull - private final String mReadableName; - @NonNull - private final String mDefaultName; - @NonNull - private final String mFeatureBestType; - @NonNull - private final String mAddress; - - @SuppressWarnings("unused") - UgcReview(double posX, double posY, @NonNull String readableName, @NonNull String defaultName, - @NonNull String bestType, @NonNull String address) - { - super(TYPE_UGC_REVIEW); - - mMercatorPosX = posX; - mMercatorPosY = posY; - mReadableName = readableName; - mDefaultName = defaultName; - mFeatureBestType = bestType; - mAddress = address; - } - - @SuppressWarnings("unused") - public double getMercatorPosX() - { - return mMercatorPosX; - } - - @SuppressWarnings("unused") - public double getMercatorPosY() - { - return mMercatorPosY; - } - - @NonNull - public String getReadableName() - { - return mReadableName; - } - - @NonNull - public String getDefaultName() - { - return mDefaultName; - } - - @NonNull - @SuppressWarnings("unused") - public String getFeatureBestType() - { - return mFeatureBestType; - } - - @NonNull - public String getAddress() - { - return mAddress; - } - } - - @NotificationType - private final int mType; - - private NotificationCandidate(@NotificationType int type) - { - mType = type; - } - - public int getType() - { - return mType; - } -} diff --git a/android/src/com/mapswithme/maps/background/Notifier.java b/android/src/com/mapswithme/maps/background/Notifier.java index 12dd813b2a..796b4225e7 100644 --- a/android/src/com/mapswithme/maps/background/Notifier.java +++ b/android/src/com/mapswithme/maps/background/Notifier.java @@ -75,31 +75,6 @@ public final class Notifier // // } - void notifyLeaveReview(@NonNull NotificationCandidate.UgcReview source) - { - Intent reviewIntent = MwmActivity.createLeaveReviewIntent(mContext, source); - reviewIntent.putExtra(EXTRA_CANCEL_NOTIFICATION, Notifier.ID_LEAVE_REVIEW); - PendingIntent pi = - PendingIntent.getActivity(mContext, 0, reviewIntent, PendingIntent.FLAG_UPDATE_CURRENT); - - String channel = NotificationChannelFactory.createProvider(mContext).getUGCChannel(); - String content = source.getAddress().isEmpty() - ? source.getReadableName() - : source.getReadableName() + ", " + source.getAddress(); - - NotificationCompat.Builder builder = - getBuilder(mContext.getString(R.string.notification_leave_review_v2_android_short_title), - content, pi, channel) - .setStyle(new NotificationCompat.BigTextStyle() - .setBigContentTitle( - mContext.getString(R.string.notification_leave_review_v2_title)) - .bigText(content)) - .addAction(0, mContext.getString(R.string.leave_a_review), pi); - - getNotificationManager().notify(ID_LEAVE_REVIEW, builder.build()); - - } - public void cancelNotification(@NotificationId int id) { if (id == ID_NONE) diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java index c8bcc72b60..31e6e3e5e2 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java @@ -36,7 +36,6 @@ import com.mapswithme.maps.bookmarks.data.BookmarkCategory; import com.mapswithme.maps.bookmarks.data.BookmarkManager; import com.mapswithme.maps.dialog.AlertDialog; import com.mapswithme.maps.dialog.AlertDialogCallback; -import com.mapswithme.maps.metrics.UserActionsLogger; import com.mapswithme.maps.purchase.AbstractProductDetailsLoadingCallback; import com.mapswithme.maps.purchase.BillingManager; import com.mapswithme.maps.purchase.BookmarksAllSubscriptionActivity; @@ -318,8 +317,6 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment if (TextUtils.isEmpty(url)) url = getCatalogUrlOrThrow(); mWebView.loadUrl(url, headers); - - UserActionsLogger.logBookmarksCatalogShownEvent(); } @Override diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java index 70905eabe8..e87ecd86b5 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java @@ -10,7 +10,6 @@ import androidx.annotation.Nullable; import com.mapswithme.maps.PrivateVariables; import com.mapswithme.maps.base.DataChangedListener; import com.mapswithme.maps.base.Observable; -import com.mapswithme.maps.metrics.UserActionsLogger; import com.mapswithme.util.KeyValue; import com.mapswithme.util.UTM; @@ -149,10 +148,6 @@ public enum BookmarkManager public Bookmark addNewBookmark(double lat, double lon) { final Bookmark bookmark = nativeAddBookmarkToLastEditedCategory(lat, lon); - if (bookmark != null) - { - UserActionsLogger.logAddToBookmarkEvent(); - } return bookmark; } diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java index 1884668e8b..7c0767544e 100644 --- a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java +++ b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java @@ -26,9 +26,8 @@ import com.mapswithme.maps.bookmarks.data.MapObject; import com.mapswithme.maps.gallery.GalleryAdapter; import com.mapswithme.maps.gallery.ItemSelectedListener; import com.mapswithme.maps.gallery.Items; +import com.mapswithme.maps.gallery.impl.BaseItemSelectedListener; import com.mapswithme.maps.gallery.impl.Factory; -import com.mapswithme.maps.gallery.impl.LoggableItemSelectedListener; -import com.mapswithme.maps.metrics.UserActionsLogger; import com.mapswithme.maps.promo.PromoCityGallery; import com.mapswithme.maps.promo.PromoEntity; import com.mapswithme.maps.search.SearchResult; @@ -96,7 +95,6 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove @Nullable Bundle savedInstanceState) { View root = inflater.inflate(R.layout.fragment_discovery, container, false); - UserActionsLogger.logDiscoveryShownEvent(); return root; } @@ -194,7 +192,7 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove RecyclerView promoRecycler = getGallery(R.id.catalog_promo_recycler); ItemSelectedListener listener = mOnlineMode ? - new CatalogPromoSelectedListener(requireActivity()) + new BaseItemSelectedListener<>(requireActivity()) : new ErrorCatalogPromoListener<>(requireActivity(), this::onNetworkPolicyResult); @@ -264,8 +262,7 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove updateViewsVisibility(experts, R.id.localGuidesTitle, R.id.localGuides); String url = DiscoveryManager.nativeGetLocalExpertsUrl(); - ItemSelectedListener listener - = createOnlineProductItemListener(ItemType.LOCAL_EXPERTS); + ItemSelectedListener listener = new BaseItemSelectedListener<>(getActivity()); RecyclerView gallery = getGallery(R.id.localGuides); GalleryAdapter adapter = Factory.createLocalExpertsAdapter(experts, url, listener); @@ -400,32 +397,19 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove }; } - private ItemSelectedListener createOnlineProductItemListener(@NonNull ItemType itemType) - { - return new LoggableItemSelectedListener(getActivity(), itemType) - { - @Override - public void onItemSelectedInternal(@NonNull I item, int position) - { - } - - @Override - public void onMoreItemSelectedInternal(@NonNull I item) - { - } - }; - } - - private static class SearchBasedListener extends LoggableItemSelectedListener + private static class SearchBasedListener extends BaseItemSelectedListener { @NonNull private final DiscoveryFragment mFragment; + @NonNull + private final ItemType mItemType; private SearchBasedListener(@NonNull DiscoveryFragment fragment, @NonNull ItemType itemType) { - super(fragment.getActivity(), itemType); + super(fragment.getActivity()); mFragment = fragment; + mItemType = itemType; } @Override @@ -435,14 +419,14 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove } @Override - public void onMoreItemSelectedInternal(@NonNull Items.SearchItem item) + public void onMoreItemSelected(@NonNull Items.SearchItem item) { - mFragment.showSimilarItems(item, getType()); + mFragment.showSimilarItems(item, mItemType); } @Override @CallSuper - public void onItemSelectedInternal(@NonNull Items.SearchItem item, int position) + public void onItemSelected(@NonNull Items.SearchItem item, int position) { mFragment.showOnMap(item); } @@ -469,7 +453,7 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove } @Override - public void onMoreItemSelectedInternal(@NonNull Items.SearchItem item) + public void onMoreItemSelected(@NonNull Items.SearchItem item) { getFragment().showFilter(); } @@ -482,22 +466,4 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove void onShowSimilarObjects(@NonNull Items.SearchItem item, @NonNull ItemType type); } - - private static class CatalogPromoSelectedListener extends LoggableItemSelectedListener - { - public CatalogPromoSelectedListener(@NonNull Activity activity) - { - super(activity, ItemType.PROMO); - } - - @Override - protected void onMoreItemSelectedInternal(@NonNull Items.Item item) - { - } - - @Override - protected void onItemSelectedInternal(@NonNull Items.Item item, int position) - { - } - } } diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryUserEvent.java b/android/src/com/mapswithme/maps/discovery/DiscoveryUserEvent.java deleted file mode 100644 index e312a762b2..0000000000 --- a/android/src/com/mapswithme/maps/discovery/DiscoveryUserEvent.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.mapswithme.maps.discovery; - -import com.mapswithme.maps.metrics.UserActionsLogger; - -public enum DiscoveryUserEvent -{ - HOTELS_CLICKED, - ATTRACTIONS_CLICKED, - CAFES_CLICKED, - LOCALS_CLICKED, - - MORE_HOTELS_CLICKED, - MORE_ATTRACTIONS_CLICKED, - MORE_CAFES_CLICKED, - MORE_LOCALS_CLICKED, - - PROMO_CLICKED, - MORE_PROMO_CLICKED, - - /* Must be last */ - STUB - { - @Override - public void log() - { - /* Do nothing */ - } - }; - - public void log() - { - UserActionsLogger.logDiscoveryItemClickedEvent(this); - } -} diff --git a/android/src/com/mapswithme/maps/discovery/ItemType.java b/android/src/com/mapswithme/maps/discovery/ItemType.java index 30dd58a5a1..cfa0fe5299 100644 --- a/android/src/com/mapswithme/maps/discovery/ItemType.java +++ b/android/src/com/mapswithme/maps/discovery/ItemType.java @@ -9,9 +9,7 @@ import com.mapswithme.util.UiUtils; public enum ItemType { - ATTRACTIONS(R.string.tourism, - DiscoveryUserEvent.MORE_ATTRACTIONS_CLICKED, - DiscoveryUserEvent.ATTRACTIONS_CLICKED) + ATTRACTIONS(R.string.tourism) { @Override public void onResultReceived(@NonNull DiscoveryResultReceiver callback, @@ -27,7 +25,7 @@ public enum ItemType } }, - CAFES(R.string.eat, DiscoveryUserEvent.MORE_CAFES_CLICKED, DiscoveryUserEvent.CAFES_CLICKED) + CAFES(R.string.eat) { @Override public void onResultReceived(@NonNull DiscoveryResultReceiver callback, @@ -43,8 +41,7 @@ public enum ItemType } }, - HOTELS(UiUtils.NO_ID, DiscoveryUserEvent.MORE_HOTELS_CLICKED, - DiscoveryUserEvent.HOTELS_CLICKED) + HOTELS(UiUtils.NO_ID) { @Override public int getSearchCategory() @@ -59,8 +56,7 @@ public enum ItemType } }, - LOCAL_EXPERTS(UiUtils.NO_ID, DiscoveryUserEvent.MORE_LOCALS_CLICKED, - DiscoveryUserEvent.LOCALS_CLICKED) + LOCAL_EXPERTS(UiUtils.NO_ID) { @Override public int getSearchCategory() @@ -69,38 +65,19 @@ public enum ItemType } }, - PROMO(UiUtils.NO_ID, DiscoveryUserEvent.MORE_PROMO_CLICKED, DiscoveryUserEvent.PROMO_CLICKED); + PROMO(UiUtils.NO_ID); @StringRes private final int mSearchCategory; - @NonNull - private final DiscoveryUserEvent mMoreClickEvent; - @NonNull - private final DiscoveryUserEvent mItemClickEvent; - ItemType(@StringRes int searchCategory, @NonNull DiscoveryUserEvent moreClickEvent, - @NonNull DiscoveryUserEvent itemClickEvent) + ItemType(@StringRes int searchCategory) { mSearchCategory = searchCategory; - mMoreClickEvent = moreClickEvent; - mItemClickEvent = itemClickEvent; } ItemType() { - this(UiUtils.NO_ID, DiscoveryUserEvent.STUB, DiscoveryUserEvent.STUB); - } - - @NonNull - public DiscoveryUserEvent getMoreClickEvent() - { - return mMoreClickEvent; - } - - @NonNull - public DiscoveryUserEvent getItemClickEvent() - { - return mItemClickEvent; + this(UiUtils.NO_ID); } @StringRes diff --git a/android/src/com/mapswithme/maps/gallery/impl/LoggableItemSelectedListener.java b/android/src/com/mapswithme/maps/gallery/impl/LoggableItemSelectedListener.java deleted file mode 100644 index 892cae6892..0000000000 --- a/android/src/com/mapswithme/maps/gallery/impl/LoggableItemSelectedListener.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.mapswithme.maps.gallery.impl; - -import android.app.Activity; -import androidx.annotation.NonNull; - -import com.mapswithme.maps.discovery.ItemType; -import com.mapswithme.maps.gallery.Items; - -public abstract class LoggableItemSelectedListener extends BaseItemSelectedListener -{ - @NonNull - private final ItemType mType; - - public LoggableItemSelectedListener(@NonNull Activity context, @NonNull ItemType type) - { - super(context); - mType = type; - } - - @Override - public final void onMoreItemSelected(@NonNull I item) - { - super.onMoreItemSelected(item); - onMoreItemSelectedInternal(item); - mType.getMoreClickEvent().log(); - } - - @Override - public final void onItemSelected(@NonNull I item, int position) - { - super.onItemSelected(item, position); - onItemSelectedInternal(item, position); - mType.getItemClickEvent().log(); - } - - @NonNull - protected ItemType getType() - { - return mType; - } - - protected abstract void onMoreItemSelectedInternal(@NonNull I item); - - protected abstract void onItemSelectedInternal(@NonNull I item, int position); -} diff --git a/android/src/com/mapswithme/maps/intent/Factory.java b/android/src/com/mapswithme/maps/intent/Factory.java index ac2f3cbacd..e578dcc190 100644 --- a/android/src/com/mapswithme/maps/intent/Factory.java +++ b/android/src/com/mapswithme/maps/intent/Factory.java @@ -9,33 +9,24 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.appcompat.widget.Toolbar; -import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; -import com.google.android.material.appbar.AppBarLayout; import com.mapswithme.maps.DownloadResourcesLegacyActivity; import com.mapswithme.maps.Framework; import com.mapswithme.maps.MapFragment; import com.mapswithme.maps.MwmActivity; -import com.mapswithme.maps.R; import com.mapswithme.maps.api.Const; import com.mapswithme.maps.api.ParsedMwmRequest; import com.mapswithme.maps.api.ParsedRoutingData; import com.mapswithme.maps.api.ParsedSearchRequest; -import com.mapswithme.maps.api.ParsedUrlMwmRequest; import com.mapswithme.maps.api.ParsingResult; import com.mapswithme.maps.api.RoutePoint; -import com.mapswithme.maps.background.NotificationCandidate; import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity; import com.mapswithme.maps.bookmarks.BookmarksCatalogActivity; import com.mapswithme.maps.bookmarks.BookmarksPageFactory; -import com.mapswithme.maps.bookmarks.data.BookmarkCategory; -import com.mapswithme.maps.bookmarks.data.BookmarkInfo; import com.mapswithme.maps.bookmarks.data.BookmarkManager; import com.mapswithme.maps.bookmarks.data.FeatureId; import com.mapswithme.maps.bookmarks.data.MapObject; -import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.maps.onboarding.IntroductionScreenFactory; import com.mapswithme.maps.purchase.BookmarksAllSubscriptionActivity; import com.mapswithme.maps.purchase.BookmarksSightsSubscriptionActivity; @@ -53,7 +44,6 @@ import com.mapswithme.util.CrashlyticsUtils; import com.mapswithme.util.KeyValue; import com.mapswithme.util.StorageUtils; import com.mapswithme.util.UTM; -import com.mapswithme.util.UiUtils; import com.mapswithme.util.Utils; import com.mapswithme.util.concurrency.ThreadPool; import com.mapswithme.util.log.Logger; @@ -1186,37 +1176,6 @@ public class Factory } } - public static class ShowUGCEditorTask implements MapTask - { - private static final long serialVersionUID = 1636712824900113568L; - // Nullable because of possible serialization from previous incompatible version of class. - @Nullable - private final NotificationCandidate.UgcReview mNotificationCandidate; - - public ShowUGCEditorTask(@Nullable NotificationCandidate.UgcReview notificationCandidate) - { - mNotificationCandidate = notificationCandidate; - } - - @Override - public boolean run(@NonNull MwmActivity target) - { - if (mNotificationCandidate == null) - return false; - - MapObject mapObject = Framework.nativeGetMapObject(mNotificationCandidate); - - if (mapObject == null) - return false; - - EditParams.Builder builder = EditParams.Builder.fromMapObject(mapObject) - .setDefaultRating(UGC.RATING_NONE) - .setFromNotification(true); - UGCEditorActivity.start(target, builder.build()); - return true; - } - } - public static class ShowDialogTask implements MapTask { private static final long serialVersionUID = 1548931513812565018L; diff --git a/android/src/com/mapswithme/maps/metrics/UserActionsLogger.java b/android/src/com/mapswithme/maps/metrics/UserActionsLogger.java deleted file mode 100644 index 7dc9904fd3..0000000000 --- a/android/src/com/mapswithme/maps/metrics/UserActionsLogger.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.mapswithme.maps.metrics; - -import androidx.annotation.NonNull; - -import com.mapswithme.maps.discovery.DiscoveryUserEvent; -import com.mapswithme.maps.tips.TutorialAction; -import com.mapswithme.maps.tips.Tutorial; - -public class UserActionsLogger -{ - public static void logTipClickedEvent(@NonNull Tutorial tutorial, @NonNull TutorialAction action) - { - nativeTipClicked(tutorial.ordinal(), action.ordinal()); - } - - public static void logBookingFilterUsedEvent() - { - nativeBookingFilterUsed(); - } - - public static void logDiscoveryShownEvent() - { - nativeDiscoveryShown(); - } - - public static void logBookmarksCatalogShownEvent() - { - nativeBookmarksCatalogShown(); - } - - public static void logDiscoveryItemClickedEvent(@NonNull DiscoveryUserEvent event) - { - nativeDiscoveryItemClicked(event.ordinal()); - } - - public static void logAddToBookmarkEvent() - { - nativeAddToBookmark(); - } - - public static void logUgcEditorOpened() - { - nativeUgcEditorOpened(); - } - - public static void logUgcSaved() - { - nativeUgcSaved(); - } - - public static void logBookingBookClicked() - { - nativeBookingBookClicked(); - } - public static void logBookingMoreClicked() - { - nativeBookingMoreClicked(); - } - public static void logBookingReviewsClicked() - { - nativeBookingReviewsClicked(); - } - public static void logBookingDetailsClicked() - { - nativeBookingDetailsClicked(); - } - - public static void logPromoAfterBookingShown(@NonNull String id) - { - nativePromoAfterBookingShown(id); - } - - private static native void nativeTipClicked(int type, int event); - private static native void nativeBookingFilterUsed(); - private static native void nativeBookmarksCatalogShown(); - private static native void nativeDiscoveryShown(); - private static native void nativeDiscoveryItemClicked(int event); - private static native void nativeAddToBookmark(); - private static native void nativeUgcEditorOpened(); - private static native void nativeUgcSaved(); - private static native void nativeBookingBookClicked(); - private static native void nativeBookingMoreClicked(); - private static native void nativeBookingReviewsClicked(); - private static native void nativeBookingDetailsClicked(); - private static native void nativePromoAfterBookingShown(@NonNull String id); -} diff --git a/android/src/com/mapswithme/maps/promo/Promo.java b/android/src/com/mapswithme/maps/promo/Promo.java index d229672cff..780eeca095 100644 --- a/android/src/com/mapswithme/maps/promo/Promo.java +++ b/android/src/com/mapswithme/maps/promo/Promo.java @@ -55,9 +55,6 @@ public enum Promo public native void nativeRequestPoiGallery(@NonNull NetworkPolicy policy, double lat, double lon, @NonNull String[] tags, @UTM.UTMType int utm); - @Nullable - public static native PromoAfterBooking nativeGetPromoAfterBooking(@NonNull NetworkPolicy policy); - @Nullable public static native String nativeGetCityUrl(@NonNull NetworkPolicy policy, double lat, double lon); } diff --git a/android/src/com/mapswithme/maps/search/FilterFragment.java b/android/src/com/mapswithme/maps/search/FilterFragment.java index 806a4c21d0..25792bbf45 100644 --- a/android/src/com/mapswithme/maps/search/FilterFragment.java +++ b/android/src/com/mapswithme/maps/search/FilterFragment.java @@ -14,7 +14,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmToolbarFragment; import com.mapswithme.maps.base.CustomNavigateUpListener; -import com.mapswithme.maps.metrics.UserActionsLogger; import com.mapswithme.maps.widget.ToolbarController; import com.mapswithme.maps.widget.recycler.TagItemDecoration; import com.mapswithme.maps.widget.recycler.TagLayoutManager; @@ -123,7 +122,6 @@ public class FilterFragment extends BaseMwmToolbarFragment HotelsFilter filter = populateFilter(); mListener.onFilterApply(filter); - UserActionsLogger.logBookingFilterUsedEvent(); } @Override diff --git a/android/src/com/mapswithme/maps/tips/AbstractClickInterceptor.java b/android/src/com/mapswithme/maps/tips/AbstractClickInterceptor.java index d65ef578ed..22a308aa14 100644 --- a/android/src/com/mapswithme/maps/tips/AbstractClickInterceptor.java +++ b/android/src/com/mapswithme/maps/tips/AbstractClickInterceptor.java @@ -3,7 +3,6 @@ package com.mapswithme.maps.tips; import androidx.annotation.NonNull; import com.mapswithme.maps.MwmActivity; -import com.mapswithme.maps.metrics.UserActionsLogger; public abstract class AbstractClickInterceptor implements ClickInterceptor { @@ -24,7 +23,6 @@ public abstract class AbstractClickInterceptor implements ClickInterceptor @Override public final void onInterceptClick(@NonNull MwmActivity activity) { - UserActionsLogger.logTipClickedEvent(getType(), TutorialAction.ACTION_CLICKED); onInterceptClickInternal(activity); } diff --git a/android/src/com/mapswithme/maps/ugc/UGCEditorActivity.java b/android/src/com/mapswithme/maps/ugc/UGCEditorActivity.java index 1bdf77d594..d532adc1b6 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCEditorActivity.java +++ b/android/src/com/mapswithme/maps/ugc/UGCEditorActivity.java @@ -8,14 +8,12 @@ import androidx.annotation.StyleRes; import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmFragmentActivity; -import com.mapswithme.maps.metrics.UserActionsLogger; import com.mapswithme.util.ThemeUtils; public class UGCEditorActivity extends BaseMwmFragmentActivity { public static void start(@NonNull Activity activity, @NonNull EditParams params) { - UserActionsLogger.logUgcEditorOpened(); final Intent i = new Intent(activity, UGCEditorActivity.class); Bundle args = new Bundle(); args.putParcelable(UGCEditorFragment.ARG_FEATURE_ID, params.getFeatureId()); diff --git a/android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java b/android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java index 6b60ce11ff..f4d6eca6b7 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java +++ b/android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java @@ -16,7 +16,6 @@ import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseToolbarAuthFragment; import com.mapswithme.maps.background.Notifier; import com.mapswithme.maps.bookmarks.data.FeatureId; -import com.mapswithme.maps.metrics.UserActionsLogger; import com.mapswithme.maps.widget.ToolbarController; import com.mapswithme.util.ConnectionState; import com.mapswithme.util.Language; @@ -114,8 +113,6 @@ public class UGCEditorFragment extends BaseToolbarAuthFragment return; } - UserActionsLogger.logUgcSaved(); - if (!ConnectionState.INSTANCE.isConnected()) { if (isAuthorized()) diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 9b20b315ad..89a0c2c6d0 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -62,7 +62,6 @@ import com.mapswithme.maps.gallery.Constants; import com.mapswithme.maps.gallery.FullScreenGalleryActivity; import com.mapswithme.maps.gallery.GalleryActivity; import com.mapswithme.maps.location.LocationHelper; -import com.mapswithme.maps.metrics.UserActionsLogger; import com.mapswithme.maps.promo.CatalogPromoController; import com.mapswithme.maps.promo.PromoCityGallery; import com.mapswithme.maps.promo.PromoEntity; @@ -72,7 +71,6 @@ import com.mapswithme.maps.search.FilterUtils; import com.mapswithme.maps.search.HotelsFilter; import com.mapswithme.maps.search.Popularity; import com.mapswithme.maps.settings.RoadType; -import com.mapswithme.maps.taxi.TaxiType; import com.mapswithme.maps.ugc.Impress; import com.mapswithme.maps.ugc.UGCController; import com.mapswithme.maps.widget.ArrowView; @@ -1025,15 +1023,6 @@ public class PlacePageView extends NestedScrollViewClickFixed if (book) { partnerAppOpenMode = Utils.PartnerAppOpenMode.Direct; - UserActionsLogger.logBookingBookClicked(); - } - else if (isDetails) - { - UserActionsLogger.logBookingDetailsClicked(); - } - else - { - UserActionsLogger.logBookingMoreClicked(); } break; case Sponsored.TYPE_OPENTABLE: @@ -1817,7 +1806,6 @@ public class PlacePageView extends NestedScrollViewClickFixed //null checking is done in 'isSponsored' method //noinspection ConstantConditions Utils.openUrl(getContext(), mSponsored.getReviewUrl()); - UserActionsLogger.logBookingReviewsClicked(); } break; case R.id.tv__place_page_order_taxi: diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index bd80686fbc..82da0545c0 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -115,7 +115,6 @@ Some of these contain their own README files. * `iphone` - iOS UI. * `kml` - manipulation of KML files. * `mapshot` - generate screenshots of maps, specified by coordinates and zoom level. -* `metrics` - * `openlr` - * `partners_api` - API for partners of the OMaps project. * `pyhelpers` - diff --git a/generator/world_roads_builder/CMakeLists.txt b/generator/world_roads_builder/CMakeLists.txt index 07ecab8d5a..d61c98ed04 100644 --- a/generator/world_roads_builder/CMakeLists.txt +++ b/generator/world_roads_builder/CMakeLists.txt @@ -33,7 +33,6 @@ omim_link_libraries( kml editor indexer - metrics platform geometry coding diff --git a/iphone/CoreApi/CoreApi.modulemap b/iphone/CoreApi/CoreApi.modulemap index 5d2b16926d..a0e7ea9ec3 100644 --- a/iphone/CoreApi/CoreApi.modulemap +++ b/iphone/CoreApi/CoreApi.modulemap @@ -1,7 +1,6 @@ framework module CoreApi { header "AppInfo.h" header "MWMBookmarkColor.h" - header "MWMEye.h" header "MWMCommon.h" header "MWMTypes.h" header "MWMBookmarksObserver.h" diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj index bcb514dcc0..5e37625212 100644 --- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -84,8 +84,6 @@ 479F7062234FBC4700011E2E /* MWMCarPlayBookmarkObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 479F7061234FBC4600011E2E /* MWMCarPlayBookmarkObject.mm */; }; 479F7063234FBC5900011E2E /* MWMCarPlayBookmarkObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 479F7060234FBC4500011E2E /* MWMCarPlayBookmarkObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47A65CAF235008E100DCD85F /* CoreApi-swift.h in Headers */ = {isa = PBXBuildFile; fileRef = 47A65CAE235008C700DCD85F /* CoreApi-swift.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 47C637D12354A6FB00E12DE0 /* MWMEye.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47C637CF2354A6FA00E12DE0 /* MWMEye.mm */; }; - 47C637D22354A6FB00E12DE0 /* MWMEye.h in Headers */ = {isa = PBXBuildFile; fileRef = 47C637D02354A6FB00E12DE0 /* MWMEye.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47C637D62354AEBE00E12DE0 /* MWMMapOverlayManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47C637D42354AEBD00E12DE0 /* MWMMapOverlayManager.mm */; }; 47C637D72354AEBE00E12DE0 /* MWMMapOverlayManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 47C637D52354AEBE00E12DE0 /* MWMMapOverlayManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47C637DC2354B79B00E12DE0 /* MWMSearchFrameworkHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47C637DA2354B79A00E12DE0 /* MWMSearchFrameworkHelper.mm */; }; @@ -121,9 +119,7 @@ 99103843237EDFA200893C9F /* DeepLinkData.h in Headers */ = {isa = PBXBuildFile; fileRef = 99103841237EDFA200893C9F /* DeepLinkData.h */; settings = {ATTRIBUTES = (Public, ); }; }; 99103844237EDFA200893C9F /* DeepLinkData.m in Sources */ = {isa = PBXBuildFile; fileRef = 99103842237EDFA200893C9F /* DeepLinkData.m */; }; 993F54F2237C5D1100545511 /* PromoDiscoveryCampaignAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 993F54EE237C5D1000545511 /* PromoDiscoveryCampaignAdapter.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 993F54F3237C5D1100545511 /* PromoAfterBookingCampaignAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 993F54EF237C5D1000545511 /* PromoAfterBookingCampaignAdapter.mm */; }; 993F54F4237C5D1100545511 /* PromoDiscoveryCampaignAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 993F54F0237C5D1000545511 /* PromoDiscoveryCampaignAdapter.mm */; }; - 993F54F5237C5D1100545511 /* PromoAfterBookingCampaignAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 993F54F1237C5D1000545511 /* PromoAfterBookingCampaignAdapter.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9940622023EAC57900493D1A /* ElevationHeightPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 9940621E23EAC57900493D1A /* ElevationHeightPoint.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9940622123EAC57900493D1A /* ElevationHeightPoint.m in Sources */ = {isa = PBXBuildFile; fileRef = 9940621F23EAC57900493D1A /* ElevationHeightPoint.m */; }; 99447849238559F2004DAEE5 /* DeeplinkUrlType.h in Headers */ = {isa = PBXBuildFile; fileRef = 99447847238559F2004DAEE5 /* DeeplinkUrlType.h */; }; @@ -233,8 +229,6 @@ 479F7060234FBC4500011E2E /* MWMCarPlayBookmarkObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCarPlayBookmarkObject.h; sourceTree = ""; }; 479F7061234FBC4600011E2E /* MWMCarPlayBookmarkObject.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCarPlayBookmarkObject.mm; sourceTree = ""; }; 47A65CAE235008C700DCD85F /* CoreApi-swift.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CoreApi-swift.h"; sourceTree = ""; }; - 47C637CF2354A6FA00E12DE0 /* MWMEye.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEye.mm; sourceTree = ""; }; - 47C637D02354A6FB00E12DE0 /* MWMEye.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEye.h; sourceTree = ""; }; 47C637D42354AEBD00E12DE0 /* MWMMapOverlayManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapOverlayManager.mm; sourceTree = ""; }; 47C637D52354AEBE00E12DE0 /* MWMMapOverlayManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapOverlayManager.h; sourceTree = ""; }; 47C637DA2354B79A00E12DE0 /* MWMSearchFrameworkHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchFrameworkHelper.mm; sourceTree = ""; }; @@ -275,9 +269,7 @@ 991CE2EC2375AF25009EB02A /* PromoDiscoveryCampaignAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PromoDiscoveryCampaignAdapter.h; sourceTree = ""; }; 991CE2ED2375AF25009EB02A /* PromoDiscoveryCampaignAdapter.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PromoDiscoveryCampaignAdapter.mm; sourceTree = ""; }; 993F54EE237C5D1000545511 /* PromoDiscoveryCampaignAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromoDiscoveryCampaignAdapter.h; sourceTree = ""; }; - 993F54EF237C5D1000545511 /* PromoAfterBookingCampaignAdapter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PromoAfterBookingCampaignAdapter.mm; sourceTree = ""; }; 993F54F0237C5D1000545511 /* PromoDiscoveryCampaignAdapter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PromoDiscoveryCampaignAdapter.mm; sourceTree = ""; }; - 993F54F1237C5D1000545511 /* PromoAfterBookingCampaignAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromoAfterBookingCampaignAdapter.h; sourceTree = ""; }; 9940621E23EAC57900493D1A /* ElevationHeightPoint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ElevationHeightPoint.h; sourceTree = ""; }; 9940621F23EAC57900493D1A /* ElevationHeightPoint.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ElevationHeightPoint.m; sourceTree = ""; }; 99447847238559F2004DAEE5 /* DeeplinkUrlType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeeplinkUrlType.h; sourceTree = ""; }; @@ -360,7 +352,6 @@ 4718C42F2355FC0D00640DF1 /* NetworkPolicy */, 47C637D92354B76700E12DE0 /* Search */, 47C637D32354AEA800E12DE0 /* Traffic */, - 47C637CE2354A6E600E12DE0 /* Metrics */, 479F704C234FB5C800011E2E /* Bookmarks */, 479F7048234F784B00011E2E /* Common */, 477C775523435B69001C5B4E /* Framework */, @@ -552,15 +543,6 @@ path = Catalog; sourceTree = ""; }; - 47C637CE2354A6E600E12DE0 /* Metrics */ = { - isa = PBXGroup; - children = ( - 47C637D02354A6FB00E12DE0 /* MWMEye.h */, - 47C637CF2354A6FA00E12DE0 /* MWMEye.mm */, - ); - path = Metrics; - sourceTree = ""; - }; 47C637D32354AEA800E12DE0 /* Traffic */ = { isa = PBXGroup; children = ( @@ -662,9 +644,7 @@ 99F31EB523D5DD8F00CE2CE1 /* PromoAfterBookingData.mm */, 99F31EB623D5DD8F00CE2CE1 /* PromoAfterBookingData+Core.h */, 993F54EE237C5D1000545511 /* PromoDiscoveryCampaignAdapter.h */, - 993F54EF237C5D1000545511 /* PromoAfterBookingCampaignAdapter.mm */, 993F54F0237C5D1000545511 /* PromoDiscoveryCampaignAdapter.mm */, - 993F54F1237C5D1000545511 /* PromoAfterBookingCampaignAdapter.h */, ); path = Promo; sourceTree = ""; @@ -742,7 +722,6 @@ 3D40DED523ED9C7F00A0153A /* WebApi.h in Headers */, 47A65CAF235008E100DCD85F /* CoreApi-swift.h in Headers */, 9957FACE237AB01400855F48 /* DeepLinkParser.h in Headers */, - 993F54F5237C5D1100545511 /* PromoAfterBookingCampaignAdapter.h in Headers */, 47942D7D237CC42B00DEFAE3 /* UgcData.h in Headers */, 47942D77237CC41A00DEFAE3 /* HotelRooms.h in Headers */, 9974CA2D23DF197B003FE824 /* ElevationProfileData+Core.h in Headers */, @@ -812,7 +791,6 @@ 47942D6F237CC3F400DEFAE3 /* PlacePageInfoData.h in Headers */, 470B362C244DDBF600C0EA9E /* GuidesGalleryItem+Core.h in Headers */, 475784C22344B422008291A4 /* Framework.h in Headers */, - 47C637D22354A6FB00E12DE0 /* MWMEye.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -893,7 +871,6 @@ 470B3625244DDA0A00C0EA9E /* GuidesGalleryItem.mm in Sources */, 47942D7F237CC43300DEFAE3 /* UgcData.mm in Sources */, 99F31EB823D5DD9000CE2CE1 /* PromoAfterBookingData.mm in Sources */, - 47C637D12354A6FB00E12DE0 /* MWMEye.mm in Sources */, 47942D9D237D927800DEFAE3 /* PlacePageBookmarkData.mm in Sources */, 47942D86237CC55500DEFAE3 /* MWMOpeningHoursCommon.mm in Sources */, 9974CA2A23DF1968003FE824 /* ElevationProfileData.mm in Sources */, @@ -927,7 +904,6 @@ 4718C4332355FC3C00640DF1 /* MWMNetworkPolicy.mm in Sources */, 47CA68E92506F61400671019 /* MWMTrack.mm in Sources */, 472602A924092C5B00731135 /* MWMGeoUtil.mm in Sources */, - 993F54F3237C5D1100545511 /* PromoAfterBookingCampaignAdapter.mm in Sources */, 99D934B424CA0052002E4802 /* MWMPurchaseValidation.mm in Sources */, 47F701F0238C86F000D18E95 /* PlacePageButtonsData.mm in Sources */, 9940622123EAC57900493D1A /* ElevationHeightPoint.m in Sources */, diff --git a/iphone/CoreApi/CoreApi/CoreApi-swift.h b/iphone/CoreApi/CoreApi/CoreApi-swift.h index 855d37ef48..e8392c32a1 100644 --- a/iphone/CoreApi/CoreApi/CoreApi-swift.h +++ b/iphone/CoreApi/CoreApi/CoreApi-swift.h @@ -16,7 +16,6 @@ FOUNDATION_EXPORT const unsigned char CoreApiVersionString[]; #import #import #import -#import #import #import #import @@ -34,7 +33,6 @@ FOUNDATION_EXPORT const unsigned char CoreApiVersionString[]; #import #import #import -#import #import #import diff --git a/iphone/CoreApi/CoreApi/CoreApi.h b/iphone/CoreApi/CoreApi/CoreApi.h index fca213eb14..5a01b6c80a 100644 --- a/iphone/CoreApi/CoreApi/CoreApi.h +++ b/iphone/CoreApi/CoreApi/CoreApi.h @@ -11,7 +11,6 @@ FOUNDATION_EXPORT const unsigned char CoreApiVersionString[]; #import #import #import -#import #import #import #import diff --git a/iphone/CoreApi/CoreApi/Metrics/MWMEye.h b/iphone/CoreApi/CoreApi/Metrics/MWMEye.h deleted file mode 100644 index 8e35c97e0f..0000000000 --- a/iphone/CoreApi/CoreApi/Metrics/MWMEye.h +++ /dev/null @@ -1,42 +0,0 @@ -#import - -typedef NS_ENUM(NSUInteger, MWMTip) -{ - MWMTipBookmarks, - MWMTipSearch, - MWMTipDiscovery, - MWMTipSubway, - MWMTipIsolines, - MWMTipNone -}; - -typedef NS_ENUM(NSUInteger, MWMTipEvent) -{ - MWMTipEventAction, - MWMTipEventGotIt -}; - -typedef NS_ENUM(NSUInteger, MWMEyeDiscoveryEvent) -{ - MWMEyeDiscoveryEventHotels, - MWMEyeDiscoveryEventAttractions, - MWMEyeDiscoveryEventCafes, - MWMEyeDiscoveryEventLocals, - MWMEyeDiscoveryEventMoreHotels, - MWMEyeDiscoveryEventMoreAttractions, - MWMEyeDiscoveryEventMoreCafes, - MWMEyeDiscoveryEventMoreLocals -}; - -@interface MWMEye : NSObject - -+ (MWMTip)getTipType; -+ (void)tipClickedWithType:(MWMTip)type event:(MWMTipEvent)event; -+ (void)bookingFilterUsed; -+ (void)boomarksCatalogShown; -+ (void)discoveryShown; -+ (void)discoveryItemClickedWithEvent:(MWMEyeDiscoveryEvent)event; -+ (void)transitionToBookingWithPos:(CGPoint)pos; -+ (void)promoAfterBookingShownWithCityId:(NSString *)cityId; - -@end diff --git a/iphone/CoreApi/CoreApi/Metrics/MWMEye.mm b/iphone/CoreApi/CoreApi/Metrics/MWMEye.mm deleted file mode 100644 index 5e8124794d..0000000000 --- a/iphone/CoreApi/CoreApi/Metrics/MWMEye.mm +++ /dev/null @@ -1,48 +0,0 @@ -#import "MWMEye.h" - -#include "Framework.h" - -@implementation MWMEye - -+ (MWMTip)getTipType -{ - auto tutorialType = GetFramework().GetTipsApi().GetTip(); - return tutorialType ? (MWMTip)*tutorialType : MWMTipNone; -} - -+ (void)tipClickedWithType:(MWMTip)type event:(MWMTipEvent)event -{ - eye::Eye::Event::TipClicked((eye::Tip::Type)type, (eye::Tip::Event)event); -} - -+ (void)bookingFilterUsed -{ - eye::Eye::Event::BookingFilterUsed(); -} - -+ (void)boomarksCatalogShown -{ - eye::Eye::Event::BoomarksCatalogShown(); -} - -+ (void)discoveryShown -{ - eye::Eye::Event::DiscoveryShown(); -} - -+ (void)discoveryItemClickedWithEvent:(MWMEyeDiscoveryEvent)event -{ - eye::Eye::Event::DiscoveryItemClicked((eye::Discovery::Event)event); -} - -+ (void)transitionToBookingWithPos:(CGPoint)pos -{ - eye::Eye::Event::TransitionToBooking({pos.x, pos.y}); -} - -+ (void)promoAfterBookingShownWithCityId:(NSString *)cityId -{ - eye::Eye::Event::PromoAfterBookingShown(cityId.UTF8String); -} - -@end diff --git a/iphone/CoreApi/CoreApi/Promo/PromoAfterBookingCampaignAdapter.h b/iphone/CoreApi/CoreApi/Promo/PromoAfterBookingCampaignAdapter.h deleted file mode 100644 index 6da8454f53..0000000000 --- a/iphone/CoreApi/CoreApi/Promo/PromoAfterBookingCampaignAdapter.h +++ /dev/null @@ -1,12 +0,0 @@ -#import -#import "PromoAfterBookingData.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface PromoAfterBookingCampaignAdapter : NSObject - -+ (PromoAfterBookingData*)afterBookingData; - -@end - -NS_ASSUME_NONNULL_END diff --git a/iphone/CoreApi/CoreApi/Promo/PromoAfterBookingCampaignAdapter.mm b/iphone/CoreApi/CoreApi/Promo/PromoAfterBookingCampaignAdapter.mm deleted file mode 100644 index e0920b9c8f..0000000000 --- a/iphone/CoreApi/CoreApi/Promo/PromoAfterBookingCampaignAdapter.mm +++ /dev/null @@ -1,18 +0,0 @@ -#import "PromoAfterBookingCampaignAdapter.h" -#import "PromoAfterBookingData+Core.h" -#import -#import "platform/network_policy.hpp" - -@implementation PromoAfterBookingCampaignAdapter - -+ (PromoAfterBookingData*)afterBookingData { - auto policy = platform::GetCurrentNetworkPolicy(); - auto promoApi = GetFramework().GetPromoApi(policy); - if (promoApi != nil) { - auto const promoAfterBooking = promoApi->GetAfterBooking(languages::GetCurrentNorm()); - return [[PromoAfterBookingData alloc] initWithAfterBooking:promoAfterBooking]; - } - return [[PromoAfterBookingData alloc] init]; -} - -@end diff --git a/iphone/CoreApi/CoreApi/Storage/MWMStorage.mm b/iphone/CoreApi/CoreApi/Storage/MWMStorage.mm index 8f32ef18f3..a0fde3c73f 100644 --- a/iphone/CoreApi/CoreApi/Storage/MWMStorage.mm +++ b/iphone/CoreApi/CoreApi/Storage/MWMStorage.mm @@ -125,7 +125,6 @@ using namespace storage; } } else { f.GetStorage().DeleteNode(countryId.UTF8String); - f.GetNotificationManager().DeleteCandidatesForCountry(countryId.UTF8String); return YES; } diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift index 1b069a3d56..ea6e6cd921 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift @@ -32,7 +32,6 @@ final class CatalogWebViewController: WebViewController { let pendingTransactionsHandler = InAppPurchase.pendingTransactionsHandler() var deeplink: URL? var categoryInfo: CatalogCategoryInfo? - var statSent = false var billing = InAppPurchase.inAppBilling() var noInternetView: CatalogConnectionErrorView! @@ -186,10 +185,6 @@ final class CatalogWebViewController: WebViewController { } override func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) { - if !statSent { - statSent = true - MWMEye.boomarksCatalogShown() - } loadingIndicator.stopAnimating() } diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h index fe7329f7ec..01ad3e3e05 100644 --- a/iphone/Maps/Bridging-Header.h +++ b/iphone/Maps/Bridging-Header.h @@ -13,7 +13,6 @@ #import -#import "CoreNotificationWrapper.h" #import "DeepLinkRouteStrategyAdapter.h" #import "EAGLView.h" #import "FirstSession.h" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 1107dd7436..b723c48edc 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -27,8 +27,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; } // namespace @interface MWMMapViewControlsManager () + MWMSearchManagerObserver> @property(nonatomic) MWMSideButtons *sideButtons; @property(nonatomic) MWMTrafficButtonViewController *trafficButton; @@ -41,9 +40,6 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; @property(weak, nonatomic) MapViewController *ownerController; @property(nonatomic) BOOL disableStandbyOnRouteFollowing; -@property(nonatomic) MWMTip tutorialType; -@property(nonatomic) MWMTutorialViewController *tutorialViewContoller; -//@property(nonatomic) PromoDiscoveryCampaign *promoDiscoveryCampaign; @end @@ -64,17 +60,6 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; self.trafficButtonHidden = NO; self.isDirectionViewHidden = YES; self.menuRestoreState = MWMBottomMenuStateInactive; - /* - self.promoDiscoveryCampaign = [ABTestManager manager].promoDiscoveryCampaign; - if (_promoDiscoveryCampaign.enabled) { - [controller.controlsView addSubview:self.promoButton]; - self.promoButton.translatesAutoresizingMaskIntoConstraints = NO; - [NSLayoutConstraint activateConstraints:@[ - [self.promoButton.centerXAnchor constraintEqualToAnchor:self.trafficButton.view.centerXAnchor], - [self.promoButton.topAnchor constraintEqualToAnchor:self.sideButtons.view.topAnchor] - ]]; - } - */ return self; } @@ -398,42 +383,6 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; return self.placePageManager; } -- (MWMTutorialViewController *)tutorialWithType:(MWMTip)tutorialType { - MWMTutorialViewController *tutorial; - switch (tutorialType) { - case MWMTipSearch: - tutorial = [MWMTutorialViewController tutorial:MWMTutorialTypeSearch - target:self.tabBarController.searchButton - delegate:self]; - break; - case MWMTipDiscovery: - tutorial = [MWMTutorialViewController tutorial:MWMTutorialTypeDiscovery - target:self.tabBarController.discoveryButton - delegate:self]; - break; - case MWMTipBookmarks: - tutorial = [MWMTutorialViewController tutorial:MWMTutorialTypeBookmarks - target:self.tabBarController.bookmarksButton - delegate:self]; - break; - case MWMTipSubway: - tutorial = [MWMTutorialViewController tutorial:MWMTutorialTypeSubway - target:(UIControl *)self.trafficButton.view - delegate:self]; - break; - case MWMTipIsolines: - tutorial = [MWMTutorialViewController tutorial:MWMTutorialTypeIsolines - target:(UIControl *)self.trafficButton.view - delegate:self]; - break; - case MWMTipNone: - tutorial = nil; - break; - } - - return tutorial; -} - - (void)showAdditionalViewsIfNeeded { auto ownerController = self.ownerController; @@ -451,79 +400,6 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; if (DeepLinkHandler.shared.isLaunchedByDeeplink) return; - - if ([self showPromoBookingIfNeeded]) - return; - - [self showTutorialIfNeeded]; -} - -- (BOOL)showPromoBookingIfNeeded { - PromoAfterBookingCampaign *afterBookingCampaign = [ABTestManager manager].promoAfterBookingCampaign; - PromoAfterBookingData *afterBookingData = afterBookingCampaign.afterBookingData; - if (!afterBookingData.enabled) - return NO; - - MWMVoidBlock ok = ^{ - auto urlString = afterBookingData.promoUrl; - auto url = [NSURL URLWithString:urlString]; - [MapViewController.sharedController openCatalogAbsoluteUrl:url animated:YES utm:MWMUTMBookingPromo]; - - [self.ownerController dismissViewControllerAnimated:YES completion:nil]; - }; - MWMVoidBlock cancel = ^{ - [self.ownerController dismissViewControllerAnimated:YES completion:nil]; - }; - NSString *cityImageUrl = afterBookingData.pictureUrl; - PromoAfterBookingViewController *alert; - alert = [[PromoAfterBookingViewController alloc] initWithCityImageUrl:cityImageUrl okClosure:ok cancelClosure:cancel]; - [self.ownerController presentViewController:alert animated:YES completion:nil]; - [MWMEye promoAfterBookingShownWithCityId:afterBookingData.promoId]; - return YES; -} - -- (BOOL)showTutorialIfNeeded { - if (self.tutorialViewContoller != nil) - return YES; - - auto ownerController = self.ownerController; - - if ([self.placePageManager isPPShown] || ownerController.downloadDialog.superview != nil) { - return NO; - } - - self.tutorialType = [MWMEye getTipType]; - self.tutorialViewContoller = [self tutorialWithType:self.tutorialType]; - if (!self.tutorialViewContoller) - return NO; - - self.hidden = NO; - [ownerController addChildViewController:self.tutorialViewContoller]; - self.tutorialViewContoller.view.frame = ownerController.view.bounds; - self.tutorialViewContoller.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; - [ownerController.controlsView addSubview:self.tutorialViewContoller.view]; - [self.tutorialViewContoller didMoveToParentViewController:ownerController]; - - return YES; -} - -- (void)didPressCancel:(MWMTutorialViewController *)viewController { - [MWMEye tipClickedWithType:self.tutorialType event:MWMTipEventGotIt]; - [self fadeOutTutorial:viewController]; -} - -- (void)didPressTarget:(MWMTutorialViewController *)viewController { - [MWMEye tipClickedWithType:self.tutorialType event:MWMTipEventAction]; - [self fadeOutTutorial:viewController]; -} - -- (void)fadeOutTutorial:(MWMTutorialViewController *)viewController { - [viewController fadeOutWithCompletion:^{ - [viewController willMoveToParentViewController:nil]; - [viewController.view removeFromSuperview]; - [viewController removeFromParentViewController]; - }]; - self.tutorialViewContoller = nil; } @end diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 41e460992f..3b77318261 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -1,8 +1,6 @@ #import "MapsAppDelegate.h" -#import "CoreNotificationWrapper+Core.h" #import "EAGLView.h" -#import "LocalNotificationManager.h" #import "MWMAuthorizationCommon.h" #import "MWMCoreRouterType.h" #import "MWMFrameworkListener.h" @@ -76,13 +74,11 @@ void OverrideUserAgent() { using namespace osm_auth_ios; @interface MapsAppDelegate () @property(nonatomic) NSInteger standbyCounter; @property(nonatomic) MWMBackgroundFetchScheduler *backgroundFetchScheduler; @property(nonatomic) id pendingTransactionHandler; -@property(nonatomic) NotificationManager *notificationManager; @end @@ -148,10 +144,6 @@ using namespace osm_auth_ios; } [self enableTTSForTheFirstTime]; - self.notificationManager = [[NotificationManager alloc] init]; - self.notificationManager.delegate = self; - [UNUserNotificationCenter currentNotificationCenter].delegate = self.notificationManager; - if ([MWMFrameworkHelper isWiFiConnected]) { [[InAppPurchase bookmarksSubscriptionManager] validateWithCompletion:^(MWMValidationResult result, BOOL isTrial) { if (result == MWMValidationResultNotValid) { @@ -194,30 +186,6 @@ using namespace osm_auth_ios; [self.backgroundFetchScheduler run]; } -- (void)application:(UIApplication *)application - performFetchWithCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler { - if ([LocalNotificationManager shouldShowAuthNotification]) { - AuthNotification *n = [[AuthNotification alloc] initWithTitle:L(@"notification_unsent_reviews_title") - text:L(@"notification_unsent_reviews_message")]; - [self.notificationManager showNotification:n]; - [LocalNotificationManager authNotificationWasShown]; - completionHandler(UIBackgroundFetchResultNewData); - return; - } - - CoreNotificationWrapper *reviewNotification = [LocalNotificationManager reviewNotificationWrapper]; - if (reviewNotification) { - NSString *text = - reviewNotification.address.length > 0 - ? [NSString stringWithFormat:@"%@, %@", reviewNotification.readableName, reviewNotification.address] - : reviewNotification.readableName; - ReviewNotification *n = [[ReviewNotification alloc] initWithTitle:L(@"notification_leave_review_v2_title") - text:text - notificationWrapper:reviewNotification]; - [self.notificationManager showNotification:n]; - } -} - - (void)applicationWillTerminate:(UIApplication *)application { [self.mapViewController onTerminate]; // Global cleanup @@ -513,20 +481,6 @@ using namespace osm_auth_ios; return YES; } -#pragma mark - NotificationManagerDelegate - -- (void)didOpenNotification:(Notification *)notification { - if (notification.class == ReviewNotification.class) { - ReviewNotification *reviewNotification = (ReviewNotification *)notification; - if (GetFramework().MakePlacePageForNotification(reviewNotification.notificationWrapper.notificationCandidate)) - [[MapViewController sharedController].controlsManager showPlacePageReview]; - } else if (notification.class == AuthNotification.class) { - MapViewController *mapViewController = [MapViewController sharedController]; - [mapViewController.navigationController popToRootViewControllerAnimated:NO]; - [mapViewController showUGCAuth]; - } -} - #pragma mark - CPApplicationDelegate implementation - (void)application:(UIApplication *)application diff --git a/iphone/Maps/Core/ABTests/ABTestManager.swift b/iphone/Maps/Core/ABTests/ABTestManager.swift index 2b15e4ce26..f183f74258 100644 --- a/iphone/Maps/Core/ABTests/ABTestManager.swift +++ b/iphone/Maps/Core/ABTests/ABTestManager.swift @@ -1,6 +1,5 @@ @objc protocol IABTestManager { @objc var promoDiscoveryCampaign: PromoDiscoveryCampaign { get } - @objc var promoAfterBookingCampaign: PromoAfterBookingCampaign { get } @objc var paidRoutesSubscriptionCampaign: PaidRoutesSubscriptionCampaign { get } @objc var abTestBookingBackButtonColor: ABTestBookingBackButtonColor { get } } @@ -16,10 +15,6 @@ return PromoDiscoveryCampaign() }() - @objc lazy var promoAfterBookingCampaign: PromoAfterBookingCampaign = { - return PromoAfterBookingCampaign() - }() - @objc lazy var paidRoutesSubscriptionCampaign: PaidRoutesSubscriptionCampaign = { return PaidRoutesSubscriptionCampaign() }() diff --git a/iphone/Maps/Core/ABTests/Promo/PromoAfterBookingCampaign.swift b/iphone/Maps/Core/ABTests/Promo/PromoAfterBookingCampaign.swift deleted file mode 100644 index 315e9b077d..0000000000 --- a/iphone/Maps/Core/ABTests/Promo/PromoAfterBookingCampaign.swift +++ /dev/null @@ -1,12 +0,0 @@ -@objc class PromoAfterBookingCampaign: NSObject, IABTest { - @objc var afterBookingData: PromoAfterBookingData { - return PromoAfterBookingCampaignAdapter.afterBookingData() - } - - @objc var enabled: Bool { - return true; - } - - required override init() { - } -} diff --git a/iphone/Maps/Core/Notifications/CoreNotificationWrapper+Core.h b/iphone/Maps/Core/Notifications/CoreNotificationWrapper+Core.h deleted file mode 100644 index 244d4b3028..0000000000 --- a/iphone/Maps/Core/Notifications/CoreNotificationWrapper+Core.h +++ /dev/null @@ -1,10 +0,0 @@ -#import "CoreNotificationWrapper.h" - -#include "map/notifications/notification_manager.hpp" - -@interface CoreNotificationWrapper (Core) - -- (instancetype)initWithNotificationCandidate:(notifications::NotificationCandidate const &)notification; -- (notifications::NotificationCandidate)notificationCandidate; - -@end diff --git a/iphone/Maps/Core/Notifications/CoreNotificationWrapper.h b/iphone/Maps/Core/Notifications/CoreNotificationWrapper.h deleted file mode 100644 index eb45dd6870..0000000000 --- a/iphone/Maps/Core/Notifications/CoreNotificationWrapper.h +++ /dev/null @@ -1,19 +0,0 @@ -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface CoreNotificationWrapper : NSObject - -@property(nonatomic, copy) NSString *bestType; -@property(nonatomic, copy) NSString *defaultName; -@property(nonatomic, copy) NSString *readableName; -@property(nonatomic, copy) NSString *address; -@property(nonatomic) double x; -@property(nonatomic) double y; - -- (instancetype _Nullable)initWithNotificationDictionary:(NSDictionary *)dictionary; -- (NSDictionary *)notificationDictionary; - -@end - -NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Core/Notifications/CoreNotificationWrapper.mm b/iphone/Maps/Core/Notifications/CoreNotificationWrapper.mm deleted file mode 100644 index aefe4bff02..0000000000 --- a/iphone/Maps/Core/Notifications/CoreNotificationWrapper.mm +++ /dev/null @@ -1,71 +0,0 @@ -#import "CoreNotificationWrapper.h" -#import "CoreNotificationWrapper+Core.h" - -static NSString *const kX = @"x"; -static NSString *const kY = @"y"; -static NSString *const kType = @"type"; -static NSString *const kName = @"name"; -static NSString *const kReadableName = @"readableName"; - -@implementation CoreNotificationWrapper - -- (instancetype)initWithNotificationDictionary:(NSDictionary *)dictionary { - self = [super init]; - if (self) { - NSNumber *x = dictionary[kX]; - NSNumber *y = dictionary[kY]; - NSString *type = dictionary[kType]; - NSString *name = dictionary[kName]; - NSString *readableName = dictionary[kReadableName]; - if (x && y && type && name && readableName) { - _x = x.doubleValue; - _y = y.doubleValue; - _bestType = type; - _defaultName = name; - _readableName = readableName; - } else { - return nil; - } - } - - return self; -} - -- (NSDictionary *)notificationDictionary { - return @{ - kX : @(self.x), - kY : @(self.y), - kType : self.bestType, - kName : self.defaultName, - kReadableName : self.readableName - }; -} - -@end - -@implementation CoreNotificationWrapper (Core) - -- (instancetype)initWithNotificationCandidate:(notifications::NotificationCandidate const &)notification { - self = [super init]; - if (self) { - _x = notification.GetPos().x; - _y = notification.GetPos().y; - _defaultName = @(notification.GetDefaultName().c_str()); - _bestType = @(notification.GetBestFeatureType().c_str()); - _readableName = @(notification.GetReadableName().c_str()); - _address = @(notification.GetAddress().c_str()); - } - - return self; -} - -- (notifications::NotificationCandidate)notificationCandidate { - notifications::NotificationCandidate nc(notifications::NotificationCandidate::Type::UgcReview); - nc.SetDefaultName(self.defaultName.UTF8String); - nc.SetBestFeatureType(self.bestType.UTF8String); - nc.SetPos(m2::PointD(self.x, self.y)); - nc.SetReadableName(self.readableName.UTF8String); - return nc; -} - -@end diff --git a/iphone/Maps/Core/Notifications/LocalNotificationManager.h b/iphone/Maps/Core/Notifications/LocalNotificationManager.h deleted file mode 100644 index bfd4f601c8..0000000000 --- a/iphone/Maps/Core/Notifications/LocalNotificationManager.h +++ /dev/null @@ -1,13 +0,0 @@ -NS_ASSUME_NONNULL_BEGIN - -@class CoreNotificationWrapper; - -@interface LocalNotificationManager : NSObject - -+ (BOOL)shouldShowAuthNotification; -+ (void)authNotificationWasShown; -+ (CoreNotificationWrapper * _Nullable)reviewNotificationWrapper; - -@end - -NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Core/Notifications/LocalNotificationManager.mm b/iphone/Maps/Core/Notifications/LocalNotificationManager.mm deleted file mode 100644 index 5b4e6602db..0000000000 --- a/iphone/Maps/Core/Notifications/LocalNotificationManager.mm +++ /dev/null @@ -1,61 +0,0 @@ -#import "LocalNotificationManager.h" -#import "CoreNotificationWrapper+Core.h" -#import "NSDate+TimeDistance.h" - -#include "map/framework_light.hpp" -#include "map/framework_light_delegate.hpp" - -#include "platform/network_policy_ios.h" - -#include - -static NSString * const kLastUGCNotificationDate = @"LastUGCNotificationDate"; - -@implementation LocalNotificationManager - -+ (BOOL)shouldShowAuthNotification -{ - if (!network_policy::CanUseNetwork()) - return NO; - - if (NSDate * date = [[NSUserDefaults standardUserDefaults] objectForKey:kLastUGCNotificationDate]) - { - if (date.daysToNow <= 5) - return NO; - } - - using namespace lightweight; - lightweight::Framework const f(REQUEST_TYPE_NUMBER_OF_UNSENT_UGC | REQUEST_TYPE_USER_AUTH_STATUS); - if (f.IsUserAuthenticated() || f.GetNumberOfUnsentUGC() < 2) - return NO; - - return YES; -} - -+ (void)authNotificationWasShown -{ - auto ud = [NSUserDefaults standardUserDefaults]; - [ud setObject:[NSDate date] forKey:kLastUGCNotificationDate]; - [ud synchronize]; -} - -+ (CoreNotificationWrapper *)reviewNotificationWrapper -{ - lightweight::Framework framework(lightweight::REQUEST_TYPE_NOTIFICATION); - framework.SetDelegate(std::make_unique(GetFramework())); - auto const notificationCandidate = framework.GetNotification(); - - if (notificationCandidate) - { - auto const notification = *notificationCandidate; - if (notification.GetType() == notifications::NotificationCandidate::Type::UgcReview) - { - CoreNotificationWrapper * w = [[CoreNotificationWrapper alloc] initWithNotificationCandidate:notification]; - return w; - } - } - - return nil; -} - -@end diff --git a/iphone/Maps/Core/Notifications/NotificationManager.swift b/iphone/Maps/Core/Notifications/NotificationManager.swift deleted file mode 100644 index fd1d786658..0000000000 --- a/iphone/Maps/Core/Notifications/NotificationManager.swift +++ /dev/null @@ -1,41 +0,0 @@ -@objc -protocol NotificationManagerDelegate { - func didOpenNotification(_ notification: Notification) -} - -@objc -final class NotificationManager: NSObject { - @objc var delegate: NotificationManagerDelegate? - - @objc - func showNotification(_ notification: Notification) { - let notificationContent = UNMutableNotificationContent() - notificationContent.title = notification.title - notificationContent.body = notification.text - notificationContent.sound = UNNotificationSound.default - notificationContent.userInfo = notification.userInfo - let notificationRequest = UNNotificationRequest(identifier: notification.identifier, - content: notificationContent, - trigger: UNTimeIntervalNotificationTrigger(timeInterval: 1, - repeats: false)) - UNUserNotificationCenter.current().add(notificationRequest) - } -} - -extension NotificationManager: UNUserNotificationCenterDelegate { - func userNotificationCenter(_ center: UNUserNotificationCenter, - willPresent notification: UNNotification, - withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) { - if Notification.fromUserInfo(notification.request.content.userInfo) != nil { - completionHandler([.sound, .alert]) - } - } - - func userNotificationCenter(_ center: UNUserNotificationCenter, - didReceive response: UNNotificationResponse, - withCompletionHandler completionHandler: @escaping () -> Void) { - if let n = Notification.fromUserInfo(response.notification.request.content.userInfo) { - delegate?.didOpenNotification(n) - } - } -} diff --git a/iphone/Maps/Core/Notifications/Notifications.swift b/iphone/Maps/Core/Notifications/Notifications.swift deleted file mode 100644 index bd8b061290..0000000000 --- a/iphone/Maps/Core/Notifications/Notifications.swift +++ /dev/null @@ -1,83 +0,0 @@ -@objc -class Notification: NSObject { - fileprivate static let kLocalNotificationName = "LocalNotificationName" - fileprivate static let kLocalNotificationTitle = "LocalNotificationTitle" - fileprivate static let kLocalNotificationText = "LocalNotificationText" - let title: String - let text: String - var userInfo: [AnyHashable : Any] { - return [Notification.kLocalNotificationName : identifier, - Notification.kLocalNotificationTitle : title, - Notification.kLocalNotificationText : text] - } - - var identifier: String { - assert(false, "Override in subclass") - return "" - } - - @objc - init(title: String, text: String) { - self.title = title - self.text = text - } - - convenience init?(userInfo: [AnyHashable : Any]) { - if let title = userInfo[Notification.kLocalNotificationTitle] as? String, - let text = userInfo[Notification.kLocalNotificationText] as? String { - self.init(title: title, text: text) - } else { - return nil - } - } - - class func fromUserInfo(_ userInfo: [AnyHashable : Any]) -> Notification? { - if let notificationName = userInfo[Notification.kLocalNotificationName] as? String { - switch notificationName { - case ReviewNotification.identifier: - return ReviewNotification(userInfo: userInfo) - case AuthNotification.identifier: - return AuthNotification(userInfo: userInfo) - default: - return nil - } - } - return nil - } -} - -@objc -class AuthNotification: Notification { - static let identifier = "UGC" - override var identifier: String { return AuthNotification.identifier } -} - -@objc -class ReviewNotification: Notification { - private static let kNotificationObject = "NotificationObject" - static let identifier = "ReviewNotification" - @objc let notificationWrapper: CoreNotificationWrapper - override var identifier: String { return ReviewNotification.identifier } - override var userInfo: [AnyHashable : Any] { - var result = super.userInfo - result[ReviewNotification.kNotificationObject] = notificationWrapper.notificationDictionary() - return result - } - - @objc - init(title: String, text: String, notificationWrapper: CoreNotificationWrapper) { - self.notificationWrapper = notificationWrapper - super.init(title: title, text: text) - } - - convenience init?(userInfo: [AnyHashable : Any]) { - if let title = userInfo[Notification.kLocalNotificationTitle] as? String, - let text = userInfo[Notification.kLocalNotificationText] as? String, - let notificationDictionary = userInfo[ReviewNotification.kNotificationObject] as? [AnyHashable : Any], - let notificationWrapper = CoreNotificationWrapper(notificationDictionary: notificationDictionary) { - self.init(title: title, text: text, notificationWrapper: notificationWrapper) - } else { - return nil - } - } -} diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 3ea76b0e91..f144970df9 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -132,7 +132,6 @@ 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 */; }; - 3486B5081E27A4B50069C126 /* LocalNotificationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3486B5061E27A4B50069C126 /* LocalNotificationManager.mm */; }; 3486B5191E27AD3B0069C126 /* MWMFrameworkListener.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3486B5131E27AD3B0069C126 /* MWMFrameworkListener.mm */; }; 3488B01A1E9D0B230068AFD8 /* UIColor+Modifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3488B0181E9D0B230068AFD8 /* UIColor+Modifications.swift */; }; 3488B03B1E9D13EF0068AFD8 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3488B03A1E9D13EF0068AFD8 /* UserNotifications.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; @@ -260,7 +259,6 @@ 34F742321E0834F400AC1FD6 /* UIViewController+Navigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F742301E0834F400AC1FD6 /* UIViewController+Navigation.m */; }; 34FE5A6F1F18F30F00BCA729 /* TrafficButtonArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FE5A6D1F18F30F00BCA729 /* TrafficButtonArea.swift */; }; 39CDE69123E1B6C8007CDA58 /* libge0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 39CDE69023E1B6C8007CDA58 /* libge0.a */; }; - 3D0D2F7623D858BF00945C8D /* IsolinesTutorialBlur.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D0D2F7523D858BF00945C8D /* IsolinesTutorialBlur.xib */; }; 3D15ACEE2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D15ACED2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm */; }; 3D1958EB213804B6009A83EC /* libmetrics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D1958EA213804B6009A83EC /* libmetrics.a */; }; 3DB1C57122D5DDA60097EC4C /* PromoAfterBookingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3DB1C57022D5DDA60097EC4C /* PromoAfterBookingViewController.xib */; }; @@ -284,9 +282,6 @@ 4701A93D243A917900B87683 /* TouchTransparentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4701A93C243A917800B87683 /* TouchTransparentView.swift */; }; 4707E4B12372FE860017DF6E /* PlacePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4707E4AF2372FE860017DF6E /* PlacePageViewController.swift */; }; 4707E4B42372FF480017DF6E /* PlacePage.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4707E4B32372FF480017DF6E /* PlacePage.storyboard */; }; - 470A89FD21342A9D00D72FBF /* TutorialBlurView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470A89FC21342A9D00D72FBF /* TutorialBlurView.swift */; }; - 470A89FF2134517600D72FBF /* BookmarksTutorialBlur.xib in Resources */ = {isa = PBXBuildFile; fileRef = 470A89FE2134517600D72FBF /* BookmarksTutorialBlur.xib */; }; - 470A8A012136097000D72FBF /* SubwayTutorialBlur.xib in Resources */ = {isa = PBXBuildFile; fileRef = 470A8A002136073000D72FBF /* SubwayTutorialBlur.xib */; }; 470B3630244E2DB400C0EA9E /* GuidesGalleryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470B362F244E2DB400C0EA9E /* GuidesGalleryViewController.swift */; }; 470B3632244E2DE200C0EA9E /* GuidesGalleryCityCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470B3631244E2DE200C0EA9E /* GuidesGalleryCityCell.swift */; }; 470B3634244E2DF900C0EA9E /* GuidesGalleryOutdoorCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470B3633244E2DF900C0EA9E /* GuidesGalleryOutdoorCell.swift */; }; @@ -310,7 +305,6 @@ 471A7BC4248471BE00A0D4C1 /* BookmarkUIUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471A7BC3248471BE00A0D4C1 /* BookmarkUIUtils.swift */; }; 471AB98923AA8A3500F56D49 /* IDownloaderDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471AB98823AA8A3500F56D49 /* IDownloaderDataSource.swift */; }; 471AB99423ABA3BD00F56D49 /* SearchMapsDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471AB99323ABA3BD00F56D49 /* SearchMapsDataSource.swift */; }; - 471BBD942130390F00EB17C9 /* TutorialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471BBD932130390F00EB17C9 /* TutorialViewController.swift */; }; 471C448C2322A7C800C307EC /* SubscriptionGoToCatalogViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471C448A2322A7C800C307EC /* SubscriptionGoToCatalogViewController.swift */; }; 471C448D2322A7C800C307EC /* SubscriptionGoToCatalogViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 471C448B2322A7C800C307EC /* SubscriptionGoToCatalogViewController.xib */; }; 4726254921C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4726254821C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift */; }; @@ -340,7 +334,6 @@ 4767CDA620AB1F6200BD8166 /* LeftAlignedIconButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4767CDA520AB1F6200BD8166 /* LeftAlignedIconButton.swift */; }; 4767CDA820AB401000BD8166 /* LinkTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4767CDA720AB401000BD8166 /* LinkTextView.swift */; }; 47699A0821F08E37009E6585 /* NSDate+TimeDistance.m in Sources */ = {isa = PBXBuildFile; fileRef = 47699A0721F08E37009E6585 /* NSDate+TimeDistance.m */; }; - 47699A0A21F0C4C8009E6585 /* NotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47699A0921F0C4C8009E6585 /* NotificationManager.swift */; }; 477219052243E79500E5B227 /* DrivingOptionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 477219042243E79500E5B227 /* DrivingOptionsViewController.swift */; }; 477D7AC7218F1515007EE2CB /* IPaidRoutePurchase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 477D7AC6218F1515007EE2CB /* IPaidRoutePurchase.swift */; }; 47868A7D22145A95000AFC86 /* GuideSharingDescriptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47868A7C22145A95000AFC86 /* GuideSharingDescriptionViewController.swift */; }; @@ -361,8 +354,6 @@ 47A6F3C4235F47B90053FBA4 /* CitySubscriptionViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47A6F3C1235F47B90053FBA4 /* CitySubscriptionViewController.xib */; }; 47A6F3C5235F47B90053FBA4 /* BookmarksSubscriptionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47A6F3C2235F47B90053FBA4 /* BookmarksSubscriptionButton.swift */; }; 47AEF8402231249E00D20538 /* categories_brands.txt in Resources */ = {isa = PBXBuildFile; fileRef = 47AEF83F2231249E00D20538 /* categories_brands.txt */; }; - 47B505542136B0C2009CBB55 /* DiscoveryTutorialBlur.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47B505522136AB41009CBB55 /* DiscoveryTutorialBlur.xib */; }; - 47B505552136B0CF009CBB55 /* SearchTutorialBlur.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47B505532136AD69009CBB55 /* SearchTutorialBlur.xib */; }; 47B9065221C7FA400079C85E /* MWMWebImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 47B9064921C7FA3B0079C85E /* MWMWebImage.m */; }; 47B9065321C7FA400079C85E /* MWMImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 47B9064A21C7FA3C0079C85E /* MWMImageCache.m */; }; 47B9065421C7FA400079C85E /* UIImageView+WebImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 47B9064F21C7FA3E0079C85E /* UIImageView+WebImage.m */; }; @@ -415,8 +406,6 @@ 47F4F21323A6EC420022FD56 /* DownloadMapsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F4F21223A6EC420022FD56 /* DownloadMapsViewController.swift */; }; 47F4F21523A6F06F0022FD56 /* AvailableMapsDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F4F21423A6F06F0022FD56 /* AvailableMapsDataSource.swift */; }; 47F67D1521CAB21B0069754E /* MWMImageCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 47F67D1421CAB21B0069754E /* MWMImageCoder.m */; }; - 47F6E51221F61908004580CA /* CoreNotificationWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47F6E51121F61908004580CA /* CoreNotificationWrapper.mm */; }; - 47F6E51721FB3C51004580CA /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F6E51621FB3C51004580CA /* Notifications.swift */; }; 47F86CFF20C936FC00FEE291 /* TabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F86CFE20C936FC00FEE291 /* TabView.swift */; }; 47F86D0120C93D8D00FEE291 /* TabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F86D0020C93D8D00FEE291 /* TabViewController.swift */; }; 47FA14D1230D52FC003DA979 /* PhoneNumberAuthorizationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47FA14D0230D52FC003DA979 /* PhoneNumberAuthorizationViewController.swift */; }; @@ -529,7 +518,6 @@ 991CE2BF2371D349009EB02A /* ABTestManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991CE2BA2371D349009EB02A /* ABTestManager.swift */; }; 991CE2C02371D349009EB02A /* IABTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991CE2BB2371D349009EB02A /* IABTest.swift */; }; 991CE2C22371D349009EB02A /* PromoDiscoveryCampaign.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991CE2BE2371D349009EB02A /* PromoDiscoveryCampaign.swift */; }; - 991CE2DD2373145C009EB02A /* PromoAfterBookingCampaign.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991CE2DC2373145C009EB02A /* PromoAfterBookingCampaign.swift */; }; 991FCA2423B11E61009AD684 /* BookmarksStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991FCA2323B11E61009AD684 /* BookmarksStyleSheet.swift */; }; 993416F82534427300526F6E /* PlacePageDividerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 993416F72534427300526F6E /* PlacePageDividerViewController.swift */; }; 993DF0B523F6B2EF00AC231A /* PlacePageElevationLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 993DF0B423F6B2EF00AC231A /* PlacePageElevationLayout.swift */; }; @@ -1091,8 +1079,6 @@ 34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchNoResultsViewController.swift; sourceTree = ""; }; 34845DB51E166084003D55B9 /* Common.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Common.swift; sourceTree = ""; }; 3486B5031E27948F0069C126 /* MWMMyPositionMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMMyPositionMode.h; sourceTree = ""; }; - 3486B5051E27A4B50069C126 /* LocalNotificationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalNotificationManager.h; sourceTree = ""; }; - 3486B5061E27A4B50069C126 /* LocalNotificationManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = LocalNotificationManager.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 3486B5121E27AD3B0069C126 /* MWMFrameworkListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMFrameworkListener.h; sourceTree = ""; }; 3486B5131E27AD3B0069C126 /* MWMFrameworkListener.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMFrameworkListener.mm; sourceTree = ""; }; 3486B5141E27AD3B0069C126 /* MWMFrameworkObservers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMFrameworkObservers.h; sourceTree = ""; }; @@ -1335,7 +1321,6 @@ 34FE4C441BCC013500066718 /* MWMMapWidgets.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapWidgets.mm; sourceTree = ""; }; 34FE5A6D1F18F30F00BCA729 /* TrafficButtonArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TrafficButtonArea.swift; sourceTree = ""; }; 39CDE69023E1B6C8007CDA58 /* libge0.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libge0.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 3D0D2F7523D858BF00945C8D /* IsolinesTutorialBlur.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = IsolinesTutorialBlur.xib; sourceTree = ""; }; 3D15ACED2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMObjectsCategorySelectorDataSource.mm; sourceTree = ""; }; 3D15ACEF2155118800F725D5 /* MWMObjectsCategorySelectorDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMObjectsCategorySelectorDataSource.h; sourceTree = ""; }; 3D1958EA213804B6009A83EC /* libmetrics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmetrics.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1368,9 +1353,6 @@ 4701A93C243A917800B87683 /* TouchTransparentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TouchTransparentView.swift; sourceTree = ""; }; 4707E4AF2372FE860017DF6E /* PlacePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageViewController.swift; sourceTree = ""; }; 4707E4B32372FF480017DF6E /* PlacePage.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = PlacePage.storyboard; sourceTree = ""; }; - 470A89FC21342A9D00D72FBF /* TutorialBlurView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialBlurView.swift; sourceTree = ""; }; - 470A89FE2134517600D72FBF /* BookmarksTutorialBlur.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarksTutorialBlur.xib; sourceTree = ""; }; - 470A8A002136073000D72FBF /* SubwayTutorialBlur.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SubwayTutorialBlur.xib; sourceTree = ""; }; 470B362F244E2DB400C0EA9E /* GuidesGalleryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuidesGalleryViewController.swift; sourceTree = ""; }; 470B3631244E2DE200C0EA9E /* GuidesGalleryCityCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuidesGalleryCityCell.swift; sourceTree = ""; }; 470B3633244E2DF900C0EA9E /* GuidesGalleryOutdoorCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuidesGalleryOutdoorCell.swift; sourceTree = ""; }; @@ -1395,7 +1377,6 @@ 471A7BC3248471BE00A0D4C1 /* BookmarkUIUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkUIUtils.swift; sourceTree = ""; }; 471AB98823AA8A3500F56D49 /* IDownloaderDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IDownloaderDataSource.swift; sourceTree = ""; }; 471AB99323ABA3BD00F56D49 /* SearchMapsDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchMapsDataSource.swift; sourceTree = ""; }; - 471BBD932130390F00EB17C9 /* TutorialViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TutorialViewController.swift; sourceTree = ""; }; 471C448A2322A7C800C307EC /* SubscriptionGoToCatalogViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionGoToCatalogViewController.swift; sourceTree = ""; }; 471C448B2322A7C800C307EC /* SubscriptionGoToCatalogViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SubscriptionGoToCatalogViewController.xib; sourceTree = ""; }; 4726254821C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageDescriptionViewController.swift; sourceTree = ""; }; @@ -1430,7 +1411,6 @@ 4767CDA720AB401000BD8166 /* LinkTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkTextView.swift; sourceTree = ""; }; 47699A0621F08E37009E6585 /* NSDate+TimeDistance.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSDate+TimeDistance.h"; sourceTree = ""; }; 47699A0721F08E37009E6585 /* NSDate+TimeDistance.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSDate+TimeDistance.m"; sourceTree = ""; }; - 47699A0921F0C4C8009E6585 /* NotificationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationManager.swift; sourceTree = ""; }; 477219042243E79500E5B227 /* DrivingOptionsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DrivingOptionsViewController.swift; sourceTree = ""; }; 477D7AC6218F1515007EE2CB /* IPaidRoutePurchase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPaidRoutePurchase.swift; sourceTree = ""; }; 47868A7C22145A95000AFC86 /* GuideSharingDescriptionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuideSharingDescriptionViewController.swift; sourceTree = ""; }; @@ -1450,8 +1430,6 @@ 47A6F3C1235F47B90053FBA4 /* CitySubscriptionViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CitySubscriptionViewController.xib; sourceTree = ""; }; 47A6F3C2235F47B90053FBA4 /* BookmarksSubscriptionButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarksSubscriptionButton.swift; sourceTree = ""; }; 47AEF83F2231249E00D20538 /* categories_brands.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = categories_brands.txt; path = ../../data/categories_brands.txt; sourceTree = ""; }; - 47B505522136AB41009CBB55 /* DiscoveryTutorialBlur.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DiscoveryTutorialBlur.xib; sourceTree = ""; }; - 47B505532136AD69009CBB55 /* SearchTutorialBlur.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SearchTutorialBlur.xib; sourceTree = ""; }; 47B9064921C7FA3B0079C85E /* MWMWebImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMWebImage.m; sourceTree = ""; }; 47B9064A21C7FA3C0079C85E /* MWMImageCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMImageCache.m; sourceTree = ""; }; 47B9064B21C7FA3C0079C85E /* NSString+MD5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+MD5.h"; sourceTree = ""; }; @@ -1510,10 +1488,6 @@ 47F67D1321CAB21B0069754E /* MWMImageCoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMImageCoder.h; sourceTree = ""; }; 47F67D1421CAB21B0069754E /* MWMImageCoder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMImageCoder.m; sourceTree = ""; }; 47F67D1621CAB50B0069754E /* IMWMImageCoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IMWMImageCoder.h; sourceTree = ""; }; - 47F6E51021F61908004580CA /* CoreNotificationWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreNotificationWrapper.h; sourceTree = ""; }; - 47F6E51121F61908004580CA /* CoreNotificationWrapper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CoreNotificationWrapper.mm; sourceTree = ""; }; - 47F6E51321F61974004580CA /* CoreNotificationWrapper+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CoreNotificationWrapper+Core.h"; sourceTree = ""; }; - 47F6E51621FB3C51004580CA /* Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = ""; }; 47F701EC238C2F8400D18E95 /* location_util.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = location_util.h; sourceTree = ""; }; 47F86CFE20C936FC00FEE291 /* TabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabView.swift; sourceTree = ""; }; 47F86D0020C93D8D00FEE291 /* TabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewController.swift; sourceTree = ""; }; @@ -1577,7 +1551,6 @@ 991CE2BA2371D349009EB02A /* ABTestManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ABTestManager.swift; sourceTree = ""; }; 991CE2BB2371D349009EB02A /* IABTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IABTest.swift; sourceTree = ""; }; 991CE2BE2371D349009EB02A /* PromoDiscoveryCampaign.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PromoDiscoveryCampaign.swift; sourceTree = ""; }; - 991CE2DC2373145C009EB02A /* PromoAfterBookingCampaign.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromoAfterBookingCampaign.swift; sourceTree = ""; }; 991FCA2323B11E61009AD684 /* BookmarksStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksStyleSheet.swift; sourceTree = ""; }; 993416F72534427300526F6E /* PlacePageDividerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageDividerViewController.swift; sourceTree = ""; }; 993DF0B423F6B2EF00AC231A /* PlacePageElevationLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageElevationLayout.swift; sourceTree = ""; }; @@ -2226,7 +2199,6 @@ isa = PBXGroup; children = ( 47AEF83F2231249E00D20538 /* categories_brands.txt */, - 471BBD92213038E000EB17C9 /* TipsAndTricks */, FA36B8011540388B004560CC /* Bookmarks */, 3454D7981E07F045004AF2AD /* Categories */, 080E96DDFE201D6D7F000001 /* Classes */, @@ -2422,7 +2394,6 @@ 3486B50F1E27AD3B0069C126 /* Framework */, 340475291E081A4600C92850 /* Location */, 340475301E081A4600C92850 /* NetworkPolicy */, - 3486B5041E27A4B50069C126 /* Notifications */, 340475331E081A4600C92850 /* Routing */, 340475391E081A4600C92850 /* Search */, 3404753F1E081A4600C92850 /* Settings */, @@ -2852,20 +2823,6 @@ path = TextToSpeech; sourceTree = ""; }; - 3486B5041E27A4B50069C126 /* Notifications */ = { - isa = PBXGroup; - children = ( - 3486B5051E27A4B50069C126 /* LocalNotificationManager.h */, - 3486B5061E27A4B50069C126 /* LocalNotificationManager.mm */, - 47699A0921F0C4C8009E6585 /* NotificationManager.swift */, - 47F6E51021F61908004580CA /* CoreNotificationWrapper.h */, - 47F6E51121F61908004580CA /* CoreNotificationWrapper.mm */, - 47F6E51321F61974004580CA /* CoreNotificationWrapper+Core.h */, - 47F6E51621FB3C51004580CA /* Notifications.swift */, - ); - path = Notifications; - sourceTree = ""; - }; 3486B50F1E27AD3B0069C126 /* Framework */ = { isa = PBXGroup; children = ( @@ -3258,20 +3215,6 @@ path = Impl; sourceTree = ""; }; - 471BBD92213038E000EB17C9 /* TipsAndTricks */ = { - isa = PBXGroup; - children = ( - 3D0D2F7523D858BF00945C8D /* IsolinesTutorialBlur.xib */, - 471BBD932130390F00EB17C9 /* TutorialViewController.swift */, - 470A89FC21342A9D00D72FBF /* TutorialBlurView.swift */, - 47B505522136AB41009CBB55 /* DiscoveryTutorialBlur.xib */, - 47B505532136AD69009CBB55 /* SearchTutorialBlur.xib */, - 470A8A002136073000D72FBF /* SubwayTutorialBlur.xib */, - 470A89FE2134517600D72FBF /* BookmarksTutorialBlur.xib */, - ); - path = TipsAndTricks; - sourceTree = ""; - }; 472E3F4221468AF40020E412 /* Subscriptions */ = { isa = PBXGroup; children = ( @@ -3590,7 +3533,6 @@ isa = PBXGroup; children = ( 9917D17C2396793A00A7E06E /* PaidRoutesSubscriptionCampaign.swift */, - 991CE2DC2373145C009EB02A /* PromoAfterBookingCampaign.swift */, 991CE2BE2371D349009EB02A /* PromoDiscoveryCampaign.swift */, ); path = Promo; @@ -4934,7 +4876,6 @@ 34D3B0241E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.xib in Resources */, 34AB667A1FC5AA330078E451 /* RoutePreviewTaxiCell.xib in Resources */, 34D3B0271E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.xib in Resources */, - 47B505542136B0C2009CBB55 /* DiscoveryTutorialBlur.xib in Resources */, F6E2FDB91E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.xib in Resources */, 34D3B02D1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.xib in Resources */, 34D3B0331E389D05004100F9 /* MWMEditorCategoryCell.xib in Resources */, @@ -5016,7 +4957,6 @@ F6E2FF421E097BA00083EBEC /* MWMSearchTableViewController.xib in Resources */, 34AB66681FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */, F6E2FEEE1E097BA00083EBEC /* MWMSearchView.xib in Resources */, - 470A89FF2134517600D72FBF /* BookmarksTutorialBlur.xib in Resources */, 4501B1952077C35A001B9173 /* resources-xxxhdpi_dark in Resources */, F6D67CDE2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib in Resources */, 344532511F714FD70059FBCC /* UGCAddReviewController.xib in Resources */, @@ -5029,7 +4969,6 @@ F623DA6C1C9C2731006A3436 /* opening_hours_how_to_edit.html in Resources */, 993ECBB424E40CEC00EA5DEF /* GuidesNavigationBarViewController.xib in Resources */, 6741A9761BF340DE002C974C /* packed_polygons.bin in Resources */, - 470A8A012136097000D72FBF /* SubwayTutorialBlur.xib in Resources */, 676507601C10559800830BB3 /* patterns.txt in Resources */, 6741A94A1BF340DE002C974C /* resources-6plus_clear in Resources */, 9989273D2449E60200260CE2 /* BottomMenuViewController.xib in Resources */, @@ -5051,8 +4990,6 @@ 6741A9421BF340DE002C974C /* sound-strings in Resources */, F69018BD1E9F7CB600B3C10B /* MWMAutoupdateController.xib in Resources */, 34BBD6681F8273350070CA50 /* AuthorizationViewController.xib in Resources */, - 3D0D2F7623D858BF00945C8D /* IsolinesTutorialBlur.xib in Resources */, - 47B505552136B0CF009CBB55 /* SearchTutorialBlur.xib in Resources */, 6741A97D1BF340DE002C974C /* synonyms.txt in Resources */, CDB4D4D7222D248900104869 /* CarPlayStoryboard.storyboard in Resources */, 47C8789122DF525A00A772DA /* SubscriptionSuccessViewController.xib in Resources */, @@ -5271,7 +5208,6 @@ 993DF12A23F6BDB100AC231A /* Style.swift in Sources */, 34ABA6171C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */, 993DF10423F6BDB100AC231A /* UIView+styleName.swift in Sources */, - 991CE2DD2373145C009EB02A /* PromoAfterBookingCampaign.swift in Sources */, 998927302449DE1500260CE2 /* TabBarArea.swift in Sources */, 995739042355CAA30019AEE7 /* PageIndicator.swift in Sources */, 470F0B7D238842EA006AEC94 /* ExpandableLabel.swift in Sources */, @@ -5381,11 +5317,9 @@ 99A906EC23F6F7030005872B /* HotelDescriptionViewController.swift in Sources */, 993DF11923F6BDB100AC231A /* UITextFieldRenderer.swift in Sources */, 99CB34C3236AEAEA001D28AD /* WhatsNewController.swift in Sources */, - 470A89FD21342A9D00D72FBF /* TutorialBlurView.swift in Sources */, 342CC5F21C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm in Sources */, 340475591E081A4600C92850 /* WebViewController.m in Sources */, 3404F4992028A20D0090E401 /* BMCCategoryCell.swift in Sources */, - 47F6E51721FB3C51004580CA /* Notifications.swift in Sources */, F62607FD207B790300176C5A /* SpinnerAlert.swift in Sources */, 3444DFD21F17620C00E73099 /* MWMMapWidgetsHelper.mm in Sources */, 348A8DFB1F66775A00D83026 /* RatingViewSettings.swift in Sources */, @@ -5479,7 +5413,6 @@ 99CB34CC236B054B001D28AD /* DeepLinkInfoPresenter.swift in Sources */, 47E3C72121108E9F008B3B27 /* BookmarksLoadedViewController.swift in Sources */, 3472B5CB200F43EF00DC6CD5 /* BackgroundFetchScheduler.swift in Sources */, - 471BBD942130390F00EB17C9 /* TutorialViewController.swift in Sources */, 34FE5A6F1F18F30F00BCA729 /* TrafficButtonArea.swift in Sources */, 993DF10D23F6BDB100AC231A /* UIPageControlRenderer.swift in Sources */, FA8E808925F412E2002A1434 /* FirstSession.mm in Sources */, @@ -5591,7 +5524,6 @@ 47F67D1521CAB21B0069754E /* MWMImageCoder.m in Sources */, 34AB66861FC5AA330078E451 /* MWMNavigationInfoView.mm in Sources */, 34C9BD051C6DB693000DC38D /* MWMViewController.m in Sources */, - 47699A0A21F0C4C8009E6585 /* NotificationManager.swift in Sources */, 331630D12191D74B00BB91A9 /* TagSectionHeaderView.swift in Sources */, 47868A7D22145A95000AFC86 /* GuideSharingDescriptionViewController.swift in Sources */, F6E2FDA41E097BA00083EBEC /* MWMCuisineEditorViewController.mm in Sources */, @@ -5617,7 +5549,6 @@ 4707E4B12372FE860017DF6E /* PlacePageViewController.swift in Sources */, 34AB66441FC5AA330078E451 /* RouteManagerViewModelProtocol.swift in Sources */, 4701A93D243A917900B87683 /* TouchTransparentView.swift in Sources */, - 3486B5081E27A4B50069C126 /* LocalNotificationManager.mm in Sources */, 3454D7BF1E07F045004AF2AD /* DateComponentsFormatter+ETA.swift in Sources */, 991FCA2423B11E61009AD684 /* BookmarksStyleSheet.swift in Sources */, 993DF12823F6BDB100AC231A /* IStyleSheet.swift in Sources */, @@ -5626,7 +5557,6 @@ 6741AA1C1BF340DE002C974C /* MWMRoutingDisclaimerAlert.m in Sources */, 34D3B0481E389D05004100F9 /* MWMNoteCell.m in Sources */, CD9AD967228067F500EC174A /* MapInfo.swift in Sources */, - 47F6E51221F61908004580CA /* CoreNotificationWrapper.mm in Sources */, 344532561F7155540059FBCC /* UGCReviewModel.swift in Sources */, 6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */, 346B42AC1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm in Sources */, diff --git a/iphone/Maps/TipsAndTricks/BookmarksTutorialBlur.xib b/iphone/Maps/TipsAndTricks/BookmarksTutorialBlur.xib deleted file mode 100644 index 4672a82be6..0000000000 --- a/iphone/Maps/TipsAndTricks/BookmarksTutorialBlur.xib +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/TipsAndTricks/DiscoveryTutorialBlur.xib b/iphone/Maps/TipsAndTricks/DiscoveryTutorialBlur.xib deleted file mode 100644 index 85b3ef3cd7..0000000000 --- a/iphone/Maps/TipsAndTricks/DiscoveryTutorialBlur.xib +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/TipsAndTricks/IsolinesTutorialBlur.xib b/iphone/Maps/TipsAndTricks/IsolinesTutorialBlur.xib deleted file mode 100644 index 614e6ff288..0000000000 --- a/iphone/Maps/TipsAndTricks/IsolinesTutorialBlur.xib +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/TipsAndTricks/SearchTutorialBlur.xib b/iphone/Maps/TipsAndTricks/SearchTutorialBlur.xib deleted file mode 100644 index 72ae0d6ff5..0000000000 --- a/iphone/Maps/TipsAndTricks/SearchTutorialBlur.xib +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/TipsAndTricks/SubwayTutorialBlur.xib b/iphone/Maps/TipsAndTricks/SubwayTutorialBlur.xib deleted file mode 100644 index 781f2ef093..0000000000 --- a/iphone/Maps/TipsAndTricks/SubwayTutorialBlur.xib +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/TipsAndTricks/TutorialBlurView.swift b/iphone/Maps/TipsAndTricks/TutorialBlurView.swift deleted file mode 100644 index faf036fb35..0000000000 --- a/iphone/Maps/TipsAndTricks/TutorialBlurView.swift +++ /dev/null @@ -1,101 +0,0 @@ -@objc(MWMTutorialBlurView) -class TutorialBlurView: UIVisualEffectView { - var targetView: UIView? - private var maskPath: UIBezierPath? - private var maskLayer = CAShapeLayer() - private let layoutView = UIView(frame: CGRect(x: -100, y: -100, width: 0, height: 0)) - - private func setup() { - maskLayer.fillRule = CAShapeLayerFillRule.evenOdd - layer.mask = maskLayer - layoutView.translatesAutoresizingMaskIntoConstraints = false - layoutView.isUserInteractionEnabled = false - contentView.addSubview(layoutView) - effect = nil - } - - override init(effect: UIVisualEffect?) { - super.init(effect: effect) - setup() - } - - required init?(coder aDecoder: NSCoder) { - super.init(coder: aDecoder) - setup() - } - - override func point(inside point: CGPoint, with event: UIEvent?) -> Bool { - guard let pointInView = targetView?.bounds.contains(convert(point, to: targetView)) else { - return super.point(inside: point, with: event) - } - return !pointInView - } - - override func didMoveToSuperview() { - super.didMoveToSuperview() - if superview != nil { - targetView?.centerXAnchor.constraint(equalTo: layoutView.centerXAnchor).isActive = true - targetView?.centerYAnchor.constraint(equalTo: layoutView.centerYAnchor).isActive = true - } - } - - override func layoutSubviews() { - super.layoutSubviews() - - let targetCenter = layoutView.center - let r: CGFloat = 40 - let targetRect = CGRect(x: targetCenter.x - r, y: targetCenter.y - r, width: r * 2, height: r * 2) - maskPath = UIBezierPath(rect: bounds) - maskPath!.append(UIBezierPath(ovalIn: targetRect)) - maskPath!.usesEvenOddFillRule = true - maskLayer.path = maskPath!.cgPath - - let pulsationPath = UIBezierPath(rect: bounds) - pulsationPath.append(UIBezierPath(ovalIn: targetRect.insetBy(dx: -10, dy: -10))) - pulsationPath.usesEvenOddFillRule = true - addPulsation(pulsationPath) - } - - func animateSizeChange(_ duration: TimeInterval) { - layer.mask = nil - DispatchQueue.main.asyncAfter(deadline: .now() + duration) { - self.layer.mask = self.maskLayer - self.setNeedsLayout() - } - } - - func animateFadeOut(_ duration: TimeInterval, completion: @escaping () -> Void) { - UIView.animate(withDuration: duration, animations: { - self.effect = nil - self.contentView.alpha = 0 - }) { _ in - self.contentView.backgroundColor = .clear - completion() - } - } - - func animateAppearance(_ duration: TimeInterval) { - contentView.alpha = 0 - UIView.animate(withDuration: duration) { - self.contentView.alpha = 1 - self.effect = UIBlurEffect(style: UIColor.isNightMode() ? .light : .dark) - } - } - - private func addPulsation(_ path: UIBezierPath) { - let animation = CABasicAnimation(keyPath: "path") - animation.duration = kDefaultAnimationDuration - animation.fromValue = maskLayer.path - animation.toValue = path.cgPath - animation.autoreverses = true - animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut) - animation.repeatCount = 2 - - let animationGroup = CAAnimationGroup() - animationGroup.duration = 3 - animationGroup.repeatCount = Float(Int.max) - animationGroup.animations = [animation] - - maskLayer.add(animationGroup, forKey: "path") - } -} diff --git a/iphone/Maps/TipsAndTricks/TutorialViewController.swift b/iphone/Maps/TipsAndTricks/TutorialViewController.swift deleted file mode 100644 index 0e51c16d9b..0000000000 --- a/iphone/Maps/TipsAndTricks/TutorialViewController.swift +++ /dev/null @@ -1,162 +0,0 @@ -@objc(MWMTutorialType) -enum TutorialType: Int { - case search = 0 - case discovery - case bookmarks - case subway - case isolines -} - -@objc(MWMTutorialViewControllerDelegate) -protocol TutorialViewControllerDelegate: AnyObject { - func didPressTarget(_ viewController: TutorialViewController) - func didPressCancel(_ viewController: TutorialViewController) -} - -fileprivate struct TargetAction { - let target: Any - let action: Selector -} - -@objc(MWMTutorialViewController) -@objcMembers -class TutorialViewController: UIViewController { - var targetView: UIControl? - var customAction: (() -> Void)? - weak var delegate: TutorialViewControllerDelegate? - private var targetViewActions: [TargetAction] = [] - - var tutorialView: TutorialBlurView { - return view as! TutorialBlurView - } - - override func viewDidLoad() { - super.viewDidLoad() - tutorialView.targetView = targetView - } - - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - overrideTargetAction() - tutorialView.animateAppearance(kDefaultAnimationDuration) - } - - override func viewWillDisappear(_ animated: Bool) { - super.viewWillDisappear(animated) - restoreTargetAction() - } - - override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) { - super.viewWillTransition(to: size, with: coordinator) - tutorialView.animateSizeChange(coordinator.transitionDuration) - } - - override func touchesBegan(_ touches: Set, with event: UIEvent?) { } - - override func touchesMoved(_ touches: Set, with event: UIEvent?) { } - - func fadeOut(withCompletion completion: (() -> Void)?) { - tutorialView.animateFadeOut(kDefaultAnimationDuration) { - completion?() - } - } - - @objc func onTap(_ sender: UIControl) { - customAction?() - delegate?.didPressTarget(self) - } - - @IBAction func onCancel(_ sender: UIButton) { - delegate?.didPressCancel(self) - } - - private func overrideTargetAction() { - if customAction != nil { - let targets = targetView?.allTargets - targets?.forEach({ target in - let actions = targetView?.actions(forTarget: target, forControlEvent: .touchUpInside) - actions?.forEach({ action in - let actionSelector = NSSelectorFromString(action) - targetViewActions.append(TargetAction(target: target, action: actionSelector)) - targetView?.removeTarget(target, action: actionSelector, for: .touchUpInside) - }) - }) - } - targetView?.addTarget(self, action: #selector(onTap(_:)), for: .touchUpInside) - } - - private func restoreTargetAction() { - targetView?.removeTarget(self, action: #selector(onTap(_:)), for: .touchUpInside) - targetViewActions.forEach { targetAction in - targetView?.addTarget(targetAction.target, action: targetAction.action, for: .touchUpInside) - } - } -} - -extension TutorialViewController { - @objc static func tutorial(_ type: TutorialType, - target: UIControl, - delegate: TutorialViewControllerDelegate) -> TutorialViewController? { - let result: TutorialViewController? - switch type { - case .search: - result = searchTutorialBlur() - case .discovery: - result = discoveryTutorialBlur() - case .subway: - result = subwayTutorialBlur() - case .isolines: - result = isolinesTutorialBlur() - case .bookmarks: - result = bookmarksTutorialBlur() - } - - result?.targetView = target - result?.delegate = delegate - return result - } - - private static func bookmarksTutorial() -> TutorialViewController { - return TutorialViewController(nibName: "BookmarksTutorial", bundle: nil) - } - - private static func bookmarksTutorialBlur() -> TutorialViewController? { -// let result = TutorialViewController(nibName: "BookmarksTutorialBlur", bundle: nil) -// result.customAction = { -// MapViewController.shared().openCatalog(animated: true, utm: .tipsAndTricks) -// } -// return result - return nil - } - - private static func searchTutorialBlur() -> TutorialViewController? { -// let result = TutorialViewController(nibName: "SearchTutorialBlur", bundle: nil) -// result.customAction = { -// MapViewController.shared().searchText(L("hotel").appending(" ")) -// } -// return result - return nil - } - - private static func discoveryTutorialBlur() -> TutorialViewController? { -// let result = TutorialViewController(nibName: "DiscoveryTutorialBlur", bundle: nil) -// return result - return nil - } - - private static func subwayTutorialBlur() -> TutorialViewController { - let result = TutorialViewController(nibName: "SubwayTutorialBlur", bundle: nil) - result.customAction = { - MapOverlayManager.setTransitEnabled(true) - } - return result - } - - private static func isolinesTutorialBlur() -> TutorialViewController { - let result = TutorialViewController(nibName: "IsolinesTutorialBlur", bundle: nil) - result.customAction = { - MapOverlayManager.setIsoLinesEnabled(true) - } - return result - } -} diff --git a/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm b/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm index 39980092ea..ba55d4f015 100644 --- a/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm +++ b/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm @@ -129,7 +129,6 @@ struct Callback [self](uint32_t const requestId, ItemType const type) { [self.tableManager errorAtItem:type]; }); - [MWMEye discoveryShown]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(didBecomeActive) @@ -145,33 +144,26 @@ struct Callback } - (void)tapOnItem:(ItemType const)type atIndex:(NSInteger)index { - MWMEyeDiscoveryEvent eyeEvent; switch (type) { case ItemType::Attractions: if (index == [self.viewModel itemsCountForType:type]) { [self searchTourism]; - eyeEvent = MWMEyeDiscoveryEventMoreAttractions; } else { [self showSearchResult:[self.viewModel.attractions searchResultAtIndex:index]]; - eyeEvent = MWMEyeDiscoveryEventAttractions; } break; case ItemType::Cafes: if (index == [self.viewModel itemsCountForType:type]) { [self searchFood]; - eyeEvent = MWMEyeDiscoveryEventMoreCafes; } else { [self showSearchResult:[self.viewModel.cafes searchResultAtIndex:index]]; - eyeEvent = MWMEyeDiscoveryEventCafes; } break; case ItemType::Hotels: if (index == [self.viewModel itemsCountForType:type]) { [self openFilters]; - eyeEvent = MWMEyeDiscoveryEventMoreHotels; } else { [self showSearchResult:[self.viewModel.hotels searchResultAtIndex:index]]; - eyeEvent = MWMEyeDiscoveryEventHotels; } break; case ItemType::Promo: @@ -185,8 +177,6 @@ struct Callback case ItemType::LocalExperts: return; } - - [MWMEye discoveryItemClickedWithEvent:eyeEvent]; } - (void)openFilters { diff --git a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm index b991d879c7..0fd189ba27 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm @@ -12,21 +12,10 @@ #import -#include "map/utils.hpp" - #include "platform/downloader_defines.hpp" using namespace storage; -namespace { -void RegisterEventIfPossible(eye::MapObject::Event::Type const type) -{ - auto const userPos = GetFramework().GetCurrentPosition(); - auto const & info = GetFramework().GetCurrentPlacePageInfo(); - utils::RegisterEyeEventIfPossible(type, userPos, info); -} -} // namespace - @interface MWMPlacePageManager () @property(nonatomic) storage::NodeStatus currentDownloaderStatus; @@ -187,8 +176,6 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type) } - (void)addBookmark:(PlacePageData *)data { - RegisterEventIfPossible(eye::MapObject::Event::Type::AddToBookmark); - auto &f = GetFramework(); auto &bmManager = f.GetBookmarkManager(); auto &info = f.GetCurrentPlacePageInfo(); @@ -258,11 +245,6 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type) NSAssert(proposedUrl, @"Sponsored url can't be nil!"); return; } - - if (data.previewData.isBookingPlace) { - auto mercator = location_helpers::ToMercator(data.locationCoordinate); - [MWMEye transitionToBookingWithPos:CGPointMake(mercator.x, mercator.y)]; - } } - (void)book:(PlacePageData *)data { @@ -279,8 +261,6 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type) NSURL *url = [NSURL URLWithString:data.sponsoredMoreURL]; if (!url) { return; } [UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil]; - auto mercator = location_helpers::ToMercator(data.locationCoordinate); - [MWMEye transitionToBookingWithPos:CGPointMake(mercator.x, mercator.y)]; } - (void)openReviewUrl:(PlacePageData *)data { @@ -315,7 +295,6 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type) - (void)showUGCAddReview:(PlacePageData *)data rating:(UgcSummaryRatingType)value fromSource:(MWMUGCReviewSource)source { - RegisterEventIfPossible(eye::MapObject::Event::Type::UgcEditorOpened); MWMUGCAddReviewController *ugcVC = [[MWMUGCAddReviewController alloc] initWithPlacePageData:data rating:value saver:self]; @@ -415,9 +394,6 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type) resultHandler(YES); GetFramework().UpdatePlacePageInfoForCurrentSelection(); [placePageData updateUgcStatus]; - - utils::RegisterEyeEventIfPossible(eye::MapObject::Event::Type::UgcSaved, - GetFramework().GetCurrentPosition(), info); }); } diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm index 087d62ae79..6d1f0cd6df 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm @@ -1,7 +1,5 @@ #import "MWMSearchHotelsFilterViewController.h" -#import - #import "MWMSearchFilterViewController_Protected.h" #import "SwiftBridge.h" @@ -165,7 +163,6 @@ void configButton(UIButton *button, NSString *primaryText, NSString *secondaryTe } - (IBAction)applyAction { - [MWMEye bookingFilterUsed]; [self.delegate hotelsFilterViewController:self didSelectParams:[self getSelectedHotelParams]]; } diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt index 2b464755bc..cafdedb6df 100644 --- a/map/CMakeLists.txt +++ b/map/CMakeLists.txt @@ -62,7 +62,6 @@ set( framework.hpp framework_light.cpp framework_light.hpp - framework_light_delegate.hpp gps_track_collection.cpp gps_track_collection.hpp gps_track_filter.cpp @@ -81,20 +80,8 @@ set( guides_on_map_delegate.hpp isolines_manager.cpp isolines_manager.hpp - layers_statistics.cpp - layers_statistics.hpp mwm_url.cpp mwm_url.hpp - notifications/notification_manager.cpp - notifications/notification_manager.hpp - notifications/notification_manager_delegate.cpp - notifications/notification_manager_delegate.hpp - notifications/notification_queue.cpp - notifications/notification_queue.hpp - notifications/notification_queue_serdes.cpp - notifications/notification_queue_serdes.hpp - notifications/notification_queue_storage.cpp - notifications/notification_queue_storage.hpp onboarding.cpp onboarding.hpp place_page_info.cpp @@ -122,10 +109,6 @@ set( search_product_info.hpp taxi_delegate.cpp taxi_delegate.hpp - tips_api.cpp - tips_api.hpp - tips_api_delegate.cpp - tips_api_delegate.hpp track.cpp track.hpp track_mark.cpp @@ -144,8 +127,6 @@ set( user_mark_layer.hpp user_mark.cpp user_mark.hpp - utils.cpp - utils.hpp viewport_search_params.hpp viewport_search_callback.cpp viewport_search_callback.hpp diff --git a/map/benchmark_tool/CMakeLists.txt b/map/benchmark_tool/CMakeLists.txt index 8c63845a34..0b9451739f 100644 --- a/map/benchmark_tool/CMakeLists.txt +++ b/map/benchmark_tool/CMakeLists.txt @@ -22,7 +22,6 @@ omim_link_libraries( web_api editor indexer - metrics geometry platform coding diff --git a/map/extrapolation_benchmark/CMakeLists.txt b/map/extrapolation_benchmark/CMakeLists.txt index 888ed3a45d..878f08acee 100644 --- a/map/extrapolation_benchmark/CMakeLists.txt +++ b/map/extrapolation_benchmark/CMakeLists.txt @@ -18,7 +18,6 @@ omim_link_libraries( ge0 web_api routing - metrics platform geometry coding diff --git a/map/framework.cpp b/map/framework.cpp index 776bdb2f1f..10d3b6edfd 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -7,14 +7,10 @@ #include "map/everywhere_search_params.hpp" #include "map/gps_tracker.hpp" #include "map/guides_on_map_delegate.hpp" -#include "map/notifications/notification_manager_delegate.hpp" -#include "map/notifications/notification_queue.hpp" #include "map/promo_catalog_poi_checker.hpp" #include "map/promo_delegate.hpp" #include "map/taxi_delegate.hpp" -#include "map/tips_api_delegate.hpp" #include "map/user_mark.hpp" -#include "map/utils.hpp" #include "map/viewport_search_params.hpp" #include "ge0/parser.hpp" @@ -68,8 +64,6 @@ #include "indexer/scales.hpp" #include "indexer/transliteration_loader.hpp" -#include "metrics/eye.hpp" - #include "platform/local_country_file_utils.hpp" #include "platform/localization.hpp" #include "platform/measurement_utils.hpp" @@ -116,7 +110,6 @@ using namespace location; -using namespace notifications; using namespace routing; using namespace storage; using namespace std::chrono; @@ -193,37 +186,6 @@ string MakeSearchBookingUrl(booking::Api const & bookingApi, search::CityFinder return bookingApi.GetSearchUrl(city, name); }*/ - -void OnRouteStartBuild(DataSource const & dataSource, - std::vector const & routePoints, m2::PointD const & userPos) -{ - using eye::MapObject; - - if (routePoints.size() < 2) - return; - - for (auto const & pt : routePoints) - { - if (pt.m_isMyPosition || pt.m_pointType == RouteMarkType::Start) - continue; - - m2::RectD rect = mercator::RectByCenterXYAndOffset(pt.m_position, kMwmPointAccuracy); - bool found = false; - dataSource.ForEachInRect([&userPos, &pt, &found](FeatureType & ft) - { - if (found || !feature::GetCenter(ft).EqualDxDy(pt.m_position, kMwmPointAccuracy)) - return; - auto const & editor = osm::Editor::Instance(); - auto const mapObject = utils::MakeEyeMapObject(ft, editor); - if (!mapObject.IsEmpty()) - { - eye::Eye::Event::MapObjectEvent(mapObject, MapObject::Event::Type::RouteToCreated, userPos); - found = true; - } - }, - rect, scales::GetUpperScale()); - } -} } // namespace pair Framework::RegisterMap( @@ -390,7 +352,6 @@ Framework::Framework(FrameworkParams const & params) , m_popularityLoader(m_featuresFetcher.GetDataSource(), POPULARITY_RANKS_FILE_TAG) , m_descriptionsLoader(std::make_unique(m_featuresFetcher.GetDataSource())) , m_purchase(std::make_unique([this] { m_user.ResetAccessToken(); })) - , m_tipsApi(std::make_unique(*this)) { CHECK(IsLittleEndian(), ("Only little-endian architectures are supported.")); @@ -460,12 +421,6 @@ Framework::Framework(FrameworkParams const & params) m_user.AddSubscriber(m_bmManager->GetUserSubscriber()); m_routingManager.SetTransitManager(&m_transitManager); - m_routingManager.SetRouteStartBuildListener([this](std::vector const & points) - { - auto const userPos = GetCurrentPosition(); - if (userPos) - OnRouteStartBuild(m_featuresFetcher.GetDataSource(), points, *userPos); - }); InitCityFinder(); InitDiscoveryManager(); @@ -513,22 +468,11 @@ Framework::Framework(FrameworkParams const & params) InitTransliteration(); LOG(LDEBUG, ("Transliterators initialized")); - m_notificationManager.SetDelegate( - std::make_unique(m_featuresFetcher.GetDataSource(), *m_cityFinder, - m_addressGetter, *m_ugcApi, m_storage, - *m_infoGetter)); - m_notificationManager.Load(); - m_notificationManager.TrimExpired(); - - eye::Eye::Instance().TrimExpired(); - eye::Eye::Instance().Subscribe(&m_notificationManager); - GetPowerManager().Subscribe(this); GetPowerManager().Load(); m_promoApi->SetDelegate(make_unique(m_featuresFetcher.GetDataSource(), *m_cityFinder, catalogHeadersProvider)); - eye::Eye::Instance().Subscribe(m_promoApi.get()); // Clean the no longer used key from old devices. // Remove this line after April 2020 (assuming the majority of devices @@ -538,7 +482,6 @@ Framework::Framework(FrameworkParams const & params) Framework::~Framework() { - eye::Eye::Instance().UnsubscribeAll(); GetPowerManager().UnsubscribeAll(); m_threadRunner.reset(); @@ -1415,7 +1358,6 @@ void Framework::EnterBackground() m_trafficManager.OnEnterBackground(); m_routingManager.SetAllowSendingPoints(false); - m_tipsApi.SetEnabled(true); // Do not clear caches for Android. This function is called when main activity is paused, // but at the same time search activity (for example) is enabled. @@ -2448,7 +2390,6 @@ void Framework::OnTapEvent(place_page::BuildInfo const & buildInfo) if (m_currentPlacePageInfo->IsGuide()) { - m_guidesManager.LogGuideSelectedStatistic(); if (prevIsGuide) { m_guidesManager.OnGuideSelected(); @@ -2584,8 +2525,6 @@ std::optional Framework::BuildPlacePageInfo( } SetPlacePageLocation(outInfo); - utils::RegisterEyeEventIfPossible(eye::MapObject::Event::Type::Open, GetCurrentPosition(), - outInfo); return outInfo; } } @@ -2605,8 +2544,6 @@ std::optional Framework::BuildPlacePageInfo( GetBookmarkManager().SelectionMark().SetPtOrg(outInfo.GetMercator()); SetPlacePageLocation(outInfo); - utils::RegisterEyeEventIfPossible(eye::MapObject::Event::Type::Open, GetCurrentPosition(), - outInfo); return outInfo; } @@ -2650,8 +2587,6 @@ std::optional Framework::BuildPlacePageInfo( GetBookmarkManager().SelectionMark().SetPtOrg(outInfo.GetMercator()); SetPlacePageLocation(outInfo); - utils::RegisterEyeEventIfPossible(eye::MapObject::Event::Type::Open, GetCurrentPosition(), - outInfo); return outInfo; } @@ -4049,11 +3984,6 @@ booking::AvailabilityParams const & Framework::GetLastBookingAvailabilityParams( return m_bookingAvailabilityParams; } -TipsApi const & Framework::GetTipsApi() const -{ - return m_tipsApi; -} - bool Framework::HaveTransit(m2::PointD const & pt) const { auto const & dataSource = m_featuresFetcher.GetDataSource(); @@ -4072,40 +4002,6 @@ double Framework::GetLastBackgroundTime() const return m_startBackgroundTime; } -bool Framework::MakePlacePageForNotification(NotificationCandidate const & notification) -{ - if (notification.GetType() != NotificationCandidate::Type::UgcReview) - return false; - - m2::RectD rect = mercator::RectByCenterXYAndOffset(notification.GetPos(), kMwmPointAccuracy); - bool found = false; - - m_featuresFetcher.GetDataSource().ForEachInRect( - [this, ¬ification, &found](FeatureType & ft) { - auto const featureCenter = feature::GetCenter(ft); - if (found || !featureCenter.EqualDxDy(notification.GetPos(), kMwmPointAccuracy)) - return; - - auto const & editor = osm::Editor::Instance(); - auto const foundMapObject = utils::MakeEyeMapObject(ft, editor); - if (!foundMapObject.IsEmpty() && notification.IsSameMapObject(foundMapObject)) - { - place_page::BuildInfo buildInfo; - buildInfo.m_mercator = featureCenter; - buildInfo.m_featureId = ft.GetID(); - m_currentPlacePageInfo = BuildPlacePageInfo(buildInfo); - if (m_currentPlacePageInfo) - { - ActivateMapSelection(); - found = true; - } - } - }, - rect, scales::GetUpperScale()); - - return found; -} - void Framework::OnPowerFacilityChanged(power_management::Facility const facility, bool enabled) { if (facility == power_management::Facility::PerspectiveView || @@ -4137,11 +4033,6 @@ void Framework::OnPowerSchemeChanged(power_management::Scheme const actualScheme GetTrafficManager().SetEnabled(false); } -notifications::NotificationManager & Framework::GetNotificationManager() -{ - return m_notificationManager; -} - void Framework::EnableGuidesOnce(bool isFirstLaunch, bool isLaunchByDeeplink) { if (m_guidesManager.IsEnabled() || !GetPlatform().IsConnected() || !platform::IsGuidesLayerFirstLaunch()) @@ -4159,8 +4050,6 @@ void Framework::EnableGuidesOnce(bool isFirstLaunch, bool isLaunchByDeeplink) platform::SetGuidesLayerFirstLaunch(true); SaveGuidesEnabled(true); - m_tipsApi.SetEnabled(false); - bool suggestZoom = !m_routingManager.IsRoutingActive() && !isFirstLaunch && !isLaunchByDeeplink; m_guidesManager.SetEnabled(true /* enabled */, true /* silentMode */, suggestZoom); } diff --git a/map/framework.hpp b/map/framework.hpp index e3abcc1b7d..611037e2b6 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -12,7 +12,6 @@ #include "map/guides_manager.hpp" #include "map/isolines_manager.hpp" #include "map/mwm_url.hpp" -#include "map/notifications/notification_manager.hpp" #include "map/place_page_info.hpp" #include "map/position_provider.hpp" #include "map/power_management/power_management_schemas.hpp" @@ -22,7 +21,6 @@ #include "map/routing_mark.hpp" #include "map/search_api.hpp" #include "map/search_mark.hpp" -#include "map/tips_api.hpp" #include "map/track.hpp" #include "map/traffic_manager.hpp" #include "map/transit/transit_reader.hpp" @@ -67,8 +65,6 @@ #include "partners_api/promo_api.hpp" #include "partners_api/taxi_engine.hpp" -#include "metrics/eye_info.hpp" - #include "platform/country_defines.hpp" #include "platform/location.hpp" #include "platform/platform.hpp" @@ -124,11 +120,6 @@ namespace descriptions class Loader; } -namespace notifications -{ -class NotificationCandidate; -} - /// Uncomment line to make fixed position settings and /// build version for screenshots. //#define FIXED_LOCATION @@ -169,7 +160,7 @@ class Framework : public PositionProvider, } m_fixedPos; #endif - + private: // Must be first member in Framework and must be destroyed first in Framework destructor. std::unique_ptr m_threadRunner = std::make_unique(); @@ -883,25 +874,17 @@ public: private: std::unique_ptr m_purchase; - TipsApi m_tipsApi; - notifications::NotificationManager m_notificationManager; void EnableGuidesOnce(bool isFirstLaunch, bool isLaunchByDeeplink); public: - TipsApi const & GetTipsApi() const; - // TipsApi::Delegate override. bool HaveTransit(m2::PointD const & pt) const; double GetLastBackgroundTime() const; - bool MakePlacePageForNotification(notifications::NotificationCandidate const & notification); - power_management::PowerManager & GetPowerManager() { return m_powerManager; } // PowerManager::Subscriber override. void OnPowerFacilityChanged(power_management::Facility const facility, bool enabled) override; void OnPowerSchemeChanged(power_management::Scheme const actualScheme) override; - - notifications::NotificationManager & GetNotificationManager(); }; diff --git a/map/framework_light.cpp b/map/framework_light.cpp index 6e1461478e..05ee8f1cd4 100644 --- a/map/framework_light.cpp +++ b/map/framework_light.cpp @@ -47,19 +47,9 @@ Framework::Framework(RequestTypeMask request) : m_request(request) request ^= REQUEST_TYPE_LOCATION; } - if (request & REQUEST_TYPE_NOTIFICATION) - { - request ^= REQUEST_TYPE_NOTIFICATION; - } - CHECK_EQUAL(request, REQUEST_TYPE_EMPTY, ("Incorrect mask type:", request)); } -void Framework::SetDelegate(std::unique_ptr delegate) -{ - m_delegate = std::move(delegate); -} - bool Framework::IsUserAuthenticated() const { ASSERT(m_request & REQUEST_TYPE_USER_AUTH_STATUS, (m_request)); @@ -93,22 +83,6 @@ CountryInfoReader::Info Framework::GetLocation(m2::PointD const & pt) const return m_countryInfoReader->GetMwmInfo(pt); } -notifications::Notification Framework::GetNotification() const -{ - // Do not disturb from 9p.m. to 10 a.m. - auto const time = notifications::Clock::to_time_t(notifications::Clock::now()); - auto const localTime = std::localtime(&time); - if (localTime->tm_hour <= 9 || localTime->tm_hour >= 21) - return {}; - - if (m_delegate) - return m_delegate->GetNotificationManager().GetNotification(); - - notifications::NotificationManager notificationManager; - notificationManager.Load(); - return notificationManager.GetNotification(); -} - std::string FeatureParamsToString(int64_t mwmVersion, std::string const & countryId, uint32_t featureIndex) { std::ostringstream stream; diff --git a/map/framework_light.hpp b/map/framework_light.hpp index 9c9dc20d49..b58e5167ab 100644 --- a/map/framework_light.hpp +++ b/map/framework_light.hpp @@ -1,7 +1,6 @@ #pragma once #include "map/bookmark_manager.hpp" -#include "map/notifications/notification_manager.hpp" #include "map/user.hpp" #include "ugc/storage.hpp" @@ -32,7 +31,6 @@ enum RequestType // and takes much time. For example it takes ~50ms on LG Nexus 5, ~100ms on Samsung A5, ~200ms on // Fly IQ4403. REQUEST_TYPE_LOCATION = 1u << 4, - REQUEST_TYPE_NOTIFICATION = 1u << 5, }; using RequestTypeMask = unsigned; @@ -47,18 +45,10 @@ using RequestTypeMask = unsigned; class Framework { public: - class Delegate - { - public: - virtual ~Delegate() = default; - virtual notifications::NotificationManager & GetNotificationManager() = 0; - }; friend struct LightFrameworkTest; explicit Framework(RequestTypeMask request); - void SetDelegate(std::unique_ptr delegate); - bool IsUserAuthenticated() const; size_t GetNumberOfUnsentUGC() const; size_t GetNumberOfUnsentEdits() const; @@ -67,11 +57,8 @@ public: /// @note Be careful here, because "lightweight" has no region's geometry cache. CountryInfoReader::Info GetLocation(m2::PointD const & pt) const; - notifications::Notification GetNotification() const; - private: RequestTypeMask m_request; - std::unique_ptr m_delegate; bool m_userAuthStatus = false; size_t m_numberOfUnsentUGC = 0; size_t m_numberOfUnsentEdits = 0; diff --git a/map/framework_light_delegate.hpp b/map/framework_light_delegate.hpp deleted file mode 100644 index 7d2b518e0c..0000000000 --- a/map/framework_light_delegate.hpp +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "map/framework.hpp" -#include "map/framework_light.hpp" - -// Implemented in assume that delegate lifetime is shorter than Framework lifetime. -// In other words lightweight::Framework lifetime should be shorter than Framework lifetime. -class FrameworkLightDelegate : public lightweight::Framework::Delegate -{ -public: - explicit FrameworkLightDelegate(Framework & framework) : m_framework(framework) {} - - notifications::NotificationManager & GetNotificationManager() override - { - return m_framework.GetNotificationManager(); - } - -private: - Framework & m_framework; -}; diff --git a/map/guides_manager.cpp b/map/guides_manager.cpp index f5f7165c0c..6e86619393 100644 --- a/map/guides_manager.cpp +++ b/map/guides_manager.cpp @@ -55,7 +55,6 @@ SortedGuides SortGuidesByPositions(std::vector const GuidesManager::GuidesManager(CloseGalleryFn && closeGalleryFn) : m_closeGallery(std::move(closeGalleryFn)) - , m_statistics("guides") { CHECK(m_closeGallery != nullptr, ()); } @@ -167,9 +166,6 @@ void GuidesManager::ChangeState(GuidesState newState, bool force /* = false */, m_state = newState; if (m_onStateChanged != nullptr && needNotify) m_onStateChanged(newState); - - if (m_shownGuides.empty()) - TrackStatistics(); } void GuidesManager::RequestGuides(bool suggestZoom) @@ -444,7 +440,6 @@ void GuidesManager::OnClusterSelected(GuidesClusterMark const & mark, ScreenBase m_drapeEngine.SafeCall(&df::DrapeEngine::ScaleAndSetCenter, mark.GetPivot(), 2.0 /* scaleFactor */, true /* isAnim */, false /* trackVisibleViewport */); - m_statistics.LogItemSelected(LayersStatistics::LayerItemType::Cluster); } void GuidesManager::OnGuideSelected() @@ -453,11 +448,6 @@ void GuidesManager::OnGuideSelected() m_onGalleryChanged(false /* reload */); } -void GuidesManager::LogGuideSelectedStatistic() -{ - m_statistics.LogItemSelected(LayersStatistics::LayerItemType::Point); -} - void GuidesManager::UpdateActiveGuide() { auto es = m_bmManager->GetEditSession(); @@ -480,18 +470,6 @@ bool GuidesManager::IsRequestParamsInitialized() const return m_screen.GlobalRect().GetLocalRect().IsEmptyInterior() || m_zoom != 0; } -void GuidesManager::TrackStatistics() const -{ - auto const initType = m_silentMode ? LayersStatistics::InitType::Auto - : LayersStatistics::InitType::User; - if (m_state == GuidesState::HasData) - m_statistics.LogActivate(LayersStatistics::Status::Success, {} /* mwmVersions */, initType); - else if (m_state == GuidesState::NoData) - m_statistics.LogActivate(LayersStatistics::Status::Unavailable, {} /* mwmVersions */, initType); - else if (m_state == GuidesState::NetworkError || m_state == GuidesState::FatalNetworkError) - m_statistics.LogActivate(LayersStatistics::Status::Error, {} /* mwmVersions */, initType); -} - GalleryItem GuidesManager::MakeGalleryItem(guides_on_map::GuidesNode const & guide) const { auto const & info = guide.m_guideInfo; diff --git a/map/guides_manager.hpp b/map/guides_manager.hpp index 6edc629383..54158e8663 100644 --- a/map/guides_manager.hpp +++ b/map/guides_manager.hpp @@ -4,7 +4,6 @@ #include "map/catalog_headers_provider.hpp" #include "map/guides_marks.hpp" #include "map/guides_on_map_delegate.hpp" -#include "map/layers_statistics.hpp" #include "partners_api/guides_on_map_api.hpp" @@ -113,8 +112,6 @@ public: void OnClusterSelected(GuidesClusterMark const & mark, ScreenBase const & screen); void OnGuideSelected(); - void LogGuideSelectedStatistic(); - private: void ChangeState(GuidesState newState, bool force = false, bool needNotify = true); void RequestGuides(bool suggestZoom = false); @@ -127,8 +124,6 @@ private: bool IsRequestParamsInitialized() const; - void TrackStatistics() const; - GuidesGallery::Item MakeGalleryItem(guides_on_map::GuidesNode const & guide) const; void OnRequestSucceed(guides_on_map::GuidesOnMap const & guides, bool suggestZoom, @@ -158,7 +153,6 @@ private: df::DrapeEngineSafePtr m_drapeEngine; std::unordered_set m_shownGuides; - LayersStatistics m_statistics; bool m_silentMode = false; }; diff --git a/map/isolines_manager.cpp b/map/isolines_manager.cpp index 8e604045ee..0bc7a52414 100644 --- a/map/isolines_manager.cpp +++ b/map/isolines_manager.cpp @@ -1,7 +1,5 @@ #include "map/isolines_manager.hpp" -#include "metrics/eye.hpp" - #include "drape_frontend/drape_engine.hpp" #include "drape_frontend/visual_params.hpp" @@ -15,7 +13,6 @@ int constexpr kMinIsolinesZoom = 11; IsolinesManager::IsolinesManager(DataSource & dataSource, GetMwmsByRectFn const & getMwmsByRectFn) : m_dataSource(dataSource) , m_getMwmsByRectFn(getMwmsByRectFn) - , m_statistics("isolines") { CHECK(m_getMwmsByRectFn != nullptr, ()); } @@ -68,7 +65,6 @@ void IsolinesManager::SetEnabled(bool enabled) { ChangeState(enabled ? IsolinesState::Enabled : IsolinesState::Disabled); m_drapeEngine.SafeCall(&df::DrapeEngine::EnableIsolines, enabled); - m_trackFirstSchemeData = enabled; if (enabled) { Invalidate(); @@ -125,7 +121,6 @@ void IsolinesManager::UpdateState() bool available = false; bool expired = false; bool noData = false; - std::set mwmVersions; for (auto const & mwmId : m_lastMwms) { if (!mwmId.IsAlive()) @@ -138,23 +133,6 @@ void IsolinesManager::UpdateState() case Availability::ExpiredData: expired = true; break; case Availability::NoData: noData = true; break; } - - if (m_trackFirstSchemeData) - mwmVersions.insert(mwmId.GetInfo()->GetVersion()); - } - - if (m_trackFirstSchemeData) - { - if (available) - { - eye::Eye::Event::LayerShown(eye::Layer::Type::Isolines); - m_statistics.LogActivate(LayersStatistics::Status::Success, mwmVersions); - m_trackFirstSchemeData = false; - } - else - { - m_statistics.LogActivate(LayersStatistics::Status::Unavailable, mwmVersions); - } } if (expired) diff --git a/map/isolines_manager.hpp b/map/isolines_manager.hpp index 3acae9f47b..18bf7e53b2 100644 --- a/map/isolines_manager.hpp +++ b/map/isolines_manager.hpp @@ -1,7 +1,5 @@ #pragma once -#include "map/layers_statistics.hpp" - #include "drape_frontend/drape_engine_safe_ptr.hpp" #include "indexer/data_source.hpp" @@ -89,8 +87,6 @@ private: std::vector m_lastMwms; mutable std::map m_mwmCache; - bool m_trackFirstSchemeData = false; - LayersStatistics m_statistics; }; std::string DebugPrint(IsolinesManager::IsolinesState state); diff --git a/map/layers_statistics.cpp b/map/layers_statistics.cpp deleted file mode 100644 index 54d780d50b..0000000000 --- a/map/layers_statistics.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "map/layers_statistics.hpp" - -#include "base/assert.hpp" -#include "base/string_utils.hpp" - -LayersStatistics::LayersStatistics(std::string const & layerName) - : m_layerName(layerName) -{ -} - -void LayersStatistics::LogActivate(Status status, - std::set const & mwmVersions /* = {} */, - InitType initType /* = InitType::User */) const -{ -} - -void LayersStatistics::LogItemSelected(LayerItemType itemType) const -{ -} diff --git a/map/layers_statistics.hpp b/map/layers_statistics.hpp deleted file mode 100644 index cfc530265d..0000000000 --- a/map/layers_statistics.hpp +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include -#include -#include - -class LayersStatistics -{ -public: - enum class Status - { - Success, - Error, - Unavailable, - }; - - enum class LayerItemType - { - Point, - Cluster, - }; - - enum class InitType - { - User, - Auto, - }; - - explicit LayersStatistics(std::string const & layerName); - - void LogActivate(Status status, std::set const & mwmVersions = {}, - InitType initType = InitType::User) const; - void LogItemSelected(LayerItemType itemType) const; - -private: - std::string m_layerName; -}; diff --git a/map/map_integration_tests/CMakeLists.txt b/map/map_integration_tests/CMakeLists.txt index 689492e8d8..52a8002e8e 100644 --- a/map/map_integration_tests/CMakeLists.txt +++ b/map/map_integration_tests/CMakeLists.txt @@ -22,7 +22,6 @@ omim_link_libraries( editor indexer ge0 - metrics platform mwm_diff bsdiff diff --git a/map/map_tests/CMakeLists.txt b/map/map_tests/CMakeLists.txt index cfb2751e87..09a216498a 100644 --- a/map/map_tests/CMakeLists.txt +++ b/map/map_tests/CMakeLists.txt @@ -20,10 +20,8 @@ set( gps_track_test.cpp kmz_unarchive_test.cpp mwm_url_tests.cpp - notification_tests.cpp power_manager_tests.cpp search_api_tests.cpp - tips_tests.cpp transliteration_test.cpp working_time_tests.cpp ) @@ -33,7 +31,6 @@ omim_add_test(${PROJECT_NAME} ${SRC}) omim_link_libraries( ${PROJECT_NAME} platform_tests_support - metrics_tests_support search_tests_support editor_tests_support generator_tests_support @@ -50,7 +47,6 @@ omim_link_libraries( routing_common search storage - metrics mwm_diff bsdiff descriptions diff --git a/map/map_tests/notification_tests.cpp b/map/map_tests/notification_tests.cpp deleted file mode 100644 index 9d337c550f..0000000000 --- a/map/map_tests/notification_tests.cpp +++ /dev/null @@ -1,338 +0,0 @@ -#include "testing/testing.hpp" - -#include "map/notifications/notification_manager.hpp" -#include "map/notifications/notification_queue.hpp" -#include "map/notifications/notification_queue_serdes.hpp" -#include "map/notifications/notification_queue_storage.hpp" - -#include "ugc/api.hpp" - -#include "metrics/eye_info.hpp" - -#include "storage/storage_defines.hpp" - -#include "platform/platform.hpp" - -#include -#include -#include - -using namespace notifications; -using namespace std::chrono; - -namespace notifications -{ -class NotificationManagerForTesting : public NotificationManager -{ -public: - class NotificationManagerDelegate : public NotificationManager::Delegate - { - public: - ugc::Api & GetUGCApi() override - { - UNREACHABLE(); - } - - std::unordered_set GetDescendantCountries( - storage::CountryId const & country) const override - { - return {{"South Korea_North"}, {"South Korea_South"}}; - } - - storage::CountryId GetCountryAtPoint(m2::PointD const & pt) const override - { - return "South Korea_North"; - } - - std::string GetAddress(m2::PointD const & pt) override - { - return {}; - } - }; - - NotificationManagerForTesting() - { - SetDelegate(std::make_unique()); - } - - Queue & GetEditableQueue() { return m_queue; } - - void OnMapObjectEvent(eye::MapObject const & poi) override - { - ProcessUgcRateCandidates(poi); - } - - static void SetCreatedTime(NotificationCandidate & dst, Time time) - { - dst.m_created = time; - } -}; -} // namespace notifications - -namespace -{ -class ScopedNotificationsQueue -{ -public: - ~ScopedNotificationsQueue() - { - GetPlatform().RmDirRecursively(QueueStorage::GetNotificationsDir()); - } -}; - -Queue MakeDefaultQueueForTesting() -{ - Queue queue; - - { - eye::MapObject mapObject; - mapObject.SetBestType("cafe"); - mapObject.SetPos({15.686299, 73.704084}); - mapObject.SetReadableName("Baba"); - - queue.m_candidates.emplace_back(mapObject, ""); - } - - { - eye::MapObject mapObject; - mapObject.SetBestType("shop"); - mapObject.SetPos({12.923975, 100.776627}); - mapObject.SetReadableName("7eleven"); - - queue.m_candidates.emplace_back(mapObject, ""); - } - - { - eye::MapObject mapObject; - mapObject.SetBestType("viewpoint"); - mapObject.SetPos({-45.943995, 167.619933}); - mapObject.SetReadableName("Waiau"); - - queue.m_candidates.emplace_back(mapObject, ""); - } - - return queue; -} - -void CompareWithDefaultQueue(Queue const & lhs) -{ - auto const rhs = MakeDefaultQueueForTesting(); - - TEST_EQUAL(lhs.m_candidates.size(), rhs.m_candidates.size(), ()); - - for (size_t i = 0; i < lhs.m_candidates.size(); ++i) - { - auto const & lhsItem = lhs.m_candidates[i]; - auto const & rhsItem = rhs.m_candidates[i]; - TEST_EQUAL(lhsItem.GetType(), rhsItem.GetType(), ()); - TEST_EQUAL(lhsItem.GetBestFeatureType(), rhsItem.GetBestFeatureType(), ()); - TEST_EQUAL(lhsItem.GetReadableName(), rhsItem.GetReadableName(), ()); - TEST_EQUAL(lhsItem.GetPos(), rhsItem.GetPos(), ()); - } -} - -UNIT_TEST(Notifications_QueueSerdesTest) -{ - auto const queue = MakeDefaultQueueForTesting(); - - std::vector queueData; - QueueSerdes::Serialize(queue, queueData); - Queue result; - QueueSerdes::Deserialize(queueData, result); - - CompareWithDefaultQueue(result); -} - -UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_QueueSaveLoadTest) -{ - auto const queue = MakeDefaultQueueForTesting(); - - std::vector queueData; - QueueSerdes::Serialize(queue, queueData); - TEST(QueueStorage::Save(queueData), ()); - queueData.clear(); - TEST(QueueStorage::Load(queueData), ()); - Queue result; - QueueSerdes::Deserialize(queueData, result); - - CompareWithDefaultQueue(result); -} - -UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_UgcRateCheckRouteToInSameGeoTrigger) -{ - NotificationManagerForTesting notificationManager; - - eye::MapObject mapObject; - mapObject.SetPos(mercator::FromLatLon({59.909299, 10.769807})); - mapObject.SetReadableName("Visiting a Bjarne"); - mapObject.SetBestType("amenity-bar"); - - eye::MapObject::Event event; - event.m_type = eye::MapObject::Event::Type::RouteToCreated; - event.m_userPos = mercator::FromLatLon({59.920333, 10.780793}); - event.m_eventTime = notifications::Clock::now() - std::chrono::hours(25); - mapObject.GetEditableEvents().push_back(event); - notificationManager.OnMapObjectEvent(mapObject); - - TEST_EQUAL(notificationManager.GetEditableQueue().m_candidates.size(), 1, ()); - - auto & candidate = notificationManager.GetEditableQueue().m_candidates[0]; - NotificationManagerForTesting::SetCreatedTime(candidate, event.m_eventTime); - - auto result = notificationManager.GetNotification(); - - TEST(result.has_value(), ()); - TEST_EQUAL(result->GetType(), NotificationCandidate::Type::UgcReview, ()); - - result = notificationManager.GetNotification(); - TEST(!result.has_value(), ()); -} - -UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_UgcRateCheckUgcNotSavedTrigger) -{ - NotificationManagerForTesting notificationManager; - - eye::MapObject mapObject; - mapObject.SetPos(mercator::FromLatLon({59.909299, 10.769807})); - mapObject.SetReadableName("Visiting a Bjarne"); - mapObject.SetBestType("amenity-bar"); - - { - eye::MapObject::Event event; - event.m_type = eye::MapObject::Event::Type::Open; - event.m_userPos = mercator::FromLatLon({59.920333, 10.780793}); - event.m_eventTime = notifications::Clock::now() - std::chrono::hours(25); - mapObject.GetEditableEvents().push_back(event); - notificationManager.OnMapObjectEvent(mapObject); - } - - TEST_EQUAL(notificationManager.GetEditableQueue().m_candidates.size(), 0, ()); - - { - eye::MapObject::Event event; - event.m_type = eye::MapObject::Event::Type::UgcEditorOpened; - event.m_userPos = mercator::FromLatLon({59.920333, 10.780793}); - event.m_eventTime = notifications::Clock::now() - std::chrono::hours(25); - mapObject.GetEditableEvents().push_back(event); - notificationManager.OnMapObjectEvent(mapObject); - } - - TEST_EQUAL(notificationManager.GetEditableQueue().m_candidates.size(), 1, ()); - - auto result = notificationManager.GetNotification(); - - TEST(!result.has_value(), ()); - - auto & candidate = notificationManager.GetEditableQueue().m_candidates[0]; - NotificationManagerForTesting::SetCreatedTime(candidate, Clock::now() - hours(25)); - - result = notificationManager.GetNotification(); - - TEST(result.has_value(), ()); - TEST_EQUAL(result->GetType(), NotificationCandidate::Type::UgcReview, ()); - - result = notificationManager.GetNotification(); - TEST(!result.has_value(), ()); - - { - eye::MapObject::Event event; - event.m_type = eye::MapObject::Event::Type::UgcEditorOpened; - event.m_userPos = mercator::FromLatLon({59.920333, 10.780793}); - event.m_eventTime = notifications::Clock::now() - std::chrono::hours(25); - mapObject.GetEditableEvents().push_back(event); - notificationManager.OnMapObjectEvent(mapObject); - } - - { - eye::MapObject::Event event; - event.m_type = eye::MapObject::Event::Type::UgcSaved; - event.m_userPos = mercator::FromLatLon({59.920333, 10.780793}); - event.m_eventTime = notifications::Clock::now() - std::chrono::hours(25); - mapObject.GetEditableEvents().push_back(event); - notificationManager.OnMapObjectEvent(mapObject); - } - - result = notificationManager.GetNotification(); - TEST(!result.has_value(), ()); -} - -UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_UgcRateCheckPlannedTripTrigger) -{ - NotificationManagerForTesting notificationManager; - - eye::MapObject mapObject; - mapObject.SetPos(mercator::FromLatLon({59.909299, 10.769807})); - mapObject.SetReadableName("Visiting a Bjarne"); - mapObject.SetBestType("amenity-bar"); - - { - eye::MapObject::Event event; - event.m_type = eye::MapObject::Event::Type::Open; - event.m_userPos = mercator::FromLatLon({54.637300, 19.877731}); - event.m_eventTime = notifications::Clock::now() - std::chrono::hours(25); - mapObject.GetEditableEvents().push_back(event); - notificationManager.OnMapObjectEvent(mapObject); - } - - TEST_EQUAL(notificationManager.GetEditableQueue().m_candidates.size(), 0, ()); - - { - eye::MapObject::Event event; - event.m_type = eye::MapObject::Event::Type::Open; - event.m_userPos = mercator::FromLatLon({54.637310, 19.877735}); - event.m_eventTime = notifications::Clock::now() - std::chrono::hours(25); - mapObject.GetEditableEvents().push_back(event); - notificationManager.OnMapObjectEvent(mapObject); - } - - TEST_EQUAL(notificationManager.GetEditableQueue().m_candidates.size(), 0, ()); - - { - eye::MapObject::Event event; - event.m_type = eye::MapObject::Event::Type::Open; - event.m_userPos = mercator::FromLatLon({59.920333, 10.780793}); - event.m_eventTime = notifications::Clock::now() - std::chrono::hours(25); - mapObject.GetEditableEvents().push_back(event); - notificationManager.OnMapObjectEvent(mapObject); - } - - TEST_EQUAL(notificationManager.GetEditableQueue().m_candidates.size(), 1, ()); - - auto result = notificationManager.GetNotification(); - - TEST(!result.has_value(), ()); - - auto & candidate = notificationManager.GetEditableQueue().m_candidates[0]; - NotificationManagerForTesting::SetCreatedTime(candidate, Clock::now() - hours(25)); - - result = notificationManager.GetNotification(); - - TEST(result.has_value(), ()); - TEST_EQUAL(result->GetType(), NotificationCandidate::Type::UgcReview, ()); - - result = notificationManager.GetNotification(); - TEST(!result.has_value(), ()); -} - -UNIT_CLASS_TEST(ScopedNotificationsQueue, Notifications_DeleteCanidatesForCountry) -{ - NotificationManagerForTesting notificationManager; - - eye::MapObject mapObject; - mapObject.SetPos(mercator::FromLatLon({35.966941, 127.571227})); - mapObject.SetReadableName("Joseon"); - mapObject.SetBestType("amenity-bar"); - - notificationManager.GetEditableQueue().m_candidates.push_back({mapObject, ""}); - - TEST_EQUAL(notificationManager.GetEditableQueue().m_candidates.size(), 1, ()); - notificationManager.DeleteCandidatesForCountry("South Korea_North"); - TEST_EQUAL(notificationManager.GetEditableQueue().m_candidates.size(), 0, ()); - - notificationManager.GetEditableQueue().m_candidates.push_back({mapObject, ""}); - - TEST_EQUAL(notificationManager.GetEditableQueue().m_candidates.size(), 1, ()); - notificationManager.DeleteCandidatesForCountry("South Korea"); - TEST_EQUAL(notificationManager.GetEditableQueue().m_candidates.size(), 0, ()); -} -} // namespace diff --git a/map/map_tests/tips_tests.cpp b/map/map_tests/tips_tests.cpp deleted file mode 100644 index 0e2b2839a9..0000000000 --- a/map/map_tests/tips_tests.cpp +++ /dev/null @@ -1,193 +0,0 @@ -#include "testing/testing.hpp" - -#include "map/tips_api.hpp" - -#include "metrics/metrics_tests_support/eye_for_testing.hpp" - -#include "metrics/eye.hpp" -#include "metrics/eye_info.hpp" - -#include "base/timer.hpp" - -#include -#include -#include - -using namespace eye; - -namespace -{ -class TipsApiDelegateForTesting : public TipsApi::Delegate -{ -public: - void SetLastBackgroundTime(double lastBackgroundTime) - { - m_lastBackgroundTime = lastBackgroundTime; - } - - // TipsApi::Delegate overrides: - std::optional GetCurrentPosition() const override { return {}; } - - bool IsCountryLoaded(m2::PointD const & pt) const override { return false; } - - bool HaveTransit(m2::PointD const & pt) const override { return false; } - - double GetLastBackgroundTime() const override { return m_lastBackgroundTime; } - - m2::PointD const & GetViewportCenter() const override { return m_point; } - storage::CountryId GetCountryId(m2::PointD const & pt) const override { return ""; } - isolines::Quality GetIsolinesQuality(storage::CountryId const & countryId) const override - { - return isolines::Quality::None; - } - -private: - double m_lastBackgroundTime = 0.0; - m2::PointD m_point; -}; - -void MakeLastShownTipAvailableByTime() -{ - auto const info = Eye::Instance().GetInfo(); - auto editableInfo = *info; - auto & tips = editableInfo.m_tips; - tips.back().m_lastShownTime = - Time(TipsApi::GetShowSameTipPeriod() + std::chrono::seconds(1)); - EyeForTesting::SetInfo(editableInfo); -} - -std::optional GetTipForTesting(TipsApi::Duration showAnyTipPeriod, - TipsApi::Duration showSameTipPeriod, - TipsApiDelegateForTesting const & delegate) -{ - // Do not use additional conditions for testing. - TipsApi::Conditions conditions = - {{ - // Condition for Tips::Type::BookmarksCatalog type. - [] (eye::Info const & info) { return true; }, - // Condition for Tips::Type::BookingHotels type. - [] (eye::Info const & info) { return true; }, - // Condition for Tips::Type::DiscoverButton type. - [] (eye::Info const & info) { return true; }, - // Condition for Tips::Type::PublicTransport type. - [] (eye::Info const & info) { return true; }, - // Condition for Tips::Type::Isolines type. - [] (eye::Info const & info) { return true; } - }}; - return TipsApi::GetTipForTesting(showAnyTipPeriod, showSameTipPeriod, delegate, conditions); -} - -std::optional GetTipForTesting() -{ - return GetTipForTesting(TipsApi::GetShowAnyTipPeriod(), TipsApi::GetShowSameTipPeriod(), {}); -} - -void ShowTipWithClickCountTest(Tip::Event eventType, size_t maxClickCount) -{ - std::vector usedTips; - auto previousTip = GetTipForTesting(); - - TEST(previousTip.has_value(), ()); - TEST_NOT_EQUAL(*previousTip, Tip::Type::Count, ()); - - auto const totalTipsCount = static_cast(Tip::Type::Count); - - for (size_t i = 0; i < totalTipsCount; ++i) - { - auto tip = GetTipForTesting(); - - TEST(tip.has_value(), ()); - TEST_NOT_EQUAL(*tip, Tip::Type::Count, ()); - - EyeForTesting::AppendTip(*tip, eventType); - - std::optional secondTip; - for (size_t j = 1; j < maxClickCount; ++j) - { - MakeLastShownTipAvailableByTime(); - - secondTip = GetTipForTesting(); - TEST(secondTip.has_value(), ()); - - EyeForTesting::AppendTip(*tip, eventType); - } - - MakeLastShownTipAvailableByTime(); - - secondTip = GetTipForTesting(); - TEST(!secondTip.has_value() || *secondTip != *tip, ()); - } - - auto emptyTip = GetTipForTesting(); - TEST(!emptyTip.has_value(), ()); -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, ShowAnyTipPeriod_Test) -{ - auto firstTip = GetTipForTesting(); - - TEST(firstTip.has_value(), ()); - TEST_NOT_EQUAL(*firstTip, Tip::Type::Count, ()); - - EyeForTesting::AppendTip(*firstTip, Tip::Event::GotitClicked); - - auto secondTip = GetTipForTesting(); - - TEST(!secondTip.has_value(), ()); -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, ShowFirstTip_Test) -{ - std::vector usedTips; - auto previousTip = GetTipForTesting(); - - TEST(previousTip.has_value(), ()); - TEST_NOT_EQUAL(*previousTip, Tip::Type::Count, ()); - - auto const totalTipsCount = static_cast(Tip::Type::Count); - - for (size_t i = 0; i < totalTipsCount; ++i) - { - auto tip = GetTipForTesting({}, TipsApi::GetShowSameTipPeriod(), {}); - - TEST(tip.has_value(), ()); - TEST_NOT_EQUAL(*tip, Tip::Type::Count, ()); - - auto const it = std::find(usedTips.cbegin(), usedTips.cend(), *tip); - TEST(it == usedTips.cend(), ()); - - if (i % 2 == 0) - EyeForTesting::AppendTip(*tip, Tip::Event::ActionClicked); - else - EyeForTesting::AppendTip(*tip, Tip::Event::GotitClicked); - - TEST(!GetTipForTesting().has_value(), ()); - - usedTips.emplace_back(*tip); - } - - auto emptyTip = GetTipForTesting(); - TEST(!emptyTip.has_value(), ()); -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, ShowTipAndActionClicked_Test) -{ - ShowTipWithClickCountTest(Tip::Event::ActionClicked, TipsApi::GetActionClicksCountToDisable()); -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, ShowTipAndGotitClicked_Test) -{ - ShowTipWithClickCountTest(Tip::Event::GotitClicked, TipsApi::GetGotitClicksCountToDisable()); -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, ShowTipAfterWarmStart) -{ - TipsApiDelegateForTesting d; - d.SetLastBackgroundTime(base::Timer::LocalTime()); - auto tip = GetTipForTesting({}, TipsApi::GetShowSameTipPeriod(), d); - TEST(!tip.has_value(), ()); - d.SetLastBackgroundTime(base::Timer::LocalTime() - TipsApi::ShowTipAfterCollapsingPeriod().count()); - tip = GetTipForTesting({}, TipsApi::GetShowSameTipPeriod(), d); - TEST(tip.has_value(), ()); -} -} // namespace diff --git a/map/mwm_tests/CMakeLists.txt b/map/mwm_tests/CMakeLists.txt index bc9217fdf8..816c037a5b 100644 --- a/map/mwm_tests/CMakeLists.txt +++ b/map/mwm_tests/CMakeLists.txt @@ -18,7 +18,6 @@ omim_link_libraries( kml editor indexer - metrics platform geometry coding diff --git a/map/notifications/notification_manager.cpp b/map/notifications/notification_manager.cpp deleted file mode 100644 index 30cc286c0a..0000000000 --- a/map/notifications/notification_manager.cpp +++ /dev/null @@ -1,271 +0,0 @@ -#include "map/notifications/notification_manager.hpp" - -#include "map/notifications/notification_queue_serdes.hpp" -#include "map/notifications/notification_queue_storage.hpp" - -#include "ugc/api.hpp" - -#include "indexer/classificator.hpp" - -#include "storage/storage_defines.hpp" - -#include "base/logging.hpp" -#include "base/macros.hpp" - -#include -#include - -using namespace notifications; - -namespace -{ -auto constexpr kCandidatesExpirePeriod = std::chrono::hours(24 * 30); -auto constexpr kPeriodBetweenNotifications = std::chrono::hours(24); -auto constexpr kMinTimeSinceLastEventForUgcRate = std::chrono::hours(24); - -double constexpr kMinDistanceToTriggerUgcRateInMeters = 50000.0; // 50 km - -uint32_t constexpr kOpenCountForPlannedTripTrigger = 2; - -bool CheckUgcNotSavedTrigger(eye::MapObject const & poi) -{ - bool ugcEditorShowed = false; - bool ugcSaved = false; - for (auto const & event : poi.GetEvents()) - { - if (event.m_type == eye::MapObject::Event::Type::UgcEditorOpened && !ugcEditorShowed) - { - ugcEditorShowed = true; - } - else if (event.m_type == eye::MapObject::Event::Type::UgcSaved) - { - ugcSaved = true; - break; - } - } - - if (ugcEditorShowed && !ugcSaved) - return true; - - return false; -} - -bool IsSmallDistance(eye::MapObject const & poi, eye::MapObject::Event const & event) -{ - auto const distanceToUser = mercator::DistanceOnEarth(event.m_userPos, poi.GetPos()); - return distanceToUser <= kMinDistanceToTriggerUgcRateInMeters; -} - -bool CheckRouteToInSameGeoTrigger(eye::MapObject const & poi) -{ - CHECK_GREATER(poi.GetEvents().size(), 0, ()); - - auto const & lastEvent = poi.GetEvents().back(); - - if (lastEvent.m_type != eye::MapObject::Event::Type::RouteToCreated) - return false; - - return IsSmallDistance(poi, lastEvent); -} - -bool CheckPlannedTripTrigger(eye::MapObject const & poi) -{ - CHECK_GREATER(poi.GetEvents().size(), 0, ()); - - auto const & events = poi.GetEvents(); - - if (events.back().m_type != eye::MapObject::Event::Type::Open) - return false; - - if (!IsSmallDistance(poi, events.back())) - return false; - - uint32_t openCounter = 0; - for (size_t i = 0; i < events.size() - 1; ++i) - { - if (events[i].m_type != eye::MapObject::Event::Type::Open && - events[i].m_type != eye::MapObject::Event::Type::AddToBookmark && - events[i].m_type != eye::MapObject::Event::Type::RouteToCreated) - { - continue; - } - - if (IsSmallDistance(poi, events[i])) - continue; - - if (events[i].m_type == eye::MapObject::Event::Type::Open) - ++openCounter; - else - return true; - - if (openCounter >= kOpenCountForPlannedTripTrigger) - return true; - } - - return false; -} -} // namespace - -namespace notifications -{ -void NotificationManager::SetDelegate(std::unique_ptr delegate) -{ - m_delegate = std::move(delegate); -} - -void NotificationManager::Load() -{ - std::vector queueFileData; - if (!QueueStorage::Load(queueFileData)) - { - m_queue = {}; - return; - } - - try - { - QueueSerdes::Deserialize(queueFileData, m_queue); - } - catch (QueueSerdes::UnknownVersion const & ex) - { - // Notifications queue might be empty. - m_queue = {}; - } -} - -void NotificationManager::TrimExpired() -{ - auto & candidates = m_queue.m_candidates; - size_t const sizeBefore = candidates.size(); - - candidates.erase(std::remove_if(candidates.begin(), candidates.end(), [](auto const & item) - { - if (item.IsUsed()) - return Clock::now() - item.GetLastUsedTime() >= eye::Eye::GetMapObjectEventsExpirePeriod(); - - return Clock::now() - item.GetCreatedTime() >= kCandidatesExpirePeriod; - }), candidates.end()); - - if (sizeBefore != candidates.size()) - VERIFY(Save(), ()); -} - -Notification NotificationManager::GetNotification() -{ - if (Clock::now() - m_queue.m_lastNotificationProvidedTime < kPeriodBetweenNotifications) - return {}; - - auto & candidates = m_queue.m_candidates; - - if (candidates.empty()) - return {}; - - auto it = GetUgcRateCandidate(); - - if (it == candidates.end()) - return {}; - - it->MarkAsUsed(); - m_queue.m_lastNotificationProvidedTime = Clock::now(); - - VERIFY(Save(), ()); - - return *it; -} - -size_t NotificationManager::GetCandidatesCount() const -{ - return m_queue.m_candidates.size(); -} - -void NotificationManager::DeleteCandidatesForCountry(storage::CountryId const & countryId) -{ - auto const countries = m_delegate->GetDescendantCountries(countryId); - - auto & candidates = m_queue.m_candidates; - size_t const sizeBefore = candidates.size(); - - base::EraseIf(candidates, [this, &countries](auto const & item) - { - auto const itemCountry = m_delegate->GetCountryAtPoint(item.GetPos()); - return countries.count(itemCountry) != 0; - }); - - if (sizeBefore != candidates.size()) - VERIFY(Save(), ()); -} - -void NotificationManager::OnMapObjectEvent(eye::MapObject const & poi) -{ - CHECK_GREATER(poi.GetEvents().size(), 0, ()); - - if (poi.GetEvents().back().m_type == eye::MapObject::Event::Type::UgcSaved) - return ProcessUgcRateCandidates(poi); - - auto const bestType = classif().GetTypeByReadableObjectName(poi.GetBestType()); - m_delegate->GetUGCApi().HasUGCForPlace(bestType, poi.GetPos(), [this, poi] (bool result) - { - if (!result) - ProcessUgcRateCandidates(poi); - }); -} - -bool NotificationManager::Save() -{ - std::vector fileData; - QueueSerdes::Serialize(m_queue, fileData); - return QueueStorage::Save(fileData); -} - -void NotificationManager::ProcessUgcRateCandidates(eye::MapObject const & poi) -{ - CHECK_GREATER(poi.GetEvents().size(), 0, ()); - - if (poi.IsEmpty()) - return; - - auto it = m_queue.m_candidates.begin(); - for (; it != m_queue.m_candidates.end(); ++it) - { - if (it->GetType() != NotificationCandidate::Type::UgcReview || it->IsUsed()) - continue; - - if (it->IsSameMapObject(poi)) - { - if (poi.GetEvents().back().m_type == eye::MapObject::Event::Type::UgcSaved) - { - m_queue.m_candidates.erase(it); - VERIFY(Save(), ()); - } - - return; - } - } - - if (poi.GetEvents().back().m_type == eye::MapObject::Event::Type::UgcSaved) - return; - - if (CheckUgcNotSavedTrigger(poi) || CheckRouteToInSameGeoTrigger(poi) || - CheckPlannedTripTrigger(poi)) - { - m_queue.m_candidates.emplace_back(poi, m_delegate->GetAddress(poi.GetPos())); - - VERIFY(Save(), ()); - } -} - -Candidates::iterator NotificationManager::GetUgcRateCandidate() -{ - auto it = m_queue.m_candidates.begin(); - for (; it != m_queue.m_candidates.end(); ++it) - { - if (!it->IsUsed() && it->GetType() == NotificationCandidate::Type::UgcReview && - Clock::now() - it->GetCreatedTime() >= kMinTimeSinceLastEventForUgcRate) - { - return it; - } - } - - return it; -} -} // namespace notifications diff --git a/map/notifications/notification_manager.hpp b/map/notifications/notification_manager.hpp deleted file mode 100644 index 2738165b67..0000000000 --- a/map/notifications/notification_manager.hpp +++ /dev/null @@ -1,61 +0,0 @@ -#pragma once - -#include "map/notifications/notification_queue.hpp" - -#include "storage/storage_defines.hpp" - -#include "metrics/eye.hpp" - -#include -#include -#include -#include -#include - -namespace ugc -{ -class Api; -} - -namespace notifications -{ -using Notification = std::optional; -class NotificationManager : public eye::Subscriber -{ -public: - friend class NotificationManagerForTesting; - - class Delegate - { - public: - virtual ~Delegate() = default; - virtual ugc::Api & GetUGCApi() = 0; - virtual std::unordered_set GetDescendantCountries( - storage::CountryId const & country) const = 0; - virtual storage::CountryId GetCountryAtPoint(m2::PointD const & pt) const = 0; - virtual std::string GetAddress(m2::PointD const & pt) = 0; - }; - - void SetDelegate(std::unique_ptr delegate); - - void Load(); - void TrimExpired(); - - Notification GetNotification(); - size_t GetCandidatesCount() const; - - void DeleteCandidatesForCountry(storage::CountryId const & countryId); - - // eye::Subscriber overrides: - void OnMapObjectEvent(eye::MapObject const & poi) override; - -private: - bool Save(); - void ProcessUgcRateCandidates(eye::MapObject const & poi); - Candidates::iterator GetUgcRateCandidate(); - - std::unique_ptr m_delegate; - // Notification candidates queue. - Queue m_queue; -}; -} // namespace notifications diff --git a/map/notifications/notification_manager_delegate.cpp b/map/notifications/notification_manager_delegate.cpp deleted file mode 100644 index c48c6c7cac..0000000000 --- a/map/notifications/notification_manager_delegate.cpp +++ /dev/null @@ -1,69 +0,0 @@ -#include "map/notifications/notification_manager_delegate.hpp" - -#include "map/caching_address_getter.hpp" - -#include "ugc/api.hpp" - -#include "search/city_finder.hpp" - -#include "storage/country_info_getter.hpp" -#include "storage/storage.hpp" - -#include "coding/string_utf8_multilang.hpp" - -namespace notifications -{ -NotificationManagerDelegate::NotificationManagerDelegate(DataSource const & dataSource, - search::CityFinder & cityFinder, - CachingAddressGetter & addressGetter, - ugc::Api & ugcApi, - storage::Storage & storage, - storage::CountryInfoGetter & countryInfoGetter) - : m_dataSource(dataSource) - , m_cityFinder(cityFinder) - , m_addressGetter(addressGetter) - , m_ugcApi(ugcApi) - , m_storage(storage) - , m_countryInfoGetter(countryInfoGetter) -{ -} - -ugc::Api & NotificationManagerDelegate::GetUGCApi() -{ - return m_ugcApi; -} - -std::unordered_set NotificationManagerDelegate::GetDescendantCountries( - storage::CountryId const & country) const -{ - std::unordered_set result; - auto const fn = [&result](storage::CountryId const & countryId, bool isGroupNode) - { - if (isGroupNode) - return; - result.insert(countryId); - }; - m_storage.ForEachInSubtree(country, fn); - - return result; -} - -storage::CountryId NotificationManagerDelegate::GetCountryAtPoint(m2::PointD const & pt) const -{ - return m_countryInfoGetter.GetRegionCountryId(pt); -} - -std::string NotificationManagerDelegate::GetAddress(m2::PointD const & pt) -{ - auto const address = m_addressGetter.GetAddressAtPoint(m_dataSource, pt).FormatAddress(); - auto const city = m_cityFinder.GetCityReadableName(pt); - - if (address.empty()) - return city; - - if (city.empty()) - return address; - - return address + ", " + city; -} -} // namespace notifications diff --git a/map/notifications/notification_manager_delegate.hpp b/map/notifications/notification_manager_delegate.hpp deleted file mode 100644 index 1aa9738f7e..0000000000 --- a/map/notifications/notification_manager_delegate.hpp +++ /dev/null @@ -1,55 +0,0 @@ -#pragma once - -#include "map/notifications/notification_manager.hpp" - -#include "storage/storage_defines.hpp" - -#include "geometry/point2d.hpp" - -#include - -class DataSource; -class CachingAddressGetter; - -namespace search -{ -class CityFinder; -} - -namespace ugc -{ -class Api; -} - -namespace storage -{ -class Storage; -class CountryInfoGetter; -} - -namespace notifications -{ -class NotificationManagerDelegate : public NotificationManager::Delegate -{ -public: - NotificationManagerDelegate(DataSource const & dataSource, search::CityFinder & cityFinder, - CachingAddressGetter & addressGetter, ugc::Api & ugcApi, - storage::Storage & storage, - storage::CountryInfoGetter & countryInfoGetter); - - // NotificationManager::Delegate overrides: - ugc::Api & GetUGCApi() override; - std::unordered_set GetDescendantCountries( - storage::CountryId const & country) const override; - storage::CountryId GetCountryAtPoint(m2::PointD const & pt) const override; - std::string GetAddress(m2::PointD const & pt) override; - -private: - DataSource const & m_dataSource; - search::CityFinder & m_cityFinder; - CachingAddressGetter & m_addressGetter; - ugc::Api & m_ugcApi; - storage::Storage & m_storage; - storage::CountryInfoGetter & m_countryInfoGetter; -}; -} // namespace notifications diff --git a/map/notifications/notification_queue.cpp b/map/notifications/notification_queue.cpp deleted file mode 100644 index bad262dafa..0000000000 --- a/map/notifications/notification_queue.cpp +++ /dev/null @@ -1,140 +0,0 @@ -#include "map/notifications/notification_queue.hpp" - -#include "base/assert.hpp" - -namespace notifications -{ -NotificationCandidate::NotificationCandidate(Type type) - : m_type(type) - , m_created(Clock::now()) -{ -} - -NotificationCandidate::NotificationCandidate(eye::MapObject const & poi, - std::string const & address) - : m_type(NotificationCandidate::Type::UgcReview) - , m_created(Clock::now()) - , m_mapObject(std::make_shared(poi)) - , m_address(address) -{ - CHECK(!poi.IsEmpty(), ()); - - m_mapObject->GetEditableEvents().clear(); -} - -NotificationCandidate::Type NotificationCandidate::GetType() const -{ - return m_type; -} - -Time NotificationCandidate::GetCreatedTime() const -{ - return m_created; -} - -Time NotificationCandidate::GetLastUsedTime() const -{ - return m_used; -} - -bool NotificationCandidate::IsUsed() const -{ - return m_used.time_since_epoch().count() != 0; -} - -void NotificationCandidate::MarkAsUsed() -{ - CHECK_EQUAL(m_used.time_since_epoch().count(), 0, ()); - - m_used = Clock::now(); -} - -bool NotificationCandidate::IsSameMapObject(eye::MapObject const & rhs) const -{ - CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ()); - - return m_mapObject->AlmostEquals(rhs); -} - -std::string const & NotificationCandidate::GetBestFeatureType() const -{ - CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ()); - - return m_mapObject->GetBestType(); -} - -m2::PointD const & NotificationCandidate::GetPos() const -{ - CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ()); - - return m_mapObject->GetPos(); -} - -std::string const & NotificationCandidate::GetDefaultName() const -{ - CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ()); - - return m_mapObject->GetDefaultName(); -} - -std::string const & NotificationCandidate::GetReadableName() const -{ - CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ()); - - return m_mapObject->GetReadableName(); -} - -std::string const & NotificationCandidate::GetAddress() const -{ - CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ()); - - return m_address; -} - -void NotificationCandidate::SetBestFeatureType(std::string const & bestFeatureType) -{ - CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ()); - - if (!m_mapObject) - m_mapObject = std::make_shared(); - - m_mapObject->SetBestType(bestFeatureType); -} - -void NotificationCandidate::SetPos(m2::PointD const & pt) -{ - CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ()); - - if (!m_mapObject) - m_mapObject = std::make_shared(); - - m_mapObject->SetPos(pt); -} - -void NotificationCandidate::SetDefaultName(std::string const & name) -{ - CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ()); - - if (!m_mapObject) - m_mapObject = std::make_shared(); - - m_mapObject->SetDefaultName(name); -} - -void NotificationCandidate::SetReadableName(std::string const & name) -{ - CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ()); - - if (!m_mapObject) - m_mapObject = std::make_shared(); - - m_mapObject->SetReadableName(name); -} - -void NotificationCandidate::SetAddress(std::string const & address) -{ - CHECK_EQUAL(m_type, NotificationCandidate::Type::UgcReview, ()); - - m_address = address; -} -} // namespace notifications diff --git a/map/notifications/notification_queue.hpp b/map/notifications/notification_queue.hpp deleted file mode 100644 index 9ca41740b5..0000000000 --- a/map/notifications/notification_queue.hpp +++ /dev/null @@ -1,95 +0,0 @@ -#pragma once - -#include "metrics/eye_info.hpp" - -#include -#include -#include - -namespace notifications -{ -using Clock = std::chrono::system_clock; -using Time = Clock::time_point; - -class NotificationCandidate -{ -public: - friend class NotificationManagerForTesting; - - enum class Type : uint8_t - { - UgcAuth = 0, - UgcReview = 1 - }; - - DECLARE_VISITOR(visitor(m_type, "type"), visitor(m_created, "created_time"), - visitor(m_used, "used"), visitor(m_mapObject, "object"), - visitor(m_address, std::string(""), "address")); - - NotificationCandidate() = default; - NotificationCandidate(Type type); - // Constructs candidate with type Type::UgcReview. - NotificationCandidate(eye::MapObject const & poi, std::string const & address); - - Type GetType() const; - Time GetCreatedTime() const; - Time GetLastUsedTime() const; - bool IsUsed() const; - void MarkAsUsed(); - - // Methods for Type::UgcReview type. - // It is possible to use inheritance, but our serialization/deserialization - // mechanism is not support it. - bool IsSameMapObject(eye::MapObject const & rhs) const; - std::string const & GetBestFeatureType() const; - m2::PointD const & GetPos() const; - std::string const & GetDefaultName() const; - std::string const & GetReadableName() const; - std::string const & GetAddress() const; - - void SetBestFeatureType(std::string const & bestFeatureType); - void SetPos(m2::PointD const & pt); - void SetDefaultName(std::string const & name); - void SetReadableName(std::string const & name); - void SetAddress(std::string const & address); - -private: - Type m_type; - Time m_created; - Time m_used; - std::shared_ptr m_mapObject; - std::string m_address; -}; - -using Candidates = std::deque; - -enum class Version : int8_t -{ - Unknown = -1, - V0 = 0, - Latest = V0 -}; - -struct QueueV0 -{ - static Version GetVersion() { return Version::V0; } - - DECLARE_VISITOR(visitor(m_candidates, "queue"), - visitor(m_lastNotificationProvidedTime, "last_notification")) - - Time m_lastNotificationProvidedTime; - Candidates m_candidates; -}; - -using Queue = QueueV0; - -inline std::string DebugPrint(NotificationCandidate::Type type) -{ - switch (type) - { - case NotificationCandidate::Type::UgcAuth: return "UgcAuth"; - case NotificationCandidate::Type::UgcReview: return "UgcReview"; - } - UNREACHABLE(); -} -} // namespace notifications diff --git a/map/notifications/notification_queue_serdes.cpp b/map/notifications/notification_queue_serdes.cpp deleted file mode 100644 index 1d9a3c0f26..0000000000 --- a/map/notifications/notification_queue_serdes.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include "map/notifications/notification_queue_serdes.hpp" - -#include "coding/reader.hpp" -#include "coding/serdes_json.hpp" -#include "coding/write_to_sink.hpp" -#include "coding/writer.hpp" - -#include "base/logging.hpp" - -namespace notifications -{ -// static -void QueueSerdes::Serialize(Queue const & queue, std::vector & result) -{ - result.clear(); - using Sink = MemWriter>; - Sink writer(result); - - WriteToSink(writer, static_cast(Queue::GetVersion())); - - coding::SerializerJson ser(writer); - ser(queue); -} - -// static -void QueueSerdes::Deserialize(std::vector const & bytes, Queue & result) -{ - MemReader reader(bytes.data(), bytes.size()); - NonOwningReaderSource source(reader); - - auto version = static_cast(Version::Unknown); - ReadPrimitiveFromSource(source, version); - if (version == static_cast(Version::V0)) - { - try - { - coding::DeserializerJson des(source); - des(result); - } - catch (base::Json::Exception & ex) - { - LOG(LERROR, ("Cannot deserialize notification queue file. Exception:", ex.Msg(), - "Version:", version, "File content:", std::string(bytes.begin(), bytes.end()))); - } - return; - } - - MYTHROW(UnknownVersion, ("Unknown data version:", static_cast(version))); -} -} // namespace notifications diff --git a/map/notifications/notification_queue_serdes.hpp b/map/notifications/notification_queue_serdes.hpp deleted file mode 100644 index 072432f006..0000000000 --- a/map/notifications/notification_queue_serdes.hpp +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "map/notifications/notification_queue.hpp" - -#include "base/exception.hpp" - -#include -#include - -namespace notifications -{ -class QueueSerdes -{ -public: - DECLARE_EXCEPTION(UnknownVersion, RootException); - - static void Serialize(Queue const & queue, std::vector & result); - static void Deserialize(std::vector const & bytes, Queue & result); -}; -} // namespace notifications diff --git a/map/notifications/notification_queue_storage.cpp b/map/notifications/notification_queue_storage.cpp deleted file mode 100644 index d0fc2fb7ff..0000000000 --- a/map/notifications/notification_queue_storage.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include "map/notifications/notification_queue_storage.hpp" - -#include "platform/platform.hpp" - -#include "coding/file_reader.hpp" -#include "coding/file_writer.hpp" -#include "coding/internal/file_data.hpp" - -#include "base/file_name_utils.hpp" -#include "base/logging.hpp" - -namespace notifications -{ -// static -std::string QueueStorage::GetNotificationsDir() -{ - return base::JoinPath(GetPlatform().SettingsDir(), "notifications"); -} - -// static -std::string QueueStorage::GetFilePath() -{ - return base::JoinPath(GetNotificationsDir(), "queue"); -} - -// static -bool QueueStorage::Save(std::vector const & src) -{ - if (!GetPlatform().IsDirectory(GetNotificationsDir()) && - !GetPlatform().MkDirChecked(GetNotificationsDir())) - { - return false; - } - - return base::WriteToTempAndRenameToFile(GetFilePath(), [&src](std::string const & fileName) - { - try - { - FileWriter writer(fileName); - writer.Write(src.data(), src.size()); - } - catch (FileWriter::Exception const & ex) - { - LOG(LERROR, (ex.what(), ex.Msg())); - return false; - } - - return true; - }); -} - -// static -bool QueueStorage::Load(std::vector & dst) -{ - try - { - FileReader reader(GetFilePath()); - - dst.clear(); - dst.resize(static_cast(reader.Size())); - - reader.Read(0, dst.data(), dst.size()); - } - catch (FileReader::Exception const &) - { - dst.clear(); - } - - return !dst.empty(); -} -} // namespace notifications diff --git a/map/notifications/notification_queue_storage.hpp b/map/notifications/notification_queue_storage.hpp deleted file mode 100644 index 88b00e48f6..0000000000 --- a/map/notifications/notification_queue_storage.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include -#include -#include - -namespace notifications -{ -class QueueStorage -{ -public: - static std::string GetFilePath(); - static std::string GetNotificationsDir(); - static bool Save(std::vector const & src); - static bool Load(std::vector & dst); -}; -} // namespace notifications diff --git a/map/tips_api.cpp b/map/tips_api.cpp deleted file mode 100644 index 885f443809..0000000000 --- a/map/tips_api.cpp +++ /dev/null @@ -1,262 +0,0 @@ -#include "map/tips_api.hpp" - -#include "metrics/eye.hpp" - -#include "platform/platform.hpp" - -#include "base/logging.hpp" -#include "base/timer.hpp" - -#include -#include -#include - -using namespace eye; - -namespace -{ -// The app shouldn't show any screen at all more frequently than once in 3 days. -auto constexpr kShowAnyTipPeriod = std::chrono::hours(24) * 3; -// The app shouldn't show the same screen more frequently than 1 month. -auto constexpr kShowSameTipPeriod = std::chrono::hours(24) * 30; -// Every current trigger for a tips screen can be activated at the start of the application by -// default and if the app was inactive more then 12 hours. -auto constexpr kShowTipAfterCollapsingPeriod = std::chrono::hours(12); -// If a user clicks on the action areas (highlighted or blue button) -// the appropriate screen will never be shown again. -size_t constexpr kActionClicksCountToDisable = 1; -// If a user clicks 3 times on the button GOT IT the appropriate screen will never be shown again. -size_t constexpr kGotitClicksCountToDisable = 3; - -std::unordered_set const kIsolinesExceptedMwms = -{ - "Argentina_Buenos Aires_Buenos Aires", - "Australia_Melbourne", - "Australia_Sydney", - "Austria_Salzburg", - "Belarus_Minsk Region", - "China_Guizhou", - "China_Shanghai", - "Czech_Praha", - "Finland_Southern Finland_Helsinki", - "France_Ile-de-France_Paris", - "Germany_Berlin", - "Germany_Hamburg_main", - "Germany_Saxony_Leipzig", - "Germany_Saxony_Dresden", - "India_Delhi", - "Italy_Veneto_Venezia", - "Italy_Veneto_Verona", - "Netherlands_Utrecht_Utrecht", - "Netherlands_North Holland_Amsterdam", - "Russia_Moscow", - "Spain_Catalonia_Provincia de Barcelona", - "Spain_Community of Madrid", - "UK_England_Greater London", - "US_New York_New York", - "Russia_Saint Petersburg", - "US_Illinois_Chickago" -}; - -template ::value> * = nullptr> -size_t ToIndex(T type) -{ - return static_cast(type); -} - -std::optional GetTipImpl(TipsApi::Duration showAnyTipPeriod, - TipsApi::Duration showSameTipPeriod, - TipsApi::Delegate const & delegate, - TipsApi::Conditions const & conditions) -{ - auto const lastBackgroundTime = delegate.GetLastBackgroundTime(); - if (lastBackgroundTime != 0.0) - { - auto const timeInBackground = - static_cast(base::Timer::LocalTime() - lastBackgroundTime); - if (timeInBackground < kShowTipAfterCollapsingPeriod.count()) - return {}; - } - - auto const info = Eye::Instance().GetInfo(); - - CHECK(info, ("Eye info must be initialized")); - - auto const & tips = info->m_tips; - auto constexpr totalTipsCount = static_cast(Tip::Type::Count); - - Time lastShownTime; - for (auto const & tip : tips) - { - if (lastShownTime < tip.m_lastShownTime) - lastShownTime = tip.m_lastShownTime; - } - - if (Clock::now() - lastShownTime <= showAnyTipPeriod) - return {}; - - // If some tips are never shown. - if (tips.size() < totalTipsCount) - { - using Candidate = std::pair; - std::array candidates; - for (size_t i = 0; i < totalTipsCount; ++i) - { - candidates[i] = {static_cast(i), true}; - } - - for (auto const & shownTip : tips) - { - candidates[ToIndex(shownTip.m_type)].second = false; - } - - // Iterates reversed because we need to show newest tip first. - for (auto c = candidates.crbegin(); c != candidates.crend(); ++c) - { - if (c->second && conditions[ToIndex(c->first)](*info)) - return c->first; - } - } - - for (auto const & shownTip : tips) - { - if (shownTip.m_eventCounters.Get(Tip::Event::ActionClicked) < kActionClicksCountToDisable && - shownTip.m_eventCounters.Get(Tip::Event::GotitClicked) < kGotitClicksCountToDisable && - Clock::now() - shownTip.m_lastShownTime > showSameTipPeriod && - conditions[ToIndex(shownTip.m_type)](*info)) - { - return shownTip.m_type; - } - } - - return {}; -} -} // namespace - -// static -TipsApi::Duration TipsApi::GetShowAnyTipPeriod() -{ - return kShowAnyTipPeriod; -} - -// static -TipsApi::Duration TipsApi::GetShowSameTipPeriod() -{ - return kShowSameTipPeriod; -} - -// static -TipsApi::Duration TipsApi::ShowTipAfterCollapsingPeriod() -{ - return kShowTipAfterCollapsingPeriod; -}; - -// static -size_t TipsApi::GetActionClicksCountToDisable() -{ - return kActionClicksCountToDisable; -} - -// static -size_t TipsApi::GetGotitClicksCountToDisable() -{ - return kGotitClicksCountToDisable; -} - -TipsApi::TipsApi(std::unique_ptr delegate) - : m_delegate(std::move(delegate)) -{ - m_conditions = - {{ - // Condition for Tips::Type::BookmarksCatalog type. - [] (eye::Info const & info) - { - return info.m_bookmarks.m_lastOpenedTime.time_since_epoch().count() == 0 && - GetPlatform().ConnectionStatus() != Platform::EConnectionType::CONNECTION_NONE; - }, - // Condition for Tips::Type::BookingHotels type. - [] (eye::Info const & info) - { - return info.m_booking.m_lastFilterUsedTime.time_since_epoch().count() == 0; - }, - // Condition for Tips::Type::DiscoverButton type. - [this] (eye::Info const & info) - { - auto const eventsCount = ToIndex(Discovery::Event::Count); - for (size_t i = 0; i < eventsCount; ++i) - { - if (info.m_discovery.m_eventCounters.Get(static_cast(i)) != 0) - return false; - } - - auto const pos = m_delegate->GetCurrentPosition(); - if (!pos) - return false; - - return m_delegate->IsCountryLoaded(*pos); - }, - // Condition for Tips::Type::PublicTransport type. - [this] (eye::Info const & info) - { - for (auto const & layer : info.m_layers) - { - if (layer.m_type == Layer::Type::PublicTransport && - layer.m_lastTimeUsed.time_since_epoch().count() != 0) - { - return false; - } - } - - auto const pos = m_delegate->GetCurrentPosition(); - if (!pos) - return false; - - return m_delegate->HaveTransit(*pos); - }, - // Condition for Tips::Type::Isolines type. - [this] (eye::Info const & info) - { - for (auto const & layer : info.m_layers) - { - if (layer.m_type == Layer::Type::Isolines && - layer.m_lastTimeUsed.time_since_epoch().count() != 0) - { - return false; - } - } - - auto const pos = m_delegate->GetViewportCenter(); - auto const countryId = m_delegate->GetCountryId(pos); - - if (countryId.empty()) - return false; - - if (kIsolinesExceptedMwms.find(countryId) != kIsolinesExceptedMwms.end()) - return false; - - return m_delegate->GetIsolinesQuality(countryId) == isolines::Quality::Normal; - }, - }}; -} - -std::optional TipsApi::GetTip() const -{ - if (!m_isEnabled) - return {}; - - return GetTipImpl(GetShowAnyTipPeriod(), GetShowSameTipPeriod(), *m_delegate, m_conditions); -} - -void TipsApi::SetEnabled(bool isEnabled) -{ - m_isEnabled = isEnabled; -} - -// static -std::optional TipsApi::GetTipForTesting(Duration showAnyTipPeriod, - Duration showSameTipPeriod, - TipsApi::Delegate const & delegate, - Conditions const & triggers) -{ - return GetTipImpl(showAnyTipPeriod, showSameTipPeriod, delegate, triggers); -} diff --git a/map/tips_api.hpp b/map/tips_api.hpp deleted file mode 100644 index 2f96f34b82..0000000000 --- a/map/tips_api.hpp +++ /dev/null @@ -1,60 +0,0 @@ -#pragma once - -#include "storage/storage_defines.hpp" - -#include "indexer/isolines_info.hpp" - -#include "metrics/eye_info.hpp" - -#include "geometry/point2d.hpp" - -#include -#include -#include -#include -#include -#include - -class TipsApi -{ -public: - using Duration = std::chrono::hours; - using Condition = std::function; - using Conditions = std::array(eye::Tip::Type::Count)>; - - class Delegate - { - public: - virtual ~Delegate() = default; - - virtual std::optional GetCurrentPosition() const = 0; - virtual bool IsCountryLoaded(m2::PointD const & pt) const = 0; - virtual bool HaveTransit(m2::PointD const & pt) const = 0; - virtual double GetLastBackgroundTime() const = 0; - virtual m2::PointD const & GetViewportCenter() const = 0; - virtual storage::CountryId GetCountryId(m2::PointD const & pt) const = 0; - virtual isolines::Quality GetIsolinesQuality(storage::CountryId const & countryId) const = 0; - }; - - static Duration GetShowAnyTipPeriod(); - static Duration GetShowSameTipPeriod(); - static Duration ShowTipAfterCollapsingPeriod(); - static size_t GetActionClicksCountToDisable(); - static size_t GetGotitClicksCountToDisable(); - - explicit TipsApi(std::unique_ptr delegate); - - std::optional GetTip() const; - - void SetEnabled(bool isEnabled); - - static std::optional GetTipForTesting(Duration showAnyTipPeriod, - Duration showSameTipPeriod, - TipsApi::Delegate const & delegate, - Conditions const & triggers); - -private: - std::unique_ptr m_delegate; - Conditions m_conditions; - bool m_isEnabled = true; -}; diff --git a/map/tips_api_delegate.cpp b/map/tips_api_delegate.cpp deleted file mode 100644 index 8db1b9e328..0000000000 --- a/map/tips_api_delegate.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include "map/tips_api_delegate.hpp" - -TipsApiDelegate::TipsApiDelegate(Framework const & framework) - : m_framework(framework) -{ -} - -std::optional TipsApiDelegate::GetCurrentPosition() const -{ - return m_framework.GetCurrentPosition(); -} - -bool TipsApiDelegate::IsCountryLoaded(m2::PointD const & pt) const -{ - return m_framework.IsCountryLoaded(pt); -} - -bool TipsApiDelegate::HaveTransit(m2::PointD const & pt) const -{ - return m_framework.HaveTransit(pt); -} - -double TipsApiDelegate::GetLastBackgroundTime() const -{ - return m_framework.GetLastBackgroundTime(); -} - -m2::PointD const & TipsApiDelegate::GetViewportCenter() const -{ - return m_framework.GetViewportCenter(); -} - -storage::CountryId TipsApiDelegate::GetCountryId(m2::PointD const & pt) const -{ - return m_framework.GetCountryIndex(pt); -} - -isolines::Quality TipsApiDelegate::GetIsolinesQuality(storage::CountryId const & countryId) const -{ - auto const id = m_framework.GetMwmIdByName(countryId); - return m_framework.GetIsolinesManager().GetDataQuality(id); -} diff --git a/map/tips_api_delegate.hpp b/map/tips_api_delegate.hpp deleted file mode 100644 index b6339b1eaf..0000000000 --- a/map/tips_api_delegate.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "map/framework.hpp" - -#include "map/tips_api.hpp" - -class TipsApiDelegate : public TipsApi::Delegate -{ -public: - explicit TipsApiDelegate(Framework const & framework); - - std::optional GetCurrentPosition() const override; - bool IsCountryLoaded(m2::PointD const & pt) const override; - bool HaveTransit(m2::PointD const & pt) const override; - double GetLastBackgroundTime() const override; - m2::PointD const & GetViewportCenter() const override; - storage::CountryId GetCountryId(m2::PointD const & pt) const override; - isolines::Quality GetIsolinesQuality(storage::CountryId const & countryId) const override; - -private: - Framework const & m_framework; -}; diff --git a/map/traffic_manager.cpp b/map/traffic_manager.cpp index a96e9ca606..b3c434ddb9 100644 --- a/map/traffic_manager.cpp +++ b/map/traffic_manager.cpp @@ -51,7 +51,6 @@ TrafficManager::TrafficManager(GetMwmsByRectFn const & getMwmsByRectFn, size_t m , m_isRunning(true) , m_isPaused(false) , m_thread(&TrafficManager::ThreadRoutine, this) - , m_statistics("traffic") { CHECK(m_getMwmsByRectFn != nullptr, ()); } @@ -96,8 +95,6 @@ void TrafficManager::SetEnabled(bool enabled) return; Clear(); ChangeState(enabled ? TrafficState::Enabled : TrafficState::Disabled); - m_trackFirstSchemeData = enabled; - m_lastTrackedStatus = {}; } m_drapeEngine.SafeCall(&df::DrapeEngine::EnableTraffic, enabled); @@ -477,7 +474,6 @@ void TrafficManager::UpdateState() bool expiredData = false; bool noData = false; - std::set mwmVersions; for (MwmSet::MwmId const & mwmId : m_activeDrapeMwms) { auto it = m_mwmCache.find(mwmId); @@ -504,9 +500,6 @@ void TrafficManager::UpdateState() networkError = true; } } - - if (m_trackFirstSchemeData) - mwmVersions.insert(mwmId.GetInfo()->GetVersion()); } if (networkError || maxPassedTime >= kNetworkErrorTimeout) @@ -523,8 +516,6 @@ void TrafficManager::UpdateState() ChangeState(TrafficState::Outdated); else ChangeState(TrafficState::Enabled); - - TrackStatistics(mwmVersions); } void TrafficManager::ChangeState(TrafficState newState) @@ -571,41 +562,6 @@ void TrafficManager::SetSimplifiedColorScheme(bool simplified) m_drapeEngine.SafeCall(&df::DrapeEngine::SetSimplifiedTrafficColors, simplified); } -void TrafficManager::TrackStatistics(std::set const & mwmVersions) -{ - if (!m_trackFirstSchemeData) - return; - - std::optional statisticStatus; - if (m_state == TrafficState::Enabled) - { - if (mwmVersions.empty()) - { - statisticStatus = LayersStatistics::Status::Unavailable; - } - else - { - m_trackFirstSchemeData = false; - statisticStatus = LayersStatistics::Status::Success; - } - } - else if (m_state == TrafficState::NetworkError) - { - statisticStatus = LayersStatistics::Status::Error; - } - else if (m_state == TrafficState::NoData || m_state == TrafficState::ExpiredData || - m_state == TrafficState::ExpiredApp) - { - statisticStatus = LayersStatistics::Status::Unavailable; - } - - if (!statisticStatus || m_lastTrackedStatus == statisticStatus) - return; - - m_lastTrackedStatus = statisticStatus; - m_statistics.LogActivate(*statisticStatus, mwmVersions); -} - std::string DebugPrint(TrafficManager::TrafficState state) { switch (state) diff --git a/map/traffic_manager.hpp b/map/traffic_manager.hpp index a6061c736f..f2a2d28b16 100644 --- a/map/traffic_manager.hpp +++ b/map/traffic_manager.hpp @@ -1,7 +1,5 @@ #pragma once -#include "map/layers_statistics.hpp" - #include "traffic/traffic_info.hpp" #include "drape_frontend/drape_engine_safe_ptr.hpp" @@ -149,8 +147,6 @@ private: std::for_each(activeMwms.begin(), activeMwms.end(), std::forward(f)); } - void TrackStatistics(std::set const & mwmVersions); - GetMwmsByRectFn m_getMwmsByRectFn; traffic::TrafficObserver & m_observer; @@ -189,10 +185,6 @@ private: std::vector m_requestedMwms; std::mutex m_mutex; threads::SimpleThread m_thread; - - bool m_trackFirstSchemeData = false; - std::optional m_lastTrackedStatus; - LayersStatistics m_statistics; }; extern std::string DebugPrint(TrafficManager::TrafficState state); diff --git a/map/transit/transit_reader.cpp b/map/transit/transit_reader.cpp index 11e4590b63..4fdc971f44 100644 --- a/map/transit/transit_reader.cpp +++ b/map/transit/transit_reader.cpp @@ -1,7 +1,5 @@ #include "map/transit/transit_reader.hpp" -#include "metrics/eye.hpp" - #include "drape_frontend/drape_engine.hpp" #include "drape_frontend/stylist.hpp" #include "drape_frontend/visual_params.hpp" @@ -232,7 +230,6 @@ TransitReadManager::TransitReadManager(DataSource & dataSource, : m_dataSource(dataSource) , m_readFeaturesFn(readFeaturesFn) , m_getMwmsByRectFn(getMwmsByRectFn) - , m_statistics("subway") { Start(); } @@ -271,8 +268,6 @@ void TransitReadManager::EnableTransitSchemeMode(bool enable) if (m_isSchemeMode == enable) return; m_isSchemeMode = enable; - m_trackFirstSchemeData = enable; - m_lastTrackedStatus = {}; m_drapeEngine.SafeCall(&df::DrapeEngine::EnableTransitScheme, enable); @@ -333,8 +328,6 @@ void TransitReadManager::UpdateViewport(ScreenBase const & screen) m_lastActiveMwms.clear(); auto const currentTime = steady_clock::now(); - std::set mwmVersions; - TransitDisplayInfos newTransitData; for (auto const & mwmId : mwms) { @@ -351,9 +344,6 @@ void TransitReadManager::UpdateViewport(ScreenBase const & screen) { it->second.m_lastActiveTime = currentTime; } - - if (m_trackFirstSchemeData) - mwmVersions.insert(mwmId.GetInfo()->GetVersion()); } if (!newTransitData.empty()) @@ -403,8 +393,6 @@ void TransitReadManager::UpdateViewport(ScreenBase const & screen) } ChangeState(hasData ? TransitSchemeState::Enabled : TransitSchemeState::NoData); - - TrackStatistics(mwmVersions); } void TransitReadManager::ClearCache(MwmSet::MwmId const & mwmId) @@ -529,27 +517,3 @@ void TransitReadManager::ChangeState(TransitSchemeState newState) if (m_onStateChangedFn) m_onStateChangedFn(newState); } - -void TransitReadManager::TrackStatistics(std::set const & mwmVersions) -{ - if (!m_trackFirstSchemeData) - return; - - LayersStatistics::Status statisticStatus; - if (m_state == TransitSchemeState::Enabled && !mwmVersions.empty()) - { - eye::Eye::Event::LayerShown(eye::Layer::Type::PublicTransport); - m_trackFirstSchemeData = false; - statisticStatus = LayersStatistics::Status::Success; - } - else - { - statisticStatus = LayersStatistics::Status::Unavailable; - } - - if (statisticStatus == m_lastTrackedStatus) - return; - - m_lastTrackedStatus = statisticStatus; - m_statistics.LogActivate(statisticStatus, mwmVersions); -} diff --git a/map/transit/transit_reader.hpp b/map/transit/transit_reader.hpp index 4f9fdb66ca..2a7dcce3fd 100644 --- a/map/transit/transit_reader.hpp +++ b/map/transit/transit_reader.hpp @@ -1,7 +1,5 @@ #pragma once -#include "map/layers_statistics.hpp" - #include "drape_frontend/drape_engine_safe_ptr.hpp" #include "transit/experimental/transit_data.hpp" @@ -123,8 +121,6 @@ private: void ShrinkCacheToAllowableSize(); void ClearCache(MwmSet::MwmId const & mwmId); - void TrackStatistics(std::set const & mwmVersions); - std::unique_ptr m_threadsPool; std::mutex m_mutex; @@ -159,8 +155,4 @@ private: bool m_isSchemeMode = false; bool m_isSchemeModeBlocked = false; std::pair m_currentModelView = {ScreenBase(), false /* initialized */}; - - bool m_trackFirstSchemeData = false; - std::optional m_lastTrackedStatus; - LayersStatistics m_statistics; }; diff --git a/map/utils.cpp b/map/utils.cpp deleted file mode 100644 index 8566658222..0000000000 --- a/map/utils.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#include "map/utils.hpp" - -#include "map/place_page_info.hpp" - -#include "indexer/feature.hpp" -#include "indexer/feature_algo.hpp" -#include "indexer/feature_decl.hpp" - -#include "metrics/eye.hpp" - -#include - -namespace utils -{ -eye::MapObject MakeEyeMapObject(place_page::Info const & info) -{ - if (!info.IsFeature() || (info.GetFeatureStatus() != FeatureStatus::Untouched && - info.GetFeatureStatus() != FeatureStatus::Modified)) - { - return {}; - } - - auto types = info.GetTypes(); - if (types.Empty()) - return {}; - - types.SortBySpec(); - - eye::MapObject mapObject; - mapObject.SetBestType(classif().GetReadableObjectName(types.GetBestType())); - mapObject.SetPos(info.GetMercator()); - mapObject.SetDefaultName(info.GetDefaultName()); - mapObject.SetReadableName(info.GetPrimaryFeatureName()); - - return mapObject; -} - -eye::MapObject MakeEyeMapObject(FeatureType & ft, osm::Editor const & editor) -{ - auto const status = editor.GetFeatureStatus(ft.GetID()); - if (status != FeatureStatus::Untouched && status != FeatureStatus::Modified) - return {}; - - feature::TypesHolder types(ft); - if (types.Empty()) - return {}; - - types.SortBySpec(); - - eye::MapObject mapObject; - mapObject.SetBestType(classif().GetReadableObjectName(types.GetBestType())); - mapObject.SetPos(feature::GetCenter(ft)); - - std::string name; - if (ft.GetName(StringUtf8Multilang::kDefaultCode, name)) - mapObject.SetDefaultName(name); - - name.clear(); - ft.GetReadableName(name); - mapObject.SetReadableName(name); - - return mapObject; -} - -void RegisterEyeEventIfPossible(eye::MapObject::Event::Type const type, - std::optional const & userPos, - place_page::Info const & info) -{ - if (!userPos) - return; - - auto const mapObject = utils::MakeEyeMapObject(info); - if (!mapObject.IsEmpty()) - eye::Eye::Event::MapObjectEvent(mapObject, type, *userPos); -} -} // namespace utils diff --git a/map/utils.hpp b/map/utils.hpp deleted file mode 100644 index a26e71ac72..0000000000 --- a/map/utils.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "editor/osm_editor.hpp" - -#include "metrics/eye_info.hpp" - -#include - -namespace place_page -{ -class Info; -} - -class FeatureType; - -namespace utils -{ -eye::MapObject MakeEyeMapObject(place_page::Info const & info); -eye::MapObject MakeEyeMapObject(FeatureType & ft, osm::Editor const & editor); - -void RegisterEyeEventIfPossible(eye::MapObject::Event::Type const type, - std::optional const & userPos, - place_page::Info const & info); -} // namespace utils diff --git a/mapshot/CMakeLists.txt b/mapshot/CMakeLists.txt index 2e47662d41..326560bf77 100644 --- a/mapshot/CMakeLists.txt +++ b/mapshot/CMakeLists.txt @@ -23,7 +23,6 @@ omim_link_libraries( routing search storage - metrics tracking traffic routing_common diff --git a/metrics/CMakeLists.txt b/metrics/CMakeLists.txt deleted file mode 100644 index d29c30fb99..0000000000 --- a/metrics/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -project(metrics) - -include_directories(${OMIM_ROOT}/3party/jansson/src) - -set( - SRC - eye.cpp - eye.hpp - eye_info.hpp - eye_serdes.cpp - eye_serdes.hpp - eye_storage.cpp - eye_storage.hpp -) - -omim_add_library(${PROJECT_NAME} ${SRC}) - -omim_add_test_subdirectory(metrics_tests) -omim_add_test_subdirectory(metrics_tests_support) diff --git a/metrics/eye.cpp b/metrics/eye.cpp deleted file mode 100644 index 69ceb8af84..0000000000 --- a/metrics/eye.cpp +++ /dev/null @@ -1,531 +0,0 @@ -#include "metrics/eye.hpp" -#include "metrics/eye_serdes.hpp" -#include "metrics/eye_storage.hpp" - -#include "platform/platform.hpp" - -#include "coding/file_writer.hpp" - -#include "base/assert.hpp" -#include "base/logging.hpp" - -#include -#include -#include -#include -#include - -using namespace eye; - -namespace -{ -// Three months. -auto constexpr kMapObjectEventsExpirePeriod = std::chrono::hours(24 * 30 * 3); -auto constexpr kEventCooldown = std::chrono::seconds(2); - -std::array const kMapEventSupportedTypes = {{"amenity-bar", "amenity-cafe", - "amenity-pub", "amenity-restaurant", - "amenity-fast_food", "amenity-biergarden", - "shop-bakery"}}; - -void Load(Info & info) -{ - Storage::Migrate(); - - std::vector infoFileData; - std::vector mapObjectsFileData; - auto const isInfoLoaded = Storage::LoadInfo(infoFileData); - auto const isMapObjectsLoaded = Storage::LoadMapObjects(mapObjectsFileData); - if (!isInfoLoaded && !isMapObjectsLoaded) - { - info = {}; - return; - } - - try - { - if (!infoFileData.empty()) - Serdes::DeserializeInfo(infoFileData, info); - - // Workaround to remove tips which were saved by mistake. - info.m_tips.erase(std::remove_if(info.m_tips.begin(), info.m_tips.end(), [](auto const & item) - { - return item.m_type == Tip::Type::Count; - }), info.m_tips.end()); - - if (!mapObjectsFileData.empty()) - Serdes::DeserializeMapObjects(mapObjectsFileData, info.m_mapObjects); - } - catch (Serdes::UnknownVersion const & ex) - { - LOG(LERROR, ("Cannot load metrics files, eye will be disabled. Exception:", ex.Msg())); - info = {}; - } -} - -bool Save(Info const & info) -{ - std::vector fileData; - Serdes::SerializeInfo(info, fileData); - return Storage::SaveInfo(fileData); -} - -bool SaveMapObjects(MapObjects const & mapObjects) -{ - std::vector fileData; - Serdes::SerializeMapObjects(mapObjects, fileData); - return Storage::SaveMapObjects(fileData); -} - -bool SaveLastMapObjectEvent(MapObject const & mapObject) -{ - ASSERT(!mapObject.GetEvents().empty(), ()); - - std::vector eventData; - Serdes::SerializeMapObjectEvent(mapObject, mapObject.GetEvents().back(), eventData); - - return Storage::AppendMapObjectEvent(eventData); -} -} // namespace - -namespace eye -{ -Eye::Eye() -{ - Info info; - Load(info); - m_info.Set(std::make_shared(info)); -} - -// static -Eye & Eye::Instance() -{ - static Eye instance; - return instance; -} - -Eye::InfoType Eye::GetInfo() const -{ - return m_info.Get(); -} - -void Eye::Subscribe(Subscriber * subscriber) -{ - m_subscribers.push_back(subscriber); -} - -void Eye::UnsubscribeAll() -{ - m_subscribers.clear(); -} - -// static -std::chrono::hours const & Eye::GetMapObjectEventsExpirePeriod() -{ - return kMapObjectEventsExpirePeriod; -} - -void Eye::TrimExpired() -{ - GetPlatform().RunTask(Platform::Thread::File, [this] - { - TrimExpiredMapObjectEvents(); - }); -} - -bool Eye::Save(InfoType const & info) -{ - if (!::Save(*info)) - return false; - - m_info.Set(info); - return true; -} - -void Eye::TrimExpiredMapObjectEvents() -{ - auto const info = m_info.Get(); - auto editableInfo = std::make_shared(*info); - auto changed = false; - - std::vector removeQueue; - - editableInfo->m_mapObjects.ForEach([&removeQueue, &changed](MapObject const & item) - { - auto & events = item.GetEditableEvents(); - events.erase(std::remove_if(events.begin(), events.end(), [&changed](auto const & item) - { - if (Clock::now() - item.m_eventTime >= kMapObjectEventsExpirePeriod) - { - if (!changed) - changed = true; - - return true; - } - return false; - }), events.end()); - - if (events.empty()) - removeQueue.push_back(item); - }); - - for (auto const & toRemove : removeQueue) - { - editableInfo->m_mapObjects.Erase(toRemove); - } - - if (changed && SaveMapObjects(editableInfo->m_mapObjects)) - m_info.Set(editableInfo); -} - -void Eye::RegisterTipClick(Tip::Type type, Tip::Event event) -{ - auto const info = m_info.Get(); - auto editableInfo = std::make_shared(*info); - auto & editableTips = editableInfo->m_tips; - - auto it = std::find_if(editableTips.begin(), editableTips.end(), [type](Tip const & tip) - { - return tip.m_type == type; - }); - - Tip tip; - auto const now = Clock::now(); - if (it != editableTips.cend()) - { - it->m_eventCounters.Increment(event); - it->m_lastShownTime = now; - tip = *it; - } - else - { - tip.m_type = type; - tip.m_eventCounters.Increment(event); - tip.m_lastShownTime = now; - editableTips.push_back(tip); - } - - if (!Save(editableInfo)) - return; - - GetPlatform().RunTask(Platform::Thread::Gui, [this, tip] - { - for (auto subscriber : m_subscribers) - { - subscriber->OnTipClicked(tip); - } - }); -} - -void Eye::UpdateBookingFilterUsedTime() -{ - auto const info = m_info.Get(); - auto editableInfo = std::make_shared(*info); - auto const now = Clock::now(); - - editableInfo->m_booking.m_lastFilterUsedTime = now; - - if (!Save(editableInfo)) - return; - - GetPlatform().RunTask(Platform::Thread::Gui, [this, now] - { - for (auto subscriber : m_subscribers) - { - subscriber->OnBookingFilterUsed(now); - } - }); -} - -void Eye::UpdateBoomarksCatalogShownTime() -{ - auto const info = m_info.Get(); - auto editableInfo = std::make_shared(*info); - auto const now = Clock::now(); - - editableInfo->m_bookmarks.m_lastOpenedTime = now; - - if (!Save(editableInfo)) - return; - - GetPlatform().RunTask(Platform::Thread::Gui, [this, now] - { - for (auto subscriber : m_subscribers) - { - subscriber->OnBookmarksCatalogShown(now); - } - }); -} - -void Eye::UpdateDiscoveryShownTime() -{ - auto const info = m_info.Get(); - auto editableInfo = std::make_shared(*info); - auto const now = Clock::now(); - - editableInfo->m_discovery.m_lastOpenedTime = now; - - if (!Save(editableInfo)) - return; - - GetPlatform().RunTask(Platform::Thread::Gui, [this, now] - { - for (auto subscriber : m_subscribers) - { - subscriber->OnDiscoveryShown(now); - } - }); -} - -void Eye::IncrementDiscoveryItem(Discovery::Event event) -{ - auto const info = m_info.Get(); - auto editableInfo = std::make_shared(*info); - - editableInfo->m_discovery.m_lastClickedTime = Clock::now(); - editableInfo->m_discovery.m_eventCounters.Increment(event); - - if (!Save(editableInfo)) - return; - - GetPlatform().RunTask(Platform::Thread::Gui, [this, event] - { - for (auto subscriber : m_subscribers) - { - subscriber->OnDiscoveryItemClicked(event); - } - }); -} - -void Eye::RegisterLayerShown(Layer::Type type) -{ - auto const info = m_info.Get(); - auto editableInfo = std::make_shared(*info); - auto & editableLayers = editableInfo->m_layers; - - auto it = std::find_if(editableLayers.begin(), editableLayers.end(), [type](Layer const & layer) - { - return layer.m_type == type; - }); - - Layer layer; - if (it != editableLayers.end()) - { - ++it->m_useCount; - it->m_lastTimeUsed = Clock::now(); - layer = *it; - } - else - { - layer.m_type = type; - - ++layer.m_useCount; - layer.m_lastTimeUsed = Clock::now(); - editableLayers.emplace_back(layer); - } - - if (!Save(editableInfo)) - return; - - GetPlatform().RunTask(Platform::Thread::Gui, [this, layer] - { - for (auto subscriber : m_subscribers) - { - subscriber->OnLayerShown(layer); - } - }); -} - -void Eye::RegisterMapObjectEvent(MapObject const & mapObject, MapObject::Event::Type type, - m2::PointD const & userPos) -{ - auto const info = m_info.Get(); - auto editableInfo = std::make_shared(*info); - auto & mapObjects = editableInfo->m_mapObjects; - - MapObject result = mapObject; - MapObject::Event event; - event.m_type = type; - event.m_userPos = userPos; - event.m_eventTime = Clock::now(); - - bool found = false; - bool duplication = false; - mapObjects.ForEachInRect( - result.GetLimitRect(), [&found, &duplication, &event, &result](MapObject const & item) - { - if (found || duplication || !item.AlmostEquals(result)) - return; - - found = true; - - auto & events = item.GetEditableEvents(); - if (!events.empty() && events.back().m_type == event.m_type && - event.m_eventTime - events.back().m_eventTime <= kEventCooldown) - { - duplication = true; - } - - item.GetEditableEvents().emplace_back(std::move(event)); - result = item; - }); - - if (duplication) - return; - - if (!found) - { - result.GetEditableEvents() = {std::move(event)}; - mapObjects.Add(result); - } - - if (!SaveLastMapObjectEvent(result)) - return; - - m_info.Set(editableInfo); - GetPlatform().RunTask(Platform::Thread::Gui, [this, result] - { - for (auto subscriber : m_subscribers) - { - subscriber->OnMapObjectEvent(result); - } - }); -} - -void Eye::RegisterTransitionToBooking(m2::PointD const & hotelPos) -{ - auto const info = m_info.Get(); - auto editableInfo = std::make_shared(*info); - - editableInfo->m_promo.m_transitionToBookingTime = Clock::now(); - if (!Save(editableInfo)) - return; - - GetPlatform().RunTask(Platform::Thread::Gui, [this, hotelPos] - { - for (auto subscriber : m_subscribers) - { - subscriber->OnTransitionToBooking(hotelPos); - } - }); -} - -void Eye::RegisterPromoAfterBookingShown(std::string const & cityId) -{ - auto const info = m_info.Get(); - auto editableInfo = std::make_shared(*info); - auto const now = Clock::now(); - - editableInfo->m_promo.m_lastTimeShownAfterBooking = now; - editableInfo->m_promo.m_lastTimeShownAfterBookingCityId = cityId; - - if (!Save(editableInfo)) - return; - - GetPlatform().RunTask(Platform::Thread::Gui, [this, now, cityId] - { - for (auto subscriber : m_subscribers) - { - subscriber->OnPromoAfterBookingShown(now, cityId); - } - }); -} - -// Eye::Event methods ------------------------------------------------------------------------------ -// static -void Eye::Event::TipClicked(Tip::Type type, Tip::Event event) -{ - CHECK_NOT_EQUAL(type, Tip::Type::Count, ()); - CHECK_NOT_EQUAL(event, Tip::Event::Count, ()); - - GetPlatform().RunTask(Platform::Thread::File, [type, event] - { - Instance().RegisterTipClick(type, event); - }); -} - -// static -void Eye::Event::BookingFilterUsed() -{ - GetPlatform().RunTask(Platform::Thread::File, [] - { - Instance().UpdateBookingFilterUsedTime(); - }); -} - -// static -void Eye::Event::BoomarksCatalogShown() -{ - GetPlatform().RunTask(Platform::Thread::File, [] - { - Instance().UpdateBoomarksCatalogShownTime(); - }); -} - -// static -void Eye::Event::DiscoveryShown() -{ - GetPlatform().RunTask(Platform::Thread::File, [] - { - Instance().UpdateDiscoveryShownTime(); - }); -} - -// static -void Eye::Event::DiscoveryItemClicked(Discovery::Event event) -{ - CHECK_NOT_EQUAL(event, Discovery::Event::Count, ()); - - GetPlatform().RunTask(Platform::Thread::File, [event] - { - Instance().IncrementDiscoveryItem(event); - }); -} - -// static -void Eye::Event::LayerShown(Layer::Type type) -{ - GetPlatform().RunTask(Platform::Thread::File, [type] - { - Instance().RegisterLayerShown(type); - }); -} - -// static -void Eye::Event::MapObjectEvent(MapObject const & mapObject, MapObject::Event::Type type, - m2::PointD const & userPos) -{ - if (mapObject.GetReadableName().empty()) - return; - - { - auto const it = std::find(kMapEventSupportedTypes.cbegin(), kMapEventSupportedTypes.cend(), - mapObject.GetBestType()); - if (it == kMapEventSupportedTypes.cend()) - return; - } - - GetPlatform().RunTask(Platform::Thread::File, [type, mapObject, userPos] - { - Instance().RegisterMapObjectEvent(mapObject, type, userPos); - }); -} - -// static -void Eye::Event::TransitionToBooking(m2::PointD const & hotelPos) -{ - GetPlatform().RunTask(Platform::Thread::File, [hotelPos] - { - Instance().RegisterTransitionToBooking(hotelPos); - }); -} - -// static -void Eye::Event::PromoAfterBookingShown(std::string const & cityId) -{ - GetPlatform().RunTask(Platform::Thread::File, [cityId] - { - Instance().RegisterPromoAfterBookingShown(cityId); - }); -} -} // namespace eye diff --git a/metrics/eye.hpp b/metrics/eye.hpp deleted file mode 100644 index c0a4d5809d..0000000000 --- a/metrics/eye.hpp +++ /dev/null @@ -1,94 +0,0 @@ -#pragma once - -#include "metrics/eye_info.hpp" - -#include "base/atomic_shared_ptr.hpp" -#include "base/macros.hpp" - -#include "geometry/point2d.hpp" - -#include -#include -#include - -namespace eye -{ -class Subscriber -{ -public: - virtual ~Subscriber() = default; - -public: - virtual void OnTipClicked(Tip const & tip) {} - virtual void OnBookingFilterUsed(Time const & time) {} - virtual void OnBookmarksCatalogShown(Time const & time) {} - virtual void OnDiscoveryShown(Time const & time) {} - virtual void OnDiscoveryItemClicked(Discovery::Event event) {} - virtual void OnLayerShown(Layer const & layer) {} - virtual void OnMapObjectEvent(MapObject const & poi) {} - virtual void OnPromoAfterBookingShown(Time const & time, std::string const & cityId) {} - virtual void OnTransitionToBooking(m2::PointD const & hotelPos) {} -}; - -// Note This class IS thread-safe. -// All write operations are asynchronous and work on Platform::Thread::File thread. -// Read operations are synchronous and return shared pointer with constant copy of internal -// container. -// But Subscribe/Unsubscribe methods are NOT thread-safe and must be called from main thread only. -class Eye -{ -public: - friend class EyeForTesting; - using InfoType = base::AtomicSharedPtr::ValueType; - - class Event - { - public: - static void TipClicked(Tip::Type type, Tip::Event event); - static void BookingFilterUsed(); - static void BoomarksCatalogShown(); - static void DiscoveryShown(); - static void DiscoveryItemClicked(Discovery::Event event); - static void LayerShown(Layer::Type type); - static void MapObjectEvent(MapObject const & mapObject, MapObject::Event::Type type, - m2::PointD const & userPos); - static void TransitionToBooking(m2::PointD const & hotelPos); - static void PromoAfterBookingShown(std::string const & cityId); - }; - - static Eye & Instance(); - - InfoType GetInfo() const; - - // Subscribe/Unsubscribe must be called from main thread only. - void Subscribe(Subscriber * subscriber); - void UnsubscribeAll(); - - static std::chrono::hours const & GetMapObjectEventsExpirePeriod(); - void TrimExpired(); - -private: - Eye(); - - bool Save(InfoType const & info); - void TrimExpiredMapObjectEvents(); - - // Event processing: - void RegisterTipClick(Tip::Type type, Tip::Event event); - void UpdateBookingFilterUsedTime(); - void UpdateBoomarksCatalogShownTime(); - void UpdateDiscoveryShownTime(); - void IncrementDiscoveryItem(Discovery::Event event); - void RegisterLayerShown(Layer::Type type); - void RegisterMapObjectEvent(MapObject const & mapObject, MapObject::Event::Type type, - m2::PointD const & userPos); - void RegisterTransitionToBooking(m2::PointD const & hotelPos); - void RegisterPromoAfterBookingShown(std::string const & cityId); - - base::AtomicSharedPtr m_info; - // |m_subscribers| must be used on main thread only. - std::vector m_subscribers; - - DISALLOW_COPY_AND_MOVE(Eye); -}; -} // namespace eye diff --git a/metrics/eye_info.hpp b/metrics/eye_info.hpp deleted file mode 100644 index 52f78d8fe6..0000000000 --- a/metrics/eye_info.hpp +++ /dev/null @@ -1,386 +0,0 @@ -#pragma once - -#include "coding/point_coding.hpp" - -#include "geometry/mercator.hpp" -#include "geometry/point2d.hpp" -#include "geometry/tree4d.hpp" - -#include "base/assert.hpp" -#include "base/visitor.hpp" - -#include -#include -#include -#include -#include -#include -#include - -namespace eye -{ -namespace traits -{ -namespace impl -{ -template -auto is_enum_with_count_checker(int) -> decltype( - T::Count, - std::is_enum {}); - -template -std::false_type is_enum_with_count_checker(...); -} // namespace impl - -template -using is_enum_with_count = decltype(impl::is_enum_with_count_checker(0)); -} // namespace traits - -template -using EnableIfEnumWithCount = std::enable_if_t::value>; - -template -class Counters; - -template -class Counters> -{ -public: - void Increment(T const key) - { - CHECK_NOT_EQUAL(key, T::Count, ()); - ++m_counters[static_cast(key)]; - } - - R Get(T const key) const - { - return m_counters[static_cast(key)]; - } - - template - void Visit(Visitor & visitor) - { - // We need it to support appending additional counters - // without any version increasing and migration. - std::vector loader; - visitor(loader, "counters"); - CHECK_LESS_OR_EQUAL(loader.size(), m_counters.size(), ()); - std::copy(loader.cbegin(), loader.cend(), m_counters.begin()); - } - - template - void Visit(Visitor & visitor) const - { - visitor(m_counters, "counters"); - } - - DECLARE_DEBUG_PRINT(Counters) - -private: - std::array(T::Count)> m_counters = {}; -}; - -enum class Version : int8_t -{ - Unknown = -1, - V0 = 0, - Latest = V0 -}; - -inline std::string DebugPrint(Version const & version) -{ - switch (version) - { - case Version::Unknown: return "Unknown"; - case Version::V0: return "V0"; - } -} - -using Clock = std::chrono::system_clock; -using Time = Clock::time_point; - -struct Booking -{ - DECLARE_VISITOR_AND_DEBUG_PRINT(Booking, visitor(m_lastFilterUsedTime, "last_filter_used_time")) - - Time m_lastFilterUsedTime; -}; - -struct Bookmarks -{ - DECLARE_VISITOR_AND_DEBUG_PRINT(Bookmarks, visitor(m_lastOpenedTime, "last_use_time")) - - Time m_lastOpenedTime; -}; - -struct Discovery -{ - // The order is important. - // New types must be added before Type::Count item. - enum class Event - { - HotelsClicked, - AttractionsClicked, - CafesClicked, - LocalsClicked, - - MoreHotelsClicked, - MoreAttractionsClicked, - MoreCafesClicked, - MoreLocalsClicked, - - PromoClicked, - MorePromoClicked, - - Count - }; - - DECLARE_VISITOR_AND_DEBUG_PRINT(Discovery, visitor(m_eventCounters, "event_counters"), - visitor(m_lastOpenedTime, "last_opened_time"), - visitor(m_lastClickedTime, "last_clicked_time")) - - Counters m_eventCounters; - Time m_lastOpenedTime; - Time m_lastClickedTime; -}; - -struct Layer -{ - enum class Type : uint8_t - { - TrafficJams, - PublicTransport, - Isolines, - }; - - DECLARE_VISITOR_AND_DEBUG_PRINT(Layer, visitor(m_type, "type"), visitor(m_useCount, "use_count"), - visitor(m_lastTimeUsed, "last_time_used")) - - Type m_type; - uint64_t m_useCount = 0; - Time m_lastTimeUsed; -}; - -using Layers = std::vector; - -struct Tip -{ - // The order is important. - // New types must be added before Type::Count item. - enum class Type : uint8_t - { - BookmarksCatalog, - BookingHotels, - DiscoverButton, - PublicTransport, - Isolines, - - Count - }; - - // The order is important. - // New types must be added before Type::Count item. - enum class Event : uint8_t - { - ActionClicked, - GotitClicked, - - Count - }; - - DECLARE_VISITOR_AND_DEBUG_PRINT(Tip, visitor(m_type, "type"), - visitor(m_eventCounters, "event_counters"), - visitor(m_lastShownTime, "last_shown_time")) - - Type m_type; - Counters m_eventCounters; - Time m_lastShownTime; -}; - -using Tips = std::vector; - -class MapObject -{ -public: - struct Event - { - enum class Type : uint8_t - { - Open, - AddToBookmark, - UgcEditorOpened, - UgcSaved, - RouteToCreated, - }; - - DECLARE_VISITOR(visitor(m_type, "type"), visitor(m_userPos, "user_pos"), - visitor(m_eventTime, "event_time")); - - Type m_type; - m2::PointD m_userPos; - Time m_eventTime; - }; - - using Events = std::deque; - - bool operator==(MapObject const & rhs) const - { - return GetPos() == rhs.GetPos() && GetBestType() == rhs.GetBestType() && - GetDefaultName() == rhs.GetDefaultName(); - } - - bool operator!=(MapObject const & rhs) const { return !((*this) == rhs); } - - bool AlmostEquals(MapObject const & rhs) const - { - return GetPos().EqualDxDy(rhs.GetPos(), kMwmPointAccuracy) && - GetBestType() == rhs.GetBestType() && GetDefaultName() == rhs.GetDefaultName(); - } - - std::string const & GetBestType() const { return m_bestType; } - - void SetBestType(std::string const & bestType) { m_bestType = bestType; } - - m2::PointD const & GetPos() const { return m_pos; } - - void SetPos(m2::PointD const & pos) - { - m_pos = pos; - m_limitRect = mercator::RectByCenterXYAndOffset(pos, kMwmPointAccuracy); - } - - std::string const & GetDefaultName() const { return m_defaultName; } - - void SetDefaultName(std::string const & defaultName) { m_defaultName = defaultName; } - - std::string const & GetReadableName() const { return m_readableName; } - - void SetReadableName(std::string const & readableName) { m_readableName = readableName; } - - MapObject::Events & GetEditableEvents() const { return m_events; } - - MapObject::Events const & GetEvents() const { return m_events; } - - m2::RectD GetLimitRect() const { return m_limitRect; } - - bool IsEmpty() const { return m_bestType.empty(); } - - DECLARE_VISITOR(visitor(m_bestType, "type"), visitor(m_pos, "pos"), - visitor(m_readableName, "readable_name"), visitor(m_defaultName, "default_name"), - visitor(m_events, "events")) - -private: - std::string m_bestType; - m2::PointD m_pos; - std::string m_defaultName; - std::string m_readableName; - // Mutable because of interface of the m4::Tree provides constant references in ForEach methods, - // but we need to add events into existing objects to avoid some overhead (copy + change + - // remove + insert operations). The other solution is to use const_cast in ForEach methods. - mutable MapObject::Events m_events; - m2::RectD m_limitRect; -}; - -struct Promo -{ - Promo() = default; - - DECLARE_VISITOR_AND_DEBUG_PRINT(Promo, - visitor(m_transitionToBookingTime, "transitionToBookingTime"), - visitor(m_lastTimeShownAfterBooking, "lastTimeShownAfterBooking"), - visitor(m_lastTimeShownAfterBookingCityId, - "lastTimeShownAfterBookingCityId")) - Time m_transitionToBookingTime; - Time m_lastTimeShownAfterBooking; - std::string m_lastTimeShownAfterBookingCityId; -}; - -using MapObjects = m4::Tree; - -struct InfoV0 -{ - static Version GetVersion() { return Version::V0; } - DECLARE_VISITOR_AND_DEBUG_PRINT(InfoV0, visitor(m_booking, "booking"), - visitor(m_bookmarks, "bookmarks"), - visitor(m_discovery, "discovery"), visitor(m_layers, "layers"), - visitor(m_tips, "tips"), visitor(m_promo, Promo(), "promo")) - - Booking m_booking; - Bookmarks m_bookmarks; - Discovery m_discovery; - Layers m_layers; - Tips m_tips; - MapObjects m_mapObjects; - Promo m_promo; -}; - -using Info = InfoV0; - -inline std::string DebugPrint(Tip::Type const & type) -{ - switch (type) - { - case Tip::Type::BookmarksCatalog: return "BookmarksCatalog"; - case Tip::Type::BookingHotels: return "BookingHotels"; - case Tip::Type::DiscoverButton: return "DiscoverButton"; - case Tip::Type::PublicTransport: return "PublicTransport"; - case Tip::Type::Isolines: return "Isolines"; - case Tip::Type::Count: return "Count"; - } - UNREACHABLE(); -} - -inline std::string DebugPrint(Tip::Event const & type) -{ - switch (type) - { - case Tip::Event::ActionClicked: return "ActionClicked"; - case Tip::Event::GotitClicked: return "GotitClicked"; - case Tip::Event::Count: return "Count"; - } - UNREACHABLE(); -} - -inline std::string DebugPrint(Layer::Type const & type) -{ - switch (type) - { - case Layer::Type::TrafficJams: return "TrafficJams"; - case Layer::Type::PublicTransport: return "PublicTransport"; - case Layer::Type::Isolines: return "Isolines"; - } - UNREACHABLE(); -} - -inline std::string DebugPrint(Discovery::Event const & event) -{ - switch (event) - { - case Discovery::Event::HotelsClicked: return "HotelsClicked"; - case Discovery::Event::AttractionsClicked: return "AttractionsClicked"; - case Discovery::Event::CafesClicked: return "CafesClicked"; - case Discovery::Event::LocalsClicked: return "LocalsClicked"; - case Discovery::Event::PromoClicked: return "PromoClicked"; - case Discovery::Event::MoreHotelsClicked: return "MoreHotelsClicked"; - case Discovery::Event::MoreAttractionsClicked: return "MoreAttractionsClicked"; - case Discovery::Event::MoreCafesClicked: return "MoreCafesClicked"; - case Discovery::Event::MoreLocalsClicked: return "MoreLocalsClicked"; - case Discovery::Event::MorePromoClicked: return "MorePromoClicked"; - case Discovery::Event::Count: return "Count"; - } - UNREACHABLE(); -} - -inline std::string DebugPrint(MapObject::Event::Type const & type) -{ - switch (type) - { - case MapObject::Event::Type::Open: return "Open"; - case MapObject::Event::Type::AddToBookmark: return "AddToBookmark"; - case MapObject::Event::Type::UgcEditorOpened: return "UgcEditorOpened"; - case MapObject::Event::Type::UgcSaved: return "UgcSaved"; - case MapObject::Event::Type::RouteToCreated: return "RouteToCreated"; - } - UNREACHABLE(); -} -} // namespace eye diff --git a/metrics/eye_serdes.cpp b/metrics/eye_serdes.cpp deleted file mode 100644 index 8ebb81cfee..0000000000 --- a/metrics/eye_serdes.cpp +++ /dev/null @@ -1,178 +0,0 @@ -#include "metrics/eye_serdes.hpp" - -#include "coding/reader.hpp" -#include "coding/serdes_json.hpp" -#include "coding/write_to_sink.hpp" -#include "coding/writer.hpp" - -#include "geometry/point2d.hpp" - -#include "base/logging.hpp" - -#include -#include -#include - -namespace -{ -struct MapObjectEvent -{ - DECLARE_VISITOR(visitor(m_bestPoiType, "best_type"), visitor(m_poiPos, "pos"), - visitor(m_readableName, "readable_name"), visitor(m_defaultName, "default_name"), - visitor(m_event, "event")); - - std::string m_bestPoiType; - m2::PointD m_poiPos; - std::string m_defaultName; - std::string m_readableName; - eye::MapObject::Event m_event; -}; -} // namespace - -namespace eye -{ -// static -void Serdes::SerializeInfo(Info const & info, std::vector & result) -{ - result.clear(); - using Sink = MemWriter>; - Sink writer(result); - - WriteToSink(writer, static_cast(Info::GetVersion())); - - coding::SerializerJson ser(writer); - ser(info); -} - -// static -void Serdes::DeserializeInfo(std::vector const & bytes, Info & result) -{ - MemReader reader(bytes.data(), bytes.size()); - NonOwningReaderSource source(reader); - - auto version = static_cast(Version::Unknown); - ReadPrimitiveFromSource(source, version); - if (version == static_cast(Version::V0)) - { - try - { - // TODO: Use temporary object InfoV0 and implement method to convert it to Info, - // TODO: when InfoV1 will be implemented. - coding::DeserializerJson des(source); - des(result); - } - catch (base::Json::Exception & ex) - { - LOG(LERROR, ("Cannot deserialize eye file. Exception:", ex.Msg(), "Version:", version, - "File content:", std::string(bytes.begin(), bytes.end()))); - } - return; - } - - MYTHROW(UnknownVersion, ("Unknown data version:", static_cast(version))); -} - -// static -void Serdes::SerializeMapObjects(MapObjects const & mapObjects, std::vector & result) -{ - result.clear(); - using Sink = MemWriter>; - - Sink writer(result); - std::string const nextLine = "\n"; - MapObjectEvent event; - - mapObjects.ForEach([&writer, &event, &nextLine](MapObject const & item) - { - for (auto const & poiEvent : item.GetEvents()) - { - // Additional scope is added because of the coding::SerializerJson dumps result at destruction. - { - coding::SerializerJson ser(writer); - event.m_bestPoiType = item.GetBestType(); - event.m_poiPos = item.GetPos(); - event.m_defaultName = item.GetDefaultName(); - event.m_readableName = item.GetReadableName(); - event.m_event = poiEvent; - ser(event); - } - writer.Write(nextLine.data(), nextLine.size()); - } - }); -} - -// static -void Serdes::DeserializeMapObjects(std::vector const & bytes, MapObjects & result) -{ - MemReader reader(bytes.data(), bytes.size()); - NonOwningReaderSource source(reader); - - std::string tmp(bytes.begin(), bytes.end()); - std::istringstream is(tmp); - - std::string eventString; - MapObjectEvent event; - MapObject poi; - - try - { - while (getline(is, eventString)) - { - if (eventString.empty()) - return; - - coding::DeserializerJson des(eventString); - des(event); - poi.SetBestType(event.m_bestPoiType); - poi.SetPos(event.m_poiPos); - poi.SetDefaultName(event.m_defaultName); - poi.SetReadableName(event.m_readableName); - - bool found = false; - result.ForEachInRect(poi.GetLimitRect(), [&found, &poi, &event](MapObject const & item) - { - if (item != poi) - return; - - if (!found) - found = true; - - item.GetEditableEvents().push_back(event.m_event); - }); - - if (!found) - { - poi.GetEditableEvents().push_back(event.m_event); - result.Add(poi); - } - } - } - catch (base::Json::Exception & ex) - { - LOG(LERROR, ("Cannot deserialize map objects. Exception:", ex.Msg(), ". Event string:", - eventString, ". Content:", std::string(bytes.begin(), bytes.end()))); - } -} - -// static -void Serdes::SerializeMapObjectEvent(MapObject const & poi, MapObject::Event const & poiEvent, - std::vector & result) -{ - result.clear(); - - using Sink = MemWriter>; - - Sink writer(result); - coding::SerializerJson ser(writer); - std::string const nextLine = "\n"; - - MapObjectEvent event; - event.m_bestPoiType = poi.GetBestType(); - event.m_poiPos = poi.GetPos(); - event.m_defaultName = poi.GetDefaultName(); - event.m_readableName = poi.GetReadableName(); - event.m_event = poiEvent; - ser(event); - writer.Write(nextLine.data(), nextLine.size()); -} -} // namespace eye diff --git a/metrics/eye_serdes.hpp b/metrics/eye_serdes.hpp deleted file mode 100644 index 6e7e9cb1f5..0000000000 --- a/metrics/eye_serdes.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "metrics/eye_info.hpp" - -#include "base/exception.hpp" - -#include -#include - -namespace eye -{ -class Serdes -{ -public: - DECLARE_EXCEPTION(UnknownVersion, RootException); - - static void SerializeInfo(Info const & info, std::vector & result); - static void DeserializeInfo(std::vector const & bytes, Info & result); - static void SerializeMapObjects(MapObjects const & mapObjects, std::vector & result); - static void DeserializeMapObjects(std::vector const & bytes, MapObjects & result); - static void SerializeMapObjectEvent(MapObject const & poi, MapObject::Event const & poiEvent, - std::vector & result); -}; -} // namespace eye diff --git a/metrics/eye_storage.cpp b/metrics/eye_storage.cpp deleted file mode 100644 index b598e2715f..0000000000 --- a/metrics/eye_storage.cpp +++ /dev/null @@ -1,141 +0,0 @@ -#include "metrics/eye_storage.hpp" - -#include "platform/platform.hpp" - -#include "coding/file_reader.hpp" -#include "coding/file_writer.hpp" -#include "coding/internal/file_data.hpp" - -#include "base/file_name_utils.hpp" -#include "base/logging.hpp" - -namespace -{ -bool Save(std::string const & filename, std::vector const & src) -{ - return base::WriteToTempAndRenameToFile(filename, [&src](std::string const & fileName) - { - try - { - FileWriter writer(fileName); - writer.Write(src.data(), src.size()); - } - catch (FileWriter::Exception const & ex) - { - LOG(LERROR, (ex.what(), ex.Msg())); - return false; - } - - return true; - }); -} - -bool Load(std::string const & filename, std::vector & dst) -{ - try - { - FileReader reader(filename); - - dst.clear(); - dst.resize(static_cast(reader.Size())); - - reader.Read(0, dst.data(), dst.size()); - } - catch (FileReader::Exception const &) - { - dst.clear(); - return false; - } - - return true; -} - -bool Append(std::string const & filename, std::vector const & src) -{ - try - { - FileWriter writer(filename, FileWriter::Op::OP_APPEND); - writer.Write(src.data(), src.size()); - } - catch (FileWriter::Exception const &) - { - return false; - } - - return true; -} -} // namespace - -namespace eye -{ -// static -std::string Storage::GetEyeDir() -{ - return base::JoinPath(GetPlatform().SettingsDir(), "metric"); -} - -// static -std::string Storage::GetInfoFilePath() -{ - return base::JoinPath(GetEyeDir(), "info"); -} - -// static -std::string Storage::GetPoiEventsFilePath() -{ - return base::JoinPath(GetEyeDir(), "events"); -} - - -// static -bool Storage::SaveInfo(std::vector const & src) -{ - return Save(GetInfoFilePath(), src); -} - -// static -bool Storage::LoadInfo(std::vector & dst) -{ - return Load(GetInfoFilePath(), dst); -} - -// static -bool Storage::SaveMapObjects(std::vector const & src) -{ - return Save(GetPoiEventsFilePath(), src); -} - -// static -bool Storage::LoadMapObjects(std::vector & dst) -{ - return Load(GetPoiEventsFilePath(), dst); -} - -// static -bool Storage::AppendMapObjectEvent(std::vector const & src) -{ - return Append(GetPoiEventsFilePath(), src); -} - -// static -void Storage::Migrate() -{ - if (!GetPlatform().MkDirChecked(GetEyeDir())) - return; - - auto const oldPath = GetPlatform().WritablePathForFile("metrics"); - if (!GetPlatform().IsFileExistsByFullPath(oldPath)) - return; - - if (GetPlatform().IsFileExistsByFullPath(GetInfoFilePath())) - { - base::DeleteFileX(oldPath); - return; - } - - if (!base::CopyFileX(oldPath, GetInfoFilePath())) - return; - - base::DeleteFileX(oldPath); -} -} // namespace eye diff --git a/metrics/eye_storage.hpp b/metrics/eye_storage.hpp deleted file mode 100644 index 737429bf8f..0000000000 --- a/metrics/eye_storage.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include -#include -#include - -namespace eye -{ -class Storage -{ -public: - static std::string GetEyeDir(); - static std::string GetInfoFilePath(); - static std::string GetPoiEventsFilePath(); - static bool SaveInfo(std::vector const & src); - static bool LoadInfo(std::vector & dst); - static bool SaveMapObjects(std::vector const & src); - static bool LoadMapObjects(std::vector & dst); - static bool AppendMapObjectEvent(std::vector const & src); - static void Migrate(); -}; -} // namespace eye diff --git a/metrics/metrics_tests/CMakeLists.txt b/metrics/metrics_tests/CMakeLists.txt deleted file mode 100644 index 29c3b6e172..0000000000 --- a/metrics/metrics_tests/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -project(metrics_tests) - -set( - SRC - eye_tests.cpp -) - -omim_add_test(${PROJECT_NAME} ${SRC}) -omim_link_libraries( - ${PROJECT_NAME} - metrics_tests_support - metrics - platform - coding - geometry - base - oauthcpp - jansson - ${LIBZ}) - -link_qt5_core(${PROJECT_NAME}) diff --git a/metrics/metrics_tests/eye_tests.cpp b/metrics/metrics_tests/eye_tests.cpp deleted file mode 100644 index 10863a7278..0000000000 --- a/metrics/metrics_tests/eye_tests.cpp +++ /dev/null @@ -1,787 +0,0 @@ -#include "testing/testing.hpp" - -#include "metrics/eye.hpp" -#include "metrics/eye_info.hpp" -#include "metrics/eye_serdes.hpp" -#include "metrics/eye_storage.hpp" - -#include "metrics/metrics_tests_support/eye_for_testing.hpp" - -#include "coding/reader.hpp" -#include "coding/serdes_json.hpp" -#include "coding/write_to_sink.hpp" -#include "coding/writer.hpp" - -#include -#include -#include -#include - -using namespace eye; - -namespace -{ -Info MakeDefaultInfoForTesting() -{ - Info info; - - Tip tip; - tip.m_type = Tip::Type::DiscoverButton; - tip.m_eventCounters.Increment(Tip::Event::GotitClicked); - tip.m_lastShownTime = Time(std::chrono::hours(101010)); - info.m_tips.emplace_back(std::move(tip)); - - info.m_booking.m_lastFilterUsedTime = Time(std::chrono::minutes(100100)); - - info.m_bookmarks.m_lastOpenedTime = Time(std::chrono::minutes(10000)); - - Layer layer; - layer.m_useCount = 3; - layer.m_lastTimeUsed = Time(std::chrono::hours(20000)); - layer.m_type = Layer::Type::PublicTransport; - info.m_layers.emplace_back(std::move(layer)); - - info.m_discovery.m_lastOpenedTime = Time(std::chrono::hours(30000)); - info.m_discovery.m_eventCounters.Increment(Discovery::Event::MoreAttractionsClicked); - info.m_discovery.m_lastClickedTime = Time(std::chrono::hours(30005)); - - MapObject poi; - poi.SetBestType("shop"); - poi.SetPos({53.652007, 108.143443}); - poi.SetDefaultName("Hello"); - poi.SetReadableName("World"); - MapObject::Event eventInfo; - eventInfo.m_eventTime = Time(std::chrono::hours(90000)); - eventInfo.m_userPos = {72.045507, 81.408095}; - eventInfo.m_type = MapObject::Event::Type::AddToBookmark; - poi.GetEditableEvents().push_back(eventInfo); - eventInfo.m_eventTime = Time(std::chrono::hours(80000)); - eventInfo.m_userPos = {53.016347, 158.683327}; - eventInfo.m_type = MapObject::Event::Type::Open; - poi.GetEditableEvents().push_back(eventInfo); - info.m_mapObjects.Add(poi); - - info.m_promo.m_lastTimeShownAfterBooking = Time(std::chrono::hours(100000)); - - return info; -} - -void CompareWithDefaultInfo(Info const & lhs) -{ - auto const rhs = MakeDefaultInfoForTesting(); - - TEST_EQUAL(lhs.m_tips.size(), 1, ()); - TEST_EQUAL(lhs.m_tips.size(), rhs.m_tips.size(), ()); - TEST_EQUAL(lhs.m_tips[0].m_type, rhs.m_tips[0].m_type, ()); - TEST_EQUAL(lhs.m_tips[0].m_lastShownTime, rhs.m_tips[0].m_lastShownTime, ()); - TEST_EQUAL(lhs.m_tips[0].m_eventCounters.Get(Tip::Event::GotitClicked), - rhs.m_tips[0].m_eventCounters.Get(Tip::Event::GotitClicked), ()); - TEST_EQUAL(lhs.m_booking.m_lastFilterUsedTime, rhs.m_booking.m_lastFilterUsedTime, ()); - TEST_EQUAL(lhs.m_bookmarks.m_lastOpenedTime, rhs.m_bookmarks.m_lastOpenedTime, ()); - TEST_EQUAL(lhs.m_layers.size(), rhs.m_layers.size(), ()); - TEST_EQUAL(lhs.m_layers.back().m_type, rhs.m_layers.back().m_type, ()); - TEST_EQUAL(lhs.m_layers.back().m_lastTimeUsed, rhs.m_layers.back().m_lastTimeUsed, ()); - TEST_EQUAL(lhs.m_layers.back().m_useCount, rhs.m_layers.back().m_useCount, ()); - TEST_EQUAL(lhs.m_discovery.m_lastOpenedTime, rhs.m_discovery.m_lastOpenedTime, ()); - TEST_EQUAL(lhs.m_discovery.m_lastClickedTime, rhs.m_discovery.m_lastClickedTime, ()); - TEST_EQUAL(lhs.m_discovery.m_eventCounters.Get(Discovery::Event::MoreAttractionsClicked), - rhs.m_discovery.m_eventCounters.Get(Discovery::Event::MoreAttractionsClicked), ()); - TEST_EQUAL(lhs.m_mapObjects.GetSize(), rhs.m_mapObjects.GetSize(), ()); - - lhs.m_mapObjects.ForEach([&rhs](MapObject const & lhsObj) - { - rhs.m_mapObjects.ForEach([&lhsObj](MapObject const & rhsObj) - { - TEST(lhsObj.GetPos().EqualDxDy(rhsObj.GetPos(), 1e-6), ()); - TEST_EQUAL(lhsObj.GetBestType(), rhsObj.GetBestType(), ()); - TEST_EQUAL(lhsObj.GetDefaultName(), rhsObj.GetDefaultName(), ()); - TEST_EQUAL(lhsObj.GetReadableName(), rhsObj.GetReadableName(), ()); - TEST_EQUAL(lhsObj.GetEvents().size(), rhsObj.GetEvents().size(), ()); - TEST(lhsObj.GetEvents()[0].m_userPos.EqualDxDy(rhsObj.GetEvents()[0].m_userPos, 1e-6), ()); - TEST_EQUAL(lhsObj.GetEvents()[0].m_eventTime, rhsObj.GetEvents()[0].m_eventTime, ()); - TEST_EQUAL(lhsObj.GetEvents()[0].m_type, rhsObj.GetEvents()[0].m_type, ()); - TEST(lhsObj.GetEvents()[1].m_userPos.EqualDxDy(rhsObj.GetEvents()[1].m_userPos, 1e-6), ()); - TEST_EQUAL(lhsObj.GetEvents()[1].m_eventTime, rhsObj.GetEvents()[1].m_eventTime, ()); - TEST_EQUAL(lhsObj.GetEvents()[1].m_type, rhsObj.GetEvents()[1].m_type, ()); - }); - }); -} - -Time GetLastShownTipTime(Tips const & tips) -{ - Time lastShownTime; - for (auto const & tip : tips) - { - if (lastShownTime < tip.m_lastShownTime) - lastShownTime = tip.m_lastShownTime; - } - - return lastShownTime; -} - -Time GetLastShownLayerTime(Layers const & layers) -{ - Time lastUsedTime; - for (auto const & layer : layers) - { - if (lastUsedTime < layer.m_lastTimeUsed) - lastUsedTime = layer.m_lastTimeUsed; - } - - return lastUsedTime; -} -} // namespace - -UNIT_TEST(Eye_SerdesTest) -{ - auto const info = MakeDefaultInfoForTesting(); - - std::vector infoData; - std::vector mapObjectsData; - eye::Serdes::SerializeInfo(info, infoData); - eye::Serdes::SerializeMapObjects(info.m_mapObjects, mapObjectsData); - Info result; - eye::Serdes::DeserializeInfo(infoData, result); - eye::Serdes::DeserializeMapObjects(mapObjectsData, result.m_mapObjects); - - CompareWithDefaultInfo(result); -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, SaveLoadTest) -{ - auto const info = MakeDefaultInfoForTesting(); - - std::vector infoData; - std::vector mapObjectsData; - eye::Serdes::SerializeInfo(info, infoData); - eye::Serdes::SerializeMapObjects(info.m_mapObjects, mapObjectsData); - TEST(eye::Storage::SaveInfo(infoData), ()); - TEST(eye::Storage::SaveMapObjects(mapObjectsData), ()); - infoData.clear(); - mapObjectsData.clear(); - TEST(eye::Storage::LoadInfo(infoData), ()); - TEST(eye::Storage::LoadMapObjects(mapObjectsData), ()); - Info result; - eye::Serdes::DeserializeInfo(infoData, result); - eye::Serdes::DeserializeMapObjects(mapObjectsData, result.m_mapObjects); - - CompareWithDefaultInfo(result); -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, AppendTipTest) -{ - { - auto const initialInfo = Eye::Instance().GetInfo(); - auto const & initialTips = initialInfo->m_tips; - - TEST(initialTips.empty(), ()); - TEST_EQUAL(GetLastShownTipTime(initialTips).time_since_epoch().count(), 0, ()); - } - { - EyeForTesting::AppendTip(Tip::Type::DiscoverButton, Tip::Event::GotitClicked); - - auto const info = Eye::Instance().GetInfo(); - auto const & tips = info->m_tips; - auto const lastShownTipTime = GetLastShownTipTime(tips); - - TEST_EQUAL(tips.size(), 1, ()); - TEST_NOT_EQUAL(tips[0].m_lastShownTime.time_since_epoch().count(), 0, ()); - TEST_EQUAL(tips[0].m_type, Tip::Type::DiscoverButton, ()); - TEST_EQUAL(tips[0].m_eventCounters.Get(Tip::Event::GotitClicked), 1, ()); - TEST_EQUAL(tips[0].m_eventCounters.Get(Tip::Event::ActionClicked), 0, ()); - TEST_NOT_EQUAL(lastShownTipTime.time_since_epoch().count(), 0, ()); - TEST_EQUAL(tips[0].m_lastShownTime, lastShownTipTime, ()); - } - - Time prevShowTime; - { - EyeForTesting::AppendTip(Tip::Type::PublicTransport, Tip::Event::ActionClicked); - - auto const info = Eye::Instance().GetInfo(); - auto const & tips = info->m_tips; - auto const lastShownTipTime = GetLastShownTipTime(tips); - - TEST_EQUAL(tips.size(), 2, ()); - TEST_NOT_EQUAL(tips[1].m_lastShownTime.time_since_epoch().count(), 0, ()); - TEST_EQUAL(tips[1].m_type, Tip::Type::PublicTransport, ()); - TEST_EQUAL(tips[1].m_eventCounters.Get(Tip::Event::GotitClicked), 0, ()); - TEST_EQUAL(tips[1].m_eventCounters.Get(Tip::Event::ActionClicked), 1, ()); - TEST_NOT_EQUAL(lastShownTipTime.time_since_epoch().count(), 0, ()); - TEST_EQUAL(tips[1].m_lastShownTime, lastShownTipTime, ()); - - prevShowTime = lastShownTipTime; - } - { - EyeForTesting::AppendTip(Tip::Type::PublicTransport, Tip::Event::GotitClicked); - - auto const info = Eye::Instance().GetInfo(); - auto const & tips = info->m_tips; - auto const lastShownTipTime = GetLastShownTipTime(tips); - - TEST_EQUAL(tips.size(), 2, ()); - TEST_NOT_EQUAL(tips[1].m_lastShownTime.time_since_epoch().count(), 0, ()); - TEST_EQUAL(tips[1].m_type, Tip::Type::PublicTransport, ()); - TEST_EQUAL(tips[1].m_eventCounters.Get(Tip::Event::GotitClicked), 1, ()); - TEST_EQUAL(tips[1].m_eventCounters.Get(Tip::Event::ActionClicked), 1, ()); - TEST_NOT_EQUAL(lastShownTipTime.time_since_epoch().count(), 0, ()); - TEST_EQUAL(tips[1].m_lastShownTime, lastShownTipTime, ()); - TEST_NOT_EQUAL(prevShowTime, lastShownTipTime, ()); - } -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, UpdateBookingFilterUsedTimeTest) -{ - auto const initialInfo = Eye::Instance().GetInfo(); - auto const & initialBooking = initialInfo->m_booking; - - TEST_EQUAL(initialBooking.m_lastFilterUsedTime, Time(), ()); - - EyeForTesting::UpdateBookingFilterUsedTime(); - - auto const info = Eye::Instance().GetInfo(); - auto const & booking = info->m_booking; - - TEST_NOT_EQUAL(initialBooking.m_lastFilterUsedTime, booking.m_lastFilterUsedTime, ()); -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, UpdateBoomarksCatalogShownTimeTest) -{ - auto const initialInfo = Eye::Instance().GetInfo(); - auto const & initialBookmarks = initialInfo->m_bookmarks; - - TEST_EQUAL(initialBookmarks.m_lastOpenedTime, Time(), ()); - - EyeForTesting::UpdateBoomarksCatalogShownTime(); - - auto const info = Eye::Instance().GetInfo(); - auto const & bookmarks = info->m_bookmarks; - - TEST_NOT_EQUAL(initialBookmarks.m_lastOpenedTime, bookmarks.m_lastOpenedTime, ()); -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, UpdateDiscoveryShownTimeTest) -{ - auto const initialInfo = Eye::Instance().GetInfo(); - auto const & initialDiscovery = initialInfo->m_discovery; - - TEST_EQUAL(initialDiscovery.m_lastOpenedTime, Time(), ()); - - EyeForTesting::UpdateDiscoveryShownTime(); - - auto const info = Eye::Instance().GetInfo(); - auto const & discovery = info->m_discovery; - - TEST_NOT_EQUAL(initialDiscovery.m_lastOpenedTime, discovery.m_lastOpenedTime, ()); -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, IncrementDiscoveryItemTest) -{ - auto const initialInfo = Eye::Instance().GetInfo(); - auto const & initialDiscovery = initialInfo->m_discovery; - - TEST_EQUAL(initialDiscovery.m_lastClickedTime, Time(), ()); - TEST_EQUAL(initialDiscovery.m_eventCounters.Get(Discovery::Event::AttractionsClicked), 0, ()); - TEST_EQUAL(initialDiscovery.m_eventCounters.Get(Discovery::Event::CafesClicked), 0, ()); - TEST_EQUAL(initialDiscovery.m_eventCounters.Get(Discovery::Event::HotelsClicked), 0, ()); - TEST_EQUAL(initialDiscovery.m_eventCounters.Get(Discovery::Event::LocalsClicked), 0, ()); - TEST_EQUAL(initialDiscovery.m_eventCounters.Get(Discovery::Event::MoreAttractionsClicked), 0, ()); - TEST_EQUAL(initialDiscovery.m_eventCounters.Get(Discovery::Event::MoreCafesClicked), 0, ()); - TEST_EQUAL(initialDiscovery.m_eventCounters.Get(Discovery::Event::MoreHotelsClicked), 0, ()); - TEST_EQUAL(initialDiscovery.m_eventCounters.Get(Discovery::Event::MoreLocalsClicked), 0, ()); - - { - EyeForTesting::IncrementDiscoveryItem(Discovery::Event::CafesClicked); - - auto const info = Eye::Instance().GetInfo(); - auto const & discovery = info->m_discovery; - - TEST_NOT_EQUAL(initialDiscovery.m_lastClickedTime, discovery.m_lastClickedTime, ()); - - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::AttractionsClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::CafesClicked), 1, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::HotelsClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::LocalsClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::MoreAttractionsClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::MoreCafesClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::MoreHotelsClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::MoreLocalsClicked), 0, ()); - } - - { - EyeForTesting::IncrementDiscoveryItem(Discovery::Event::CafesClicked); - - auto const info = Eye::Instance().GetInfo(); - auto const & discovery = info->m_discovery; - - TEST_NOT_EQUAL(initialDiscovery.m_lastClickedTime, discovery.m_lastClickedTime, ()); - - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::AttractionsClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::CafesClicked), 2, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::HotelsClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::LocalsClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::MoreAttractionsClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::MoreCafesClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::MoreHotelsClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::MoreLocalsClicked), 0, ()); - } - - { - EyeForTesting::IncrementDiscoveryItem(Discovery::Event::CafesClicked); - EyeForTesting::IncrementDiscoveryItem(Discovery::Event::HotelsClicked); - EyeForTesting::IncrementDiscoveryItem(Discovery::Event::MoreLocalsClicked); - EyeForTesting::IncrementDiscoveryItem(Discovery::Event::MoreHotelsClicked); - - auto const info = Eye::Instance().GetInfo(); - auto const & discovery = info->m_discovery; - - TEST_NOT_EQUAL(initialDiscovery.m_lastClickedTime, discovery.m_lastClickedTime, ()); - - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::AttractionsClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::CafesClicked), 3, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::HotelsClicked), 1, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::LocalsClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::MoreAttractionsClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::MoreCafesClicked), 0, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::MoreHotelsClicked), 1, ()); - TEST_EQUAL(discovery.m_eventCounters.Get(Discovery::Event::MoreLocalsClicked), 1, ()); - } -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, AppendLayerTest) -{ - { - auto const initialInfo = Eye::Instance().GetInfo(); - auto const & initialLayers = initialInfo->m_layers; - - TEST(initialLayers.empty(), ()); - TEST_EQUAL(GetLastShownLayerTime(initialLayers), Time(), ()); - } - Time prevShowTime; - { - EyeForTesting::AppendLayer(Layer::Type::PublicTransport); - - auto const info = Eye::Instance().GetInfo(); - auto const & layers = info->m_layers; - auto const prevShowTime = GetLastShownLayerTime(layers); - - TEST_EQUAL(layers.size(), 1, ()); - TEST_NOT_EQUAL(layers[0].m_lastTimeUsed, Time(), ()); - TEST_EQUAL(layers[0].m_type, Layer::Type::PublicTransport, ()); - TEST_EQUAL(layers[0].m_useCount, 1, ()); - TEST_NOT_EQUAL(prevShowTime, Time(), ()); - } - { - EyeForTesting::AppendLayer(Layer::Type::TrafficJams); - - auto const info = Eye::Instance().GetInfo(); - auto const & layers = info->m_layers; - auto const lastShownLayerTime = GetLastShownLayerTime(layers); - - TEST_EQUAL(layers.size(), 2, ()); - TEST_NOT_EQUAL(layers[1].m_lastTimeUsed, Time(), ()); - TEST_EQUAL(layers[1].m_type, Layer::Type::TrafficJams, ()); - TEST_EQUAL(layers[1].m_useCount, 1, ()); - TEST_EQUAL(layers[1].m_lastTimeUsed, lastShownLayerTime, ()); - TEST_NOT_EQUAL(prevShowTime, lastShownLayerTime, ()); - prevShowTime = lastShownLayerTime; - } - { - EyeForTesting::AppendLayer(Layer::Type::TrafficJams); - - auto const info = Eye::Instance().GetInfo(); - auto const & layers = info->m_layers; - auto const lastShownLayerTime = GetLastShownLayerTime(layers); - - TEST_EQUAL(layers.size(), 2, ()); - TEST_NOT_EQUAL(layers[1].m_lastTimeUsed, Time(), ()); - TEST_EQUAL(layers[1].m_type, Layer::Type::TrafficJams, ()); - TEST_EQUAL(layers[1].m_useCount, 2, ()); - TEST_EQUAL(layers[1].m_lastTimeUsed, lastShownLayerTime, ()); - TEST_NOT_EQUAL(prevShowTime, lastShownLayerTime, ()); - } -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, TrimExpiredMapObjectEvents) -{ - Info info; - { - MapObject poi; - poi.SetBestType("shop"); - poi.SetPos({53.652007, 108.143443}); - MapObject::Event eventInfo; - - eventInfo.m_eventTime = Clock::now() - std::chrono::hours((24 * 30 * 3) + 1); - eventInfo.m_userPos = {72.045507, 81.408095}; - eventInfo.m_type = MapObject::Event::Type::Open; - poi.GetEditableEvents().emplace_back(eventInfo); - - eventInfo.m_eventTime = - Clock::now() - (std::chrono::hours(24 * 30 * 3) + std::chrono::seconds(1)); - eventInfo.m_userPos = {72.045400, 81.408200}; - eventInfo.m_type = MapObject::Event::Type::AddToBookmark; - poi.GetEditableEvents().emplace_back(eventInfo); - - eventInfo.m_eventTime = Clock::now() - std::chrono::hours(24 * 30 * 3); - eventInfo.m_userPos = {72.045450, 81.408201}; - eventInfo.m_type = MapObject::Event::Type::RouteToCreated; - poi.GetEditableEvents().emplace_back(eventInfo); - - info.m_mapObjects.Add(poi); - } - - { - MapObject poi; - poi.SetBestType("cafe"); - poi.SetPos({53.652005, 108.143448}); - MapObject::Event eventInfo; - - eventInfo.m_eventTime = Clock::now() - std::chrono::hours(24 * 30 * 3); - eventInfo.m_userPos = {53.016347, 158.683327}; - eventInfo.m_type = MapObject::Event::Type::Open; - poi.GetEditableEvents().emplace_back(eventInfo); - - eventInfo.m_eventTime = Clock::now() - std::chrono::seconds(30); - eventInfo.m_userPos = {53.016347, 158.683327}; - eventInfo.m_type = MapObject::Event::Type::UgcEditorOpened; - poi.GetEditableEvents().emplace_back(eventInfo); - - eventInfo.m_eventTime = Clock::now(); - eventInfo.m_userPos = {53.116347, 158.783327}; - eventInfo.m_type = MapObject::Event::Type::UgcSaved; - poi.GetEditableEvents().emplace_back(eventInfo); - - info.m_mapObjects.Add(poi); - } - - EyeForTesting::SetInfo(info); - - { - auto const resultInfo = Eye::Instance().GetInfo(); - auto const & mapObjects = resultInfo->m_mapObjects; - TEST_EQUAL(mapObjects.GetSize(), 2, ()); - - { - MapObject poi; - poi.SetBestType("shop"); - poi.SetPos({53.652007, 108.143443}); - - bool found = false; - mapObjects.ForEachInRect(poi.GetLimitRect(), [&poi, &found](MapObject const & item) - { - if (poi != item) - return; - - if (!found) - found = true; - - TEST_EQUAL(item.GetEvents().size(), 3, ()); - TEST_EQUAL(item.GetEvents()[0].m_type, MapObject::Event::Type::Open, ()); - TEST_EQUAL(item.GetEvents()[1].m_userPos, m2::PointD(72.045400, 81.408200), ()); - TEST_EQUAL(item.GetEvents()[2].m_userPos, m2::PointD(72.045450, 81.408201), ()); - }); - - TEST(found, ()); - } - - { - MapObject poi; - poi.SetBestType("cafe"); - poi.SetPos({53.652005, 108.143448}); - - bool found = false; - mapObjects.ForEachInRect(poi.GetLimitRect(), [&poi, &found](MapObject const & item) - { - if (poi != item) - return; - - if (!found) - found = true; - - TEST_EQUAL(item.GetEvents().size(), 3, ()); - TEST_EQUAL(item.GetEvents()[0].m_type, MapObject::Event::Type::Open, ()); - TEST_EQUAL(item.GetEvents()[1].m_userPos, m2::PointD(53.016347, 158.683327), ()); - TEST_EQUAL(item.GetEvents()[2].m_userPos, m2::PointD(53.116347, 158.783327), ()); - }); - - TEST(found, ()); - } - } - - EyeForTesting::TrimExpiredMapObjectEvents(); - - { - auto const resultInfo = Eye::Instance().GetInfo(); - auto const & mapObjects = resultInfo->m_mapObjects; - TEST_EQUAL(mapObjects.GetSize(), 1, ()); - - { - MapObject poi; - poi.SetBestType("shop"); - poi.SetPos({53.652007, 108.143443}); - - bool found = false; - mapObjects.ForEachInRect(poi.GetLimitRect(), [&poi, &found](MapObject const & item) - { - if (poi != item) - return; - - if (!found) - found = true; - }); - - TEST(!found, ()); - } - - { - MapObject poi; - poi.SetBestType("cafe"); - poi.SetPos({53.652005, 108.143448}); - - bool found = false; - mapObjects.ForEachInRect(poi.GetLimitRect(), [&poi, &found](MapObject const & item) - { - if (poi != item) - return; - - if (!found) - found = true; - - TEST_EQUAL(item.GetEvents().size(), 2, ()); - TEST_EQUAL(item.GetEvents()[0].m_userPos, m2::PointD(53.016347, 158.683327), ()); - TEST_EQUAL(item.GetEvents()[0].m_type, MapObject::Event::Type::UgcEditorOpened, ()); - - TEST_EQUAL(item.GetEvents()[1].m_userPos, m2::PointD(53.116347, 158.783327), ()); - TEST_EQUAL(item.GetEvents()[1].m_type, MapObject::Event::Type::UgcSaved, ()); - }); - - TEST(found, ()); - } - } -} - -UNIT_CLASS_TEST(ScopedEyeForTesting, RegisterMapObjectEvent) -{ - { - MapObject poi; - poi.SetBestType("cafe"); - poi.SetPos({53.652005, 108.143448}); - m2::PointD userPos = {53.016347, 158.683327}; - - EyeForTesting::RegisterMapObjectEvent(poi, MapObject::Event::Type::Open, userPos); - - userPos = {53.016345, 158.683329}; - - EyeForTesting::RegisterMapObjectEvent(poi, MapObject::Event::Type::RouteToCreated, userPos); - } - { - MapObject poi; - poi.SetBestType("shop"); - poi.SetPos({53.652005, 108.143448}); - m2::PointD userPos = {0.0, 0.0}; - - EyeForTesting::RegisterMapObjectEvent(poi, MapObject::Event::Type::RouteToCreated, userPos); - } - - { - MapObject poi; - poi.SetBestType("shop"); - // Sould NOT be concatenated with previous poi because of different names method returns false. - poi.SetPos({53.652005, 108.143448}); - poi.SetDefaultName("No"); - m2::PointD userPos = {0.0, 0.0}; - - EyeForTesting::RegisterMapObjectEvent(poi, MapObject::Event::Type::RouteToCreated, userPos); - } - - { - MapObject poi; - poi.SetBestType("shop"); - // Sould be concatenated with previous poi because of AlmostEquals method returns true. - poi.SetPos({53.65201, 108.1434399999}); - m2::PointD userPos = {158.016345, 53.683329}; - - EyeForTesting::RegisterMapObjectEvent(poi, MapObject::Event::Type::AddToBookmark, userPos); - } - - { - MapObject poi; - poi.SetBestType("shop"); - // Sould NOT be concatenated with previous poi because of AlmostEquals method returns false. - poi.SetPos({53.65202, 108.143448}); - m2::PointD userPos = {0.0, 0.0}; - - EyeForTesting::RegisterMapObjectEvent(poi, MapObject::Event::Type::UgcEditorOpened, userPos); - } - - { - MapObject poi; - poi.SetBestType("amenity-bench"); - poi.SetPos({53.652005, 108.143448}); - m2::PointD userPos = {0.0, 0.0}; - - EyeForTesting::RegisterMapObjectEvent(poi, MapObject::Event::Type::Open, userPos); - } - - { - auto const resultInfo = Eye::Instance().GetInfo(); - auto const & mapObjects = resultInfo->m_mapObjects; - TEST_EQUAL(mapObjects.GetSize(), 5, ()); - - { - MapObject poi; - poi.SetBestType("cafe"); - poi.SetPos({53.652005, 108.143448}); - - bool found = false; - mapObjects.ForEachInRect(poi.GetLimitRect(), [&poi, &found](MapObject const & item) - { - if (poi != item) - return; - - if (!found) - found = true; - - TEST_EQUAL(item.GetEvents().size(), 2, ()); - TEST_EQUAL(item.GetEvents()[0].m_userPos, m2::PointD(53.016347, 158.683327), ()); - TEST_EQUAL(item.GetEvents()[0].m_type, MapObject::Event::Type::Open, ()); - - TEST_EQUAL(item.GetEvents()[1].m_userPos, m2::PointD(53.016345, 158.683329), ()); - TEST_EQUAL(item.GetEvents()[1].m_type, MapObject::Event::Type::RouteToCreated, ()); - }); - - TEST(found, ()); - } - - { - MapObject poi; - poi.SetBestType("shop"); - poi.SetPos({53.652005, 108.143448}); - - bool found = false; - mapObjects.ForEachInRect(poi.GetLimitRect(), [&poi, &found](MapObject const & item) - { - if (poi != item) - return; - - if (!found) - found = true; - - TEST_EQUAL(item.GetEvents().size(), 2, ()); - TEST_EQUAL(item.GetEvents()[0].m_userPos, m2::PointD(0.0, 0.0), ()); - TEST_EQUAL(item.GetEvents()[0].m_type, MapObject::Event::Type::RouteToCreated, ()); - - TEST_EQUAL(item.GetEvents()[1].m_userPos, m2::PointD(158.016345, 53.683329), ()); - TEST_EQUAL(item.GetEvents()[1].m_type, MapObject::Event::Type::AddToBookmark, ()); - }); - - TEST(found, ()); - } - - { - MapObject poi; - poi.SetBestType("amenity-bench"); - poi.SetPos({53.652005, 108.143448}); - - bool found = false; - mapObjects.ForEachInRect(poi.GetLimitRect(), [&poi, &found](MapObject const & item) - { - if (poi != item) - return; - - if (!found) - found = true; - - TEST_EQUAL(item.GetEvents().size(), 1, ()); - TEST_EQUAL(item.GetEvents()[0].m_userPos, m2::PointD(0.0, 0.0), ()); - TEST_EQUAL(item.GetEvents()[0].m_type, MapObject::Event::Type::Open, ()); - }); - - TEST(found, ()); - } - } -} - -namespace -{ -enum class First : uint8_t -{ - One, - Two, - - Count -}; - -enum class Second : uint8_t -{ - One, - Two, - Three, - Four, - - Count -}; - -std::string DebugPrint(First first) -{ - switch (first) - { - case First::One: return "One"; - case First::Two: return "Two"; - case First::Count: return "Count"; - } -} -} // namespace - -UNIT_TEST(EyeInfo_CountersSerdes) -{ - std::vector data; - - eye::Counters counters; - counters.Increment(First::One); - counters.Increment(First::Two); - - TEST_EQUAL(counters.Get(First::One), 1, ()); - TEST_EQUAL(counters.Get(First::Two), 1, ()); - - { - using Sink = MemWriter>; - Sink writer(data); - - coding::SerializerJson ser(writer); - ser(counters); - } - - { - eye::Counters result; - TEST_EQUAL(result.Get(First::One), 0, ()); - TEST_EQUAL(result.Get(First::Two), 0, ()); - - MemReader reader(data.data(), data.size()); - NonOwningReaderSource source(reader); - - coding::DeserializerJson des(source); - des(result); - - TEST_EQUAL(counters.Get(First::One), result.Get(First::One), ()); - TEST_EQUAL(counters.Get(First::Two), result.Get(First::Two), ()); - } - - { - eye::Counters result; - TEST_EQUAL(result.Get(Second::One), 0, ()); - TEST_EQUAL(result.Get(Second::Two), 0, ()); - TEST_EQUAL(result.Get(Second::Three), 0, ()); - TEST_EQUAL(result.Get(Second::Four), 0, ()); - - MemReader reader(data.data(), data.size()); - NonOwningReaderSource source(reader); - - coding::DeserializerJson des(source); - des(result); - - TEST_EQUAL(result.Get(Second::One), counters.Get(First::One), ()); - TEST_EQUAL(result.Get(Second::Two), counters.Get(First::Two), ()); - TEST_EQUAL(result.Get(Second::Three), 0, ()); - TEST_EQUAL(result.Get(Second::Four), 0, ()); - } -} diff --git a/metrics/metrics_tests_support/CMakeLists.txt b/metrics/metrics_tests_support/CMakeLists.txt deleted file mode 100644 index 8622ec56aa..0000000000 --- a/metrics/metrics_tests_support/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -project(metrics_tests_support) - -set( - SRC - eye_for_testing.cpp - eye_for_testing.hpp -) - -omim_add_library(${PROJECT_NAME} ${SRC}) diff --git a/metrics/metrics_tests_support/eye_for_testing.cpp b/metrics/metrics_tests_support/eye_for_testing.cpp deleted file mode 100644 index 53ea60fcae..0000000000 --- a/metrics/metrics_tests_support/eye_for_testing.cpp +++ /dev/null @@ -1,89 +0,0 @@ -#include "metrics/metrics_tests_support/eye_for_testing.hpp" - -#include "metrics/eye.hpp" -#include "metrics/eye_storage.hpp" - -#include "platform/platform.hpp" - -#include "coding/internal/file_data.hpp" - -#include "base/logging.hpp" -#include "base/macros.hpp" - -#include - -namespace eye -{ -// static -void EyeForTesting::ResetEye() -{ - if(!GetPlatform().MkDirChecked(Storage::GetEyeDir())) - LOG(LWARNING, ("Path", Storage::GetEyeDir(), "was not created.")); - - SetInfo({}); - - auto path = Storage::GetInfoFilePath(); - uint64_t unused; - if (base::GetFileSize(path, unused)) - base::DeleteFileX(path); - - path = Storage::GetPoiEventsFilePath(); - if (base::GetFileSize(path, unused)) - base::DeleteFileX(path); -} - -// static -void EyeForTesting::SetInfo(Info const & info) -{ - Eye::Instance().m_info.Set(std::make_shared(info)); -} - -// static -void EyeForTesting::AppendTip(Tip::Type type, Tip::Event event) -{ - Eye::Instance().RegisterTipClick(type, event); -} - -// static -void EyeForTesting::UpdateBookingFilterUsedTime() -{ - Eye::Instance().UpdateBookingFilterUsedTime(); -} - -// static -void EyeForTesting::UpdateBoomarksCatalogShownTime() -{ - Eye::Instance().UpdateBoomarksCatalogShownTime(); -} - -// static -void EyeForTesting::UpdateDiscoveryShownTime() -{ - Eye::Instance().UpdateDiscoveryShownTime(); -} - -// static -void EyeForTesting::IncrementDiscoveryItem(Discovery::Event event) -{ - Eye::Instance().IncrementDiscoveryItem(event); -} - -// static -void EyeForTesting::AppendLayer(Layer::Type type) -{ - Eye::Instance().RegisterLayerShown(type); -} - -// static -void EyeForTesting::TrimExpiredMapObjectEvents() -{ - Eye::Instance().TrimExpiredMapObjectEvents(); -} - -// static -void EyeForTesting::RegisterMapObjectEvent(MapObject const & mapObject, MapObject::Event::Type type, - m2::PointD const & userPos) -{ - Eye::Instance().RegisterMapObjectEvent(mapObject, type, userPos); -} -} // namespace eye diff --git a/metrics/metrics_tests_support/eye_for_testing.hpp b/metrics/metrics_tests_support/eye_for_testing.hpp deleted file mode 100644 index 0672acd0fe..0000000000 --- a/metrics/metrics_tests_support/eye_for_testing.hpp +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include "metrics/eye_info.hpp" - -#include "platform/platform.hpp" - -namespace eye -{ -class EyeForTesting -{ -public: - static void ResetEye(); - static void SetInfo(Info const & info); - static void AppendTip(Tip::Type type, Tip::Event event); - static void UpdateBookingFilterUsedTime(); - static void UpdateBoomarksCatalogShownTime(); - static void UpdateDiscoveryShownTime(); - static void IncrementDiscoveryItem(Discovery::Event event); - static void AppendLayer(Layer::Type type); - static void TrimExpiredMapObjectEvents(); - static void RegisterMapObjectEvent(MapObject const & mapObject, MapObject::Event::Type type, - m2::PointD const & userPos); -}; - -class ScopedEyeForTesting -{ -public: - ScopedEyeForTesting() { EyeForTesting::ResetEye(); } - ~ScopedEyeForTesting() { EyeForTesting::ResetEye(); } - -private: - Platform::ThreadRunner m_runner; -}; -} // namespace eye diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt index b5156569a6..e57abfdc94 100644 --- a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt +++ b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt @@ -53,7 +53,6 @@ omim_link_libraries( kml editor indexer - metrics platform mwm_diff bsdiff diff --git a/partners_api/partners_api_tests/CMakeLists.txt b/partners_api/partners_api_tests/CMakeLists.txt index 43a836ca51..357ea25e7d 100644 --- a/partners_api/partners_api_tests/CMakeLists.txt +++ b/partners_api/partners_api_tests/CMakeLists.txt @@ -10,7 +10,6 @@ set( guides_on_map_tests.cpp # Maxim taxi project is disabled. # maxim_tests.cpp - promo_tests.cpp rutaxi_tests.cpp taxi_engine_tests.cpp taxi_places_tests.cpp @@ -23,10 +22,8 @@ omim_add_test(${PROJECT_NAME} ${SRC}) omim_link_libraries( ${PROJECT_NAME} platform_tests_support - metrics_tests_support partners_api web_api - metrics storage indexer platform diff --git a/partners_api/partners_api_tests/promo_tests.cpp b/partners_api/partners_api_tests/promo_tests.cpp deleted file mode 100644 index a5f96f71fe..0000000000 --- a/partners_api/partners_api_tests/promo_tests.cpp +++ /dev/null @@ -1,144 +0,0 @@ -#include "testing/testing.hpp" - -#include "partners_api/promo_api.hpp" - -#include "platform/settings.hpp" - -#include "metrics/metrics_tests_support/eye_for_testing.hpp" - -#include "platform/platform_tests_support/async_gui_thread.hpp" - -#include - -using namespace eye; -using namespace platform::tests_support; - -namespace -{ -// It should be compatible with test id on test server side at tools/python/ResponseProvider.py:150. -// On server side this value is negative because of the prod server does not support unsigned values. -std::string const kTestId = "13835058055282357840"; - -class ScopedEyeWithAsyncGuiThread : public AsyncGuiThread -{ -public: - ScopedEyeWithAsyncGuiThread() - { - EyeForTesting::ResetEye(); - } - - ~ScopedEyeWithAsyncGuiThread() override - { - EyeForTesting::ResetEye(); - } -}; - -class DelegateForTesting : public promo::Api::Delegate -{ -public: - std::string GetCityId(m2::PointD const &) override { return kTestId; } - platform::HttpClient::Headers GetHeaders() override { return {}; } -}; -} // namespace - -UNIT_CLASS_TEST(ScopedEyeWithAsyncGuiThread, Promo_GetAfterBooking) -{ - promo::Api api; - std::string lang = "en"; - - settings::Set("BookingPromoAwaitingForId", kTestId); - TEST_EQUAL(api.GetAfterBooking(lang).IsEmpty(), true, ()); - - Info info; - info.m_promo.m_transitionToBookingTime = Clock::now() - std::chrono::hours(2); - EyeForTesting::SetInfo(info); - settings::Set("BookingPromoAwaitingForId", kTestId); - TEST_EQUAL(api.GetAfterBooking(lang).IsEmpty(), true, ()); - - info.m_promo.m_transitionToBookingTime = Clock::now() - std::chrono::minutes(6); - EyeForTesting::SetInfo(info); - settings::Set("BookingPromoAwaitingForId", kTestId); - TEST_EQUAL(api.GetAfterBooking(lang).IsEmpty(), false, ()); -} - -UNIT_CLASS_TEST(ScopedEyeWithAsyncGuiThread, Promo_GetCityGallery) -{ - promo::Api api("http://localhost:34568/"); - api.SetDelegate(std::make_unique()); - auto const lang = "en"; - - { - promo::CityGallery result{}; - api.GetCityGallery({}, lang, UTM::None, [&result](promo::CityGallery const & gallery) - { - result = gallery; - testing::Notify(); - }, - [] - { - testing::Notify(); - }); - - testing::Wait(); - TEST_EQUAL(result.m_items.size(), 2, ()); - } - { - promo::CityGallery result{}; - m2::PointD pt; - api.GetCityGallery(pt, lang, UTM::None, [&result](promo::CityGallery const & gallery) - { - result = gallery; - testing::Notify(); - }, - [] - { - testing::Notify(); - }); - - testing::Wait(); - TEST_EQUAL(result.m_items.size(), 2, ()); - } -} - -UNIT_CLASS_TEST(ScopedEyeWithAsyncGuiThread, Promo_GetCityGallerySingleItem) -{ - { - promo::Api api("http://localhost:34568/single/empty/"); - api.SetDelegate(std::make_unique()); - auto const lang = "en"; - - promo::CityGallery result{}; - api.GetCityGallery({}, lang, UTM::None, [&result](promo::CityGallery const & gallery) - { - result = gallery; - testing::Notify(); - }, - [] - { - testing::Notify(); - }); - - testing::Wait(); - TEST_EQUAL(result.m_items.size(), 0, ()); - } - { - promo::Api api("http://localhost:34568/single/"); - api.SetDelegate(std::make_unique()); - auto const lang = "en"; - - promo::CityGallery result{}; - m2::PointD pt; - api.GetCityGallery(pt, lang, UTM::None, [&result](promo::CityGallery const & gallery) - { - result = gallery; - testing::Notify(); - }, - [] - { - testing::Notify(); - }); - - testing::Wait(); - TEST_EQUAL(result.m_items.size(), 1, ()); - } -} diff --git a/partners_api/promo_api.cpp b/partners_api/promo_api.cpp index bcd7757757..e68ff664c2 100644 --- a/partners_api/promo_api.cpp +++ b/partners_api/promo_api.cpp @@ -5,6 +5,8 @@ #include "platform/preferred_languages.hpp" #include "platform/settings.hpp" +#include "geometry/mercator.hpp" + #include "coding/url.hpp" #include "base/assert.hpp" @@ -26,27 +28,6 @@ namespace promo { namespace { -constexpr minutes kMinMinutesAfterBooking = minutes(5); -constexpr minutes kMaxMinutesAfterBooking = minutes(60); -constexpr hours kShowPromoNotRaterThan = hours(24); - -bool NeedToShowImpl(std::string const & bookingPromoAwaitingForId, eye::Eye::InfoType const & eyeInfo) -{ - if (bookingPromoAwaitingForId.empty() || - bookingPromoAwaitingForId == eyeInfo->m_promo.m_lastTimeShownAfterBookingCityId) - { - return false; - } - - auto const timeSinceLastShown = eye::Clock::now() - eyeInfo->m_promo.m_lastTimeShownAfterBooking; - auto const timeSinceLastTransitionToBooking = - eye::Clock::now() - eyeInfo->m_promo.m_transitionToBookingTime; - - return timeSinceLastTransitionToBooking >= kMinMinutesAfterBooking && - timeSinceLastTransitionToBooking <= kMaxMinutesAfterBooking && - timeSinceLastShown > kShowPromoNotRaterThan; -} - void ParseCityGallery(std::string const & src, UTM utm, std::string const & utmTerm, promo::CityGallery & result) { @@ -149,17 +130,6 @@ std::string MakePoiGalleryUrl(std::string const & baseUrl, std::string const & i return url::Make(url::Join(baseUrl, "gallery/v2/search/"), params); } -std::string GetPictureUrl(std::string const & baseUrl, std::string const & id) -{ - // Support opensource build. - if (baseUrl.empty()) - return {}; - - ASSERT_EQUAL(baseUrl.back(), '/', ()); - - return baseUrl + "bookmarks_catalogue/city/" + ToSignedId(id) + ".jpg"; -} - std::string GetCityCatalogueUrl(std::string const & baseUrl, std::string const & id) { // Support opensource build. @@ -208,27 +178,6 @@ void GetPromoGalleryImpl(std::string const & url, platform::HttpClient::Headers onSuccess(result.IsEmpty() ? CityGallery{} : std::move(result)); }); } - -std::string LoadPromoIdForBooking(eye::Eye::InfoType const & eyeInfo) -{ - std::string bookingPromoAwaitingForId; - settings::TryGet("BookingPromoAwaitingForId", bookingPromoAwaitingForId); - - if (bookingPromoAwaitingForId.empty()) - return bookingPromoAwaitingForId; - - auto const timeSinceLastTransitionToBooking = - eye::Clock::now() - eyeInfo->m_promo.m_transitionToBookingTime; - - if (timeSinceLastTransitionToBooking < kMinMinutesAfterBooking || - timeSinceLastTransitionToBooking > kMaxMinutesAfterBooking) - { - settings::Delete("BookingPromoAwaitingForId"); - bookingPromoAwaitingForId.clear(); - } - - return bookingPromoAwaitingForId; -} } // namespace Api::Api(std::string const & baseUrl /* = BOOKMARKS_CATALOG_FRONT_URL */, @@ -243,19 +192,6 @@ void Api::SetDelegate(std::unique_ptr delegate) m_delegate = std::move(delegate); } -AfterBooking Api::GetAfterBooking(std::string const & lang) const -{ - auto const eyeInfo = eye::Eye::Instance().GetInfo(); - - auto const promoId = LoadPromoIdForBooking(eyeInfo); - - if (!NeedToShowImpl(promoId, eyeInfo)) - return {}; - - return {promoId, InjectUTM(GetCityCatalogueUrl(m_baseUrl, promoId), UTM::BookingPromo), - GetPictureUrl(m_basePicturesUrl, promoId)}; -} - std::string Api::GetLinkForDownloader(std::string const & id) const { return InjectUTM(GetCityCatalogueUrl(m_baseUrl, id), UTM::DownloadMwmBanner); @@ -292,12 +228,4 @@ void Api::GetPoiGallery(m2::PointD const & point, std::string const & lang, Tags auto const headers = m_delegate->GetHeaders(); GetPromoGalleryImpl(url, headers, utm, "", onSuccess, onError); } - -void Api::OnTransitionToBooking(m2::PointD const & hotelPos) -{ - auto const id = m_delegate->GetCityId(hotelPos); - - if (!id.empty()) - settings::Set("BookingPromoAwaitingForId", id); -} } // namespace promo diff --git a/partners_api/promo_api.hpp b/partners_api/promo_api.hpp index 8e422e4b54..3c3ef0183e 100644 --- a/partners_api/promo_api.hpp +++ b/partners_api/promo_api.hpp @@ -2,8 +2,6 @@ #include "partners_api/utm.hpp" -#include "metrics/eye.hpp" - #include "platform/http_client.hpp" #include "platform/safe_callback.hpp" @@ -78,7 +76,7 @@ using CityGalleryCallback = platform::SafeCallback; using Tags = std::vector; -class Api : public eye::Subscriber +class Api { public: class Delegate @@ -94,7 +92,6 @@ public: std::string const & basePicturesUrl = PICTURES_URL); void SetDelegate(std::unique_ptr delegate); - AfterBooking GetAfterBooking(std::string const & lang) const; std::string GetLinkForDownloader(std::string const & id) const; std::string GetCityUrl(m2::PointD const & point) const; void GetCityGallery(m2::PointD const & point, std::string const & lang, UTM utm, @@ -103,9 +100,6 @@ public: bool useCoordinates, UTM utm, CityGalleryCallback const & onSuccess, OnError const & onError) const; - // eye::Subscriber overrides: - void OnTransitionToBooking(m2::PointD const & hotelPos) override; - private: std::unique_ptr m_delegate; diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 26830bac71..d49781633a 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -93,7 +93,6 @@ omim_link_libraries( kml editor indexer - metrics platform geometry coding diff --git a/routing/routing_integration_tests/CMakeLists.txt b/routing/routing_integration_tests/CMakeLists.txt index 326f7d5105..1ba0082913 100644 --- a/routing/routing_integration_tests/CMakeLists.txt +++ b/routing/routing_integration_tests/CMakeLists.txt @@ -64,7 +64,6 @@ omim_link_libraries( kml editor indexer - metrics platform oauthcpp geometry diff --git a/search/search_quality/assessment_tool/CMakeLists.txt b/search/search_quality/assessment_tool/CMakeLists.txt index 218ae1161c..7f770c89e8 100644 --- a/search/search_quality/assessment_tool/CMakeLists.txt +++ b/search/search_quality/assessment_tool/CMakeLists.txt @@ -61,7 +61,6 @@ omim_link_libraries( kml editor indexer - metrics platform mwm_diff bsdiff diff --git a/storage/storage_integration_tests/CMakeLists.txt b/storage/storage_integration_tests/CMakeLists.txt index c3a8970889..bf9e69e1bb 100644 --- a/storage/storage_integration_tests/CMakeLists.txt +++ b/storage/storage_integration_tests/CMakeLists.txt @@ -40,7 +40,6 @@ omim_link_libraries( kml editor indexer - metrics platform opening_hours mwm_diff diff --git a/transit/world_feed/CMakeLists.txt b/transit/world_feed/CMakeLists.txt index 50731cca43..72db7e48f8 100644 --- a/transit/world_feed/CMakeLists.txt +++ b/transit/world_feed/CMakeLists.txt @@ -37,7 +37,6 @@ omim_link_libraries( kml editor indexer - metrics platform geometry coding diff --git a/transit/world_feed/world_feed_tests/CMakeLists.txt b/transit/world_feed/world_feed_tests/CMakeLists.txt index c021e30f3d..c41e4d2a7c 100644 --- a/transit/world_feed/world_feed_tests/CMakeLists.txt +++ b/transit/world_feed/world_feed_tests/CMakeLists.txt @@ -31,7 +31,6 @@ omim_link_libraries( kml editor indexer - metrics platform geometry coding diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index 78eda92bfa..811dc425e7 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -24,8 +24,6 @@ 39E3C60423312BA800FB0C37 /* features_fetcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39E3C60223312BA800FB0C37 /* features_fetcher.cpp */; }; 3D035CA82451960400C21B57 /* guides_on_map_delegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D035CA62451960400C21B57 /* guides_on_map_delegate.cpp */; }; 3D035CA92451960400C21B57 /* guides_on_map_delegate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D035CA72451960400C21B57 /* guides_on_map_delegate.hpp */; }; - 3D089872247FF5FE00837783 /* layers_statistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D089870247FF5FE00837783 /* layers_statistics.cpp */; }; - 3D089873247FF5FE00837783 /* layers_statistics.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D089871247FF5FE00837783 /* layers_statistics.hpp */; }; 3D0AEAFC1FBB0FF400AD042B /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0AEAFF1FBB0FF400AD042B /* libgenerator_tests_support.a */; }; 3D0AEAFE1FBB0FF400AD042B /* libsearch_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0AEB011FBB0FF400AD042B /* libsearch_tests_support.a */; }; 3D0BBAE523F3EEEF00A50354 /* libweb_api.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0BBAE423F3EEEF00A50354 /* libweb_api.a */; }; @@ -33,8 +31,6 @@ 3D0BBAE923F3EF4B00A50354 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0BBAE823F3EF4B00A50354 /* CoreLocation.framework */; }; 3D0BBAEB23F3EF9D00A50354 /* libdescriptions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0BBAEA23F3EF9D00A50354 /* libdescriptions.a */; }; 3D0BBAED23F3EFBC00A50354 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0BBAEC23F3EFBC00A50354 /* Security.framework */; }; - 3D0D2F7323D854AA00945C8D /* tips_api_delegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D0D2F7123D854AA00945C8D /* tips_api_delegate.cpp */; }; - 3D0D2F7423D854AA00945C8D /* tips_api_delegate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D0D2F7223D854AA00945C8D /* tips_api_delegate.hpp */; }; 3D1775A42317E2FD00F8889C /* promo_catalog_poi_checker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D1775A22317E2FD00F8889C /* promo_catalog_poi_checker.hpp */; }; 3D18DC3C22956DD100A583A6 /* framework_light_delegate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D18DC3922956DD100A583A6 /* framework_light_delegate.hpp */; }; 3D18DC3D22956DD100A583A6 /* promo_delegate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D18DC3A22956DD100A583A6 /* promo_delegate.hpp */; }; @@ -48,9 +44,6 @@ 3D4E99A21FB4A6410025B48C /* booking_filter_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D4E999E1FB4A6400025B48C /* booking_filter_cache.hpp */; }; 3D4E99A31FB4A6410025B48C /* booking_filter_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4E999F1FB4A6400025B48C /* booking_filter_cache.cpp */; }; 3D4E99A51FB4A6410025B48C /* booking_filter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D4E99A11FB4A6410025B48C /* booking_filter.hpp */; }; - 3D4F44BB21345D270005E765 /* tips_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D4F44B921345D270005E765 /* tips_api.hpp */; }; - 3D4F44BC21345D270005E765 /* tips_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4F44BA21345D270005E765 /* tips_api.cpp */; }; - 3D4F4582213552AD0005E765 /* tips_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4F4581213552AD0005E765 /* tips_tests.cpp */; }; 3D62CBCC20F4DFD600E7BB6E /* search_product_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D62CBCB20F4DFD600E7BB6E /* search_product_info.hpp */; }; 3D62CBD920FF6C8B00E7BB6E /* discovery_search.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D62CBD720FF6C8B00E7BB6E /* discovery_search.cpp */; }; 3D62CBDA20FF6C8B00E7BB6E /* discovery_search.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D62CBD820FF6C8B00E7BB6E /* discovery_search.hpp */; }; @@ -93,18 +86,8 @@ 3DA5723320C195ED007BDE27 /* viewport_search_callback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DA5722F20C195EC007BDE27 /* viewport_search_callback.cpp */; }; 3DBD7B92240D523400ED9FE8 /* elevation_info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7B90240D523300ED9FE8 /* elevation_info.cpp */; }; 3DBD7B93240D523400ED9FE8 /* elevation_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7B91240D523300ED9FE8 /* elevation_info.hpp */; }; - 3DD1166621888AAC007A2ED4 /* notification_queue_serdes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1165F21888AAC007A2ED4 /* notification_queue_serdes.cpp */; }; - 3DD1166721888AAC007A2ED4 /* notification_queue.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1166021888AAC007A2ED4 /* notification_queue.hpp */; }; - 3DD1166821888AAC007A2ED4 /* notification_queue_storage.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1166121888AAC007A2ED4 /* notification_queue_storage.hpp */; }; - 3DD1166921888AAC007A2ED4 /* notification_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1166221888AAC007A2ED4 /* notification_manager.cpp */; }; - 3DD1166A21888AAD007A2ED4 /* notification_queue_storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1166321888AAC007A2ED4 /* notification_queue_storage.cpp */; }; - 3DD1166B21888AAD007A2ED4 /* notification_manager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1166421888AAC007A2ED4 /* notification_manager.hpp */; }; - 3DD1166C21888AAD007A2ED4 /* notification_queue_serdes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1166521888AAC007A2ED4 /* notification_queue_serdes.hpp */; }; 3DD122BB2135708900EDFB53 /* libmetrics_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DD122BA2135708900EDFB53 /* libmetrics_tests_support.a */; }; 3DD122BD2135708900EDFB53 /* libmetrics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DD122BC2135708900EDFB53 /* libmetrics.a */; }; - 3DD692AD2209E253001C3C62 /* notification_queue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DD692AC2209E253001C3C62 /* notification_queue.cpp */; }; - 3DD692B02209E272001C3C62 /* notification_manager_delegate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DD692AE2209E272001C3C62 /* notification_manager_delegate.hpp */; }; - 3DD692B12209E272001C3C62 /* notification_manager_delegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DD692AF2209E272001C3C62 /* notification_manager_delegate.cpp */; }; 3DD692B3220AD240001C3C62 /* caching_address_getter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DD692B2220AD240001C3C62 /* caching_address_getter.hpp */; }; 3DE28A7824BE05220009465C /* booking_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DE28A7624BE05220009465C /* booking_utils.cpp */; }; 3DE28A7924BE05220009465C /* booking_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DE28A7724BE05220009465C /* booking_utils.hpp */; }; @@ -115,12 +98,9 @@ 3DF528D7237DC82E000ED0D5 /* catalog_headers_provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DF528D4237DC82E000ED0D5 /* catalog_headers_provider.cpp */; }; 3DF528D8237DC82E000ED0D5 /* position_provider.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DF528D5237DC82E000ED0D5 /* position_provider.hpp */; }; 3DF528D9237DC82E000ED0D5 /* catalog_headers_provider.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DF528D6237DC82E000ED0D5 /* catalog_headers_provider.hpp */; }; - 3DF54F80219DD21000D12E37 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DF54F7E219DD21000D12E37 /* utils.cpp */; }; - 3DF54F81219DD21000D12E37 /* utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DF54F7F219DD21000D12E37 /* utils.hpp */; }; 3DF54F8A21AEA04A00D12E37 /* framework_light.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DF54F8921AEA04900D12E37 /* framework_light.cpp */; }; 40ACC79623191C2600238E21 /* countries_names_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40ACC79223191C2500238E21 /* countries_names_tests.cpp */; }; 40ACC79723191C2600238E21 /* check_mwms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40ACC79323191C2600238E21 /* check_mwms.cpp */; }; - 40ACC79823191C2600238E21 /* notification_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40ACC79423191C2600238E21 /* notification_tests.cpp */; }; 40ACC79923191C2600238E21 /* power_manager_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40ACC79523191C2600238E21 /* power_manager_tests.cpp */; }; 451E692921494C2700764A97 /* purchase.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 451E692721494C2600764A97 /* purchase.hpp */; }; 451E692A21494C2700764A97 /* purchase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 451E692821494C2700764A97 /* purchase.cpp */; }; @@ -315,8 +295,6 @@ 39E3C60223312BA800FB0C37 /* features_fetcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_fetcher.cpp; sourceTree = ""; }; 3D035CA62451960400C21B57 /* guides_on_map_delegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = guides_on_map_delegate.cpp; sourceTree = ""; }; 3D035CA72451960400C21B57 /* guides_on_map_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = guides_on_map_delegate.hpp; sourceTree = ""; }; - 3D089870247FF5FE00837783 /* layers_statistics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = layers_statistics.cpp; sourceTree = ""; }; - 3D089871247FF5FE00837783 /* layers_statistics.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = layers_statistics.hpp; sourceTree = ""; }; 3D0AEAFF1FBB0FF400AD042B /* libgenerator_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgenerator_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3D0AEB001FBB0FF400AD042B /* libindexer_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libindexer_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3D0AEB011FBB0FF400AD042B /* libsearch_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsearch_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -328,8 +306,6 @@ 3D0BBB9723F3F45F00A50354 /* libindexer_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libindexer_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3D0BBB9923F3FCF700A50354 /* libweb_api.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libweb_api.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3D0BBB9B23F3FDAE00A50354 /* libtraffic.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtraffic.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 3D0D2F7123D854AA00945C8D /* tips_api_delegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tips_api_delegate.cpp; sourceTree = ""; }; - 3D0D2F7223D854AA00945C8D /* tips_api_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tips_api_delegate.hpp; sourceTree = ""; }; 3D1775A22317E2FD00F8889C /* promo_catalog_poi_checker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = promo_catalog_poi_checker.hpp; sourceTree = ""; }; 3D18DC3922956DD100A583A6 /* framework_light_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = framework_light_delegate.hpp; sourceTree = ""; }; 3D18DC3A22956DD100A583A6 /* promo_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = promo_delegate.hpp; sourceTree = ""; }; @@ -343,11 +319,8 @@ 3D4E999E1FB4A6400025B48C /* booking_filter_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = booking_filter_cache.hpp; sourceTree = ""; }; 3D4E999F1FB4A6400025B48C /* booking_filter_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_filter_cache.cpp; sourceTree = ""; }; 3D4E99A11FB4A6410025B48C /* booking_filter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = booking_filter.hpp; sourceTree = ""; }; - 3D4F44B921345D270005E765 /* tips_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tips_api.hpp; sourceTree = ""; }; - 3D4F44BA21345D270005E765 /* tips_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tips_api.cpp; sourceTree = ""; }; 3D4F457D21354F720005E765 /* libeye_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libeye_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3D4F457F21354F720005E765 /* libeye.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libeye.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 3D4F4581213552AD0005E765 /* tips_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tips_tests.cpp; sourceTree = ""; }; 3D62CBCB20F4DFD600E7BB6E /* search_product_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_product_info.hpp; sourceTree = ""; }; 3D62CBD720FF6C8B00E7BB6E /* discovery_search.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = discovery_search.cpp; sourceTree = ""; }; 3D62CBD820FF6C8B00E7BB6E /* discovery_search.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = discovery_search.hpp; sourceTree = ""; }; @@ -389,18 +362,8 @@ 3DA5722F20C195EC007BDE27 /* viewport_search_callback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = viewport_search_callback.cpp; sourceTree = ""; }; 3DBD7B90240D523300ED9FE8 /* elevation_info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = elevation_info.cpp; sourceTree = ""; }; 3DBD7B91240D523300ED9FE8 /* elevation_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = elevation_info.hpp; sourceTree = ""; }; - 3DD1165F21888AAC007A2ED4 /* notification_queue_serdes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = notification_queue_serdes.cpp; sourceTree = ""; }; - 3DD1166021888AAC007A2ED4 /* notification_queue.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = notification_queue.hpp; sourceTree = ""; }; - 3DD1166121888AAC007A2ED4 /* notification_queue_storage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = notification_queue_storage.hpp; sourceTree = ""; }; - 3DD1166221888AAC007A2ED4 /* notification_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = notification_manager.cpp; sourceTree = ""; }; - 3DD1166321888AAC007A2ED4 /* notification_queue_storage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = notification_queue_storage.cpp; sourceTree = ""; }; - 3DD1166421888AAC007A2ED4 /* notification_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = notification_manager.hpp; sourceTree = ""; }; - 3DD1166521888AAC007A2ED4 /* notification_queue_serdes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = notification_queue_serdes.hpp; sourceTree = ""; }; 3DD122BA2135708900EDFB53 /* libmetrics_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmetrics_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3DD122BC2135708900EDFB53 /* libmetrics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmetrics.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 3DD692AC2209E253001C3C62 /* notification_queue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = notification_queue.cpp; sourceTree = ""; }; - 3DD692AE2209E272001C3C62 /* notification_manager_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = notification_manager_delegate.hpp; sourceTree = ""; }; - 3DD692AF2209E272001C3C62 /* notification_manager_delegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = notification_manager_delegate.cpp; sourceTree = ""; }; 3DD692B2220AD240001C3C62 /* caching_address_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = caching_address_getter.hpp; sourceTree = ""; }; 3DE28A7624BE05220009465C /* booking_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_utils.cpp; sourceTree = ""; }; 3DE28A7724BE05220009465C /* booking_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = booking_utils.hpp; sourceTree = ""; }; @@ -411,12 +374,9 @@ 3DF528D4237DC82E000ED0D5 /* catalog_headers_provider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = catalog_headers_provider.cpp; sourceTree = ""; }; 3DF528D5237DC82E000ED0D5 /* position_provider.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = position_provider.hpp; sourceTree = ""; }; 3DF528D6237DC82E000ED0D5 /* catalog_headers_provider.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catalog_headers_provider.hpp; sourceTree = ""; }; - 3DF54F7E219DD21000D12E37 /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utils.cpp; sourceTree = ""; }; - 3DF54F7F219DD21000D12E37 /* utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = utils.hpp; sourceTree = ""; }; 3DF54F8921AEA04900D12E37 /* framework_light.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = framework_light.cpp; sourceTree = ""; }; 40ACC79223191C2500238E21 /* countries_names_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = countries_names_tests.cpp; sourceTree = ""; }; 40ACC79323191C2600238E21 /* check_mwms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = check_mwms.cpp; sourceTree = ""; }; - 40ACC79423191C2600238E21 /* notification_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = notification_tests.cpp; sourceTree = ""; }; 40ACC79523191C2600238E21 /* power_manager_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = power_manager_tests.cpp; sourceTree = ""; }; 451E692721494C2600764A97 /* purchase.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = purchase.hpp; sourceTree = ""; }; 451E692821494C2700764A97 /* purchase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = purchase.cpp; sourceTree = ""; }; @@ -755,23 +715,6 @@ path = ../../map/map_integration_tests; sourceTree = ""; }; - 3DD1165E21888AAC007A2ED4 /* notifications */ = { - isa = PBXGroup; - children = ( - 3DD692AF2209E272001C3C62 /* notification_manager_delegate.cpp */, - 3DD692AE2209E272001C3C62 /* notification_manager_delegate.hpp */, - 3DD692AC2209E253001C3C62 /* notification_queue.cpp */, - 3DD1165F21888AAC007A2ED4 /* notification_queue_serdes.cpp */, - 3DD1166021888AAC007A2ED4 /* notification_queue.hpp */, - 3DD1166121888AAC007A2ED4 /* notification_queue_storage.hpp */, - 3DD1166221888AAC007A2ED4 /* notification_manager.cpp */, - 3DD1166321888AAC007A2ED4 /* notification_queue_storage.cpp */, - 3DD1166421888AAC007A2ED4 /* notification_manager.hpp */, - 3DD1166521888AAC007A2ED4 /* notification_queue_serdes.hpp */, - ); - path = notifications; - sourceTree = ""; - }; 3DEE1AD921EE03B400054A91 /* power_management */ = { isa = PBXGroup; children = ( @@ -788,9 +731,7 @@ children = ( 40ACC79323191C2600238E21 /* check_mwms.cpp */, 40ACC79223191C2500238E21 /* countries_names_tests.cpp */, - 40ACC79423191C2600238E21 /* notification_tests.cpp */, 40ACC79523191C2600238E21 /* power_manager_tests.cpp */, - 3D4F4581213552AD0005E765 /* tips_tests.cpp */, 56D1C15D20A0AB9D005C689E /* extrapolator_tests.cpp */, 679624A01D1017C200AE4E3C /* address_tests.cpp */, 671ED38620D403B200D4317E /* booking_availability_cache_test.cpp */, @@ -892,8 +833,6 @@ children = ( 3DE28A7624BE05220009465C /* booking_utils.cpp */, 3DE28A7724BE05220009465C /* booking_utils.hpp */, - 3D089870247FF5FE00837783 /* layers_statistics.cpp */, - 3D089871247FF5FE00837783 /* layers_statistics.hpp */, BB5FA776245AE2CF009A81A4 /* guides_marks.cpp */, BB5FA775245AE2CE009A81A4 /* guides_marks.hpp */, 3D035CA62451960400C21B57 /* guides_on_map_delegate.cpp */, @@ -906,8 +845,6 @@ 3DBD7B91240D523300ED9FE8 /* elevation_info.hpp */, BBB7060923E45F3300A7F29A /* isolines_manager.cpp */, BBB7060A23E45F3300A7F29A /* isolines_manager.hpp */, - 3D0D2F7123D854AA00945C8D /* tips_api_delegate.cpp */, - 3D0D2F7223D854AA00945C8D /* tips_api_delegate.hpp */, 3DF528D4237DC82E000ED0D5 /* catalog_headers_provider.cpp */, 3DF528D6237DC82E000ED0D5 /* catalog_headers_provider.hpp */, 3DF528D5237DC82E000ED0D5 /* position_provider.hpp */, @@ -969,7 +906,6 @@ 45F6EE9B1FB1C77500019892 /* mwm_tree.hpp */, 675346051A4054E800A0A8C3 /* mwm_url.cpp */, 675346061A4054E800A0A8C3 /* mwm_url.hpp */, - 3DD1165E21888AAC007A2ED4 /* notifications */, 674A2A371B2715FB001A525C /* osm_opening_hours.hpp */, 34583BCD1C88556800F94664 /* place_page_info.cpp */, 34583BCE1C88556800F94664 /* place_page_info.hpp */, @@ -992,8 +928,6 @@ 3D62CBCB20F4DFD600E7BB6E /* search_product_info.hpp */, 3D47B2901F054BC5000828D2 /* taxi_delegate.cpp */, 3D47B2911F054BC5000828D2 /* taxi_delegate.hpp */, - 3D4F44BA21345D270005E765 /* tips_api.cpp */, - 3D4F44B921345D270005E765 /* tips_api.hpp */, 6753462C1A4054E800A0A8C3 /* track.cpp */, 6753462D1A4054E800A0A8C3 /* track.hpp */, 347B60741DD9926D0050FA24 /* traffic_manager.cpp */, @@ -1007,8 +941,6 @@ 675346331A4054E800A0A8C3 /* user_mark.hpp */, 45A2D9D31F7556EB003310A0 /* user.cpp */, 45A2D9D41F7556EB003310A0 /* user.hpp */, - 3DF54F7E219DD21000D12E37 /* utils.cpp */, - 3DF54F7F219DD21000D12E37 /* utils.hpp */, 3DA5722F20C195EC007BDE27 /* viewport_search_callback.cpp */, 3DA5722C20C195EC007BDE27 /* viewport_search_callback.hpp */, 3D4E99811FB462B60025B48C /* viewport_search_params.hpp */, @@ -1053,14 +985,11 @@ 45F6EE9E1FB1C77600019892 /* mwm_tree.hpp in Headers */, F6B283081C1B03320081957A /* gps_track_storage.hpp in Headers */, 3D035CA92451960400C21B57 /* guides_on_map_delegate.hpp in Headers */, - 3DD1166B21888AAD007A2ED4 /* notification_manager.hpp in Headers */, - 3D4F44BB21345D270005E765 /* tips_api.hpp in Headers */, 675346A21A4054E800A0A8C3 /* user_mark.hpp in Headers */, BBB7060C23E45F3400A7F29A /* isolines_manager.hpp in Headers */, 39E3C60323312BA800FB0C37 /* features_fetcher.hpp in Headers */, BBA014AE2073C784007402E4 /* bookmark_helpers.hpp in Headers */, F6B283061C1B03320081957A /* gps_track_filter.hpp in Headers */, - 3DD1166821888AAC007A2ED4 /* notification_queue_storage.hpp in Headers */, 3D1775A42317E2FD00F8889C /* promo_catalog_poi_checker.hpp in Headers */, 3D18DC3D22956DD100A583A6 /* promo_delegate.hpp in Headers */, 3D62CBCC20F4DFD600E7BB6E /* search_product_info.hpp in Headers */, @@ -1068,7 +997,6 @@ 3D4E99831FB462B60025B48C /* viewport_search_params.hpp in Headers */, 34583BD01C88556800F94664 /* place_page_info.hpp in Headers */, 34921F661BFA0A6900737D6E /* api_mark_point.hpp in Headers */, - 3D089873247FF5FE00837783 /* layers_statistics.hpp in Headers */, 3DBD7B93240D523400ED9FE8 /* elevation_info.hpp in Headers */, BB5FA777245AE2D0009A81A4 /* guides_marks.hpp in Headers */, 3D4E99821FB462B60025B48C /* everywhere_search_params.hpp in Headers */, @@ -1092,9 +1020,7 @@ 56C116612090E5670068BBC0 /* extrapolator.hpp in Headers */, 3DD692B3220AD240001C3C62 /* caching_address_getter.hpp in Headers */, 3D62CBDA20FF6C8B00E7BB6E /* discovery_search.hpp in Headers */, - 3DD1166C21888AAD007A2ED4 /* notification_queue_serdes.hpp in Headers */, BB1C0196241BF73C0067FD5C /* track_mark.hpp in Headers */, - 3D0D2F7423D854AA00945C8D /* tips_api_delegate.hpp in Headers */, 675346491A4054E800A0A8C3 /* bookmark_manager.hpp in Headers */, 3DA5714320B5CC80007BDE27 /* booking_filter_processor.hpp in Headers */, F6B2830A1C1B03320081957A /* gps_track.hpp in Headers */, @@ -1103,7 +1029,6 @@ 45F6EE9D1FB1C77600019892 /* search_api.hpp in Headers */, 3DA5723120C195ED007BDE27 /* everywhere_search_callback.hpp in Headers */, 3DF528D9237DC82E000ED0D5 /* catalog_headers_provider.hpp in Headers */, - 3DD1166721888AAC007A2ED4 /* notification_queue.hpp in Headers */, BBBB5ED324460BFA000CBFF4 /* guides_manager.hpp in Headers */, 3DA5723020C195ED007BDE27 /* viewport_search_callback.hpp in Headers */, F6FC3CB51FC323430001D929 /* discovery_client_params.hpp in Headers */, @@ -1111,7 +1036,6 @@ F6FC3CB71FC323430001D929 /* discovery_manager.hpp in Headers */, 6753469C1A4054E800A0A8C3 /* track.hpp in Headers */, 675346651A4054E800A0A8C3 /* framework.hpp in Headers */, - 3DD692B02209E272001C3C62 /* notification_manager_delegate.hpp in Headers */, BBA014B120754997007402E4 /* user_mark_id_storage.hpp in Headers */, 674A2A381B2715FB001A525C /* osm_opening_hours.hpp in Headers */, 3DEE1ADF21EE03B400054A91 /* power_manager.hpp in Headers */, @@ -1122,7 +1046,6 @@ 45580ABF1E2CBD5E00CD535D /* benchmark_tools.hpp in Headers */, 456E1B3B1F9A3C2A009C32E1 /* search_mark.hpp in Headers */, BBD9E2C71EE9D01900DF189A /* routing_mark.hpp in Headers */, - 3DF54F81219DD21000D12E37 /* utils.hpp in Headers */, 342D833B1D5233E8000D8AEA /* displacement_mode_manager.hpp in Headers */, 3DEE1ADE21EE03B400054A91 /* power_management_schemas.hpp in Headers */, F6B283041C1B03320081957A /* gps_track_collection.hpp in Headers */, @@ -1254,7 +1177,6 @@ 671ED38B20D403B300D4317E /* booking_availability_cache_test.cpp in Sources */, BB421D6C1E8C0031005BFA4D /* transliteration_test.cpp in Sources */, 679624B21D1017DB00AE4E3C /* mwm_set_test.cpp in Sources */, - 3D4F4582213552AD0005E765 /* tips_tests.cpp in Sources */, 454523AD202A00C3009275C1 /* cloud_tests.cpp in Sources */, 679624AD1D1017DB00AE4E3C /* address_tests.cpp in Sources */, 67F183791BD5045700AB1840 /* kmz_unarchive_test.cpp in Sources */, @@ -1282,11 +1204,9 @@ BB5FA778245AE2D0009A81A4 /* guides_marks.cpp in Sources */, 675346481A4054E800A0A8C3 /* bookmark_manager.cpp in Sources */, BBB7060B23E45F3400A7F29A /* isolines_manager.cpp in Sources */, - 3D0D2F7323D854AA00945C8D /* tips_api_delegate.cpp in Sources */, 40ACC79923191C2600238E21 /* power_manager_tests.cpp in Sources */, 45F6EE9F1FB1C77600019892 /* search_api.cpp in Sources */, BB4E5F251FCC664A00A77250 /* transit_display.cpp in Sources */, - 3DD1166A21888AAD007A2ED4 /* notification_queue_storage.cpp in Sources */, 3D47B2931F054BC5000828D2 /* taxi_delegate.cpp in Sources */, 3D18DC3E22956DD100A583A6 /* promo_delegate.cpp in Sources */, 675346741A4054E800A0A8C3 /* mwm_url.cpp in Sources */, @@ -1295,8 +1215,6 @@ BBFC7E3A202D29C000531BE7 /* user_mark_layer.cpp in Sources */, F6B283091C1B03320081957A /* gps_track.cpp in Sources */, 34583BCF1C88556800F94664 /* place_page_info.cpp in Sources */, - 3DD1166921888AAC007A2ED4 /* notification_manager.cpp in Sources */, - 3DD692AD2209E253001C3C62 /* notification_queue.cpp in Sources */, F6B283031C1B03320081957A /* gps_track_collection.cpp in Sources */, 3D4E99A31FB4A6410025B48C /* booking_filter_cache.cpp in Sources */, 3DF528D7237DC82E000ED0D5 /* catalog_headers_provider.cpp in Sources */, @@ -1311,14 +1229,12 @@ 40ACC79623191C2600238E21 /* countries_names_tests.cpp in Sources */, 3DBD7B92240D523400ED9FE8 /* elevation_info.cpp in Sources */, BB1C0197241BF73C0067FD5C /* track_mark.cpp in Sources */, - 40ACC79823191C2600238E21 /* notification_tests.cpp in Sources */, 3DEE1AE021EE03B400054A91 /* power_manager.cpp in Sources */, BB4E5F281FCC664A00A77250 /* transit_reader.cpp in Sources */, F63421F81DF9BF9100A96868 /* reachable_by_taxi_checker.cpp in Sources */, 56C116602090E5670068BBC0 /* extrapolator.cpp in Sources */, 40ACC79723191C2600238E21 /* check_mwms.cpp in Sources */, 39E3C60423312BA800FB0C37 /* features_fetcher.cpp in Sources */, - 3DD1166621888AAC007A2ED4 /* notification_queue_serdes.cpp in Sources */, 348AB57C1D7EE0C6009F8301 /* chart_generator.cpp in Sources */, 342D833A1D5233E8000D8AEA /* displacement_mode_manager.cpp in Sources */, 3D47B2C71F20EF06000828D2 /* displayed_categories_modifiers.cpp in Sources */, @@ -1328,9 +1244,7 @@ F6FC3CB61FC323430001D929 /* discovery_manager.cpp in Sources */, 3D62CBD920FF6C8B00E7BB6E /* discovery_search.cpp in Sources */, BBA014AD2073C784007402E4 /* bookmark_helpers.cpp in Sources */, - 3D4F44BC21345D270005E765 /* tips_api.cpp in Sources */, F6D2CE7E1EDEB7F500636DFD /* routing_manager.cpp in Sources */, - 3D089872247FF5FE00837783 /* layers_statistics.cpp in Sources */, 45A2D9D51F7556EB003310A0 /* user.cpp in Sources */, F6B283071C1B03320081957A /* gps_track_storage.cpp in Sources */, 3DE28A7824BE05220009465C /* booking_utils.cpp in Sources */, @@ -1338,9 +1252,7 @@ BBA014B220754997007402E4 /* user_mark_id_storage.cpp in Sources */, 6753464A1A4054E800A0A8C3 /* bookmark.cpp in Sources */, 45580ABE1E2CBD5E00CD535D /* benchmark_tools.cpp in Sources */, - 3DF54F80219DD21000D12E37 /* utils.cpp in Sources */, 3DA5723220C195ED007BDE27 /* everywhere_search_callback.cpp in Sources */, - 3DD692B12209E272001C3C62 /* notification_manager_delegate.cpp in Sources */, 3DEE1AE121EE03B400054A91 /* power_management_schemas.cpp in Sources */, BBD9E2C61EE9D01900DF189A /* routing_mark.cpp in Sources */, 991CE2D12372BDB1009EB02A /* onboarding.cpp in Sources */, diff --git a/xcode/metrics/metrics.xcodeproj/project.pbxproj b/xcode/metrics/metrics.xcodeproj/project.pbxproj deleted file mode 100644 index 1e7f79c8a8..0000000000 --- a/xcode/metrics/metrics.xcodeproj/project.pbxproj +++ /dev/null @@ -1,621 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 54; - objects = { - -/* Begin PBXBuildFile section */ - 3D4F45212134606C0005E765 /* eye_serdes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4F450E2134606B0005E765 /* eye_serdes.cpp */; }; - 3D4F45222134606C0005E765 /* eye_storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4F450F2134606B0005E765 /* eye_storage.cpp */; }; - 3D4F45252134606C0005E765 /* eye.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4F45192134606B0005E765 /* eye.cpp */; }; - 3D4F4568213542700005E765 /* eye_for_testing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4F4566213542700005E765 /* eye_for_testing.cpp */; }; - 3D4F45692135427C0005E765 /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4F4555213541460005E765 /* testingmain.cpp */; }; - 3D4F456B213542830005E765 /* eye_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4F4553213541280005E765 /* eye_tests.cpp */; }; - 3D4F457021354E0C0005E765 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F456F21354E0C0005E765 /* libjansson.a */; }; - 3D4F457221354E3A0005E765 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F457121354E3A0005E765 /* libbase.a */; }; - 3D4F457421354E430005E765 /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F457321354E430005E765 /* libcoding.a */; }; - 3D4F457621354E4B0005E765 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F457521354E4B0005E765 /* libplatform.a */; }; - 3D4F457721354E530005E765 /* libmetrics_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F4564213542130005E765 /* libmetrics_tests_support.a */; }; - 3D4F457821354E530005E765 /* libmetrics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F44FB21345FC50005E765 /* libmetrics.a */; }; - 3D4F457C21354F150005E765 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F457B21354F150005E765 /* libz.tbd */; }; - 56DAC378239925C4000BC50D /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC377239925C4000BC50D /* libgeometry.a */; }; - D5D5DC4F2396AE02003E9A83 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D5D5DC4E2396AE02003E9A83 /* liboauthcpp.a */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 3D4F44F921345FC50005E765 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 3D4F455F213542130005E765 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 3D4F44FB21345FC50005E765 /* libmetrics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmetrics.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 3D4F450E2134606B0005E765 /* eye_serdes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eye_serdes.cpp; sourceTree = ""; }; - 3D4F450F2134606B0005E765 /* eye_storage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eye_storage.cpp; sourceTree = ""; }; - 3D4F45152134606B0005E765 /* eye_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = eye_info.hpp; sourceTree = ""; }; - 3D4F45192134606B0005E765 /* eye.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eye.cpp; sourceTree = ""; }; - 3D4F451A2134606B0005E765 /* eye.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = eye.hpp; sourceTree = ""; }; - 3D4F451F2134606B0005E765 /* eye_storage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = eye_storage.hpp; sourceTree = ""; }; - 3D4F45202134606B0005E765 /* eye_serdes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = eye_serdes.hpp; sourceTree = ""; }; - 3D4F453621353F290005E765 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; - 3D4F453721353F290005E765 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; - 3D4F4541213540F50005E765 /* metrics_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = metrics_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 3D4F4553213541280005E765 /* eye_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eye_tests.cpp; sourceTree = ""; }; - 3D4F4555213541460005E765 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; - 3D4F4564213542130005E765 /* libmetrics_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmetrics_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 3D4F4566213542700005E765 /* eye_for_testing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eye_for_testing.cpp; sourceTree = ""; }; - 3D4F4567213542700005E765 /* eye_for_testing.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = eye_for_testing.hpp; sourceTree = ""; }; - 3D4F456F21354E0C0005E765 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 3D4F457121354E3A0005E765 /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 3D4F457321354E430005E765 /* libcoding.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcoding.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 3D4F457521354E4B0005E765 /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 3D4F457B21354F150005E765 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; - 56DAC377239925C4000BC50D /* libgeometry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgeometry.a; sourceTree = BUILT_PRODUCTS_DIR; }; - D5D5DC4E2396AE02003E9A83 /* liboauthcpp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = liboauthcpp.a; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 3D4F44F821345FC50005E765 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 3D4F453E213540F50005E765 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 56DAC378239925C4000BC50D /* libgeometry.a in Frameworks */, - 3D4F457721354E530005E765 /* libmetrics_tests_support.a in Frameworks */, - 3D4F457821354E530005E765 /* libmetrics.a in Frameworks */, - 3D4F457621354E4B0005E765 /* libplatform.a in Frameworks */, - 3D4F457421354E430005E765 /* libcoding.a in Frameworks */, - 3D4F457221354E3A0005E765 /* libbase.a in Frameworks */, - D5D5DC4F2396AE02003E9A83 /* liboauthcpp.a in Frameworks */, - 3D4F457021354E0C0005E765 /* libjansson.a in Frameworks */, - 3D4F457C21354F150005E765 /* libz.tbd in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 3D4F455E213542130005E765 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 3D4F44F221345FC50005E765 = { - isa = PBXGroup; - children = ( - 3D4F453621353F290005E765 /* common-debug.xcconfig */, - 3D4F453721353F290005E765 /* common-release.xcconfig */, - 3D4F450D2134606B0005E765 /* metrics */, - 3D4F4542213540F50005E765 /* metrics_tests */, - 3D4F4565213542480005E765 /* metrics_tests_support */, - 3D4F44FC21345FC50005E765 /* Products */, - 3D4F456E21354E0C0005E765 /* Frameworks */, - ); - sourceTree = ""; - }; - 3D4F44FC21345FC50005E765 /* Products */ = { - isa = PBXGroup; - children = ( - 3D4F44FB21345FC50005E765 /* libmetrics.a */, - 3D4F4541213540F50005E765 /* metrics_tests.app */, - 3D4F4564213542130005E765 /* libmetrics_tests_support.a */, - ); - name = Products; - sourceTree = ""; - }; - 3D4F450D2134606B0005E765 /* metrics */ = { - isa = PBXGroup; - children = ( - 3D4F450E2134606B0005E765 /* eye_serdes.cpp */, - 3D4F450F2134606B0005E765 /* eye_storage.cpp */, - 3D4F45152134606B0005E765 /* eye_info.hpp */, - 3D4F45192134606B0005E765 /* eye.cpp */, - 3D4F451A2134606B0005E765 /* eye.hpp */, - 3D4F451F2134606B0005E765 /* eye_storage.hpp */, - 3D4F45202134606B0005E765 /* eye_serdes.hpp */, - ); - name = metrics; - path = ../../metrics; - sourceTree = ""; - }; - 3D4F4542213540F50005E765 /* metrics_tests */ = { - isa = PBXGroup; - children = ( - 3D4F4555213541460005E765 /* testingmain.cpp */, - 3D4F4553213541280005E765 /* eye_tests.cpp */, - ); - name = metrics_tests; - path = ../../metrics/metrics_tests; - sourceTree = ""; - }; - 3D4F4565213542480005E765 /* metrics_tests_support */ = { - isa = PBXGroup; - children = ( - 3D4F4566213542700005E765 /* eye_for_testing.cpp */, - 3D4F4567213542700005E765 /* eye_for_testing.hpp */, - ); - name = metrics_tests_support; - path = ../../metrics/metrics_tests_support; - sourceTree = ""; - }; - 3D4F456E21354E0C0005E765 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 56DAC377239925C4000BC50D /* libgeometry.a */, - D5D5DC4E2396AE02003E9A83 /* liboauthcpp.a */, - 3D4F457B21354F150005E765 /* libz.tbd */, - 3D4F457521354E4B0005E765 /* libplatform.a */, - 3D4F457321354E430005E765 /* libcoding.a */, - 3D4F457121354E3A0005E765 /* libbase.a */, - 3D4F456F21354E0C0005E765 /* libjansson.a */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 3D4F44FA21345FC50005E765 /* metrics */ = { - isa = PBXNativeTarget; - buildConfigurationList = 3D4F450421345FC60005E765 /* Build configuration list for PBXNativeTarget "metrics" */; - buildPhases = ( - 3D4F44F721345FC50005E765 /* Sources */, - 3D4F44F821345FC50005E765 /* Frameworks */, - 3D4F44F921345FC50005E765 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = metrics; - productName = eye; - productReference = 3D4F44FB21345FC50005E765 /* libmetrics.a */; - productType = "com.apple.product-type.library.static"; - }; - 3D4F4540213540F50005E765 /* metrics_tests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 3D4F454F213540F70005E765 /* Build configuration list for PBXNativeTarget "metrics_tests" */; - buildPhases = ( - 3D4F453D213540F50005E765 /* Sources */, - 3D4F453E213540F50005E765 /* Frameworks */, - 3D4F453F213540F50005E765 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = metrics_tests; - productName = eye_tests; - productReference = 3D4F4541213540F50005E765 /* metrics_tests.app */; - productType = "com.apple.product-type.application"; - }; - 3D4F4557213542130005E765 /* metrics_tests_support */ = { - isa = PBXNativeTarget; - buildConfigurationList = 3D4F4560213542130005E765 /* Build configuration list for PBXNativeTarget "metrics_tests_support" */; - buildPhases = ( - 3D4F4558213542130005E765 /* Sources */, - 3D4F455E213542130005E765 /* Frameworks */, - 3D4F455F213542130005E765 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = metrics_tests_support; - productName = eye; - productReference = 3D4F4564213542130005E765 /* libmetrics_tests_support.a */; - productType = "com.apple.product-type.library.static"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 3D4F44F321345FC50005E765 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1240; - TargetAttributes = { - 3D4F44FA21345FC50005E765 = { - CreatedOnToolsVersion = 9.4.1; - }; - 3D4F4540213540F50005E765 = { - CreatedOnToolsVersion = 9.4.1; - }; - }; - }; - buildConfigurationList = 3D4F44F621345FC50005E765 /* Build configuration list for PBXProject "metrics" */; - compatibilityVersion = "Xcode 12.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 3D4F44F221345FC50005E765; - productRefGroup = 3D4F44FC21345FC50005E765 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 3D4F44FA21345FC50005E765 /* metrics */, - 3D4F4540213540F50005E765 /* metrics_tests */, - 3D4F4557213542130005E765 /* metrics_tests_support */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 3D4F453F213540F50005E765 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 3D4F44F721345FC50005E765 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 3D4F45212134606C0005E765 /* eye_serdes.cpp in Sources */, - 3D4F45222134606C0005E765 /* eye_storage.cpp in Sources */, - 3D4F45252134606C0005E765 /* eye.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 3D4F453D213540F50005E765 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 3D4F45692135427C0005E765 /* testingmain.cpp in Sources */, - 3D4F456B213542830005E765 /* eye_tests.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 3D4F4558213542130005E765 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 3D4F4568213542700005E765 /* eye_for_testing.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 3D4F450221345FC60005E765 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3D4F453621353F290005E765 /* common-debug.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/jansson/src", - ); - }; - name = Debug; - }; - 3D4F450321345FC60005E765 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3D4F453721353F290005E765 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/jansson/src", - ); - }; - name = Release; - }; - 3D4F450521345FC60005E765 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 3D4F450621345FC60005E765 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 3D4F4539213540710005E765 /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3D4F453721353F290005E765 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/jansson/src", - ); - }; - name = "Production Full"; - }; - 3D4F453A213540710005E765 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - 3D4F4550213540F70005E765 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = ""; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_BUNDLE_IDENTIFIER = "maps.me.eye-tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 3D4F4551213540F70005E765 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = ""; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "maps.me.eye-tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 3D4F4552213540F70005E765 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = ""; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "maps.me.eye-tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - 3D4F4561213542130005E765 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 3D4F4562213542130005E765 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 3D4F4563213542130005E765 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 3D4F44F621345FC50005E765 /* Build configuration list for PBXProject "metrics" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3D4F450221345FC60005E765 /* Debug */, - 3D4F450321345FC60005E765 /* Release */, - 3D4F4539213540710005E765 /* Production Full */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 3D4F450421345FC60005E765 /* Build configuration list for PBXNativeTarget "metrics" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3D4F450521345FC60005E765 /* Debug */, - 3D4F450621345FC60005E765 /* Release */, - 3D4F453A213540710005E765 /* Production Full */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 3D4F454F213540F70005E765 /* Build configuration list for PBXNativeTarget "metrics_tests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3D4F4550213540F70005E765 /* Debug */, - 3D4F4551213540F70005E765 /* Release */, - 3D4F4552213540F70005E765 /* Production Full */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 3D4F4560213542130005E765 /* Build configuration list for PBXNativeTarget "metrics_tests_support" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3D4F4561213542130005E765 /* Debug */, - 3D4F4562213542130005E765 /* Release */, - 3D4F4563213542130005E765 /* Production Full */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 3D4F44F321345FC50005E765 /* Project object */; -} diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index 3441f6c860..0d355e828d 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -136,9 +136,6 @@ - - diff --git a/xcode/partners_api/partners_api.xcodeproj/project.pbxproj b/xcode/partners_api/partners_api.xcodeproj/project.pbxproj index 1f43179262..39f7e4ba62 100644 --- a/xcode/partners_api/partners_api.xcodeproj/project.pbxproj +++ b/xcode/partners_api/partners_api.xcodeproj/project.pbxproj @@ -28,7 +28,6 @@ 3D18DC3422953FF600A583A6 /* rutaxi_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D18DC3222953FF600A583A6 /* rutaxi_tests.cpp */; }; 3D18DC4122956DFA00A583A6 /* promo_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D18DC3F22956DFA00A583A6 /* promo_api.hpp */; }; 3D18DC4222956DFA00A583A6 /* promo_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D18DC4022956DFA00A583A6 /* promo_api.cpp */; }; - 3D18DC4422956E0900A583A6 /* promo_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D18DC4322956E0900A583A6 /* promo_tests.cpp */; }; 3D47B29A1F054C89000828D2 /* taxi_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D47B2961F054C89000828D2 /* taxi_base.cpp */; }; 3D47B2B11F14FA14000828D2 /* utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D47B2B01F14FA14000828D2 /* utils.hpp */; }; 3D4E997C1FB439260025B48C /* booking_availability_params.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D4E997A1FB439260025B48C /* booking_availability_params.hpp */; }; @@ -111,7 +110,6 @@ 3D18DC3222953FF600A583A6 /* rutaxi_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rutaxi_tests.cpp; sourceTree = ""; }; 3D18DC3F22956DFA00A583A6 /* promo_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = promo_api.hpp; sourceTree = ""; }; 3D18DC4022956DFA00A583A6 /* promo_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = promo_api.cpp; sourceTree = ""; }; - 3D18DC4322956E0900A583A6 /* promo_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = promo_tests.cpp; sourceTree = ""; }; 3D47B2961F054C89000828D2 /* taxi_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = taxi_base.cpp; sourceTree = ""; }; 3D47B2B01F14FA14000828D2 /* utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = utils.hpp; sourceTree = ""; }; 3D4E997A1FB439260025B48C /* booking_availability_params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = booking_availability_params.hpp; sourceTree = ""; }; @@ -291,7 +289,6 @@ 3DA6BCE12535B53C00DF0DA5 /* citymobil_tests.cpp */, 3D035CA4245195EF00C21B57 /* guides_on_map_tests.cpp */, 3DBD7B9A24112DEA00ED9FE8 /* freenow_tests.cpp */, - 3D18DC4322956E0900A583A6 /* promo_tests.cpp */, 3D18DC3222953FF600A583A6 /* rutaxi_tests.cpp */, F6B536451DA5213D0067EEA5 /* booking_tests.cpp */, 349CFD0C2045720700569949 /* maxim_tests.cpp */, @@ -483,7 +480,6 @@ 3DFEBF9B1EFBFC1500317D5C /* taxi_engine.cpp in Sources */, 3DF01C2D20652463005DDF8C /* taxi_places.cpp in Sources */, F67E75251DB8F06F00D6741F /* opentable_api.cpp in Sources */, - 3D18DC4422956E0900A583A6 /* promo_tests.cpp in Sources */, BB1956E61F543D7C003ECE6C /* locals_api.cpp in Sources */, 3DBD7B9B24112DEA00ED9FE8 /* freenow_tests.cpp in Sources */, 3DFEBFA31EFBFC2300317D5C /* taxi_engine_tests.cpp in Sources */,