From be6d66ca262960accb83a6138d6e25f8dfcd0400 Mon Sep 17 00:00:00 2001
From: Sergey Yershov <yershov@corp.mail.ru>
Date: Fri, 13 Mar 2015 15:10:19 +0300
Subject: [PATCH] Add contact:phone and website metadata

---
 generator/osm2meta.hpp   |  8 +++++++-
 indexer/feature_meta.hpp | 25 +++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/generator/osm2meta.hpp b/generator/osm2meta.hpp
index 509844e3f3..5f17d2ebd8 100644
--- a/generator/osm2meta.hpp
+++ b/generator/osm2meta.hpp
@@ -33,7 +33,7 @@ public:
       if (!value.empty())
         m_params.GetMetadata().Add(feature::FeatureMetadata::FMD_CUISINE, value);
     }
-    else if (k == "phone")
+    else if (k == "phone" || k == "contact:phone")
     {
       string const & value = ValidateAndFormat_phone(v);
       if (!value.empty())
@@ -51,6 +51,12 @@ public:
       if (!value.empty())
         m_params.GetMetadata().Add(feature::FeatureMetadata::FMD_URL, value);
     }
+    else if (k == "website" || k == "contact:website")
+    {
+      string const & value = ValidateAndFormat_url(v);
+      if (!value.empty())
+        m_params.GetMetadata().Add(feature::FeatureMetadata::FMD_WEBSITE, value);
+    }
     else if (k == "operator")
     {
       string const & value = ValidateAndFormat_operator(v);
diff --git a/indexer/feature_meta.hpp b/indexer/feature_meta.hpp
index ffe2294caf..8d1fb5dce4 100644
--- a/indexer/feature_meta.hpp
+++ b/indexer/feature_meta.hpp
@@ -19,18 +19,19 @@ namespace feature
   public:
     enum EMetadataType {
       FMD_CUISINE = 1,
-      FMD_OPEN_HOURS,
-      FMD_PHONE_NUMBER,
-      FMD_FAX_NUMBER,
-      FMD_STARS,
-      FMD_OPERATOR,
-      FMD_URL,
-      FMD_INTERNET,
-      FMD_ELE,
-      FMD_TURN_LANES,
-      FMD_TURN_LANES_FORWARD,
-      FMD_TURN_LANES_BACKWARD,
-      FMD_EMAIL
+      FMD_OPEN_HOURS = 2,
+      FMD_PHONE_NUMBER = 3,
+      FMD_FAX_NUMBER = 4,
+      FMD_STARS = 5,
+      FMD_OPERATOR = 6,
+      FMD_URL = 7,
+      FMD_WEBSITE = 8,
+      FMD_INTERNET = 9,
+      FMD_ELE = 10,
+      FMD_TURN_LANES = 11,
+      FMD_TURN_LANES_FORWARD = 12,
+      FMD_TURN_LANES_BACKWARD = 13,
+      FMD_EMAIL = 14
     };
 
     bool Add(EMetadataType type, string const & s)