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

[indexer] wheelchair type info added into MapObject class

Browse source
This commit is contained in:
Arsentiy Milchakov 2017-06-05 18:48:04 +03:00
parent 338283c7fc
commit 4871e2f7f4
4 changed files with 61 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
indexer/indexer.pro
View file

@ -134,6 +134,7 @@ HEADERS += \
trie_reader.hpp \
types_mapping.hpp \
unique_index.hpp \
wheelchair.hpp \
OTHER_FILES += drules_struct.proto

5
indexer/map_object.cpp
View file

@ -198,6 +198,11 @@ string MapObject::GetBuildingLevels() const
return m_metadata.Get(feature::Metadata::FMD_BUILDING_LEVELS);
}
wheelchair::Type MapObject::GetWheelchairType() const
{
return wheelchair::Matcher::GetType(m_types);
}
feature::Metadata const & MapObject::GetMetadata() const { return m_metadata; }
bool MapObject::IsPointType() const { return m_geomType == feature::EGeomType::GEOM_POINT; }
bool MapObject::IsBuilding() const { return ftypes::IsBuildingChecker::Instance()(m_types); }

2
indexer/map_object.hpp
View file

@ -3,6 +3,7 @@
#include "indexer/feature_data.hpp"
#include "indexer/feature_decl.hpp"
#include "indexer/feature_meta.hpp"
#include "indexer/wheelchair.hpp"
#include "geometry/latlon.hpp"
#include "geometry/mercator.hpp"
@ -88,6 +89,7 @@ public:
string GetWikipediaLink() const;
string GetFlats() const;
string GetBuildingLevels() const;
wheelchair::Type GetWheelchairType() const;
// TODO(Vlad, yunikkk): Use Props enum + getters instead of direct metadata access.
// TODO: Remove this method.

53
indexer/wheelchair.hpp Normal file
View file

@ -0,0 +1,53 @@
#pragma once
#include "indexer/feature.hpp"
#include "indexer/ftypes_mapping.hpp"
#include <initializer_list>
namespace wheelchair
{
enum class Type
{
No,
Yes,
Limited
};
inline string DebugPrint(Type wheelchair)
{
switch (wheelchair)
{
case Type::No: return "No";
case Type::Yes: return "Yes";
case Type::Limited: return "Limited";
}
return {};
}
class Matcher
{
public:
static Type GetType(feature::TypesHolder const & types)
{
static Matcher instance;
auto const it = instance.m_matcher.Find(types);
if (!instance.m_matcher.IsValid(it))
return Type::No;
return it->second;
}
private:
using TypesInitializer = std::initializer_list<std::initializer_list<char const *>>;
Matcher()
{
m_matcher.Append<TypesInitializer>({{"wheelchair", "no"}}, Type::No);
m_matcher.Append<TypesInitializer>({{"wheelchair", "yes"}}, Type::Yes);
m_matcher.Append<TypesInitializer>({{"wheelchair", "limited"}}, Type::Limited);
}
ftypes::HashMapMatcher<uint32_t, Type> m_matcher;
};
} // namespace wheelchair