kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

get local_ref

Browse source 
Signed-off-by: Harry Bond <hrbond@pm.me>
This commit is contained in:
Harry Bond 2024-01-26 12:11:48 +00:00 • committed by Viktor Govako
parent bf2ca2ed9f
commit 6653955bf1
5 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java
View file

@ -61,7 +61,8 @@ public class Metadata implements Parcelable
FMD_BUILDING_MIN_LEVEL(40),
FMD_WIKIMEDIA_COMMONS(41),
FMD_CAPACITY(42),
FMD_WHEELCHAIR(43);
FMD_WHEELCHAIR(43),
FMD_LOCAL_REF(44);
private final int mMetaType;
MetadataType(int metadataType)

6
generator/osm2meta.cpp
View file

@ -332,6 +332,11 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_capacity(std::string con
return v;
}
std::string MetadataTagProcessorImpl::ValidateAndFormat_local_ref(std::string const & v)
{
return v;
}
std::string MetadataTagProcessorImpl::ValidateAndFormat_duration(std::string const & v) const
{
if (!ftypes::IsWayWithDurationChecker::Instance()(m_params.m_types))
@ -526,6 +531,7 @@ void MetadataTagProcessor::operator()(std::string const & k, std::string const &
break;
case Metadata::FMD_DURATION: valid = ValidateAndFormat_duration(v); break;
case Metadata::FMD_CAPACITY: valid = ValidateAndFormat_capacity(v); break;
case Metadata::FMD_LOCAL_REF: valid = ValidateAndFormat_local_ref(v); break;
// Metadata types we do not get from OSM.
case Metadata::FMD_CUISINE:
case Metadata::FMD_DESCRIPTION: // processed separately

1
generator/osm2meta.hpp
View file

@ -17,6 +17,7 @@ struct MetadataTagProcessorImpl
static std::string ValidateAndFormat_opening_hours(std::string const & v) ;
std::string ValidateAndFormat_ele(std::string const & v) const;
static std::string ValidateAndFormat_destination(std::string const & v) ;
static std::string ValidateAndFormat_local_ref(std::string const & v) ;
static std::string ValidateAndFormat_destination_ref(std::string const & v) ;
static std::string ValidateAndFormat_junction_ref(std::string const & v) ;
static std::string ValidateAndFormat_turn_lanes(std::string const & v) ;

3
indexer/feature_meta.cpp
View file

@ -124,6 +124,8 @@ bool Metadata::TypeFromString(string_view k, Metadata::EType & outType)
outType = Metadata::FMD_DURATION;
else if (k == "capacity")
outType = Metadata::FMD_CAPACITY;
else if (k == "local_ref")
outType = Metadata::FMD_LOCAL_REF;
else
return false;
@ -241,6 +243,7 @@ string ToString(Metadata::EType type)
case Metadata::FMD_WIKIMEDIA_COMMONS: return "wikimedia_commons";
case Metadata::FMD_CAPACITY: return "capacity";
case Metadata::FMD_WHEELCHAIR: return "wheelchair";
case Metadata::FMD_LOCAL_REF: return "local_ref";
case Metadata::FMD_COUNT: CHECK(false, ("FMD_COUNT can not be used as a type."));
};

1
indexer/feature_meta.hpp
View file

@ -149,6 +149,7 @@ public:
FMD_WIKIMEDIA_COMMONS = 41,
FMD_CAPACITY = 42,
FMD_WHEELCHAIR = 43, // Value is runtime only, data is taken from the classificator types
FMD_LOCAL_REF = 44,
FMD_COUNT
};