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

Merge pull request #5785 from darina/deep-link-not-follow

Browse source 
Don't follow to my position in case of launch by deep link.
This commit is contained in:
Roman Kuznetsov 2017-04-07 13:45:20 +03:00 • committed by GitHub
commit 5031637d27
14 changed files with 105 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -146,7 +146,9 @@ bool Framework::CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi
p.m_hasMyPositionState = m_isCurrentModeInitialized;
p.m_initialMyPositionState = m_currentMode;
p.m_isChoosePositionMode = m_isChoosePositionMode;
p.m_isFirstLaunch = firstLaunch;
p.m_hints.m_isFirstLaunch = firstLaunch;
// TODO: Add initialization.
// p.m_hints.m_isLaunchByDeepLink = ...;
ASSERT(!m_guiPositions.empty(), ("GUI elements must be set-up before engine is created"));
p.m_widgetsInitInfo = m_guiPositions;

1
drape_frontend/CMakeLists.txt
View file

@ -70,6 +70,7 @@ set(
drape_api_renderer.hpp
drape_engine.cpp
drape_engine.hpp
drape_hints.hpp
drape_measurer.cpp
drape_measurer.hpp
engine_context.cpp

39
drape_frontend/drape_engine.cpp
View file

@ -1,6 +1,7 @@
#include "drape_frontend/drape_engine.hpp"
#include "drape_frontend/message_subclasses.hpp"
#include "drape_frontend/visual_params.hpp"
#include "drape_frontend/my_position_controller.hpp"
#include "drape_frontend/gui/drape_gui.hpp"
@ -43,25 +44,39 @@ DrapeEngine::DrapeEngine(Params && params)
if (settings::Get("LastEnterBackground", lastEnterBackground))
timeInBackground = my::Timer::LocalTime() - lastEnterBackground;
FrontendRenderer::Params frParams(make_ref(m_threadCommutator), params.m_factory,
make_ref(m_textureManager), m_viewport,
MyPositionController::Params mpParams(mode,
timeInBackground,
params.m_hints,
params.m_isRoutingActive,
params.m_isAutozoomEnabled,
bind(&DrapeEngine::MyPositionModeChanged, this, _1, _2));
FrontendRenderer::Params frParams(make_ref(m_threadCommutator),
params.m_factory,
make_ref(m_textureManager),
move(mpParams),
m_viewport,
bind(&DrapeEngine::ModelViewChanged, this, _1),
bind(&DrapeEngine::TapEvent, this, _1),
bind(&DrapeEngine::UserPositionChanged, this, _1),
bind(&DrapeEngine::MyPositionModeChanged, this, _1, _2),
mode, make_ref(m_requestedTiles),
move(params.m_overlaysShowStatsCallback), timeInBackground,
params.m_allow3dBuildings, params.m_trafficEnabled,
params.m_blockTapEvents, params.m_isFirstLaunch,
params.m_isRoutingActive, params.m_isAutozoomEnabled);
make_ref(m_requestedTiles),
move(params.m_overlaysShowStatsCallback),
params.m_allow3dBuildings,
params.m_trafficEnabled,
params.m_blockTapEvents);
m_frontend = make_unique_dp<FrontendRenderer>(move(frParams));
BackendRenderer::Params brParams(frParams.m_commutator, frParams.m_oglContextFactory,
frParams.m_texMng, params.m_model,
BackendRenderer::Params brParams(frParams.m_commutator,
frParams.m_oglContextFactory,
frParams.m_texMng,
params.m_model,
params.m_model.UpdateCurrentCountryFn(),
make_ref(m_requestedTiles), params.m_allow3dBuildings,
params.m_trafficEnabled, params.m_simplifiedTrafficColors);
make_ref(m_requestedTiles),
params.m_allow3dBuildings,
params.m_trafficEnabled,
params.m_simplifiedTrafficColors);
m_backend = make_unique_dp<BackendRenderer>(move(brParams));
m_widgetsInfo = move(params.m_info);

7
drape_frontend/drape_engine.hpp
View file

@ -3,6 +3,7 @@
#include "drape_frontend/backend_renderer.hpp"
#include "drape_frontend/color_constants.hpp"
#include "drape_frontend/custom_symbol.hpp"
#include "drape_frontend/drape_hints.hpp"
#include "drape_frontend/frontend_renderer.hpp"
#include "drape_frontend/route_shape.hpp"
#include "drape_frontend/overlays_tracker.hpp"
@ -44,6 +45,7 @@ public:
ref_ptr<StringsBundle> stringBundle,
Viewport const & viewport,
MapDataProvider const & model,
Hints const & hints,
double vs,
double fontsScaleFactor,
gui::TWidgetsInitInfo && info,
@ -54,7 +56,6 @@ public:
bool blockTapEvents,
bool showChoosePositionMark,
vector<m2::TriangleD> && boundAreaTriangles,
bool firstLaunch,
bool isRoutingActive,
bool isAutozoomEnabled,
bool simplifiedTrafficColors,
@ -63,6 +64,7 @@ public:
, m_stringsBundle(stringBundle)
, m_viewport(viewport)
, m_model(model)
, m_hints(hints)
, m_vs(vs)
, m_fontsScaleFactor(fontsScaleFactor)
, m_info(move(info))
@ -73,7 +75,6 @@ public:
, m_blockTapEvents(blockTapEvents)
, m_showChoosePositionMark(showChoosePositionMark)
, m_boundAreaTriangles(move(boundAreaTriangles))
, m_isFirstLaunch(firstLaunch)
, m_isRoutingActive(isRoutingActive)
, m_isAutozoomEnabled(isAutozoomEnabled)
, m_simplifiedTrafficColors(simplifiedTrafficColors)
@ -84,6 +85,7 @@ public:
ref_ptr<StringsBundle> m_stringsBundle;
Viewport m_viewport;
MapDataProvider m_model;
Hints m_hints;
double m_vs;
double m_fontsScaleFactor;
gui::TWidgetsInitInfo m_info;
@ -94,7 +96,6 @@ public:
bool m_blockTapEvents;
bool m_showChoosePositionMark;
vector<m2::TriangleD> m_boundAreaTriangles;
bool m_isFirstLaunch;
bool m_isRoutingActive;
bool m_isAutozoomEnabled;
bool m_simplifiedTrafficColors;

1
drape_frontend/drape_frontend.pro
View file

@ -152,6 +152,7 @@ HEADERS += \
drape_api_builder.hpp \
drape_api_renderer.hpp \
drape_engine.hpp \
drape_hints.hpp \
drape_measurer.hpp \
engine_context.hpp \
framebuffer.hpp \

10
drape_frontend/drape_hints.hpp Normal file
View file

@ -0,0 +1,10 @@
#pragma once
namespace df
{
struct Hints
{
bool m_isFirstLaunch = false;
bool m_isLaunchByDeepLink = false;
};
} // namespace df

4
drape_frontend/frontend_renderer.cpp
View file

@ -150,9 +150,7 @@ FrontendRenderer::FrontendRenderer(Params && params)
ASSERT(m_tapEventInfoFn, ());
ASSERT(m_userPositionChangedFn, ());
m_myPositionController.reset(new MyPositionController(params.m_initMyPositionMode, params.m_timeInBackground,
params.m_firstLaunch, params.m_isRoutingActive,
params.m_isAutozoomEnabled, params.m_myPositionModeCallback));
m_myPositionController.reset(new MyPositionController(move(params.m_myPositionParams)));
StartThread();
}

18
drape_frontend/frontend_renderer.hpp
View file

@ -73,39 +73,30 @@ public:
Params(ref_ptr<ThreadsCommutator> commutator,
ref_ptr<dp::OGLContextFactory> factory,
ref_ptr<dp::TextureManager> texMng,
MyPositionController::Params && myPositionParams,
Viewport viewport,
TModelViewChanged const & modelViewChangedFn,
TTapEventInfoFn const & tapEventFn,
TUserPositionChangedFn const & positionChangedFn,
location::TMyPositionModeChanged myPositionModeCallback,
location::EMyPositionMode initMode,
ref_ptr<RequestedTiles> requestedTiles,
OverlaysShowStatsCallback && overlaysShowStatsCallback,
double timeInBackground,
bool allow3dBuildings,
bool trafficEnabled,
bool blockTapEvents,
bool firstLaunch,
bool isRoutingActive,
bool isAutozoomEnabled)
bool blockTapEvents)
: BaseRenderer::Params(commutator, factory, texMng)
, m_myPositionParams(move(myPositionParams))
, m_viewport(viewport)
, m_modelViewChangedFn(modelViewChangedFn)
, m_tapEventFn(tapEventFn)
, m_positionChangedFn(positionChangedFn)
, m_myPositionModeCallback(myPositionModeCallback)
, m_initMyPositionMode(initMode)
, m_requestedTiles(requestedTiles)
, m_overlaysShowStatsCallback(move(overlaysShowStatsCallback))
, m_timeInBackground(timeInBackground)
, m_allow3dBuildings(allow3dBuildings)
, m_trafficEnabled(trafficEnabled)
, m_blockTapEvents(blockTapEvents)
, m_firstLaunch(firstLaunch)
, m_isRoutingActive(isRoutingActive)
, m_isAutozoomEnabled(isAutozoomEnabled)
{}
MyPositionController::Params m_myPositionParams;
Viewport m_viewport;
TModelViewChanged m_modelViewChangedFn;
TTapEventInfoFn m_tapEventFn;
@ -119,6 +110,7 @@ public:
bool m_trafficEnabled;
bool m_blockTapEvents;
bool m_firstLaunch;
bool m_isLaunchByDeepLink;
bool m_isRoutingActive;
bool m_isAutozoomEnabled;
};

28
drape_frontend/my_position_controller.cpp
View file

@ -123,14 +123,12 @@ double CalculateZoomBySpeed(double speed, bool isPerspectiveAllowed)
} // namespace
MyPositionController::MyPositionController(location::EMyPositionMode initMode, double timeInBackground,
bool isFirstLaunch, bool isRoutingActive, bool isAutozoomEnabled,
location::TMyPositionModeChanged const & fn)
MyPositionController::MyPositionController(Params && params)
: m_mode(location::PendingPosition)
, m_desiredInitMode(initMode)
, m_modeChangeCallback(fn)
, m_isFirstLaunch(isFirstLaunch)
, m_isInRouting(isRoutingActive)
, m_desiredInitMode(params.m_initMode)
, m_modeChangeCallback(move(params.m_myPositionModeCallback))
, m_hints(params.m_hints)
, m_isInRouting(params.m_isRoutingActive)
, m_needBlockAnimation(false)
, m_wasRotationInScaling(false)
, m_errorRadius(0.0)
@ -139,7 +137,7 @@ MyPositionController::MyPositionController(location::EMyPositionMode initMode, d
, m_oldPosition(m2::PointD::Zero())
, m_oldDrawDirection(0.0)
, m_enablePerspectiveInRouting(false)
, m_enableAutoZoomInRouting(isAutozoomEnabled)
, m_enableAutoZoomInRouting(params.m_isAutozoomEnabled)
, m_autoScale2d(GetScale(kDefaultAutoZoom))
, m_autoScale3d(m_autoScale2d)
, m_lastGPSBearing(false)
@ -156,12 +154,16 @@ MyPositionController::MyPositionController(location::EMyPositionMode initMode, d
, m_needBlockAutoZoom(false)
, m_notFollowAfterPending(false)
{
if (m_isFirstLaunch)
if (m_hints.m_isFirstLaunch)
{
m_mode = location::NotFollowNoPosition;
m_desiredInitMode = location::NotFollowNoPosition;
}
else if (timeInBackground >= kMaxTimeInBackgroundSec)
else if (m_hints.m_isLaunchByDeepLink)
{
m_desiredInitMode = location::NotFollow;
}
else if (params.m_timeInBackground >= kMaxTimeInBackgroundSec)
{
m_desiredInitMode = location::Follow;
}
@ -412,8 +414,8 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool
}
else if (!m_isPositionAssigned)
{
ChangeMode(m_isFirstLaunch ? location::Follow : m_desiredInitMode);
if (!m_isFirstLaunch || !AnimationSystem::Instance().AnimationExists(Animation::Object::MapPlane))
ChangeMode(m_hints.m_isFirstLaunch ? location::Follow : m_desiredInitMode);
if (!m_hints.m_isFirstLaunch || !AnimationSystem::Instance().AnimationExists(Animation::Object::MapPlane))
{
if (m_mode == location::Follow)
ChangeModelView(m_position, kDoNotChangeZoom);
@ -432,7 +434,7 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool
else
{
ChangeMode(location::Follow);
if (!m_isFirstLaunch)
if (!m_hints.m_isFirstLaunch)
{
if (GetZoomLevel(screen, m_position, m_errorRadius) <= kMaxScaleZoomLevel)
{

31
drape_frontend/my_position_controller.hpp
View file

@ -1,5 +1,6 @@
#pragma once
#include "drape_frontend/drape_hints.hpp"
#include "drape_frontend/my_position.hpp"
#include "drape/gpu_program_manager.hpp"
@ -40,9 +41,31 @@ public:
TAnimationCreator const & parallelAnimCreator) = 0;
};
MyPositionController(location::EMyPositionMode initMode, double timeInBackground,
bool isFirstLaunch, bool isRoutingActive, bool isAutozoomEnabled,
location::TMyPositionModeChanged const & fn);
struct Params
{
Params(location::EMyPositionMode initMode,
double timeInBackground,
Hints const & hints,
bool isRoutingActive,
bool isAutozoomEnabled,
location::TMyPositionModeChanged && fn)
: m_initMode(initMode)
, m_timeInBackground(timeInBackground)
, m_hints(hints)
, m_isRoutingActive(isRoutingActive)
, m_isAutozoomEnabled(isAutozoomEnabled)
, m_myPositionModeCallback(move(fn))
{}
location::EMyPositionMode m_initMode;
double m_timeInBackground;
Hints m_hints;
bool m_isRoutingActive;
bool m_isAutozoomEnabled;
location::TMyPositionModeChanged m_myPositionModeCallback;
};
MyPositionController(Params && params);
~MyPositionController();
void UpdatePosition();
@ -133,7 +156,7 @@ private:
location::EMyPositionMode m_mode;
location::EMyPositionMode m_desiredInitMode;
location::TMyPositionModeChanged m_modeChangeCallback;
bool m_isFirstLaunch;
Hints m_hints;
bool m_isInRouting;

6
iphone/Maps/Classes/EAGLView.mm
View file

@ -84,8 +84,10 @@ double getExactDPI(double contentScaleFactor)
p.m_surfaceWidth = width;
p.m_surfaceHeight = height;
p.m_visualScale = dp::VisualScale(getExactDPI(self.contentScaleFactor));
p.m_isFirstLaunch = [Alohalytics isFirstSession];
p.m_hints.m_isFirstLaunch = [Alohalytics isFirstSession];
// TODO: Add initialization.
// p.m_hints.m_isLaunchByDeepLink = ...;
[self.widgetsManager setupWidgets:p];
GetFramework().CreateDrapeEngine(make_ref(m_factory), move(p));

4
map/framework.cpp
View file

@ -1809,10 +1809,10 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
make_ref(&m_stringsBundle),
df::Viewport(0, 0, params.m_surfaceWidth, params.m_surfaceHeight),
df::MapDataProvider(idReadFn, featureReadFn, isCountryLoadedByNameFn, updateCurrentCountryFn),
params.m_visualScale, fontsScaleFactor, move(params.m_widgetsInitInfo),
params.m_hints, params.m_visualScale, fontsScaleFactor, move(params.m_widgetsInitInfo),
make_pair(params.m_initialMyPositionState, params.m_hasMyPositionState),
move(myPositionModeChangedFn), allow3dBuildings, trafficEnabled, params.m_isChoosePositionMode,
params.m_isChoosePositionMode, GetSelectedFeatureTriangles(), params.m_isFirstLaunch,
params.m_isChoosePositionMode, GetSelectedFeatureTriangles(),
m_routingSession.IsActive() && m_routingSession.IsFollowing(), isAutozoomEnabled,
simplifiedTrafficColors, move(overlaysShowStatsFn));

3
map/framework.hpp
View file

@ -451,8 +451,7 @@ public:
location::EMyPositionMode m_initialMyPositionState = location::PendingPosition;
bool m_isChoosePositionMode = false;
bool m_isFirstLaunch = false;
df::Hints m_hints;
};
void CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory, DrapeCreationParams && params);

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

@ -213,6 +213,7 @@
67E91C7E1BDFC85E005CEE88 /* visual_params.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6709478F1BDF9BE1005014C0 /* visual_params.cpp */; };
BB035F6F1E3A2AAE00519962 /* drape_measurer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB035F6D1E3A2AAE00519962 /* drape_measurer.cpp */; };
BB035F701E3A2AAE00519962 /* drape_measurer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BB035F6E1E3A2AAE00519962 /* drape_measurer.hpp */; };
BBD8F8791E96A51A00BAEB72 /* drape_hints.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BBD8F8781E96A51A00BAEB72 /* drape_hints.hpp */; };
F6B283101C1B04680081957A /* gps_track_point.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6B2830B1C1B04680081957A /* gps_track_point.hpp */; };
F6B283111C1B04680081957A /* gps_track_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6B2830C1C1B04680081957A /* gps_track_renderer.cpp */; };
F6B283121C1B04680081957A /* gps_track_renderer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6B2830D1C1B04680081957A /* gps_track_renderer.hpp */; };
@ -431,6 +432,7 @@
677A2DE41C0DD55D00635A00 /* requested_tiles.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = requested_tiles.hpp; sourceTree = "<group>"; };
BB035F6D1E3A2AAE00519962 /* drape_measurer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drape_measurer.cpp; sourceTree = "<group>"; };
BB035F6E1E3A2AAE00519962 /* drape_measurer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drape_measurer.hpp; sourceTree = "<group>"; };
BBD8F8781E96A51A00BAEB72 /* drape_hints.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drape_hints.hpp; sourceTree = "<group>"; };
F6B2830B1C1B04680081957A /* gps_track_point.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_track_point.hpp; sourceTree = "<group>"; };
F6B2830C1C1B04680081957A /* gps_track_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track_renderer.cpp; sourceTree = "<group>"; };
F6B2830D1C1B04680081957A /* gps_track_renderer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_track_renderer.hpp; sourceTree = "<group>"; };
@ -483,6 +485,7 @@
347F520A1DC2334A0064B273 /* drape_api_renderer.hpp */,
347F520B1DC2334A0064B273 /* drape_api.cpp */,
347F520C1DC2334A0064B273 /* drape_api.hpp */,
BBD8F8781E96A51A00BAEB72 /* drape_hints.hpp */,
BB035F6D1E3A2AAE00519962 /* drape_measurer.cpp */,
BB035F6E1E3A2AAE00519962 /* drape_measurer.hpp */,
34C624BF1DABDB0400510300 /* traffic_generator.cpp */,
@ -765,6 +768,7 @@
56D545671C74A44900E3719C /* overlay_batcher.hpp in Headers */,
670947B21BDF9BE1005014C0 /* read_mwm_task.hpp in Headers */,
670947C91BDF9BE1005014C0 /* text_shape.hpp in Headers */,
BBD8F8791E96A51A00BAEB72 /* drape_hints.hpp in Headers */,
677A2DE61C0DD55D00635A00 /* requested_tiles.hpp in Headers */,
670947C11BDF9BE1005014C0 /* shape_view_params.hpp in Headers */,
670948461BDF9C48005014C0 /* gui_text.hpp in Headers */,