From 4be5bc0fa919d2d5899e4df822c1012db1c77783 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <alex@maps.me>
Date: Fri, 4 Mar 2016 11:06:24 +0300
Subject: [PATCH] Metadata::TypeFromString to correctly match osm tags with our
 metadata types.

---
 indexer/feature_meta.cpp | 52 ++++++++++++++++++++++++++++++++++++++++
 indexer/feature_meta.hpp |  4 ++++
 2 files changed, 56 insertions(+)

diff --git a/indexer/feature_meta.cpp b/indexer/feature_meta.cpp
index d936c3310d..ec00c8c236 100644
--- a/indexer/feature_meta.cpp
+++ b/indexer/feature_meta.cpp
@@ -41,6 +41,58 @@ string Metadata::GetWikiURL() const
   return "https://" + v.substr(0, colon) + kBaseWikiUrl + v.substr(colon + 1);
 }
 
+// static
+bool Metadata::TypeFromString(string const & k, Metadata::EType & outType)
+{
+  if (k == "cuisine")
+    outType = Metadata::FMD_CUISINE;
+  else if (k == "opening_hours")
+    outType = Metadata::FMD_OPEN_HOURS;
+  else if (k == "phone" || k == "contact:phone")
+    outType = Metadata::FMD_PHONE_NUMBER;
+  else if (k == "fax" || k == "contact:fax")
+    outType = Metadata::EType::FMD_FAX_NUMBER;
+  else if (k == "stars")
+    outType = Metadata::FMD_STARS;
+  else if (k == "operator")
+    outType = Metadata::FMD_OPERATOR;
+  else if (k == "url")  // TODO: Should we match url to website here?
+    outType = Metadata::FMD_URL;
+  else if (k == "website" || k == "contact:website")
+    outType = Metadata::FMD_WEBSITE;
+  else if (k == "internet_access")
+    outType = Metadata::FMD_INTERNET;
+  else if (k == "ele")
+    outType = Metadata::FMD_ELE;
+  else if (k == "turn:lanes")
+    outType = Metadata::FMD_TURN_LANES;
+  else if (k == "turn:lanes:forward")
+    outType = Metadata::FMD_TURN_LANES_FORWARD;
+  else if (k == "turn:lanes:backward")
+    outType = Metadata::FMD_TURN_LANES_BACKWARD;
+  else if (k == "email" || k == "contact:email")
+    outType = Metadata::FMD_EMAIL;
+  else if (k == "addr:postcode")
+    outType = Metadata::FMD_POSTCODE;
+  else if (k == "wikipedia")
+    outType = Metadata::FMD_WIKIPEDIA;
+  else if (k == "maxspeed")
+    outType = Metadata::FMD_MAXSPEED;
+  else if (k == "addr:flats")
+    outType = Metadata::FMD_FLATS;
+  else if (k == "height")
+    outType = Metadata::FMD_HEIGHT;
+  else if (k == "min_height")
+    outType = Metadata::FMD_MIN_HEIGHT;
+  else if (k == "building:levels")
+    outType = Metadata::FMD_BUILDING_LEVELS;
+  else if (k == "denomination")
+    outType = Metadata::FMD_DENOMINATION;
+  else
+    return false;
+
+  return true;
+}
 }  // namespace feature
 
 // Warning: exact osm tag keys should be returned for valid enum values.
diff --git a/indexer/feature_meta.hpp b/indexer/feature_meta.hpp
index c85b32f0ba..7fc272211a 100644
--- a/indexer/feature_meta.hpp
+++ b/indexer/feature_meta.hpp
@@ -97,6 +97,7 @@ class Metadata : public MetadataBase
 public:
   /// @note! Do not change values here.
   /// Add new types to the end of list, before FMD_COUNT.
+  /// Please also modify MetadataTagProcessor::TypeFromString().
   enum EType : int8_t
   {
     FMD_CUISINE = 1,
@@ -125,6 +126,9 @@ public:
     FMD_COUNT
   };
 
+  /// Used to normalize tags like "contact:phone" and "phone" to a common metadata enum value.
+  static bool TypeFromString(string const & osmTagKey, feature::Metadata::EType & outType);
+
   void Set(EType type, string const & value)
   {
     MetadataBase::Set(type, value);