drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-20 13:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[generator] Add branch key to map generator

Browse Source 
Signed-off-by: eisa01 <eisa01@gmail.com>
This commit is contained in:
eisa01
2025-08-24 19:24:58 +02:00
committed by x7z4w
parent 9fd80ecf88
commit 20208cf892
5 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
generator/osm2meta.cpp
View File

@@ -136,6 +136,11 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_url(std::string const &
return v; return v;
} }
std::string MetadataTagProcessorImpl::ValidateAndFormat_text(std::string const & v)
{
return v;
}
std::string MetadataTagProcessorImpl::ValidateAndFormat_phone(std::string const & v) std::string MetadataTagProcessorImpl::ValidateAndFormat_phone(std::string const & v)
{ {
return v; return v;
@@ -617,6 +622,7 @@ void MetadataTagProcessor::operator()(std::string const & k, std::string const &
return; return;
valid = ValidateAndFormat_brand(v); valid = ValidateAndFormat_brand(v);
break; break;
case Metadata::FMD_BRANCH: valid = ValidateAndFormat_text(v); break;
case Metadata::FMD_DURATION: valid = ValidateAndFormat_duration(v); break; case Metadata::FMD_DURATION: valid = ValidateAndFormat_duration(v); break;
case Metadata::FMD_CAPACITY: valid = ValidateAndFormat_capacity(v); break; case Metadata::FMD_CAPACITY: valid = ValidateAndFormat_capacity(v); break;
case Metadata::FMD_LOCAL_REF: valid = ValidateAndFormat_local_ref(v); break; case Metadata::FMD_LOCAL_REF: valid = ValidateAndFormat_local_ref(v); break;

1
generator/osm2meta.hpp
View File

@@ -12,6 +12,7 @@ struct MetadataTagProcessorImpl
std::string ValidateAndFormat_maxspeed(std::string const & v) const; std::string ValidateAndFormat_maxspeed(std::string const & v) const;
static std::string ValidateAndFormat_stars(std::string const & v); static std::string ValidateAndFormat_stars(std::string const & v);
std::string ValidateAndFormat_operator(std::string const & v) const; std::string ValidateAndFormat_operator(std::string const & v) const;
static std::string ValidateAndFormat_text(std::string const & v);
static std::string ValidateAndFormat_url(std::string const & v); static std::string ValidateAndFormat_url(std::string const & v);
static std::string ValidateAndFormat_phone(std::string const & v); static std::string ValidateAndFormat_phone(std::string const & v);
static std::string ValidateAndFormat_opening_hours(std::string const & v); static std::string ValidateAndFormat_opening_hours(std::string const & v);

3
libs/indexer/feature_meta.cpp
View File

@@ -176,6 +176,8 @@ bool Metadata::TypeFromString(string_view k, Metadata::EType & outType)
outType = Metadata::FMD_AIRPORT_IATA; outType = Metadata::FMD_AIRPORT_IATA;
else if (k.starts_with("brand")) else if (k.starts_with("brand"))
outType = Metadata::FMD_BRAND; outType = Metadata::FMD_BRAND;
else if (k == "branch")
outType = Metadata::FMD_BRANCH;
else if (k == "duration") else if (k == "duration")
outType = Metadata::FMD_DURATION; outType = Metadata::FMD_DURATION;
else if (k == "capacity") else if (k == "capacity")
@@ -290,6 +292,7 @@ string ToString(Metadata::EType type)
case Metadata::FMD_LEVEL: return "level"; case Metadata::FMD_LEVEL: return "level";
case Metadata::FMD_AIRPORT_IATA: return "iata"; case Metadata::FMD_AIRPORT_IATA: return "iata";
case Metadata::FMD_BRAND: return "brand"; case Metadata::FMD_BRAND: return "brand";
case Metadata::FMD_BRANCH: return "branch";
case Metadata::FMD_DURATION: return "duration"; case Metadata::FMD_DURATION: return "duration";
case Metadata::FMD_CONTACT_FACEBOOK: return "contact:facebook"; case Metadata::FMD_CONTACT_FACEBOOK: return "contact:facebook";
case Metadata::FMD_CONTACT_INSTAGRAM: return "contact:instagram"; case Metadata::FMD_CONTACT_INSTAGRAM: return "contact:instagram";

1
libs/indexer/feature_meta.hpp
View File

@@ -123,6 +123,7 @@ public:
FMD_PANORAMAX = 52, FMD_PANORAMAX = 52,
FMD_CHECK_DATE = 53, FMD_CHECK_DATE = 53,
FMD_CHECK_DATE_OPEN_HOURS = 54, FMD_CHECK_DATE_OPEN_HOURS = 54,
FMD_BRANCH = 55,
FMD_COUNT FMD_COUNT
}; };

3
tools/feature_list/feature_list.cpp
View File

@@ -257,6 +257,7 @@ public:
string const contact_fediverse(meta.Get(feature::Metadata::FMD_CONTACT_FEDIVERSE)); string const contact_fediverse(meta.Get(feature::Metadata::FMD_CONTACT_FEDIVERSE));
string const contact_bluesky(meta.Get(feature::Metadata::FMD_CONTACT_BLUESKY)); string const contact_bluesky(meta.Get(feature::Metadata::FMD_CONTACT_BLUESKY));
string const stars(meta.Get(feature::Metadata::FMD_STARS)); string const stars(meta.Get(feature::Metadata::FMD_STARS));
string const branch(meta.Get(feature::Metadata::FMD_BRANCH));
string const internet(meta.Get(feature::Metadata::FMD_INTERNET)); string const internet(meta.Get(feature::Metadata::FMD_INTERNET));
string const denomination(meta.Get(feature::Metadata::FMD_DENOMINATION)); string const denomination(meta.Get(feature::Metadata::FMD_DENOMINATION));
string const wheelchair(GetWheelchairType(f)); string const wheelchair(GetWheelchairType(f));
@@ -284,6 +285,7 @@ public:
website, website,
stars, stars,
std::string(metaOperator), std::string(metaOperator),
branch,
internet, internet,
denomination, denomination,
wheelchair, wheelchair,
@@ -326,6 +328,7 @@ void PrintHeader()
"cuisines", "cuisines",
"stars", "stars",
"operator", "operator",
"branch",
"internet", "internet",
"denomination", "denomination",
"wheelchair", "wheelchair",