diff --git a/base/timer.cpp b/base/timer.cpp index d695eb4e2c..ad871d84ba 100644 --- a/base/timer.cpp +++ b/base/timer.cpp @@ -1,12 +1,15 @@ +#include "base/timer.hpp" + #include "base/assert.hpp" #include "base/get_time.hpp" +#include "base/gmtime.hpp" #include "base/macros.hpp" #include "base/timegm.hpp" -#include "base/timer.hpp" #include "std/target_os.hpp" #include +#include #include #include #include @@ -60,6 +63,37 @@ uint32_t GenerateYYMMDD(int year, int month, int day) return result; } +uint32_t GenerateYYMMDD(uint64_t secondsSinceEpoch) +{ + auto const tm = GmTime(SecondsSinceEpochToTimeT(secondsSinceEpoch)); + return GenerateYYMMDD(tm.tm_year, tm.tm_mon, tm.tm_mday); +} + +uint64_t YYMMDDToSecondsSinceEpoch(uint32_t yymmdd) +{ + auto constexpr partsCount = 3; + // From left to right YY MM DD. + std::array parts{}; // Initialize with zeros. + for (auto i = partsCount - 1; i >= 0; --i) + { + parts[i] = yymmdd % 100; + yymmdd /= 100; + } + ASSERT_EQUAL(yymmdd, 0, ("Version is too big.")); + + ASSERT_GREATER_OR_EQUAL(parts[1], 1, ("Month should be in range [1, 12]")); + ASSERT_LESS_OR_EQUAL(parts[1], 12, ("Month should be in range [1, 12]")); + ASSERT_GREATER_OR_EQUAL(parts[2], 1, ("Day should be in range [1, 31]")); + ASSERT_LESS_OR_EQUAL(parts[2], 31, ("Day should be in range [1, 31]")); + + std::tm tm{}; + tm.tm_year = parts[0] + 100; + tm.tm_mon = parts[1] - 1; + tm.tm_mday = parts[2]; + + return TimeTToSecondsSinceEpoch(TimeGM(tm)); +} + uint64_t SecondsSinceEpoch() { return TimeTToSecondsSinceEpoch(::time(nullptr)); diff --git a/base/timer.hpp b/base/timer.hpp index 86fbd2a804..6e981cf69d 100644 --- a/base/timer.hpp +++ b/base/timer.hpp @@ -40,6 +40,8 @@ std::string FormatCurrentTime(); /// \param day The day of the month, in the range 1 to 31. /// \return Timestamp. uint32_t GenerateYYMMDD(int year, int month, int day); +uint32_t GenerateYYMMDD(uint64_t secondsSinceEpoch); +uint64_t YYMMDDToSecondsSinceEpoch(uint32_t yymmdd); uint64_t SecondsSinceEpoch(); diff --git a/generator/generator_tests_support/test_mwm_builder.cpp b/generator/generator_tests_support/test_mwm_builder.cpp index c35493999a..a01bd2f6bc 100644 --- a/generator/generator_tests_support/test_mwm_builder.cpp +++ b/generator/generator_tests_support/test_mwm_builder.cpp @@ -53,11 +53,13 @@ namespace generator { namespace tests_support { -TestMwmBuilder::TestMwmBuilder(platform::LocalCountryFile & file, feature::DataHeader::MapType type) +TestMwmBuilder::TestMwmBuilder(platform::LocalCountryFile & file, feature::DataHeader::MapType type, + uint32_t version) : m_file(file) , m_type(type) - , m_collector(make_unique(m_file.GetPath(MapOptions::Map) + - EXTENSION_TMP)) + , m_collector( + make_unique(m_file.GetPath(MapOptions::Map) + EXTENSION_TMP)) + , m_version(version) { } @@ -121,6 +123,7 @@ void TestMwmBuilder::Finish() feature::GenerateInfo info; info.m_targetDir = m_file.GetDirectory(); info.m_tmpDir = m_file.GetDirectory(); + info.m_versionDate = static_cast(base::YYMMDDToSecondsSinceEpoch(m_version)); CHECK(GenerateFinalFeatures(info, m_file.GetCountryFile().GetName(), m_type), ("Can't sort features.")); diff --git a/generator/generator_tests_support/test_mwm_builder.hpp b/generator/generator_tests_support/test_mwm_builder.hpp index 924d083f09..28011cdc60 100644 --- a/generator/generator_tests_support/test_mwm_builder.hpp +++ b/generator/generator_tests_support/test_mwm_builder.hpp @@ -4,6 +4,8 @@ #include "indexer/data_header.hpp" +#include "base/timer.hpp" + #include #include #include @@ -27,7 +29,8 @@ class TestFeature; class TestMwmBuilder { public: - TestMwmBuilder(platform::LocalCountryFile & file, feature::DataHeader::MapType type); + TestMwmBuilder(platform::LocalCountryFile & file, feature::DataHeader::MapType type, + uint32_t version = base::GenerateYYMMDD(base::SecondsSinceEpoch())); ~TestMwmBuilder(); @@ -43,6 +46,7 @@ private: std::vector m_languages; std::unique_ptr m_collector; TestIdToBoundariesTable m_boundariesTable; + uint32_t m_version = 0; }; } // namespace tests_support } // namespace generator diff --git a/generator/generator_tests_support/test_with_custom_mwms.cpp b/generator/generator_tests_support/test_with_custom_mwms.cpp index f16c205a2d..81e918a947 100644 --- a/generator/generator_tests_support/test_with_custom_mwms.cpp +++ b/generator/generator_tests_support/test_with_custom_mwms.cpp @@ -3,11 +3,17 @@ #include "platform/local_country_file_utils.hpp" #include "base/stl_helpers.hpp" +#include "base/timer.hpp" namespace generator { namespace tests_support { +TestWithCustomMwms::TestWithCustomMwms() +{ + m_version = base::GenerateYYMMDD(base::SecondsSinceEpoch()); +} + TestWithCustomMwms::~TestWithCustomMwms() { for (auto const & file : m_files) @@ -20,5 +26,7 @@ void TestWithCustomMwms::Cleanup(platform::LocalCountryFile const & file) platform::CountryIndexes::DeleteFromDisk(file); file.DeleteFromDisk(MapOptions::Map); } + +void TestWithCustomMwms::SetMwmVersion(uint32_t version) { m_version = version; } } // namespace tests_support } // namespace generator diff --git a/generator/generator_tests_support/test_with_custom_mwms.hpp b/generator/generator_tests_support/test_with_custom_mwms.hpp index 06409815c3..f99e87519b 100644 --- a/generator/generator_tests_support/test_with_custom_mwms.hpp +++ b/generator/generator_tests_support/test_with_custom_mwms.hpp @@ -26,6 +26,8 @@ namespace tests_support class TestWithCustomMwms : public TestWithClassificator { public: + TestWithCustomMwms(); + ~TestWithCustomMwms() override; // Creates a physical country file on a disk, which will be removed @@ -43,7 +45,7 @@ public: Cleanup(file); { - generator::tests_support::TestMwmBuilder builder(file, type); + generator::tests_support::TestMwmBuilder builder(file, type, m_version); fn(builder); } @@ -83,6 +85,8 @@ public: return BuildMwm(name, feature::DataHeader::country, std::forward(fn)); } + void SetMwmVersion(uint32_t version); + protected: static void Cleanup(platform::LocalCountryFile const & file); @@ -90,6 +94,7 @@ protected: EditableDataSource m_dataSource; std::vector m_files; + uint32_t m_version = 0; }; } // namespace tests_support } // namespace generator diff --git a/platform/mwm_traits.cpp b/platform/mwm_traits.cpp index 471effd226..708664d419 100644 --- a/platform/mwm_traits.cpp +++ b/platform/mwm_traits.cpp @@ -31,6 +31,12 @@ bool MwmTraits::HasRoutingIndex() const return GetVersion() >= kFirstVersionWithRoutingIndex; } +bool MwmTraits::HasCuisineTypes() const +{ + uint32_t constexpr kFirstVersionWithCuisineTypes = 180917; + return GetVersion() >= kFirstVersionWithCuisineTypes; +} + string DebugPrint(MwmTraits::SearchIndexFormat format) { switch (format) diff --git a/platform/mwm_traits.hpp b/platform/mwm_traits.hpp index 019496d32f..65f0a4295f 100644 --- a/platform/mwm_traits.hpp +++ b/platform/mwm_traits.hpp @@ -52,6 +52,8 @@ public: // Check whether mwm has routing index section. bool HasRoutingIndex() const; + bool HasCuisineTypes() const; + private: Format GetFormat() const { return m_version.GetFormat(); } uint32_t GetVersion() const { return m_version.GetVersion(); } diff --git a/platform/mwm_version.cpp b/platform/mwm_version.cpp index bf49d38cd8..a114b99db9 100644 --- a/platform/mwm_version.cpp +++ b/platform/mwm_version.cpp @@ -24,30 +24,6 @@ namespace // because a user can forget to update maps after a new app version has been installed // automatically in the background. uint64_t constexpr kMaxSecondsTillNoEdits = 3600 * 24 * 31 * 2; - -uint64_t VersionToSecondsSinceEpoch(uint64_t version) -{ - auto constexpr partsCount = 3; - // From left to right YY MM DD. - array parts{}; // Initialize with zeros. - for (auto i = partsCount - 1; i >= 0; --i) - { - parts[i] = version % 100; - version /= 100; - } - ASSERT_EQUAL(version, 0, ("Version is too big.")); - - ASSERT_LESS_OR_EQUAL(parts[1], 12, ("Month should be in range [1, 12]")); - ASSERT_LESS_OR_EQUAL(parts[2], 31, ("Day should be in range [1, 31]")); - - std::tm tm{}; - tm.tm_year = parts[0] + 100; - tm.tm_mon = parts[1] - 1; - tm.tm_mday = parts[2]; - - return base::TimeTToSecondsSinceEpoch(base::TimeGM(tm)); -} - char const MWM_PROLOG[] = "MWM"; template @@ -60,7 +36,7 @@ void ReadVersionT(TSource & src, MwmVersion & version) if (strcmp(prolog, MWM_PROLOG) != 0) { version.SetFormat(Format::v2); - version.SetSecondsSinceEpoch(VersionToSecondsSinceEpoch(111101)); + version.SetSecondsSinceEpoch(base::YYMMDDToSecondsSinceEpoch(111101)); return; } @@ -68,9 +44,14 @@ void ReadVersionT(TSource & src, MwmVersion & version) // with the correspondent return value. version.SetFormat(static_cast(ReadVarUint(src))); if (version.GetFormat() < Format::v8) - version.SetSecondsSinceEpoch(VersionToSecondsSinceEpoch(ReadVarUint(src))); + { + version.SetSecondsSinceEpoch( + base::YYMMDDToSecondsSinceEpoch(static_cast(ReadVarUint(src)))); + } else + { version.SetSecondsSinceEpoch(ReadVarUint(src)); + } } } // namespace diff --git a/search/cuisine_filter.cpp b/search/cuisine_filter.cpp index aae67069bd..e736ff3f42 100644 --- a/search/cuisine_filter.cpp +++ b/search/cuisine_filter.cpp @@ -5,6 +5,8 @@ #include "indexer/feature_meta.hpp" #include "indexer/ftypes_matcher.hpp" +#include "platform/mwm_traits.hpp" + #include "base/assert.hpp" #include "base/checked_cast.hpp" @@ -17,18 +19,19 @@ namespace search namespace cuisine_filter { // Description ------------------------------------------------------------------------------------- -void Description::FromFeature(FeatureType & ft) +Description::Description(FeatureType & ft, bool fromMetadata) { m_types.clear(); - ft.ForEachType([this](uint32_t t) { - if (ftypes::IsCuisineChecker::Instance().IsMatched(t)) - m_types.push_back(t); - }); + if (!fromMetadata) + { + ft.ForEachType([this](uint32_t t) { + if (ftypes::IsCuisineChecker::Instance().IsMatched(t)) + m_types.push_back(t); + }); + return; + } // Old maps support. - if (!m_types.empty()) - return; - auto const & metadata = ft.GetMetadata(); if (!metadata.Has(feature::Metadata::FMD_CUISINE)) return; @@ -93,16 +96,17 @@ CuisineFilter::Descriptions const & CuisineFilter::GetDescriptions(MwmContext co if (it != m_descriptions.end()) return it->second; + auto & value = context.m_value; + version::MwmTraits mwmTraits(value.GetMwmVersion()); + auto const loadFromMetadata = !mwmTraits.HasCuisineTypes(); + auto const food = m_food.Get(context); auto & descriptions = m_descriptions[mwmId]; - food.ForEach([&descriptions, &context](uint64_t bit) { + food.ForEach([&descriptions, &context, &loadFromMetadata](uint64_t bit) { auto const id = base::asserted_cast(bit); FeatureType ft; - - Description description; if (context.GetFeature(id, ft)) - description.FromFeature(ft); - descriptions.emplace_back(id, description); + descriptions.emplace_back(id, Description(ft, loadFromMetadata)); }); return descriptions; } diff --git a/search/cuisine_filter.hpp b/search/cuisine_filter.hpp index faca17c9b1..371d5c73af 100644 --- a/search/cuisine_filter.hpp +++ b/search/cuisine_filter.hpp @@ -18,7 +18,8 @@ namespace cuisine_filter { struct Description { - void FromFeature(FeatureType & ft); + Description() = default; + Description(FeatureType & ft, bool fromMetadata); std::vector m_types; }; diff --git a/search/search_integration_tests/processor_test.cpp b/search/search_integration_tests/processor_test.cpp index 8df472e569..e3b0f09a40 100644 --- a/search/search_integration_tests/processor_test.cpp +++ b/search/search_integration_tests/processor_test.cpp @@ -1483,6 +1483,9 @@ UNIT_CLASS_TEST(ProcessorTest, CuisineMetadataTest) TestCafeWithCuisine kebab(m2::PointD(1.0, 1.0), "Useless name", "en", "kebab"); TestCafeWithCuisine tapas(m2::PointD(1.0, 1.0), "Useless name", "en", "tapas"); + // Metadata is supported for old maps only. + SetMwmVersion(180801); + auto countryId = BuildCountry(countryName, [&](TestMwmBuilder & builder) { builder.Add(kebab); builder.Add(tapas);