gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Added UTM for catalog opening

Browse source
This commit is contained in:
r.kuznetsov 2019-06-27 19:04:40 +03:00 • committed by Aleksandr Zatsepin
parent b2a8add9bc
commit 9e250bb3ae
36 changed files with 182 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -798,7 +798,8 @@ uint64_t Framework::GetLocals(JNIEnv * env, jobject policy, double lat, double l
return api->GetLocals(lat, lon, langStr, kResultsOnPage, kPageNumber, successFn, errorFn);
}
void Framework::GetPromoCityGallery(JNIEnv * env, jobject policy, m2::PointD const & point,
void Framework::GetPromoCityGallery(JNIEnv * env, jobject policy,
m2::PointD const & point, UTM utm,
promo::CityGalleryCallback const & onSuccess,
promo::OnError const & onError)
{
@ -806,8 +807,7 @@ void Framework::GetPromoCityGallery(JNIEnv * env, jobject policy, m2::PointD con
if (api == nullptr)
return;
api->GetCityGallery(point, languages::GetCurrentNorm(), onSuccess,
onError);
api->GetCityGallery(point, languages::GetCurrentNorm(), utm, onSuccess, onError);
}
void Framework::LogLocalAdsEvent(local_ads::EventType type, double lat, double lon, uint16_t accuracy)

4
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -20,6 +20,7 @@
#include "partners_api/booking_api.hpp"
#include "partners_api/locals_api.hpp"
#include "partners_api/promo_api.hpp"
#include "partners_api/utm.hpp"
#include "platform/country_defines.hpp"
#include "platform/location.hpp"
@ -219,7 +220,8 @@ namespace android
uint64_t GetLocals(JNIEnv * env, jobject policy, double lat, double lon,
locals::LocalsSuccessCallback const & successFn,
locals::LocalsErrorCallback const & errorFn);
void GetPromoCityGallery(JNIEnv * env, jobject policy, m2::PointD const & point,
void GetPromoCityGallery(JNIEnv * env, jobject policy,
m2::PointD const & point, UTM utm,
promo::CityGalleryCallback const & onSuccess,
promo::OnError const & onError);

6
android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
View file

@ -5,6 +5,8 @@
#include "map/bookmark_helpers.hpp"
#include "map/place_page_info.hpp"
#include "partners_api/utm.hpp"
#include "coding/zip_creator.hpp"
#include "platform/preferred_languages.hpp"
@ -885,10 +887,10 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetWebEditorUrl(
JNIEXPORT jstring JNICALL
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCatalogFrontendUrl(
JNIEnv * env, jobject)
JNIEnv * env, jobject, jint utm)
{
auto & bm = frm()->GetBookmarkManager();
return ToJavaString(env, bm.GetCatalog().GetFrontendUrl());
return ToJavaString(env, bm.GetCatalog().GetFrontendUrl(static_cast<UTM>(utm)));
}
JNIEXPORT jboolean JNICALL

5
android/jni/com/mapswithme/maps/promo/CityGallery.cpp
View file

@ -127,12 +127,13 @@ extern "C" {
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_promo_Promo_nativeRequestCityGallery(JNIEnv * env, jclass,
jobject policy, jdouble lat,
jdouble lon)
jdouble lon, jint utm)
{
PrepareClassRefs(env);
auto const point = MercatorBounds::FromLatLon(static_cast<double>(lat), static_cast<double>(lon));
++g_lastRequestId;
g_framework->GetPromoCityGallery(env, policy, point, std::bind(OnSuccess, g_lastRequestId, _1),
g_framework->GetPromoCityGallery(env, policy, point, static_cast<UTM>(utm),
std::bind(OnSuccess, g_lastRequestId, _1),
std::bind(OnError, g_lastRequestId));
}
} // extern "C"

3
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -117,6 +117,7 @@ import com.mapswithme.util.InputUtils;
import com.mapswithme.util.PermissionsUtils;
import com.mapswithme.util.ThemeSwitcher;
import com.mapswithme.util.ThemeUtils;
import com.mapswithme.util.UTM;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.log.Logger;
@ -2429,7 +2430,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
void onPostStatisticMenuItemClick()
{
int requestCode = BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY;
String catalogUrl = BookmarkManager.INSTANCE.getCatalogFrontendUrl();
String catalogUrl = BookmarkManager.INSTANCE.getCatalogFrontendUrl(UTM.UTM_TOOLBAR_BUTTON);
getActivity().closeMenu(() -> BookmarksCatalogActivity.startForResult(getActivity(),
requestCode,
catalogUrl));

4
android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java
View file

@ -17,6 +17,7 @@ import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.bookmarks.data.CatalogCustomProperty;
import com.mapswithme.maps.bookmarks.data.CatalogTagsGroup;
import com.mapswithme.util.SharedPropertiesUtils;
import com.mapswithme.util.UTM;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.sharing.TargetUtils;
import com.mapswithme.util.statistics.Statistics;
@ -133,7 +134,8 @@ public class CachedBookmarkCategoriesFragment extends BaseBookmarkCategoriesFrag
private void openBookmarksCatalogScreen()
{
String catalogUrl = BookmarkManager.INSTANCE.getCatalogFrontendUrl();
String catalogUrl = BookmarkManager.INSTANCE.getCatalogFrontendUrl(
UTM.UTM_BOOKMARKS_PAGE_CATALOG_BUTTON);
BookmarksCatalogActivity.startForResult(this, BookmarksCatalogActivity.REQ_CODE_CATALOG,
catalogUrl);
Statistics.INSTANCE.trackOpenCatalogScreen();

7
android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
View file

@ -7,6 +7,7 @@ import android.support.annotation.NonNull;
import com.mapswithme.maps.PrivateVariables;
import com.mapswithme.maps.R;
import com.mapswithme.maps.metrics.UserActionsLogger;
import com.mapswithme.util.UTM;
import com.mapswithme.util.statistics.Statistics;
import java.io.File;
@ -640,9 +641,9 @@ public enum BookmarkManager
}
@NonNull
public String getCatalogFrontendUrl()
public String getCatalogFrontendUrl(@UTM.UTMType int utm)
{
return nativeGetCatalogFrontendUrl();
return nativeGetCatalogFrontendUrl(utm);
}
public void requestRouteTags()
@ -794,7 +795,7 @@ public enum BookmarkManager
private static native String nativeGetWebEditorUrl(@NonNull String serverId);
@NonNull
private static native String nativeGetCatalogFrontendUrl();
private static native String nativeGetCatalogFrontendUrl(@UTM.UTMType int utm);
private static native boolean nativeIsCategoryFromCatalog(long catId);

3
android/src/com/mapswithme/maps/intent/Factory.java
View file

@ -37,6 +37,7 @@ import com.mapswithme.maps.ugc.UGC;
import com.mapswithme.maps.ugc.UGCEditorActivity;
import com.mapswithme.util.Constants;
import com.mapswithme.util.StorageUtils;
import com.mapswithme.util.UTM;
import com.mapswithme.util.Utils;
import com.mapswithme.util.concurrency.ThreadPool;
import com.mapswithme.util.log.Logger;
@ -145,7 +146,7 @@ public class Factory
@NonNull
private static String convertUrlToGuidesPageDeeplink(@NonNull String url)
{
String baseCatalogUrl = BookmarkManager.INSTANCE.getCatalogFrontendUrl();
String baseCatalogUrl = BookmarkManager.INSTANCE.getCatalogFrontendUrl(UTM.UTM_NONE);
String relativePath = Uri.parse(url).getQueryParameter("url");
return Uri.parse(baseCatalogUrl)
.buildUpon().appendEncodedPath(relativePath).toString();

4
android/src/com/mapswithme/maps/promo/Promo.java
View file

@ -5,6 +5,7 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.mapswithme.util.NetworkPolicy;
import com.mapswithme.util.UTM;
import com.mapswithme.util.concurrency.UiThread;
public enum Promo
@ -49,5 +50,6 @@ public enum Promo
mListener.onErrorReceived();
}
public native void nativeRequestCityGallery(@NonNull NetworkPolicy policy, double lat, double lon);
public native void nativeRequestCityGallery(@NonNull NetworkPolicy policy,
double lat, double lon, @UTM.UTMType int utm);
}

3
android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java
View file

@ -8,6 +8,7 @@ import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity;
import com.mapswithme.maps.bookmarks.BookmarksCatalogActivity;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.maplayer.Mode;
import com.mapswithme.util.UTM;
class ClickInterceptorFactory
{
@ -45,7 +46,7 @@ class ClickInterceptorFactory
@Override
public void onInterceptClickInternal(@NonNull MwmActivity activity)
{
String catalogUrl = BookmarkManager.INSTANCE.getCatalogFrontendUrl();
String catalogUrl = BookmarkManager.INSTANCE.getCatalogFrontendUrl(UTM.UTM_TIPS_AND_TRICKS);
BookmarksCatalogActivity.startForResult(activity,
BookmarkCategoriesActivity
.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY, catalogUrl);

4
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -93,6 +93,7 @@ import com.mapswithme.util.NetworkPolicy;
import com.mapswithme.util.SponsoredLinks;
import com.mapswithme.util.StringUtils;
import com.mapswithme.util.ThemeUtils;
import com.mapswithme.util.UTM;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.concurrency.UiThread;
@ -1243,7 +1244,8 @@ public class PlacePageView extends NestedScrollView
if (mSponsored == null || mMapObject == null)
return;
Promo.INSTANCE.nativeRequestCityGallery(policy, mMapObject.getLat(), mMapObject.getLon());
Promo.INSTANCE.nativeRequestCityGallery(policy, mMapObject.getLat(), mMapObject.getLon(),
UTM.UTM_PLACEPAGE_GALLERY);
mSponsored.updateId(mMapObject);
mSponsoredPrice = mSponsored.getPrice();
String currencyCode = Utils.getCurrencyCode();

23
android/src/com/mapswithme/util/UTM.java Normal file
View file

@ -0,0 +1,23 @@
package com.mapswithme.util;
import android.support.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
public class UTM
{
@Retention(RetentionPolicy.SOURCE)
@IntDef({ UTM_NONE, UTM_BOOKMARKS_PAGE_CATALOG_BUTTON, UTM_TOOLBAR_BUTTON,
UTM_DOWNLOAD_MWM_BANNER, UTM_PLACEPAGE_GALLERY, UTM_DISCOVERY_PAGE_GALLERY,
UTM_TIPS_AND_TRICKS })
public @interface UTMType {}
// The order of these constants must correspond to C++ enumeration in partners_api/utm.hpp.
public static final int UTM_NONE = 0;
public static final int UTM_BOOKMARKS_PAGE_CATALOG_BUTTON = 1;
public static final int UTM_TOOLBAR_BUTTON = 2;
public static final int UTM_DOWNLOAD_MWM_BANNER = 3;
public static final int UTM_PLACEPAGE_GALLERY = 4;
public static final int UTM_DISCOVERY_PAGE_GALLERY = 5;
public static final int UTM_TIPS_AND_TRICKS = 6;
}

6
iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
View file

@ -32,13 +32,13 @@ final class CatalogWebViewController: WebViewController {
var toolbar = UIToolbar()
var billing = InAppPurchase.inAppBilling()
@objc init(_ deeplinkURL: URL? = nil) {
var catalogUrl = MWMBookmarksManager.shared().catalogFrontendUrl()!
@objc init(_ deeplinkURL: URL? = nil, utm: MWMUTM = .none) {
var catalogUrl = MWMBookmarksManager.shared().catalogFrontendUrl(utm)!
if let dl = deeplinkURL {
if dl.host == "guides_page" {
if let urlComponents = URLComponents(url: dl, resolvingAgainstBaseURL: false),
let path = urlComponents.queryItems?.reduce(into: "", { if $1.name == "url" { $0 = $1.value } }),
let url = MWMBookmarksManager.shared().catalogFrontendUrlPlusPath(path) {
let url = MWMBookmarksManager.shared().catalogFrontendUrlPlusPath(path, utm: utm) {
catalogUrl = url
}
} else {

2
iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift
View file

@ -58,7 +58,7 @@ class DownloadedBookmarksViewController: MWMViewController {
return
}
Statistics.logEvent(kStatCatalogOpen, withParameters: [kStatFrom: kStatDownloaded])
let webViewController = CatalogWebViewController()
let webViewController = CatalogWebViewController(nil, utm: .bookmarksPageCatalogButton)
MapViewController.topViewController().navigationController?.pushViewController(webViewController,
animated: true)
}

10
iphone/Maps/Bookmarks/Catalog/MWMUTM.h Normal file
View file

@ -0,0 +1,10 @@
// This enumeration must correspond to C++ enumeration in partners_api/utm.hpp.
typedef NS_ENUM(NSInteger, MWMUTM) {
MWMUTMNone = 0,
MWMUTMBookmarksPageCatalogButton,
MWMUTMToolbarButton,
MWMUTMDownloadMwmBanner,
MWMUTMPlacepageGallery,
MWMUTMDiscoveryPageGallery,
MWMUTMTipsAndTricks
};

1
iphone/Maps/Bridging-Header.h
View file

@ -97,3 +97,4 @@
#import "MWMRouterResultCode.h"
#import "MWMLocationModeListener.h"
#import "MWMSpeedCameraManagerMode.h"
#import "MWMUTM.h"

4
iphone/Maps/Classes/DeepLinkHelper.mm
View file

@ -102,10 +102,10 @@
break;
}
case ParsedMapApi::ParsingResult::Catalogue:
[MapViewController.sharedController openCatalogDeeplink:url animated:NO];
[MapViewController.sharedController openCatalogDeeplink:url animated:NO utm:MWMUTMNone];
break;
case ParsedMapApi::ParsingResult::CataloguePath:
[MapViewController.sharedController openCatalogDeeplink:url animated:NO];
[MapViewController.sharedController openCatalogDeeplink:url animated:NO utm:MWMUTMNone];
break;
case ParsedMapApi::ParsingResult::Lead: break;
}

7
iphone/Maps/Classes/MapViewController.h
View file

@ -1,6 +1,7 @@
#import "MWMMapDownloaderMode.h"
#import "MWMViewController.h"
#import "MWMMyPositionMode.h"
#import "MWMUTM.h"
@class MWMWelcomePageController;
@class MWMMapViewControlsManager;
@ -32,8 +33,10 @@
- (void)openFullPlaceDescriptionWithHtml:(NSString *)htmlString;
- (void)showUGCAuth;
- (void)showBookmarksLoadedAlert:(UInt64)categoryId;
- (void)openCatalogAnimated:(BOOL)animated;
- (void)openCatalogDeeplink:(NSURL * _Nullable)deeplinkUrl animated:(BOOL)animated;
- (void)openCatalogAnimated:(BOOL)animated utm:(MWMUTM)utm;
- (void)openCatalogDeeplink:(NSURL * _Nullable)deeplinkUrl
animated:(BOOL)animated
utm:(MWMUTM)utm;
- (void)searchText:(NSString *)text;
- (void)openDrivingOptions;

11
iphone/Maps/Classes/MapViewController.mm
View file

@ -19,6 +19,7 @@
#import "MapsAppDelegate.h"
#import "SwiftBridge.h"
#import "MWMLocationModeListener.h"
#import "MWMUTM.h"
#include "Framework.h"
@ -503,22 +504,22 @@ BOOL gIsFirstMyPositionMode = YES;
[[MWMToast toastWithText:L(@"guide_downloaded_title")] show];
}
- (void)openCatalogAnimated:(BOOL)animated
- (void)openCatalogAnimated:(BOOL)animated utm:(MWMUTM)utm
{
[Statistics logEvent:kStatCatalogOpen withParameters:@{kStatFrom : kStatMenu}];
[self openCatalogDeeplink:nil animated:animated];
[self openCatalogDeeplink:nil animated:animated utm:utm];
}
- (void)openCatalogDeeplink:(NSURL *)deeplinkUrl animated:(BOOL)animated
- (void)openCatalogDeeplink:(NSURL *)deeplinkUrl animated:(BOOL)animated utm:(MWMUTM)utm
{
[self.navigationController popToRootViewControllerAnimated:NO];
auto bookmarks = [[MWMBookmarksTabViewController alloc] init];
bookmarks.activeTab = ActiveTabCatalog;
MWMCatalogWebViewController *catalog;
if (deeplinkUrl)
catalog = [[MWMCatalogWebViewController alloc] init:deeplinkUrl];
catalog = [[MWMCatalogWebViewController alloc] init:deeplinkUrl utm:utm];
else
catalog = [[MWMCatalogWebViewController alloc] init:nil];
catalog = [[MWMCatalogWebViewController alloc] init:nil utm:utm];
NSMutableArray<UIViewController *> * controllers = [self.navigationController.viewControllers mutableCopy];
[controllers addObjectsFromArray:@[bookmarks, catalog]];

6
iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h
View file

@ -1,6 +1,7 @@
#import "MWMBookmarksObserver.h"
#import "MWMTypes.h"
#import "MWMCatalogCommon.h"
#import "MWMUTM.h"
@class MWMCategory;
@class MWMCarPlayBookmarkObject;
@ -60,8 +61,9 @@ typedef void (^LoadTagsCompletionBlock)(NSArray<MWMTagGroup *> * _Nullable tags,
- (void)setNotificationsEnabled:(BOOL)enabled;
- (BOOL)areNotificationsEnabled;
- (NSURL * _Nullable)catalogFrontendUrl;
- (NSURL * _Nullable)catalogFrontendUrlPlusPath:(NSString *)path;
- (NSURL * _Nullable)catalogFrontendUrl:(MWMUTM)utm;
- (NSURL * _Nullable)catalogFrontendUrlPlusPath:(NSString *)path
utm:(MWMUTM)utm;
- (NSURL * _Nullable)sharingUrlForCategoryId:(MWMMarkGroupID)groupId;
- (NSURL * _Nullable)webEditorUrlForCategoryId:(MWMMarkGroupID)groupId;
- (void)downloadItemWithId:(NSString *)itemId

9
iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
View file

@ -10,6 +10,8 @@
#include "Framework.h"
#include "partners_api/utm.hpp"
#include "coding/internal/file_data.hpp"
#include "base/stl_helpers.hpp"
@ -554,15 +556,16 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
#pragma mark - Catalog
- (NSURL *)catalogFrontendUrl
- (NSURL *)catalogFrontendUrl:(MWMUTM)utm
{
NSString * urlString = @(self.bm.GetCatalog().GetFrontendUrl().c_str());
NSString * urlString = @(self.bm.GetCatalog().GetFrontendUrl((UTM)utm).c_str());
return urlString ? [NSURL URLWithString:urlString] : nil;
}
- (NSURL * _Nullable)catalogFrontendUrlPlusPath:(NSString *)path
utm:(MWMUTM)utm
{
NSString * urlString = @(self.bm.GetCatalog().GetFrontendUrl().c_str());
NSString * urlString = @(self.bm.GetCatalog().GetFrontendUrl((UTM)utm).c_str());
return urlString ? [NSURL URLWithString:[urlString stringByAppendingPathComponent:path]] : nil;
}

2
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -1408,6 +1408,7 @@
4598438521394CFD00F8CAB2 /* MetalPerformanceShaders.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalPerformanceShaders.framework; path = System/Library/Frameworks/MetalPerformanceShaders.framework; sourceTree = SDKROOT; };
4598438921394D7700F8CAB2 /* shaders_metal.metallib */ = {isa = PBXFileReference; explicitFileType = "archive.metal-library"; path = shaders_metal.metallib; sourceTree = BUILT_PRODUCTS_DIR; };
45A37B9D20B33F5D005FBDBB /* FBAudienceNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBAudienceNetwork.framework; path = MoPubSDK/AdNetworkSupport/FacebookAudienceNetwork/SDK/FBAudienceNetwork.framework; sourceTree = "<group>"; };
45AC339022C4F57C004DC574 /* MWMUTM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMUTM.h; sourceTree = "<group>"; };
45CBCCBB20590AAB006B55C2 /* libkml.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libkml.a; sourceTree = BUILT_PRODUCTS_DIR; };
45FFD65C1E965EBE00DB854E /* liblocal_ads.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblocal_ads.a; path = "/Users/r.kuznetsov/Dev/Projects/omim/xcode/local_ads/../../../omim-build/xcode/Debug/liblocal_ads.a"; sourceTree = "<absolute>"; };
46F26CD610F623BA00ECCA39 /* EAGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = EAGLView.h; sourceTree = "<group>"; };
@ -3581,6 +3582,7 @@
47E3C72021108E9F008B3B27 /* BookmarksLoadedViewController.xib */,
470F5A592181DE7400754295 /* PaidRouteViewController.swift */,
470F5A5A2181DE7400754295 /* PaidRouteViewController.xib */,
45AC339022C4F57C004DC574 /* MWMUTM.h */,
);
path = Catalog;
sourceTree = "<group>";

2
iphone/Maps/TipsAndTricks/TutorialViewController.swift
View file

@ -124,7 +124,7 @@ extension TutorialViewController {
private static func bookmarksTutorialBlur() -> TutorialViewController {
let result = TutorialViewController(nibName: "BookmarksTutorialBlur", bundle: nil)
result.customAction = {
MapViewController.shared().openCatalog(animated: true)
MapViewController.shared().openCatalog(animated: true, utm: .tipsAndTricks)
}
return result
}

2
iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm
View file

@ -246,7 +246,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
{
[Statistics logEvent:kStatToolbarMenuClick withParameters:@{kStatItem : kStatDownloadGuides}];
self.state = self.restoreState;
[self.mapViewController openCatalogAnimated:YES];
[self.mapViewController openCatalogAnimated:YES utm:MWMUTMToolbarButton];
}
- (void)menuActionBookingSearch

3
iphone/Maps/UI/Discovery/MWMDiscoveryController.mm
View file

@ -344,7 +344,8 @@ struct Callback
- (void)openCatalogForURL:(NSURL *)url {
auto bookmarks = [[MWMBookmarksTabViewController alloc] init];
bookmarks.activeTab = ActiveTabCatalog;
MWMCatalogWebViewController *catalog = [[MWMCatalogWebViewController alloc] init:url];
// NOTE: UTM is already is URL, core part does it for Discovery page.
MWMCatalogWebViewController *catalog = [[MWMCatalogWebViewController alloc] init:url utm:MWMUTMNone];
NSMutableArray<UIViewController *> * controllers = [self.navigationController.viewControllers mutableCopy];
[controllers addObjectsFromArray:@[bookmarks, catalog]];
[self.navigationController setViewControllers:controllers animated:YES];

2
iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
View file

@ -892,7 +892,7 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
};
auto appInfo = AppInfo.sharedInfo;
auto locale = appInfo.twoLetterLanguageId.UTF8String;
api->GetCityGallery(self.mercator, locale, resultHandler, errorHandler);
api->GetCityGallery(self.mercator, locale, UTM::PlacepageGallery, resultHandler, errorHandler);
});
}

3
iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
View file

@ -791,7 +791,8 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
- (void)openCatalogForURL:(NSURL *)url {
auto bookmarks = [[MWMBookmarksTabViewController alloc] init];
bookmarks.activeTab = ActiveTabCatalog;
MWMCatalogWebViewController *catalog = [[MWMCatalogWebViewController alloc] init:url];
// NOTE: UTM is already is URL, core part does it for Placepage Gallery.
MWMCatalogWebViewController *catalog = [[MWMCatalogWebViewController alloc] init:url utm:MWMUTMNone];
NSMutableArray<UIViewController *> * controllers = [self.ownerViewController.navigationController.viewControllers mutableCopy];
[controllers addObjectsFromArray:@[bookmarks, catalog]];
[self.ownerViewController.navigationController setViewControllers:controllers animated:YES];

4
map/bookmark_catalog.cpp
View file

@ -289,9 +289,9 @@ std::string BookmarkCatalog::GetWebEditorUrl(std::string const & serverId,
return BuildWebEditorUrl(serverId, language);
}
std::string BookmarkCatalog::GetFrontendUrl() const
std::string BookmarkCatalog::GetFrontendUrl(UTM utm) const
{
return kCatalogFrontendServer + languages::GetCurrentNorm() + "/v2/mobilefront/";
return InjectUTM(kCatalogFrontendServer + languages::GetCurrentNorm() + "/v2/mobilefront/", utm);
}
void BookmarkCatalog::RequestTagGroups(std::string const & language,

4
map/bookmark_catalog.hpp
View file

@ -1,5 +1,7 @@
#pragma once
#include "partners_api/utm.hpp"
#include "kml/types.hpp"
#include "platform/remote_file.hpp"
@ -76,7 +78,7 @@ public:
std::string GetDownloadUrl(std::string const & serverId) const;
std::string GetWebEditorUrl(std::string const & serverId, std::string const & language) const;
std::string GetFrontendUrl() const;
std::string GetFrontendUrl(UTM utm) const;
void RequestTagGroups(std::string const & language, TagGroupsCallback && callback) const;

2
map/discovery/discovery_manager.hpp
View file

@ -114,7 +114,7 @@ public:
case ItemType::Promo:
{
m_promoApi.GetCityGallery(
params.m_viewportCenter, params.m_lang,
params.m_viewportCenter, params.m_lang, UTM::DiscoveryPageGallery,
[this, requestId, onResult](promo::CityGallery const & cityGallery) {
CHECK_THREAD_CHECKER(m_threadChecker, ());
onResult(requestId, cityGallery);

1
partners_api/CMakeLists.txt
View file

@ -54,6 +54,7 @@ set(
uber_api.hpp
utils.cpp
utils.hpp
utm.hpp
yandex_api.cpp
yandex_api.hpp
)

4
partners_api/partners_api_tests/promo_tests.cpp
View file

@ -144,7 +144,7 @@ UNIT_CLASS_TEST(ScopedEyeWithAsyncGuiThread, Promo_GetCityGallery)
{
promo::CityGallery result{};
api.GetCityGallery({}, lang, [&result](promo::CityGallery const & gallery)
api.GetCityGallery({}, lang, UTM::None, [&result](promo::CityGallery const & gallery)
{
result = gallery;
testing::Notify();
@ -160,7 +160,7 @@ UNIT_CLASS_TEST(ScopedEyeWithAsyncGuiThread, Promo_GetCityGallery)
{
promo::CityGallery result{};
m2::PointD pt;
api.GetCityGallery(pt, lang, [&result](promo::CityGallery const & gallery)
api.GetCityGallery(pt, lang, UTM::None, [&result](promo::CityGallery const & gallery)
{
result = gallery;
testing::Notify();

17
partners_api/promo_api.cpp
View file

@ -14,6 +14,7 @@
#include <algorithm>
#include <chrono>
#include <cstdint>
#include <sstream>
#include <utility>
#include "3party/jansson/myjansson.hpp"
@ -45,7 +46,7 @@ bool NeedToShowImpl(std::string const & bookingPromoAwaitingForId, eye::Eye::Inf
timeSinceLastShown > kShowPromoNotRaterThan;
}
void ParseCityGallery(std::string const & src, promo::CityGallery & result)
void ParseCityGallery(std::string const & src, UTM utm, promo::CityGallery & result)
{
base::Json root(src.c_str());
auto const dataArray = json_object_get(root.get(), "data");
@ -80,6 +81,7 @@ void ParseCityGallery(std::string const & src, promo::CityGallery & result)
auto const meta = json_object_get(root.get(), "meta");
FromJSONObject(meta, "more", result.m_moreUrl);
result.m_moreUrl.insert(0, BOOKMARKS_CATALOG_FRONT_URL);
result.m_moreUrl = InjectUTM(result.m_moreUrl, utm);
}
std::string ToSignedId(std::string const & id)
@ -109,7 +111,8 @@ std::string GetPictureUrl(std::string const & baseUrl, std::string const & id)
}
void GetPromoCityGalleryImpl(std::string const & baseUrl, std::string const & id,
std::string const & lang, CityGalleryCallback const & onSuccess,
std::string const & lang, UTM utm,
CityGalleryCallback const & onSuccess,
OnError const & onError)
{
ASSERT(!baseUrl.empty(), ());
@ -121,7 +124,7 @@ void GetPromoCityGalleryImpl(std::string const & baseUrl, std::string const & id
return;
}
GetPlatform().RunTask(Platform::Thread::Network, [baseUrl, id, lang, onSuccess, onError]()
GetPlatform().RunTask(Platform::Thread::Network, [baseUrl, id, lang, utm, onSuccess, onError]()
{
ASSERT(!id.empty(), ());
@ -135,7 +138,7 @@ void GetPromoCityGalleryImpl(std::string const & baseUrl, std::string const & id
try
{
ParseCityGallery(httpResult, result);
ParseCityGallery(httpResult, utm, result);
}
catch (base::Json::Exception const & e)
{
@ -207,7 +210,7 @@ AfterBooking Api::GetAfterBooking(std::string const & lang) const
std::string Api::GetPromoLinkForDownloader(std::string const & id, std::string const & lang) const
{
return MakeCityGalleryUrl(m_baseUrl, id, lang);
return InjectUTM(MakeCityGalleryUrl(m_baseUrl, id, lang), UTM::DownloadMwmBanner);
}
std::string Api::GetMoreUrl(std::string const & id) const
@ -218,12 +221,12 @@ std::string Api::GetMoreUrl(std::string const & id) const
return m_baseUrl + "v2/mobilefront/city/" + ToSignedId(id);
}
void Api::GetCityGallery(m2::PointD const & point, std::string const & lang,
void Api::GetCityGallery(m2::PointD const & point, std::string const & lang, UTM utm,
CityGalleryCallback const & onSuccess, OnError const & onError) const
{
CHECK(m_delegate, ());
GetPromoCityGalleryImpl(m_baseUrl, m_delegate->GetCityId(point), lang, onSuccess, onError);
GetPromoCityGalleryImpl(m_baseUrl, m_delegate->GetCityId(point), lang, utm, onSuccess, onError);
}
void Api::OnMapObjectEvent(eye::MapObject const & mapObject)

5
partners_api/promo_api.hpp
View file

@ -1,5 +1,7 @@
#pragma once
#include "partners_api/utm.hpp"
#include "metrics/eye.hpp"
#include "platform/safe_callback.hpp"
@ -69,6 +71,7 @@ public:
virtual std::string GetCityId(m2::PointD const & point) = 0;
};
Api(std::string const & baseUrl = BOOKMARKS_CATALOG_FRONT_URL,
std::string const & basePicturesUrl = PICTURES_URL);
@ -78,7 +81,7 @@ public:
AfterBooking GetAfterBooking(std::string const & lang) const;
std::string GetPromoLinkForDownloader(std::string const & id, std::string const & lang) const;
std::string GetMoreUrl(std::string const & id) const;
void GetCityGallery(m2::PointD const & point, std::string const & lang,
void GetCityGallery(m2::PointD const & point, std::string const & lang, UTM utm,
CityGalleryCallback const & onSuccess, OnError const & onError) const;
// eye::Subscriber overrides:

53
partners_api/utm.hpp Normal file
View file

@ -0,0 +1,53 @@
#pragma once
#include "base/url_helpers.hpp"
#include <cstdint>
#include <string>
enum class UTM : uint8_t
{
None = 0,
BookmarksPageCatalogButton,
ToolbarButton,
DownloadMwmBanner,
PlacepageGallery,
DiscoveryPageGallery,
TipsAndTricks
};
inline std::string InjectUTM(std::string const & url, UTM utm)
{
base::url::Params params;
params.emplace_back("utm_source", "maps.me");
switch (utm)
{
case UTM::BookmarksPageCatalogButton:
params.emplace_back("utm_medium", "button");
params.emplace_back("utm_campaign", "bookmarks_downloaded");
break;
case UTM::ToolbarButton:
params.emplace_back("utm_medium", "button");
params.emplace_back("utm_campaign", "toolbar_menu");
break;
case UTM::DownloadMwmBanner:
params.emplace_back("utm_medium", "banner");
params.emplace_back("utm_campaign", "download_map_popup");
break;
case UTM::PlacepageGallery:
params.emplace_back("utm_medium", "gallery");
params.emplace_back("utm_campaign", "placepage_gallery");
break;
case UTM::DiscoveryPageGallery:
params.emplace_back("utm_medium", "gallery");
params.emplace_back("utm_campaign", "discovery_button_gallery");
break;
case UTM::TipsAndTricks:
params.emplace_back("utm_medium", "button");
params.emplace_back("utm_campaign", "tips_and_tricks");
break;
case UTM::None:
return url;
}
return base::url::Make(url, params);
}

4
xcode/partners_api/partners_api.xcodeproj/project.pbxproj
View file

@ -66,6 +66,7 @@
4566605120D91FEE0085E8C1 /* megafon_countries.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4566604F20D91FEE0085E8C1 /* megafon_countries.hpp */; };
4566605320D920000085E8C1 /* megafon_countries_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4566605220D920000085E8C1 /* megafon_countries_tests.cpp */; };
4566605520D920220085E8C1 /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4566605420D920220085E8C1 /* libstorage.a */; };
45AC338F22C4F449004DC574 /* utm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45AC338E22C4F448004DC574 /* utm.hpp */; };
45BABC33229812830060FA53 /* downloader_promo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45BABC31229812820060FA53 /* downloader_promo.cpp */; };
45BABC34229812830060FA53 /* downloader_promo.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45BABC32229812830060FA53 /* downloader_promo.hpp */; };
45C380772094C5B400C18D81 /* partners.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45C380752094C5B400C18D81 /* partners.cpp */; };
@ -160,6 +161,7 @@
4566604F20D91FEE0085E8C1 /* megafon_countries.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = megafon_countries.hpp; sourceTree = "<group>"; };
4566605220D920000085E8C1 /* megafon_countries_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = megafon_countries_tests.cpp; sourceTree = "<group>"; };
4566605420D920220085E8C1 /* libstorage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libstorage.a; sourceTree = BUILT_PRODUCTS_DIR; };
45AC338E22C4F448004DC574 /* utm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = utm.hpp; sourceTree = "<group>"; };
45BABC31229812820060FA53 /* downloader_promo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = downloader_promo.cpp; sourceTree = "<group>"; };
45BABC32229812830060FA53 /* downloader_promo.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = downloader_promo.hpp; sourceTree = "<group>"; };
45C380752094C5B400C18D81 /* partners.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = partners.cpp; sourceTree = "<group>"; };
@ -295,6 +297,7 @@
F6B5363F1DA520E40067EEA5 /* uber_api.hpp */,
3D4E997E1FB439300025B48C /* utils.cpp */,
3D47B2B01F14FA14000828D2 /* utils.hpp */,
45AC338E22C4F448004DC574 /* utm.hpp */,
3DFEBF831EF82BEA00317D5C /* viator_api.cpp */,
3DFEBF841EF82BEA00317D5C /* viator_api.hpp */,
3DFEBF981EFBFC1500317D5C /* yandex_api.cpp */,
@ -389,6 +392,7 @@
349CFD0A2045720000569949 /* maxim_api.hpp in Headers */,
3D4E997C1FB439260025B48C /* booking_availability_params.hpp in Headers */,
3DFEBF9C1EFBFC1500317D5C /* taxi_engine.hpp in Headers */,
45AC338F22C4F449004DC574 /* utm.hpp in Headers */,
4566605120D91FEE0085E8C1 /* megafon_countries.hpp in Headers */,
F6B536431DA520E40067EEA5 /* uber_api.hpp in Headers */,
3DBC1C551E4B14920016897F /* facebook_ads.hpp in Headers */,