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

Supporting adding new place via long tap

Browse source
This commit is contained in:
r.kuznetsov 2016-04-21 13:31:59 +03:00
parent 7ab4c38ced
commit 538b571506
16 changed files with 49 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -203,11 +203,12 @@ void Framework::Get3dMode(bool & allow3d, bool & allow3dBuildings)
m_work.Load3dMode(allow3d, allow3dBuildings);
}
void Framework::SetChoosePositionMode(bool isChoosePositionMode, bool isBusiness)
void Framework::SetChoosePositionMode(bool isChoosePositionMode, bool isBusiness,
bool hasPosition, m2::PointD const & position)
{
m_isChoosePositionMode = isChoosePositionMode;
m_work.BlockTapEvents(isChoosePositionMode);
m_work.EnableChoosePositionMode(isChoosePositionMode, isBusiness);
m_work.EnableChoosePositionMode(isChoosePositionMode, isBusiness, hasPosition, position);
}
Storage & Framework::Storage()
@ -988,7 +989,8 @@ Java_com_mapswithme_maps_Framework_nativeOnBookmarkCategoryChanged(JNIEnv * env,
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_Framework_nativeTurnChoosePositionMode(JNIEnv *, jclass, jboolean turnOn, jboolean isBusiness)
{
g_framework->SetChoosePositionMode(turnOn, isBusiness);
//TODO(Android team): implement positioning
g_framework->SetChoosePositionMode(turnOn, isBusiness, false /* hasPosition */, m2::PointD());
}
JNIEXPORT jboolean JNICALL

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

@ -137,7 +137,7 @@ namespace android
void Set3dMode(bool allow3d, bool allow3dBuildings);
void Get3dMode(bool & allow3d, bool & allow3dBuildings);
void SetChoosePositionMode(bool isChoosePositionMode, bool isBusiness);
void SetChoosePositionMode(bool isChoosePositionMode, bool isBusiness, bool hasPosition, m2::PointD const & position);
void SetupWidget(gui::EWidget widget, float x, float y, dp::Anchor anchor);
void ApplyWidgets();

8
drape_frontend/drape_engine.cpp
View file

@ -70,7 +70,7 @@ DrapeEngine::DrapeEngine(Params && params)
RecacheGui(false);
if (params.m_showChoosePositionMark)
EnableChoosePositionMode(true, move(params.m_boundAreaTriangles));
EnableChoosePositionMode(true, move(params.m_boundAreaTriangles), false, m2::PointD());
ResizeImpl(m_viewport.GetWidth(), m_viewport.GetHeight());
}
@ -436,7 +436,8 @@ void DrapeEngine::ClearGpsTrackPoints()
MessagePriority::Normal);
}
void DrapeEngine::EnableChoosePositionMode(bool enable, vector<m2::TriangleD> && boundAreaTriangles)
void DrapeEngine::EnableChoosePositionMode(bool enable, vector<m2::TriangleD> && boundAreaTriangles,
bool hasPosition, m2::PointD const & position)
{
m_choosePositionMode = enable;
bool kineticScroll = m_kineticScrollEnabled;
@ -453,7 +454,8 @@ void DrapeEngine::EnableChoosePositionMode(bool enable, vector<m2::TriangleD> &&
RecacheGui(true);
}
m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
make_unique_dp<SetAddNewPlaceModeMessage>(enable, move(boundAreaTriangles), kineticScroll),
make_unique_dp<SetAddNewPlaceModeMessage>(enable, move(boundAreaTriangles),
kineticScroll, hasPosition, position),
MessagePriority::High);
}

3
drape_frontend/drape_engine.hpp
View file

@ -133,7 +133,8 @@ public:
void UpdateGpsTrackPoints(vector<df::GpsTrackPoint> && toAdd, vector<uint32_t> && toRemove);
void ClearGpsTrackPoints();
void EnableChoosePositionMode(bool enable, vector<m2::TriangleD> && boundAreaTriangles);
void EnableChoosePositionMode(bool enable, vector<m2::TriangleD> && boundAreaTriangles,
bool hasPosition, m2::PointD const & position);
void BlockTapEvents(bool block);
void SetKineticScrollEnabled(bool enabled);

6
drape_frontend/frontend_renderer.cpp
View file

@ -718,10 +718,8 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
}
else
{
ScreenBase const & screen = m_userEventStream.GetCurrentScreen();
m2::PointD pt = screen.GlobalRect().Center();
if (!m_myPositionController->IsWaitingForLocation())
pt = m_myPositionController->GetDrawablePosition();
m2::PointD const pt = msg->HasPosition()? msg->GetPosition() :
m_userEventStream.GetCurrentScreen().GlobalRect().Center();
AddUserEvent(SetCenterEvent(pt, scales::GetAddNewPlaceScale(), true));
}
}

9
drape_frontend/message_subclasses.hpp
View file

@ -332,21 +332,28 @@ private:
class SetAddNewPlaceModeMessage : public Message
{
public:
SetAddNewPlaceModeMessage(bool enable, vector<m2::TriangleD> && boundArea, bool enableKineticScroll)
SetAddNewPlaceModeMessage(bool enable, vector<m2::TriangleD> && boundArea, bool enableKineticScroll,
bool hasPosition, m2::PointD const & position)
: m_enable(enable)
, m_boundArea(move(boundArea))
, m_enableKineticScroll(enableKineticScroll)
, m_hasPosition(hasPosition)
, m_position(position)
{}
Type GetType() const override { return Message::SetAddNewPlaceMode; }
vector<m2::TriangleD> && AcceptBoundArea() { return move(m_boundArea); }
bool IsEnabled() const { return m_enable; }
bool IsKineticScrollEnabled() const { return m_enableKineticScroll; }
bool HasPosition() const { return m_hasPosition; }
m2::PointD const & GetPosition() const { return m_position; }
private:
bool m_enable;
vector<m2::TriangleD> m_boundArea;
bool m_enableKineticScroll;
bool m_hasPosition;
m2::PointD m_position;
};
class BlockTapEventsMessage : public Message

6
iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.h
View file

@ -1,5 +1,9 @@
#include "geometry/point2d.hpp"
@interface MWMAddPlaceNavigationBar : SolidTouchView
+ (void)showInSuperview:(nonnull UIView *)superview isBusiness:(BOOL)isBusiness doneBlock:(nonnull TMWMVoidBlock)done cancelBlock:(nonnull TMWMVoidBlock)cancel;
+ (void)showInSuperview:(UIView *)superview isBusiness:(BOOL)isBusiness
applyPosition:(BOOL)applyPosition position:(m2::PointD const &)position
doneBlock:(TMWMVoidBlock)done cancelBlock:(TMWMVoidBlock)cancel;
@end

12
iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.mm
View file

@ -12,7 +12,9 @@
@implementation MWMAddPlaceNavigationBar
+ (void)showInSuperview:(UIView *)superview isBusiness:(BOOL)isBusiness doneBlock:(TMWMVoidBlock)done cancelBlock:(TMWMVoidBlock)cancel
+ (void)showInSuperview:(UIView *)superview isBusiness:(BOOL)isBusiness
applyPosition:(BOOL)applyPosition position:(m2::PointD const &)position
doneBlock:(TMWMVoidBlock)done cancelBlock:(TMWMVoidBlock)cancel
{
MWMAddPlaceNavigationBar * navBar = [[[NSBundle mainBundle] loadNibNamed:self.className owner:nil options:nil] firstObject];
navBar.width = superview.width;
@ -22,13 +24,13 @@
[navBar setNeedsLayout];
navBar.origin = {0., -navBar.height};
[superview addSubview:navBar];
[navBar show:isBusiness];
[navBar show:isBusiness applyPosition:applyPosition position:position];
}
- (void)show:(BOOL)enableBounds
- (void)show:(BOOL)enableBounds applyPosition:(BOOL)applyPosition position:(m2::PointD const &)position
{
auto & f = GetFramework();
f.EnableChoosePositionMode(true /* enable */, enableBounds);
f.EnableChoosePositionMode(true /* enable */, enableBounds, applyPosition, position);
f.BlockTapEvents(true);
[UIView animateWithDuration:kDefaultAnimationDuration animations:^
@ -40,7 +42,7 @@
- (void)dismiss
{
auto & f = GetFramework();
f.EnableChoosePositionMode(false /* enable */, false /* enableBounds */);
f.EnableChoosePositionMode(false /* enable */, false /* enableBounds */, false /* applyPosition */, m2::PointD());
f.BlockTapEvents(false);
[UIView animateWithDuration:kDefaultAnimationDuration animations:^

2
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h
View file

@ -9,7 +9,7 @@
- (void)actionDownloadMaps:(mwm::DownloaderMode)mode;
- (void)closeInfoScreens;
- (void)addPlace:(BOOL)isBusiness;
- (void)addPlace:(BOOL)isBusiness hasPoint:(BOOL)hasPoint point:(m2::PointD const &)point;
- (void)didFinishAddingPlace;
@end

2
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
View file

@ -351,7 +351,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell)
{
[Statistics logEvent:kStatEditorAddClick withParameters:@{kStatValue : kStatMenu}];
self.state = self.restoreState;
[self.delegate addPlace:NO];
[self.delegate addPlace:NO hasPoint:NO point:m2::PointD()];
}
- (void)menuActionDownloadMaps

10
iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
View file

@ -305,14 +305,15 @@ extern NSString * const kAlohalyticsTapEventKey;
#pragma mark - MWMBottomMenuControllerProtocol && MWMPlacePageViewManagerProtocol
- (void)addPlace:(BOOL)isBusiness
- (void)addPlace:(BOOL)isBusiness hasPoint:(BOOL)hasPoint point:(m2::PointD const &)point
{
self.menuState = MWMBottomMenuStateHidden;
static_cast<EAGLView *>(self.ownerController.view).widgetsManager.fullScreen = YES;
[self.placePageManager dismissPlacePage];
self.searchManager.state = MWMSearchManagerStateHidden;
[MWMAddPlaceNavigationBar showInSuperview:self.ownerController.view isBusiness:isBusiness doneBlock:^
[MWMAddPlaceNavigationBar showInSuperview:self.ownerController.view
isBusiness:isBusiness applyPosition:hasPoint position:point doneBlock:^
{
auto & f = GetFramework();
@ -361,11 +362,6 @@ extern NSString * const kAlohalyticsTapEventKey;
}
}
- (void)addBusiness
{
[self addPlace:YES];
}
- (void)updateStatusBarStyle
{
[self.ownerController updateStatusBarStyle];

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

@ -260,12 +260,12 @@ extern NSString * const kBookmarksChangedNotification;
- (void)addBusiness
{
[self.delegate addBusiness];
[self.delegate addPlace:YES hasPoint:NO point:m2::PointD()];
}
- (void)addPlace
{
[self.delegate addPlace];
[self.delegate addPlace:NO hasPoint:YES point:self.entity.mercator];
}
- (void)addBookmark

3
iphone/Maps/Classes/MWMPlacePageViewManagerDelegate.h
View file

@ -9,7 +9,6 @@
- (void)updateStatusBarStyle;
- (void)apiBack;
- (void)placePageDidClose;
- (void)addBusiness;
- (void)addPlace;
- (void)addPlace:(BOOL)isBusiness hasPoint:(BOOL)hasPoint point:(m2::PointD const &)point;
@end

5
map/framework.cpp
View file

@ -2417,10 +2417,11 @@ void Framework::Load3dMode(bool & allow3d, bool & allow3dBuildings)
allow3dBuildings = true;
}
void Framework::EnableChoosePositionMode(bool enable, bool enableBounds)
void Framework::EnableChoosePositionMode(bool enable, bool enableBounds, bool applyPosition, m2::PointD const & position)
{
if (m_drapeEngine != nullptr)
m_drapeEngine->EnableChoosePositionMode(enable, enableBounds ? GetBoundAreaTriangles() : vector<m2::TriangleD>());
m_drapeEngine->EnableChoosePositionMode(enable, enableBounds ? GetBoundAreaTriangles() : vector<m2::TriangleD>(),
applyPosition, position);
}
vector<m2::TriangleD> Framework::GetBoundAreaTriangles() const

2
map/framework.hpp
View file

@ -276,7 +276,7 @@ public:
void InvalidateRendering();
void EnableChoosePositionMode(bool enable, bool enableBounds);
void EnableChoosePositionMode(bool enable, bool enableBounds, bool applyPosition, m2::PointD const & position);
void BlockTapEvents(bool block);
using TCurrentCountryChanged = function<void(storage::TCountryId const &)>;

4
qt/draw_widget.cpp
View file

@ -231,12 +231,12 @@ void DrawWidget::SliderReleased()
void DrawWidget::ChoosePositionModeEnable()
{
m_framework->BlockTapEvents(true);
m_framework->EnableChoosePositionMode(true, false);
m_framework->EnableChoosePositionMode(true, false, false, m2::PointD());
}
void DrawWidget::ChoosePositionModeDisable()
{
m_framework->EnableChoosePositionMode(false, false);
m_framework->EnableChoosePositionMode(false, false, false, m2::PointD());
m_framework->BlockTapEvents(false);
}