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

Removed LocalAdsManager from core Framework.

Browse source 
Signed-off-by: vng <viktor.govako@gmail.com>
This commit is contained in:
vng 2021-02-20 15:13:33 +03:00 • committed by Roman Tsisyk
parent 671cbfa3e1
commit 2c8bffeb07
3 changed files with 6 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -861,19 +861,6 @@ std::string Framework::GetPromoCityUrl(JNIEnv * env, jobject policy, jdouble lat
void Framework::LogLocalAdsEvent(local_ads::EventType type, double lat, double lon, uint16_t accuracy)
{
::Framework * frm = g_framework->NativeFramework();
if (!frm->HasPlacePageInfo())
return;
auto const & info = g_framework->GetPlacePageInfo();
auto const & featureID = info.GetID();
auto const & mwmInfo = featureID.m_mwmId.GetInfo();
if (!mwmInfo)
return;
local_ads::Event event(type, mwmInfo->GetVersion(), mwmInfo->GetCountryName(), featureID.m_index,
m_work.GetDrawScale(), local_ads::Clock::now(), lat, lon, accuracy);
m_work.GetLocalAdsManager().GetStatistics().RegisterEvent(std::move(event));
}
void Framework::OnPowerFacilityChanged(power_management::Facility const facility, bool enabled)

70
map/framework.cpp
View file

@ -269,7 +269,6 @@ void Framework::OnLocationUpdate(GpsInfo const & info)
#endif
m_routingManager.OnLocationUpdate(rInfo);
m_localAdsManager.OnLocationUpdate(rInfo, GetDrawScale());
}
void Framework::OnCompassUpdate(CompassInfo const & info)
@ -306,11 +305,6 @@ TrafficManager & Framework::GetTrafficManager()
return m_trafficManager;
}
LocalAdsManager & Framework::GetLocalAdsManager()
{
return m_localAdsManager;
}
TransitReadManager & Framework::GetTransitManager()
{
return m_transitManager;
@ -358,7 +352,6 @@ void Framework::OnViewportChanged(ScreenBase const & screen)
GetBookmarkManager().UpdateViewport(m_currentModelView);
m_trafficManager.UpdateViewport(m_currentModelView);
m_localAdsManager.UpdateViewport(m_currentModelView);
m_transitManager.UpdateViewport(m_currentModelView);
m_isolinesManager.UpdateViewport(m_currentModelView);
m_guidesManager.UpdateViewport(m_currentModelView);
@ -368,11 +361,7 @@ void Framework::OnViewportChanged(ScreenBase const & screen)
}
Framework::Framework(FrameworkParams const & params)
: m_localAdsManager(bind(&Framework::GetMwmsByRect, this, _1, true /* rough */),
bind(&Framework::GetMwmIdByName, this, _1),
bind(&Framework::ReadFeatures, this, _1, _2),
bind(&Framework::GetMapObjectByID, this, _1))
, m_enabledDiffs(params.m_enableDiffs)
: m_enabledDiffs(params.m_enableDiffs)
, m_isRenderingEnabled(true)
, m_transitManager(m_featuresFetcher.GetDataSource(),
[this](FeatureCallback const & fn, vector<FeatureID> const & features) {
@ -502,14 +491,6 @@ Framework::Framework(FrameworkParams const & params)
GetSearchAPI().LoadCitiesBoundaries();
GetSearchAPI().CacheWorldLocalities();
// Local ads manager should be initialized after storage initialization.
if (params.m_enableLocalAds)
{
auto const isActive = m_purchase->IsSubscriptionActive(SubscriptionType::RemoveAds);
m_localAdsManager.Startup(m_bmManager.get(), !isActive);
m_purchase->RegisterSubscription(&m_localAdsManager);
}
m_routingManager.SetRouterImpl(RouterType::Vehicle);
UpdateMinBuildingsTapZoom();
@ -662,10 +643,11 @@ void Framework::OnCountryFileDownloaded(storage::CountryId const & countryId,
if (id.IsAlive())
rect = id.GetInfo()->m_bordersRect;
}
m_trafficManager.Invalidate();
m_transitManager.Invalidate();
m_isolinesManager.Invalidate();
m_localAdsManager.OnDownloadCountry(countryId);
InvalidateRect(rect);
GetSearchAPI().ClearCaches();
}
@ -700,7 +682,6 @@ void Framework::OnMapDeregistered(platform::LocalCountryFile const & localFile)
{
auto action = [this, localFile]
{
m_localAdsManager.OnMwmDeregistered(localFile);
m_transitManager.OnMwmDeregistered(localFile);
m_isolinesManager.OnMwmDeregistered(localFile);
m_trafficManager.OnMwmDeregistered(localFile);
@ -1007,20 +988,6 @@ void Framework::FillInfoFromFeatureType(FeatureType & ft, place_page::Info & inf
!info.IsNotEditableSponsored() && isMapVersionEditable;
info.SetCanEditOrAdd(canEditOrAdd);
if (m_localAdsManager.IsSupportedType(info.GetTypes()))
{
info.SetLocalAdsUrl(m_localAdsManager.GetCompanyUrl(ft.GetID()));
auto status = m_localAdsManager.HasAds(ft.GetID()) ? place_page::LocalAdsStatus::Customer
: place_page::LocalAdsStatus::Candidate;
if (status == place_page::LocalAdsStatus::Customer && !m_localAdsManager.HasVisualization(ft.GetID()))
status = place_page::LocalAdsStatus::Hidden;
info.SetLocalAdsStatus(status);
}
else
{
info.SetLocalAdsStatus(place_page::LocalAdsStatus::NotAvailable);
}
auto const latlon = mercator::ToLatLon(feature::GetCenter(ft));
ASSERT(m_taxiEngine, ());
info.SetReachableByTaxiProviders(m_taxiEngine->GetProvidersAtPos(latlon));
@ -1837,13 +1804,13 @@ void Framework::FillSearchResultsMarks(search::Results::ConstIter begin,
if (r.m_details.m_isSponsoredHotel)
{
mark->SetBookingType(isFeature && m_localAdsManager.HasVisualization(r.GetFeatureID()) /* hasLocalAds */);
//mark->SetBookingType(isFeature && m_localAdsManager.HasVisualization(r.GetFeatureID()) /* hasLocalAds */);
mark->SetRating(r.m_details.m_hotelRating);
mark->SetPricing(r.m_details.m_hotelPricing);
}
else if (isFeature)
{
bool const hasLocalAds = m_localAdsManager.HasVisualization(r.GetFeatureID());
bool const hasLocalAds = false;
if (r.m_details.m_isHotel)
mark->SetHotelType(hasLocalAds);
else
@ -1926,26 +1893,8 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::GraphicsContextFactory> contextFac
return PartnerChecker::Instance().IsFakeObject(ft);
};
auto overlaysShowStatsFn = [this](list<df::OverlayShowEvent> && events)
auto overlaysShowStatsFn = [](list<df::OverlayShowEvent> &&)
{
if (events.empty())
return;
list<local_ads::Event> statEvents;
for (auto const & event : events)
{
auto const & mwmInfo = event.m_feature.m_mwmId.GetInfo();
if (!mwmInfo || !m_localAdsManager.HasAds(event.m_feature))
continue;
statEvents.emplace_back(local_ads::EventType::ShowPoint,
mwmInfo->GetVersion(), mwmInfo->GetCountryName(),
event.m_feature.m_index, event.m_zoomLevel, event.m_timestamp,
mercator::YToLat(event.m_myPosition.y),
mercator::XToLon(event.m_myPosition.x),
static_cast<uint16_t>(event.m_gpsAccuracy));
}
m_localAdsManager.GetStatistics().RegisterEvents(std::move(statEvents));
};
auto onGraphicsContextInitialized = [this]()
@ -2035,7 +1984,6 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::GraphicsContextFactory> contextFac
m_transitManager.SetDrapeEngine(make_ref(m_drapeEngine));
m_isolinesManager.SetDrapeEngine(make_ref(m_drapeEngine));
m_guidesManager.SetDrapeEngine(make_ref(m_drapeEngine));
m_localAdsManager.SetDrapeEngine(make_ref(m_drapeEngine));
m_searchMarks.SetDrapeEngine(make_ref(m_drapeEngine));
InvalidateUserMarks();
@ -2069,7 +2017,6 @@ void Framework::OnRecoverSurface(int width, int height, bool recreateContextDepe
m_trafficManager.OnRecoverSurface();
m_transitManager.Invalidate();
m_isolinesManager.Invalidate();
m_localAdsManager.Invalidate();
}
void Framework::OnDestroySurface()
@ -2104,7 +2051,6 @@ void Framework::DestroyDrapeEngine()
m_transitManager.SetDrapeEngine(nullptr);
m_isolinesManager.SetDrapeEngine(nullptr);
m_guidesManager.SetDrapeEngine(nullptr);
m_localAdsManager.SetDrapeEngine(nullptr);
m_searchMarks.SetDrapeEngine(nullptr);
GetBookmarkManager().SetDrapeEngine(nullptr);
@ -2211,7 +2157,6 @@ void Framework::SetMapStyle(MapStyle mapStyle)
if (m_drapeEngine != nullptr)
m_drapeEngine->UpdateMapStyle();
InvalidateUserMarks();
m_localAdsManager.Invalidate();
UpdateMinBuildingsTapZoom();
}
@ -2721,7 +2666,6 @@ std::optional<place_page::Info> Framework::BuildPlacePageInfo(
return {};
outInfo.SetBuildInfo(buildInfo);
outInfo.SetAdsEngine(m_adsEngine.get());
if (buildInfo.IsUserMarkMatchingEnabled())
{
@ -4063,8 +4007,6 @@ search::ProductInfo Framework::GetProductInfo(search::Result const & result) con
search::ProductInfo productInfo;
productInfo.m_isLocalAdsCustomer = m_localAdsManager.HasVisualization(result.GetFeatureID());
auto const ugc = m_ugcApi->GetLoader().GetUGC(result.GetFeatureID());
productInfo.m_ugcRating = ugc.m_totalRating;

5
map/framework.hpp
View file

@ -11,7 +11,6 @@
#include "map/features_fetcher.hpp"
#include "map/guides_manager.hpp"
#include "map/isolines_manager.hpp"
#include "map/local_ads_manager.hpp"
#include "map/mwm_url.hpp"
#include "map/notifications/notification_manager.hpp"
#include "map/place_page_info.hpp"
@ -199,8 +198,6 @@ protected:
// search::Engine and, therefore, destroyed after search::Engine.
std::unique_ptr<storage::CountryInfoGetter> m_infoGetter;
LocalAdsManager m_localAdsManager;
// The order matters here: ugc::Api should be destroyed after
// SearchAPI and notifications::NotificationManager.
std::unique_ptr<ugc::Api> m_ugcApi;
@ -772,8 +769,6 @@ public:
TrafficManager & GetTrafficManager();
LocalAdsManager & GetLocalAdsManager();
TransitReadManager & GetTransitManager();
IsolinesManager & GetIsolinesManager();