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

Added a method for removing intermediate route points.

Browse source
This commit is contained in:
Daria Volvenkova 2017-06-26 15:05:01 +03:00 • committed by Aleksandr Zatsepin
parent 6b813fa9fc
commit 61c89ccc06
7 changed files with 38 additions and 2 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

@ -1181,6 +1181,12 @@ Java_com_mapswithme_maps_Framework_nativeRemoveRoutePoint(JNIEnv * env, jclass,
static_cast<int8_t>(intermediateIndex));
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_Framework_nativeRemoveIntermediateRoutePoints(JNIEnv * env, jclass)
{
frm()->GetRoutingManager().RemoveIntermediateRoutePoints();
}
JNIEXPORT jboolean JNICALL
Java_com_mapswithme_maps_Framework_nativeCouldAddIntermediatePoint(JNIEnv * env, jclass)
{

4
android/src/com/mapswithme/maps/Framework.java
View file

@ -278,8 +278,12 @@ public class Framework
@RoutePointInfo.RouteMarkType int markType,
int intermediateIndex, boolean isMyPosition,
double lat, double lon);
public static native void nativeRemoveRoutePoint(@RoutePointInfo.RouteMarkType int markType,
int intermediateIndex);
public static native void nativeRemoveIntermediateRoutePoints();
public static native boolean nativeCouldAddIntermediatePoint();
@NonNull
public static native RouteMarkData[] nativeGetRoutePoints();

5
android/src/com/mapswithme/maps/routing/RoutingController.java
View file

@ -457,6 +457,11 @@ public class RoutingController
mContainer.onRemovedStop();
}
public void removeIntermediatePoints()
{
Framework.nativeRemoveIntermediateRoutePoints();
}
public boolean isStopPointAllowed()
{
return Framework.nativeCouldAddIntermediatePoint();

8
map/routing_manager.cpp
View file

@ -417,6 +417,14 @@ void RoutingManager::RemoveRoutePoint(RouteMarkType type, int8_t intermediateInd
routePoints.RemoveRoutePoint(type, intermediateIndex);
}
void RoutingManager::RemoveIntermediateRoutePoints()
{
ASSERT(m_bmManager != nullptr, ());
UserMarkControllerGuard guard(*m_bmManager, UserMarkType::ROUTING_MARK);
RoutePointsLayout routePoints(guard.m_controller);
routePoints.RemoveIntermediateRoutePoints();
}
void RoutingManager::MoveRoutePoint(RouteMarkType currentType, int8_t currentIntermediateIndex,
RouteMarkType targetType, int8_t targetIntermediateIndex)
{

4
map/routing_manager.hpp
View file

@ -164,7 +164,9 @@ public:
void GenerateTurnNotifications(std::vector<std::string> & turnNotifications);
void AddRoutePoint(RouteMarkData && markData);
std::vector<RouteMarkData> GetRoutePoints() const;
void RemoveRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
void RemoveIntermediateRoutePoints();
void MoveRoutePoint(RouteMarkType currentType, int8_t currentIntermediateIndex,
RouteMarkType targetType, int8_t targetIntermediateIndex);
void HideRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
@ -210,8 +212,6 @@ public:
int32_t & minRouteAltitude, int32_t & maxRouteAltitude,
measurement_utils::Units & altitudeUnits) const;
std::vector<RouteMarkData> GetRoutePoints() const;
private:
void InsertRoute(routing::Route const & route);
bool IsTrackingReporterEnabled() const;

12
map/routing_mark.cpp
View file

@ -143,6 +143,18 @@ bool RoutePointsLayout::RemoveRoutePoint(RouteMarkType type, int8_t intermediate
return true;
}
void RoutePointsLayout::RemoveIntermediateRoutePoints()
{
for (size_t i = 0; i < m_routeMarks.GetUserMarkCount();)
{
RouteMarkPoint const * mark = static_cast<RouteMarkPoint const *>(m_routeMarks.GetUserMark(i));
if (mark->GetRoutePointType() == RouteMarkType::Intermediate)
m_routeMarks.DeleteUserMark(i);
else
++i;
}
}
bool RoutePointsLayout::MoveRoutePoint(RouteMarkType currentType, int8_t currentIntermediateIndex,
RouteMarkType destType, int8_t destIntermediateIndex)
{

1
map/routing_mark.hpp
View file

@ -71,6 +71,7 @@ public:
RouteMarkPoint * GetRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
std::vector<RouteMarkPoint *> GetRoutePoints();
bool RemoveRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
void RemoveIntermediateRoutePoints();
bool MoveRoutePoint(RouteMarkType currentType, int8_t currentIntermediateIndex,
RouteMarkType destType, int8_t destIntermediateIndex);