From d19f74317c5fc7e123dc05ede98daceb9017779f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= Date: Thu, 12 Sep 2019 18:00:17 +0300 Subject: [PATCH] [android] Added missed 'FWD_DURAION' metadata type on Java side', commented 'FWD_MAXSPEED' and added missed 'FWD_TEST_ID' type to make java enum identical to core --- .../src/com/mapswithme/maps/bookmarks/data/Metadata.java | 7 ++++--- indexer/feature_meta.hpp | 1 + 2 files changed, 5 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 a1833271cc..3b8fe72a5d 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java @@ -31,20 +31,21 @@ public class Metadata implements Parcelable FMD_POSTCODE(15), // TODO: It is hacked in jni and returns full Wikipedia url. Should use separate getter instead. FMD_WIKIPEDIA(16), - FMD_MAXSPEED(17), + // FMD_MAXSPEED(17), FMD_FLATS(18), FMD_HEIGHT(19), FMD_MIN_HEIGHT(20), FMD_DENOMINATION(21), FMD_BUILDING_LEVELS(22), + FWD_TEST_ID(23), FMD_SPONSORED_ID(24), FMD_PRICE_RATE(25), FMD_RATING(26), FMD_BANNER_URL(27), FMD_LEVEL(28), FMD_AIRPORT_IATA(29), - FMD_AIRPORT_BRAND(30); - + FMD_BRAND(30), + FMD_DURATION(31); private final int mMetaType; MetadataType(int metadataType) diff --git a/indexer/feature_meta.hpp b/indexer/feature_meta.hpp index adbe19bfaf..c28e36d9c4 100644 --- a/indexer/feature_meta.hpp +++ b/indexer/feature_meta.hpp @@ -100,6 +100,7 @@ class Metadata : public MetadataBase public: /// @note! Do not change values here. /// Add new types to the end of list, before FMD_COUNT. + /// Add new types to the corresponding list in Java. /// For types parsed from OSM get corresponding OSM tag to MetadataTagProcessor::TypeFromString(). enum EType : int8_t {