diff --git a/packaging/app.organicmaps.desktop.metainfo.xml b/packaging/app.organicmaps.desktop.metainfo.xml
index 55057db743..1e19d4d30f 100644
--- a/packaging/app.organicmaps.desktop.metainfo.xml
+++ b/packaging/app.organicmaps.desktop.metainfo.xml
@@ -28,9 +28,6 @@
## Features
- The Linux version of Organic Maps has not reached feature parity
- with the Android and iPhone versions yet, and has not been optimized
- for mobile devices yet.
Organic Maps is the ultimate companion app for travelers, tourists,
hikers, and cyclists:
@@ -99,82 +96,17 @@
OrganicMaps.desktop
- https://organicmaps.app/images/screenshots/Desktop_light_routing.png
+ https://organicmaps.app/images/screenshots/hiking.jpg
- https://organicmaps.app/images/screenshots/Desktop_dark_routing.png
+ https://organicmaps.app/images/screenshots/prague.jpg
- https://organicmaps.app/images/screenshots/Desktop_light_overview.png
-
-
- https://organicmaps.app/images/screenshots/Desktop_dark_overview.png
+ https://organicmaps.app/images/screenshots/dark.jpg
-
-
- Highlights:
-
- - New OpenStreetMap data as of February 10, including changes by the Humanitarian OpenStreetMap Team (HOT) after the earthquake in Turkey and Syria
- - Filtered wrong search results in the list and on the map
- - Fixed crash on opening
-
- Map Styles:
-
- - Better icons for main and secondary building entrances
-
- Translations:
-
- - Fixed Persian, Polish, and German translations
-
-
-
-
-
- Highlights:
-
- - New OpenStreetMap data as of January 21, 2023
- - Fixed import of some KML tracks
- - Automatic search for the current position in 30 hours of inactivity instead of 8 hours
- - Improved search categories results
- - Proper spelling of Australia in search results
- - leisure=track is now searchable
-
- Routing:
-
- - Proper handling of elevation for hiking and cycling
- - Fixed inter-region routing
- - Fixed routing via some bridges
- - Busways are supported
- - Added Croatia to Schengen area
-
- Map Styles:
-
- - Fixed Buenos Aires metro icons
- - Added Bowling Alley
- - Fixed historic=fountain and tourism=information-office icon
- - Equal icon sizes for springs & hot springs
-
- Editor:
-
- - Allowed editing names with /\°[] symbols
- - Added amenity=public_bookcase
- - Increased the maximum editable building floors from 25 to 50
-
- Translations:
-
- - Fixed Brazil, Czech, French, Hungarian, Spanish (Mexican), Turkish
- - Fixed TTS translations for Finnish and Portuguese
-
- Linux:
-
- - Import upper-case KML and KMZ files on case-sensitive Linux file systems
- - Use Organic Maps server to check if a connection is alive
-
-
-
Highlights:
@@ -253,7 +185,7 @@
- Show all found results on the map screen
- Improved villages search
- Show only matched categories if they were selected from the list, not names
- - Fixed street synonyms for nordic languages
+ - Fixed street synonyms for nordic languages
Styles:
diff --git a/platform/measurement_utils.cpp b/platform/measurement_utils.cpp
index 8d7dafc93c..df4d383cc9 100644
--- a/platform/measurement_utils.cpp
+++ b/platform/measurement_utils.cpp
@@ -12,7 +12,6 @@
#include "base/string_utils.hpp"
#include
-#include // strstr
#include
#include
diff --git a/platform/preferred_languages.cpp b/platform/preferred_languages.cpp
index 7c32bee711..949fdf8616 100644
--- a/platform/preferred_languages.cpp
+++ b/platform/preferred_languages.cpp
@@ -1,12 +1,12 @@
#include "platform/preferred_languages.hpp"
#include "base/string_utils.hpp"
+#include "base/logging.hpp"
#include "base/macros.hpp"
#include "std/target_os.hpp"
#include // getenv
-#include // strlen
#include
#include
diff --git a/routing/routing_tests/turns_sound_test.cpp b/routing/routing_tests/turns_sound_test.cpp
index 764200f36b..d362d9c146 100644
--- a/routing/routing_tests/turns_sound_test.cpp
+++ b/routing/routing_tests/turns_sound_test.cpp
@@ -3,10 +3,13 @@
#include "routing/turns_notification_manager.hpp"
#include "routing/turns_sound_settings.hpp"
+#include "platform/location.hpp"
+
#include
namespace turns_sound_test
{
+using namespace location;
using namespace std;
using routing::turns::CarDirection;
using routing::turns::TurnItemDist;
@@ -16,7 +19,7 @@ using routing::turns::sound::Settings;
// An error to compare two double after conversion feet to meters.
double const kEps = 1.;
-UNIT_TEST(TurnNotificationSettings_MetersTest)
+UNIT_TEST(TurnNotificationSettingsMetersTest)
{
Settings const settings(20 /* notificationTimeSeconds */, 200 /* minNotificationDistanceUnits */,
700 /* maxNotificationDistanceUnits */, 5 /* m_startBeforeSeconds */,
@@ -47,7 +50,7 @@ UNIT_TEST(TurnNotificationSettings_MetersTest)
TEST_EQUAL(settings.ComputeDistToPronounceDistM(200. /* speedMetersPerSecond */), 150., ());
}
-UNIT_TEST(TurnNotificationSettings_FeetTest)
+UNIT_TEST(TurnNotificationSettingsFeetTest)
{
Settings const settings(20 /* notificationTimeSeconds */, 500 /* minNotificationDistanceUnits */,
2000 /* maxNotificationDistanceUnits */, 5 /* m_startBeforeSeconds */,
@@ -66,7 +69,7 @@ UNIT_TEST(TurnNotificationSettings_FeetTest)
TEST_EQUAL(settings.RoundByPresetSoundedDistancesUnits(0 /* distanceInUnits */), 200, ());
}
-UNIT_TEST(TurnNotificationSettings_NotValidTest)
+UNIT_TEST(TurnNotificationSettingsNotValidTest)
{
Settings settings1(20 /* notificationTimeSeconds */, 500 /* minNotificationDistanceUnits */,
2000 /* maxNotificationDistanceUnits */, 5 /* m_startBeforeSeconds */,
@@ -85,7 +88,7 @@ UNIT_TEST(TurnNotificationSettings_NotValidTest)
TEST(!settings2.IsValid(), ());
}
-UNIT_TEST(TurnsSound_MetersTest)
+UNIT_TEST(TurnsSoundMetersTest)
{
string const engShortJson =
"\
@@ -177,7 +180,7 @@ UNIT_TEST(TurnsSound_MetersTest)
// - Two turns;
// - They are close to each other;
// So the first notification of the second turn shall be skipped.
-UNIT_TEST(TurnsSound_MetersTwoTurnsTest)
+UNIT_TEST(TurnsSoundMetersTwoTurnsTest)
{
string const engShortJson =
"\
@@ -248,7 +251,7 @@ UNIT_TEST(TurnsSound_MetersTwoTurnsTest)
TEST(notificationManager.IsEnabled(), ());
}
-UNIT_TEST(TurnsSound_FeetTest)
+UNIT_TEST(TurnsSoundFeetTest)
{
string const engShortJson =
"\
@@ -325,13 +328,12 @@ UNIT_TEST(TurnsSound_FeetTest)
TEST(notificationManager.IsEnabled(), ());
}
-UNIT_TEST(TurnsSound_ComposedTurnTest)
+UNIT_TEST(TurnsSoundComposedTurnTest)
{
string const engShortJson =
"\
{\
\"in_600_meters\":\"In 600 meters.\",\
- \"in_200_meters\":\"In 200 meters.\",\
\"make_a_right_turn\":\"Turn right.\",\
\"enter_the_roundabout\":\"Enter the roundabout.\",\
\"then\":\"Then.\",\
@@ -355,7 +357,7 @@ UNIT_TEST(TurnsSound_ComposedTurnTest)
// 620 meters till the first turn.
turnNotifications.clear();
vector const turns2 = {{{5 /* idx */, CarDirection::TurnRight}, 620. /* m_distMeters */},
- {{10 /* idx */, CarDirection::EnterRoundAbout}, 665. /* m_distMeters */}};
+ {{10 /* idx */, CarDirection::EnterRoundAbout}, 820. /* m_distMeters */}};
vector const expectedNotification2 = {{"In 600 meters. Turn right."},
{"Then. Enter the roundabout."}};
notificationManager.GenerateTurnNotifications(turns2, turnNotifications);
@@ -375,7 +377,7 @@ UNIT_TEST(TurnsSound_ComposedTurnTest)
vector const turns4 = {{{5 /* idx */, CarDirection::TurnRight}, 20. /* m_distMeters */},
{{10 /* idx */, CarDirection::EnterRoundAbout}, 220. /* m_distMeters */}};
vector const expectedNotification4 = {{"Turn right."},
- {"Then. In 200 meters. Enter the roundabout."}};
+ {"Then. Enter the roundabout."}};
notificationManager.GenerateTurnNotifications(turns4, turnNotifications);
TEST_EQUAL(turnNotifications, expectedNotification4, ());
TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::EnterRoundAbout, ());
@@ -398,7 +400,7 @@ UNIT_TEST(TurnsSound_ComposedTurnTest)
TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ());
}
-UNIT_TEST(TurnsSound_RoundaboutTurnTest)
+UNIT_TEST(TurnsSoundRoundaboutTurnTest)
{
string const engShortJson =
"\
@@ -409,7 +411,6 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest)
\"take_the_2_exit\":\"Take the second exit.\",\
\"take_the_4_exit\":\"Take the fourth exit.\",\
\"in_600_meters\":\"In 600 meters.\",\
- \"in_1_kilometer\":\"In 1 kilometer.\",\
\"then\":\"Then.\"\
}";
auto notificationManager = NotificationManager::CreateNotificationManagerForTesting(
@@ -435,7 +436,7 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest)
{{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */},
1620. /* m_distMeters */}};
vector const expectedNotification2 = {{"In 600 meters. Enter the roundabout."},
- {"Then. In 1 kilometer. Take the second exit."}};
+ {"Then. Take the second exit."}};
notificationManager.GenerateTurnNotifications(turns2, turnNotifications);
TEST_EQUAL(turnNotifications, expectedNotification2, ());
TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ());
@@ -446,7 +447,7 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest)
{{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */},
1003. /* m_distMeters */}};
vector const expectedNotification3 = {{"Enter the roundabout."},
- {"Then. In 1 kilometer. Take the second exit."}};
+ {"Then. Take the second exit."}};
notificationManager.GenerateTurnNotifications(turns3, turnNotifications);
TEST_EQUAL(turnNotifications, expectedNotification3, ());
TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ());
@@ -485,7 +486,7 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest)
{{20 /* idx */, CarDirection::LeaveRoundAbout, 1 /* m_exitNum */},
1005. /* m_distMeters */}};
vector const expectedNotification7 = {{"Enter the roundabout."},
- {"Then. In 1 kilometer. Take the first exit."}};
+ {"Then. Take the first exit."}};
notificationManager.GenerateTurnNotifications(
turns7, turnNotifications); // The first notification fast forwarding.
notificationManager.GenerateTurnNotifications(turns7, turnNotifications);
@@ -506,7 +507,7 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest)
vector const turns9 = {{{25 /* idx */, CarDirection::EnterRoundAbout, 4 /* m_exitNum */},
620. /* m_distMeters */},
{{30 /* idx */, CarDirection::LeaveRoundAbout, 4 /* m_exitNum */},
- 665. /* m_distMeters */}};
+ 920. /* m_distMeters */}};
vector const expectedNotification9 = {{"In 600 meters. Enter the roundabout."},
{"Then. Take the fourth exit."}};
notificationManager.GenerateTurnNotifications(turns9, turnNotifications);
diff --git a/routing/routing_tests/turns_tts_text_tests.cpp b/routing/routing_tests/turns_tts_text_tests.cpp
index 236da541b8..77f4b34081 100644
--- a/routing/routing_tests/turns_tts_text_tests.cpp
+++ b/routing/routing_tests/turns_tts_text_tests.cpp
@@ -24,9 +24,9 @@ UNIT_TEST(GetDistanceTextIdMetersTest)
Notification const notification1(500, 0, false, CarDirection::TurnRight,
measurement_utils::Units::Metric);
TEST_EQUAL(GetDistanceTextId(notification1), "in_500_meters", ());
-// Notification const notification2(500, 0, true, CarDirection::TurnRight,
-// measurement_utils::Units::Metric);
-// TEST_EQUAL(GetDistanceTextId(notification2), "then", ());
+ Notification const notification2(500, 0, true, CarDirection::TurnRight,
+ measurement_utils::Units::Metric);
+ TEST_EQUAL(GetDistanceTextId(notification2), "then", ());
Notification const notification3(200, 0, false, CarDirection::TurnRight,
measurement_utils::Units::Metric);
TEST_EQUAL(GetDistanceTextId(notification3), "in_200_meters", ());
@@ -42,9 +42,9 @@ UNIT_TEST(GetDistanceTextIdFeetTest)
Notification const notification1(500, 0, false, CarDirection::TurnRight,
measurement_utils::Units::Imperial);
TEST_EQUAL(GetDistanceTextId(notification1), "in_500_feet", ());
-// Notification const notification2(500, 0, true, CarDirection::TurnRight,
-// measurement_utils::Units::Imperial);
-// TEST_EQUAL(GetDistanceTextId(notification2), "then", ());
+ Notification const notification2(500, 0, true, CarDirection::TurnRight,
+ measurement_utils::Units::Imperial);
+ TEST_EQUAL(GetDistanceTextId(notification2), "then", ());
Notification const notification3(800, 0, false, CarDirection::TurnRight,
measurement_utils::Units::Imperial);
TEST_EQUAL(GetDistanceTextId(notification3), "in_800_feet", ());
diff --git a/routing/turns_notification_manager.cpp b/routing/turns_notification_manager.cpp
index d33d2cd11a..347fd447f4 100644
--- a/routing/turns_notification_manager.cpp
+++ b/routing/turns_notification_manager.cpp
@@ -1,26 +1,18 @@
#include "routing/turns_notification_manager.hpp"
+#include "platform/location.hpp"
+
#include "base/assert.hpp"
#include
#include
-namespace routing
-{
-namespace turns
-{
-namespace sound
-{
-
namespace
{
-// If the distance between two sequential turns is less than kSecondTurnThresholdDistM
-// the information about the second turn will be shown or pronounced
-// when the user is approaching to the first one with "Then.".
-double constexpr kSecondTurnThresholdDistM = 400.0;
-// If the distance between two sequential turns is less than kDistanceNotifyThresholdM
-// the notification will *not* append second distance, (like "In 500 meters. Turn left. Then. Turn right.")
-double constexpr kDistanceNotifyThresholdM = 50.0;
+// If the distance between two sequential turns is less than kMaxTurnDistM
+// the information about the second turn will be shown or pronounced when the user is
+// approaching to the first one.
+double constexpr kMaxTurnDistM = 400.0;
// Returns true if the closest turn is an entrance to a roundabout and the second is
// an exit form a roundabout.
@@ -35,6 +27,12 @@ bool IsClassicEntranceToRoundabout(routing::turns::TurnItemDist const & firstTur
}
} // namespace
+namespace routing
+{
+namespace turns
+{
+namespace sound
+{
NotificationManager::NotificationManager()
: m_enabled(false)
, m_speedMetersPerSecond(0.0)
@@ -106,35 +104,24 @@ void NotificationManager::GenerateTurnNotifications(std::vector co
return;
if (firstNotification.empty())
return;
- turnNotifications.emplace_back(std::move(firstNotification));
+ turnNotifications.emplace_back(move(firstNotification));
// Generating notifications like "Then turn left" if necessary.
if (turns.size() < 2)
return;
TurnItemDist const & secondTurn = turns[1];
ASSERT_LESS_OR_EQUAL(firstTurn.m_distMeters, secondTurn.m_distMeters, ());
-
- double distBetweenTurnsMeters = secondTurn.m_distMeters - firstTurn.m_distMeters;
- ASSERT_GREATER_OR_EQUAL(distBetweenTurnsMeters, 0, ());
- if (distBetweenTurnsMeters > kSecondTurnThresholdDistM &&
+ if (secondTurn.m_distMeters - firstTurn.m_distMeters > kMaxTurnDistM &&
!IsClassicEntranceToRoundabout(firstTurn, secondTurn))
{
return;
}
-
- if (distBetweenTurnsMeters < kDistanceNotifyThresholdM)
- {
- // distanceUnits is not used because of "Then" is used
- distBetweenTurnsMeters = 0;
- }
-
std::string secondNotification = GenerateTurnText(
- distBetweenTurnsMeters, secondTurn.m_turnItem.m_exitNum,
+ 0 /* distanceUnits is not used because of "Then" is used */, secondTurn.m_turnItem.m_exitNum,
true, secondTurn.m_turnItem, m_settings.GetLengthUnits());
if (secondNotification.empty())
return;
- turnNotifications.emplace_back(std::move(secondNotification));
-
+ turnNotifications.emplace_back(move(secondNotification));
// Turn notification with word "Then" (about the second turn) will be pronounced.
// When this second turn become the first one the first notification about the turn
// shall be skipped.
@@ -282,7 +269,7 @@ CarDirection NotificationManager::GenerateSecondTurnNotification(std::vector kSecondTurnThresholdDistM)
+ if (distBetweenTurnsMeters > kMaxTurnDistM)
return CarDirection::None;
uint32_t const startPronounceDistMeters =
diff --git a/routing/turns_sound_settings.cpp b/routing/turns_sound_settings.cpp
index 71f6ac6967..66a9536fa3 100644
--- a/routing/turns_sound_settings.cpp
+++ b/routing/turns_sound_settings.cpp
@@ -2,6 +2,8 @@
#include "platform/measurement_utils.hpp"
+#include "base/string_utils.hpp"
+
#include
namespace routing
diff --git a/routing/turns_tts_text.cpp b/routing/turns_tts_text.cpp
index c720f58e9e..af1768c3fe 100644
--- a/routing/turns_tts_text.cpp
+++ b/routing/turns_tts_text.cpp
@@ -6,13 +6,7 @@
#include
#include
#include
-
-namespace routing
-{
-namespace turns
-{
-namespace sound
-{
+#include
namespace
{
@@ -35,6 +29,12 @@ template std::string DistToTextId(TIter begin, TIter end, uint32_t
}
} // namespace
+namespace routing
+{
+namespace turns
+{
+namespace sound
+{
void GetTtsText::SetLocale(std::string const & locale)
{
m_getCurLang = platform::GetTextByIdFactory(platform::TextSource::TtsSound, locale);
@@ -54,25 +54,17 @@ std::string GetTtsText::GetTurnNotification(Notification const & notification) c
{
if (notification.m_useThenInsteadOfDistance &&
notification.m_turnDirPedestrian == PedestrianDirection::None)
- return {};
+ return std::string{};
}
if (notification.m_useThenInsteadOfDistance && notification.m_turnDir == CarDirection::None)
- return {};
+ return std::string{};
std::string const dirStr = GetTextById(GetDirectionTextId(notification));
if (dirStr.empty())
- return {};
+ return std::string{};
- std::string distStr;
- if (notification.m_useThenInsteadOfDistance)
- {
- distStr = GetTextById("then");
- if (notification.m_distanceUnits > 0)
- distStr = distStr + " " + GetTextById(GetDistanceTextId(notification));
- }
- else
- distStr = GetTextById(GetDistanceTextId(notification));
+ std::string const distStr = GetTextById(GetDistanceTextId(notification));
return distStr + " " + dirStr;
}
@@ -86,7 +78,7 @@ std::string GetTtsText::GetLocale() const
if (m_getCurLang == nullptr)
{
ASSERT(false, ());
- return {};
+ return std::string{};
}
return m_getCurLang->GetLocale();
}
@@ -98,15 +90,15 @@ std::string GetTtsText::GetTextById(std::string const & textId) const
if (m_getCurLang == nullptr)
{
ASSERT(false, ());
- return {};
+ return std::string{};
}
return (*m_getCurLang)(textId);
}
std::string GetDistanceTextId(Notification const & notification)
{
-// if (notification.m_useThenInsteadOfDistance)
-// return "then";
+ if (notification.m_useThenInsteadOfDistance)
+ return "then";
switch (notification.m_lengthUnits)
{
@@ -118,7 +110,7 @@ std::string GetDistanceTextId(Notification const & notification)
notification.m_distanceUnits);
}
ASSERT(false, ());
- return {};
+ return std::string{};
}
std::string GetRoundaboutTextId(Notification const & notification)
diff --git a/search/categories_cache.cpp b/search/categories_cache.cpp
index aaa54e1044..905e0a640e 100644
--- a/search/categories_cache.cpp
+++ b/search/categories_cache.cpp
@@ -1,6 +1,7 @@
#include "search/categories_cache.hpp"
#include "search/mwm_context.hpp"
+#include "search/query_params.hpp"
#include "search/retrieval.hpp"
#include "indexer/classificator.hpp"
@@ -8,12 +9,12 @@
#include "indexer/search_string_utils.hpp"
#include "base/assert.hpp"
+#include "base/levenshtein_dfa.hpp"
+using namespace std;
namespace search
{
-using namespace std;
-
// CategoriesCache ---------------------------------------------------------------------------------
CBV CategoriesCache::Get(MwmContext const & context)
{
diff --git a/search/categories_cache.hpp b/search/categories_cache.hpp
index fa2b5745fa..b2d6f699c3 100644
--- a/search/categories_cache.hpp
+++ b/search/categories_cache.hpp
@@ -7,6 +7,7 @@
#include "base/cancellable.hpp"
+#include
#include