[metadata] Renaming (refactoring) according to code style.

android/jni/com/mapswithme/maps/Framework.cpp

@@ -1475,4 +1475,4 @@ extern "C"
     m2::PointD const pivot = m2::PointD(pivotX, pivotY);
     android::Platform::RunOnGuiThreadImpl(bind(&Framework::SetWidgetPivot, frm(), widgetType, pivot));
   }
-} // extern "C"
+} // extern "C"

generator/generator.pro

@@ -52,6 +52,7 @@ HEADERS += \
     generate_info.hpp \
     osm2meta.hpp \
     osm2type.hpp \
+    osm2meta.hpp \
     osm_decl.hpp \
     osm_element.hpp \
     osm_id.hpp \

iphone/Maps/Classes/MWMPlacePageEntity.mm

@@ -20,7 +20,7 @@ static NSArray * const kPatternTypesArray = @[@(MWMPlacePageMetadataTypePostcode
 static NSString * const kTypesKey = @"types";
 static NSString * const kValuesKey = @"values";
 
-typedef feature::FeatureMetadata::EMetadataType TMetadataType;
+using feature::Metadata;
 
 @interface MWMPlacePageEntity ()
 
@@ -71,7 +71,7 @@ typedef feature::FeatureMetadata::EMetadataType TMetadataType;
       [self configureForBookmark:mark];
       break;
   }
- GetFramework().ActivateUserMark(mark);
+  GetFramework().ActivateUserMark(mark);
 }
 
 - (void)configureForBookmark:(UserMark const *)bookmark
@@ -82,7 +82,7 @@ typedef feature::FeatureMetadata::EMetadataType TMetadataType;
   BookmarkCategory * category = f.GetBmCategory(self.bac.first);
   BookmarkData const & data = static_cast<Bookmark const *>(bookmark)->GetData();
   m2::PointD const & point = bookmark->GetOrg();
-  feature::FeatureMetadata metadata;
+  Metadata metadata;
   search::AddressInfo info;
   f.FindClosestPOIMetadata(point, metadata);
   f.GetAddressInfoForGlobalPoint(point, info);
@@ -101,7 +101,7 @@ typedef feature::FeatureMetadata::EMetadataType TMetadataType;
 - (void)configureForPOI:(SearchMarkPoint const *)poiMark
 {
   search::AddressInfo const & addressInfo = poiMark->GetInfo();
-  feature::FeatureMetadata const & metadata = poiMark->GetMetadata();
+  Metadata const & metadata = poiMark->GetMetadata();
   [self configureEntityWithMetadata:metadata addressInfo:addressInfo];
 }
 
@@ -124,13 +124,13 @@ typedef feature::FeatureMetadata::EMetadataType TMetadataType;
 // TODO(Vlad): Should implement this method.
 }
 
-- (void)configureEntityWithMetadata:(feature::FeatureMetadata const &)metadata addressInfo:(search::AddressInfo const &)info
+- (void)configureEntityWithMetadata:(Metadata const &)metadata addressInfo:(search::AddressInfo const &)info
 {
   NSString * const name = [NSString stringWithUTF8String:info.GetPinName().c_str()];
   self.title = name.length > 0 ? name : L(@"dropped_pin");
   self.category = [NSString stringWithUTF8String:info.GetPinType().c_str()];
 
-  vector<TMetadataType> const presentTypes = metadata.GetPresentTypes();
+  vector<Metadata::EType> const presentTypes = metadata.GetPresentTypes();
 
   NSMutableArray const * types = [NSMutableArray array];
   NSMutableArray const * values = [NSMutableArray array];
@@ -139,20 +139,20 @@ typedef feature::FeatureMetadata::EMetadataType TMetadataType;
   {
     switch (type)
     {
-      case TMetadataType::FMD_CUISINE:
+      case Metadata::FMD_CUISINE:
       {
         NSString * cuisine = [NSString stringWithFormat:@"cuisine_%@", [NSString stringWithUTF8String:metadata.Get(type).c_str()]];
         self.category = [NSString stringWithFormat:@"%@, %@", self.category, L(cuisine)];
         break;
       }
-      case TMetadataType::FMD_ELE:
+      case Metadata::FMD_ELE:
       {
         self.typeDescriptionValue = atoi(metadata.Get(type).c_str());
         if (self.type != MWMPlacePageEntityTypeBookmark)
           self.type = MWMPlacePageEntityTypeEle;
         break;
       }
-      case TMetadataType::FMD_OPERATOR:
+      case Metadata::FMD_OPERATOR:
       {
         NSString const * bank = [NSString stringWithUTF8String:metadata.Get(type).c_str()];
         if (self.category.length)
@@ -161,22 +161,22 @@ typedef feature::FeatureMetadata::EMetadataType TMetadataType;
           self.category = [NSString stringWithFormat:@"%@", bank];
         break;
       }
-      case TMetadataType::FMD_STARS:
+      case Metadata::FMD_STARS:
       {
         self.typeDescriptionValue = atoi(metadata.Get(type).c_str());
         if (self.type != MWMPlacePageEntityTypeBookmark)
           self.type = MWMPlacePageEntityTypeHotel;
         break;
       }
-      case TMetadataType::FMD_URL:
-      case TMetadataType::FMD_WEBSITE:
-      case TMetadataType::FMD_PHONE_NUMBER:
-      case TMetadataType::FMD_OPEN_HOURS:
-      case TMetadataType::FMD_EMAIL:
-      case TMetadataType::FMD_POSTCODE:
+      case Metadata::FMD_URL:
+      case Metadata::FMD_WEBSITE:
+      case Metadata::FMD_PHONE_NUMBER:
+      case Metadata::FMD_OPEN_HOURS:
+      case Metadata::FMD_EMAIL:
+      case Metadata::FMD_POSTCODE:
       {
         NSString * v;
-        if (type == feature::FeatureMetadata::EMetadataType::FMD_OPEN_HOURS)
+        if (type == Metadata::EType::FMD_OPEN_HOURS)
           v = [self formattedOpenHoursFromString:metadata.Get(type)];
         else
           v = [NSString stringWithUTF8String:metadata.Get(type).c_str()];
@@ -186,11 +186,11 @@ typedef feature::FeatureMetadata::EMetadataType TMetadataType;
         [values addObject:v];
         break;
       }
-      case TMetadataType::FMD_TURN_LANES:
-      case TMetadataType::FMD_TURN_LANES_BACKWARD:
-      case TMetadataType::FMD_TURN_LANES_FORWARD:
-      case TMetadataType::FMD_FAX_NUMBER:
-      case TMetadataType::FMD_INTERNET:
+      case Metadata::FMD_INTERNET:
+        /// @todo Add Internet processing here
+        break;
+
+      default:
         break;
     }
   }
@@ -237,35 +237,26 @@ typedef feature::FeatureMetadata::EMetadataType TMetadataType;
   [self.metadata[kTypesKey] removeObject:@(MWMPlacePageMetadataTypeBookmark)];
 }
 
-- (NSNumber *)typeFromMetadata:(TMetadataType)type
+- (NSNumber *)typeFromMetadata:(Metadata::EType)type
 {
   switch (type)
   {
-    case TMetadataType::FMD_URL:
+    case Metadata::FMD_URL:
       return @(MWMPlacePageMetadataTypeURL);
-    case TMetadataType::FMD_WEBSITE:
+    case Metadata::FMD_WEBSITE:
       return @(MWMPlacePageMetadataTypeWebsite);
-    case TMetadataType::FMD_PHONE_NUMBER:
+    case Metadata::FMD_PHONE_NUMBER:
       return @(MWMPlacePageMetadataTypePhoneNumber);
-    case TMetadataType::FMD_OPEN_HOURS:
+    case Metadata::FMD_OPEN_HOURS:
       return @(MWMPlacePageMetadataTypeOpenHours);
-    case TMetadataType::FMD_EMAIL:
+    case Metadata::FMD_EMAIL:
       return @(MWMPlacePageMetadataTypeEmail);
-    case TMetadataType::FMD_POSTCODE:
+    case Metadata::FMD_POSTCODE:
       return @(MWMPlacePageMetadataTypePostcode);
 
-    case TMetadataType::FMD_TURN_LANES:
-    case TMetadataType::FMD_TURN_LANES_BACKWARD:
-    case TMetadataType::FMD_TURN_LANES_FORWARD:
-    case TMetadataType::FMD_FAX_NUMBER:
-    case TMetadataType::FMD_INTERNET:
-    case TMetadataType::FMD_STARS:
-    case TMetadataType::FMD_OPERATOR:
-    case TMetadataType::FMD_ELE:
-    case TMetadataType::FMD_CUISINE:
-      break;
+    default:
+      return nil;
   }
-  return nil;
 }
 
 #pragma mark - Bookmark editing