Merge commit '211e3fb4' into traffic

# Conflicts:
#	android/app/src/main/cpp/CMakeLists.txt
#	android/app/src/main/java/app/organicmaps/sdk/util/Config.java
#	android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
#	android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
#	android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
#	indexer/ftypes_matcher.hpp
#	iphone/Maps/Maps.xcodeproj/project.pbxproj
This commit is contained in:
mvglasow
2025-08-16 18:04:14 +03:00
1752 changed files with 25177 additions and 870703 deletions

View File

@@ -178,9 +178,9 @@ public:
bool GetRouteAltitudesAndDistancesM(std::vector<double> & routeSegDistanceM,
geometry::Altitudes & routeAltitudesM) const;
/// \brief returns coordinates of route junctions.
/// \brief returns points of route junctions.
/// \returns true if there is valid route information. If the route is not valid returns false.
bool GetRouteJunctionPoints(std::vector<m2::PointD> & routeJunctionPoints) const;
bool GetRouteJunctionPoints(std::vector<geometry::PointWithAltitude> & routeJunctionPoints) const;
SessionState OnLocationPositionChanged(location::GpsInfo const & info);
void GetRouteFollowingInfo(FollowingInfo & info) const;