pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Add contact:phone and website metadata

Browse source
This commit is contained in:
Sergey Yershov 2015-03-13 15:10:19 +03:00 • committed by Alex Zolotarev
parent f33370ca6d
commit be6d66ca26
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
generator/osm2meta.hpp
View file

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

25
indexer/feature_meta.hpp
View file

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