diff options
author | Dmitry Yunitsky <yunik@mapswithme.com> | 2016-03-22 00:20:04 +0300 |
---|---|---|
committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:57:49 +0300 |
commit | fe0f4fb8cf084a42f5667c06489628d07c79c89b (patch) | |
tree | a6ddbf510415c77f18a6d74f9168533c6505f23e /indexer | |
parent | 1a56a37d6bd1f1636435400ad0503c1bf111253e (diff) |
[android] Used core cuisine localization.
Diffstat (limited to 'indexer')
-rw-r--r-- | indexer/editable_map_object.cpp | 5 | ||||
-rw-r--r-- | indexer/editable_map_object.hpp | 2 | ||||
-rw-r--r-- | indexer/map_object.hpp | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/indexer/editable_map_object.cpp b/indexer/editable_map_object.cpp index b2214933fe..b8b12d7e21 100644 --- a/indexer/editable_map_object.cpp +++ b/indexer/editable_map_object.cpp @@ -171,11 +171,6 @@ void EditableMapObject::SetCuisines(vector<string> const & cuisine) m_metadata.Set(feature::Metadata::FMD_CUISINE, strings::JoinStrings(cuisine, ';')); } -void EditableMapObject::SetRawOSMCuisines(string const & cuisine) -{ - m_metadata.Set(feature::Metadata::FMD_CUISINE, cuisine); -} - void EditableMapObject::SetOpeningHours(string const & openingHours) { m_metadata.Set(feature::Metadata::FMD_OPEN_HOURS, openingHours); diff --git a/indexer/editable_map_object.hpp b/indexer/editable_map_object.hpp index 3331097e7c..3f4aaa2322 100644 --- a/indexer/editable_map_object.hpp +++ b/indexer/editable_map_object.hpp @@ -86,8 +86,6 @@ public: void SetBuildingLevels(string const & buildingLevels); /// @param[in] cuisine is a vector of osm cuisine ids. void SetCuisines(vector<string> const & cuisine); - // TODO(yunikkk): Refactor out this method in jni, because it lacks possible validation. - void SetRawOSMCuisines(string const & cuisine); void SetOpeningHours(string const & openingHours); /// Special mark that it's a point feature, not area or line. diff --git a/indexer/map_object.hpp b/indexer/map_object.hpp index eeef2421c2..a97dae8b7c 100644 --- a/indexer/map_object.hpp +++ b/indexer/map_object.hpp @@ -72,9 +72,9 @@ public: string GetEmail() const; string GetWebsite() const; Internet GetInternet() const; - /// @returns translated cuisine(s). + /// @returns not localized cuisines keys. vector<string> GetCuisines() const; - // @returns not localized cuisines keys. + /// @returns translated cuisine(s). vector<string> GetLocalizedCuisines() const; /// @returns translated and formatted cuisines. string FormatCuisines() const; |