organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[indexer] Add metadata key for brand. Minor fixes.

Browse source
This commit is contained in:
tatiana-yan 2018-11-27 11:58:48 +03:00 • committed by mpimenov
parent 01a8015404
commit 26b59b6022
6 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/src/com/mapswithme/maps/bookmarks/data/Metadata.java
View file

@ -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;

3
generator/osm2meta.hpp
View file

@ -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;

1
indexer/feature_meta.cpp
View file

@ -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."));
};

1
indexer/feature_meta.hpp
View file

@ -128,6 +128,7 @@ public:
FMD_BANNER_URL = 27,
FMD_LEVEL = 28,
FMD_AIRPORT_IATA = 29,
FMD_BRAND = 30,
FMD_COUNT
};

1
indexer/map_object.hpp
View file

@ -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.

2
tools/python/mwm/mwm.py
View file

@ -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"]