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

Intermediate route point adding.

Browse source
This commit is contained in:
Daria Volvenkova 2017-06-08 21:32:03 +03:00
parent b55dd4c1ae
commit 82159cb74e
14 changed files with 130 additions and 22 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

@ -1146,15 +1146,17 @@ Java_com_mapswithme_maps_Framework_nativeGetBestRouter(JNIEnv * env, jclass, jdo
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_Framework_nativeSetRouteStartPoint(JNIEnv * env, jclass, jdouble lat, jdouble lon, jboolean valid)
{
frm()->GetRoutingManager().RemoveRoutePoint(RouteMarkType::Start);
frm()->GetRoutingManager().AddRoutePoint(m2::PointD(MercatorBounds::FromLatLon(lat, lon)),
static_cast<bool>(valid), RouteMarkType::Start);
static_cast<bool>(!valid), RouteMarkType::Start);
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_Framework_nativeSetRouteEndPoint(JNIEnv * env, jclass, jdouble lat, jdouble lon, jboolean valid)
{
frm()->GetRoutingManager().RemoveRoutePoint(RouteMarkType::Finish);
frm()->GetRoutingManager().AddRoutePoint(m2::PointD(MercatorBounds::FromLatLon(lat, lon)),
static_cast<bool>(valid), RouteMarkType::Finish);
static_cast<bool>(!valid), RouteMarkType::Finish);
}
JNIEXPORT void JNICALL

6
iphone/Maps/Core/Routing/MWMRouter.mm
View file

@ -202,8 +202,10 @@ bool isMarkerPoint(MWMRoutePoint * point) { return point.isValid && !point.isMyP
self.type =
routerType(GetFramework().GetRoutingManager().GetBestRouter(startPoint, finishPoint));
f.GetRoutingManager().BuildRoute(startPoint, finishPoint, isP2P, 0 /* timeoutSec */);
f.GetRoutingManager().AddRoutePoint(startPoint, isMarkerPoint(self.startPoint), RouteMarkType::Start);
f.GetRoutingManager().AddRoutePoint(finishPoint, isMarkerPoint(self.finishPoint), RouteMarkType::Finish);
if (self.startPoint.isValid)
f.GetRoutingManager().AddRoutePoint(startPoint, self.startPoint.isMyPosition, RouteMarkType::Start);
if (self.finishPoint.isValid)
f.GetRoutingManager().AddRoutePoint(finishPoint, self.finishPoint.isMyPosition, RouteMarkType::Finish);
[mapViewControlsManager onRouteRebuild];
}

4
iphone/Maps/UI/PlacePage/MWMPlacePageData.h
View file

@ -145,6 +145,10 @@ using BannerIsReady = void (^)();
- (NSURL *)URLToAllReviews;
- (NSArray<MWMGalleryItemModel *> *)photos;
// Route points
- (RouteMarkType)routeMarkType;
- (int8_t)intermediateIndex;
// Banner
- (id<MWMBanner>)nativeAd;

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

@ -517,6 +517,8 @@ using namespace place_page;
#pragma mark - Getters
- (RouteMarkType)routeMarkType { return m_info.m_routeMarkType; }
- (int8_t)intermediateIndex { return m_info.m_intermediateIndex; }
- (NSString *)address { return @(m_info.GetAddress().c_str()); }
- (NSString *)apiURL { return @(m_info.GetApiUrl().c_str()); }
- (vector<Sections> const &)sections { return m_sections; }

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

@ -276,13 +276,15 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName)
- (void)addStop
{
// TODO: Implement adding a routing point.
// self.data contains all point's data.
GetFramework().GetRoutingManager().AddRoutePoint(self.data.mercator, false /* isMyPosition */,
RouteMarkType::Intermediate, 0);
[self close];
}
- (void)removeStop
{
// TODO: Implement removing a routing point.
GetFramework().GetRoutingManager().RemoveRoutePoint(self.data.routeMarkType, self.data.intermediateIndex);
[self close];
}
- (void)taxiTo

3
iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMPlacePageActionBar.mm
View file

@ -64,8 +64,7 @@ extern NSString * const kAlohalyticsTapEventKey;
BOOL const isP2P = self.isPrepareRouteMode;
BOOL const isMyPosition = data.isMyPosition;
BOOL const isRoutePoint = data.isRoutePoint;
BOOL const isNeedToAddIntermediatePoint = GetFramework().GetRoutingManager().IsRoutingActive()
/* && there is no intermediate point yet */;
BOOL const isNeedToAddIntermediatePoint = GetFramework().GetRoutingManager().CouldAddIntermediatePoint();
EButton sponsoredButton = EButton::BookingSearch;
if (isBooking)

2
map/CMakeLists.txt
View file

@ -56,6 +56,8 @@ set(
reachable_by_taxi_checker.hpp
routing_manager.cpp
routing_manager.hpp
routing_mark.cpp
routing_mark.hpp
track.cpp
track.hpp
traffic_manager.cpp

20
map/framework.cpp
View file

@ -948,15 +948,29 @@ void Framework::FillRouteMarkInfo(RouteMarkPoint const & rmp, place_page::Info &
FillPointInfo(rmp.GetPivot(), "", info);
info.m_isRoutePoint = true;
switch (rmp.GetRoutePointType())
std::string title;
RouteMarkType const type = rmp.GetRoutePointType();
int8_t const intermediateIndex = rmp.GetIntermediateIndex();
switch (type)
{
case RouteMarkType::Start:
info.m_customName = "Start";
title = "Start";
break;
case RouteMarkType::Intermediate:
if (intermediateIndex == 0)
title = "First stop A";
else if (intermediateIndex == 1)
title = "Second stop B";
else
title = "Third stop C";
break;
case RouteMarkType::Finish:
info.m_customName = "Finish";
title = "Finish";
break;
}
info.m_customName = title;
info.m_routeMarkType = type;
info.m_intermediateIndex = intermediateIndex;
}
void Framework::ShowBookmark(BookmarkAndCategory const & bnc)

4
map/place_page_info.hpp
View file

@ -1,6 +1,7 @@
#pragma once
#include "map/bookmark.hpp"
#include "map/routing_mark.hpp"
#include "storage/index.hpp"
@ -148,6 +149,9 @@ public:
storage::TCountriesVec m_topmostCountryIds;
bool m_isRoutePoint = false;
RouteMarkType m_routeMarkType;
int8_t m_intermediateIndex = 0;
bool m_isMyPosition = false;
/// True if editing of a selected point is allowed by basic logic.
/// See initialization in framework.

61
map/routing_manager.cpp
View file

@ -300,7 +300,49 @@ void RoutingManager::HideRoutePoint(RouteMarkType type, int8_t intermediateIndex
}
}
void RoutingManager::AddRoutePoint(m2::PointD const & pt, bool isVisible,
void RoutingManager::UpdateRoute()
{
if (!IsRoutingActive())
return;
bool isValid = false;
m2::PointD startPt;
m2::PointD finishPt;
{
UserMarkControllerGuard guard(*m_bmManager, UserMarkType::ROUTING_MARK);
RoutePointsLayout routePoints(guard.m_controller);
RouteMarkPoint * start = routePoints.GetRoutePoint(RouteMarkType::Start);
RouteMarkPoint * finish = routePoints.GetRoutePoint(RouteMarkType::Finish);
if (start != nullptr && finish != nullptr)
{
startPt = start->GetPivot();
finishPt = finish->GetPivot();
isValid = true;
}
}
if (isValid)
{
RemoveRoute(true /* deactivateFollowing */);
m_routingSession.SetUserCurrentPosition(startPt);
m_routingSession.BuildRoute(startPt, finishPt, 0 /* timeoutSec */);
}
else
{
CloseRouting();
}
}
bool RoutingManager::CouldAddIntermediatePoint() const
{
if (!IsRoutingActive())
return false;
UserMarkControllerGuard guard(*m_bmManager, UserMarkType::ROUTING_MARK);
return guard.m_controller.GetUserMarkCount() < RoutePointsLayout::kMaxIntermediatePointsCount + 2;
}
void RoutingManager::AddRoutePoint(m2::PointD const & pt, bool isMyPosition,
RouteMarkType type, int8_t intermediateIndex)
{
ASSERT(m_bmManager != nullptr, ());
@ -308,15 +350,22 @@ void RoutingManager::AddRoutePoint(m2::PointD const & pt, bool isVisible,
RoutePointsLayout routePoints(guard.m_controller);
RouteMarkPoint * mark = routePoints.AddRoutePoint(pt, type, intermediateIndex);
if (mark != nullptr)
mark->SetIsVisible(isVisible);
{
mark->SetIsVisible(!isMyPosition);
mark->SetIsMyPosition(isMyPosition);
}
// TODO(@darina) Update route.
}
void RoutingManager::RemoveRoutePoint(RouteMarkType type, int8_t intermediateIndex)
{
ASSERT(m_bmManager != nullptr, ());
UserMarkControllerGuard guard(*m_bmManager, UserMarkType::ROUTING_MARK);
RoutePointsLayout routePoints(guard.m_controller);
routePoints.RemoveRoutePoint(type, intermediateIndex);
{
UserMarkControllerGuard guard(*m_bmManager, UserMarkType::ROUTING_MARK);
RoutePointsLayout routePoints(guard.m_controller);
routePoints.RemoveRoutePoint(type, intermediateIndex);
}
//UpdateRoute();
}
void RoutingManager::MoveRoutePoint(RouteMarkType currentType, int8_t currentIntermediateIndex,
@ -327,6 +376,8 @@ void RoutingManager::MoveRoutePoint(RouteMarkType currentType, int8_t currentInt
RoutePointsLayout routePoints(guard.m_controller);
routePoints.MoveRoutePoint(currentType, currentIntermediateIndex,
targetType, targetIntermediateIndex);
// TODO(@darina) Update route.
}
void RoutingManager::GenerateTurnNotifications(std::vector<std::string> & turnNotifications)

4
map/routing_manager.hpp
View file

@ -161,11 +161,12 @@ public:
/// GenerateTurnNotifications shall be called by the client when a new position is available.
void GenerateTurnNotifications(std::vector<std::string> & turnNotifications);
void AddRoutePoint(m2::PointD const & pt, bool isVisible, RouteMarkType type, int8_t intermediateIndex = 0);
void AddRoutePoint(m2::PointD const & pt, bool isMyPosition, RouteMarkType type, int8_t intermediateIndex = 0);
void RemoveRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
void MoveRoutePoint(RouteMarkType currentType, int8_t currentIntermediateIndex,
RouteMarkType targetType, int8_t targetIntermediateIndex);
void HideRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
bool CouldAddIntermediatePoint() const;
void SetRouterImpl(routing::RouterType type);
void RemoveRoute(bool deactivateFollowing);
@ -211,6 +212,7 @@ private:
bool IsTrackingReporterEnabled() const;
void MatchLocationToRoute(location::GpsInfo & info,
location::RouteMatchingInfo & routeMatchingInfo) const;
void UpdateRoute();
RouteBuildingCallback m_routingCallback = nullptr;
Callbacks m_callbacks;

14
map/routing_mark.cpp
View file

@ -2,8 +2,6 @@
#include <algorithm>
static int8_t const kMaxIntermediatePointsCount = 3;
RouteMarkPoint::RouteMarkPoint(const m2::PointD & ptOrg, UserMarkContainer * container)
: UserMark(ptOrg, container)
{}
@ -18,6 +16,16 @@ void RouteMarkPoint::SetIsVisible(bool isVisible)
m_isVisible = isVisible;
}
void RouteMarkPoint::SetIsMyPosition(bool isMyPosition)
{
m_isMyPosition = isMyPosition;
}
bool RouteMarkPoint::IsMyPosition() const
{
return m_isMyPosition;
}
std::string RouteMarkPoint::GetSymbolName() const
{
switch (m_pointType)
@ -153,10 +161,12 @@ bool RoutePointsLayout::MoveRoutePoint(RouteMarkType currentType, int8_t current
m2::PointD const pt = point->GetPivot();
bool const isVisible = point->IsVisible();
bool const isMyPosition = point->IsMyPosition();
RemoveRoutePoint(currentType, currentIntermediateIndex);
RouteMarkPoint * point2 = AddRoutePoint(pt, destType, destIntermediateIndex);
point2->SetIsVisible(isVisible);
point2->SetIsMyPosition(isMyPosition);
return true;
}

10
map/routing_mark.hpp
View file

@ -27,12 +27,16 @@ public:
void SetRoutePointType(RouteMarkType type) { m_pointType = type; }
void SetIntermediateIndex(int8_t index) { m_intermediateIndex = index; }
int8_t GetIntermediateIndex() { return m_intermediateIndex; }
int8_t GetIntermediateIndex() const { return m_intermediateIndex; }
void SetIsMyPosition(bool isMyPosition);
bool IsMyPosition() const;
private:
RouteMarkType m_pointType;
int8_t m_intermediateIndex = 0;
bool m_isVisible = true;
bool m_isMyPosition = false;
};
class RouteUserMarkContainer : public UserMarkContainer
@ -46,9 +50,11 @@ protected:
class RoutePointsLayout
{
public:
static int8_t const kMaxIntermediatePointsCount = 1;
RoutePointsLayout(UserMarksController & routeMarks);
RouteMarkPoint * GetRoutePoint(RouteMarkType type, int8_t intermediateIndex);
RouteMarkPoint * GetRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
RouteMarkPoint * AddRoutePoint(m2::PointD const & ptOrg, RouteMarkType type, int8_t intermediateIndex = 0);
bool RemoveRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
bool MoveRoutePoint(RouteMarkType currentType, int8_t currentIntermediateIndex,

8
xcode/map/map.xcodeproj/project.pbxproj
View file

@ -97,6 +97,8 @@
67F183831BD5049500AB1840 /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F1837F1BD5049500AB1840 /* libminizip.a */; };
67F183841BD5049500AB1840 /* libtess2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F183801BD5049500AB1840 /* libtess2.a */; };
BB421D6C1E8C0031005BFA4D /* transliteration_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB421D6A1E8C0026005BFA4D /* transliteration_test.cpp */; };
BBD9E2C61EE9D01900DF189A /* routing_mark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBD9E2C41EE9D01900DF189A /* routing_mark.cpp */; };
BBD9E2C71EE9D01900DF189A /* routing_mark.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BBD9E2C51EE9D01900DF189A /* routing_mark.hpp */; };
F627BFC41E8E89B600B1CBF4 /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F627BFC31E8E89B600B1CBF4 /* librouting_common.a */; };
F63421F81DF9BF9100A96868 /* reachable_by_taxi_checker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F63421F61DF9BF9100A96868 /* reachable_by_taxi_checker.cpp */; };
F63421F91DF9BF9100A96868 /* reachable_by_taxi_checker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F63421F71DF9BF9100A96868 /* reachable_by_taxi_checker.hpp */; };
@ -226,6 +228,8 @@
67F183851BD504ED00AB1840 /* libsystem_configuration.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsystem_configuration.tbd; path = usr/lib/system/libsystem_configuration.tbd; sourceTree = SDKROOT; };
67F183871BD5050900AB1840 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
BB421D6A1E8C0026005BFA4D /* transliteration_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transliteration_test.cpp; sourceTree = "<group>"; };
BBD9E2C41EE9D01900DF189A /* routing_mark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_mark.cpp; sourceTree = "<group>"; };
BBD9E2C51EE9D01900DF189A /* routing_mark.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_mark.hpp; sourceTree = "<group>"; };
F627BFC31E8E89B600B1CBF4 /* librouting_common.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting_common.a; path = "/Users/v.mikhaylenko/mapsme/omim/xcode/routing_common/../../../omim-build/xcode/Debug/librouting_common.a"; sourceTree = "<absolute>"; };
F63421F61DF9BF9100A96868 /* reachable_by_taxi_checker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reachable_by_taxi_checker.cpp; sourceTree = "<group>"; };
F63421F71DF9BF9100A96868 /* reachable_by_taxi_checker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = reachable_by_taxi_checker.hpp; sourceTree = "<group>"; };
@ -424,6 +428,8 @@
F63421F71DF9BF9100A96868 /* reachable_by_taxi_checker.hpp */,
F6D2CE7C1EDEB7F500636DFD /* routing_manager.cpp */,
F6D2CE7D1EDEB7F500636DFD /* routing_manager.hpp */,
BBD9E2C41EE9D01900DF189A /* routing_mark.cpp */,
BBD9E2C51EE9D01900DF189A /* routing_mark.hpp */,
347B60741DD9926D0050FA24 /* traffic_manager.cpp */,
347B60751DD9926D0050FA24 /* traffic_manager.hpp */,
348AB57A1D7EE0C6009F8301 /* chart_generator.cpp */,
@ -504,6 +510,7 @@
F6D2CE7F1EDEB7F500636DFD /* routing_manager.hpp in Headers */,
670E39411C46C5C700E9C0A6 /* gps_tracker.hpp in Headers */,
45580ABF1E2CBD5E00CD535D /* benchmark_tools.hpp in Headers */,
BBD9E2C71EE9D01900DF189A /* routing_mark.hpp in Headers */,
342D833B1D5233E8000D8AEA /* displacement_mode_manager.hpp in Headers */,
F6B283041C1B03320081957A /* gps_track_collection.hpp in Headers */,
);
@ -634,6 +641,7 @@
670E39401C46C5C700E9C0A6 /* gps_tracker.cpp in Sources */,
6753464A1A4054E800A0A8C3 /* bookmark.cpp in Sources */,
45580ABE1E2CBD5E00CD535D /* benchmark_tools.cpp in Sources */,
BBD9E2C61EE9D01900DF189A /* routing_mark.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};