From 26b59b602281eac656d988d9a679b224de346453 Mon Sep 17 00:00:00 2001
From: tatiana-yan <tatiana.kondakova@gmail.com>
Date: Tue, 27 Nov 2018 11:58:48 +0300
Subject: [PATCH] [indexer] Add metadata key for brand. Minor fixes.

---
 android/src/com/mapswithme/maps/bookmarks/data/Metadata.java | 4 +++-
 generator/osm2meta.hpp                                       | 3 ++-
 indexer/feature_meta.cpp                                     | 1 +
 indexer/feature_meta.hpp                                     | 1 +
 indexer/map_object.hpp                                       | 1 +
 tools/python/mwm/mwm.py                                      | 2 +-
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java b/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java
index 5cd606406e..a1833271cc 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java
@@ -41,7 +41,9 @@ public class Metadata implements Parcelable
     FMD_PRICE_RATE(25),
     FMD_RATING(26),
     FMD_BANNER_URL(27),
-    FMD_LEVEL(28);
+    FMD_LEVEL(28),
+    FMD_AIRPORT_IATA(29),
+    FMD_AIRPORT_BRAND(30);
 
     private final int mMetaType;
 
diff --git a/generator/osm2meta.hpp b/generator/osm2meta.hpp
index bca47b0fbc..23bf5938bc 100644
--- a/generator/osm2meta.hpp
+++ b/generator/osm2meta.hpp
@@ -100,8 +100,9 @@ public:
     case Metadata::FMD_SPONSORED_ID:
     case Metadata::FMD_PRICE_RATE:
     case Metadata::FMD_RATING:
+    case Metadata::FMD_BRAND:
     case Metadata::FMD_TEST_ID:
-    case Metadata::FMD_COUNT: CHECK(false, ("FMD_COUNT can not be used as a type."));
+    case Metadata::FMD_COUNT: CHECK(false, (mdType, "should not be parsed from OSM"));
     }
     md.Set(mdType, valid);
     return false;
diff --git a/indexer/feature_meta.cpp b/indexer/feature_meta.cpp
index d7f6339ce9..420637eb7b 100644
--- a/indexer/feature_meta.cpp
+++ b/indexer/feature_meta.cpp
@@ -192,6 +192,7 @@ string ToString(feature::Metadata::EType type)
   case Metadata::FMD_BANNER_URL: return "banner_url";
   case Metadata::FMD_LEVEL: return "level";
   case Metadata::FMD_AIRPORT_IATA: return "iata";
+  case Metadata::FMD_BRAND: return "brand";
   case Metadata::FMD_COUNT: CHECK(false, ("FMD_COUNT can not be used as a type."));
   };
 
diff --git a/indexer/feature_meta.hpp b/indexer/feature_meta.hpp
index 40df6a3caa..b5a6e85102 100644
--- a/indexer/feature_meta.hpp
+++ b/indexer/feature_meta.hpp
@@ -128,6 +128,7 @@ public:
     FMD_BANNER_URL = 27,
     FMD_LEVEL = 28,
     FMD_AIRPORT_IATA = 29,
+    FMD_BRAND = 30,
     FMD_COUNT
   };
 
diff --git a/indexer/map_object.hpp b/indexer/map_object.hpp
index 2c97cd526a..f431af2c16 100644
--- a/indexer/map_object.hpp
+++ b/indexer/map_object.hpp
@@ -156,6 +156,7 @@ std::vector<Props> MetadataToProps(std::vector<T> const & metadata)
     case Metadata::FMD_RATING:
     case Metadata::FMD_BANNER_URL:
     case Metadata::FMD_AIRPORT_IATA:
+    case Metadata::FMD_BRAND:
     case Metadata::FMD_COUNT:
       break;
       // Please add new cases when compiler issues an "unhandled switch case" warning here.
diff --git a/tools/python/mwm/mwm.py b/tools/python/mwm/mwm.py
index 6d322e09fe..812b0651e2 100644
--- a/tools/python/mwm/mwm.py
+++ b/tools/python/mwm/mwm.py
@@ -62,7 +62,7 @@ class MWM:
                 "turn_lanes", "turn_lanes_forward", "turn_lanes_backward", "email", "postcode",
                 "wikipedia", "maxspeed", "flats", "height", "min_height",
                 "denomination", "building_levels", "test_id", "ref:sponsored", "price_rate",
-                "rating", "fuel", "routes"]
+                "rating", "banner_url", "level", "iata", "brand"]
 
     regiondata = ["languages", "driving", "timezone", "addr_fmt", "phone_fmt", "postcode_fmt", "holidays", "housenames"]