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

[generator] store addr:flats and ref for entrances

Browse source
This commit is contained in:
Darafei Praliaskouski 2013-05-02 19:22:24 +03:00 • committed by Alex Zolotarev
parent cc967b7440
commit beb113a28f
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
generator/feature_builder.cpp
View file

@ -39,7 +39,7 @@ m2::PointD FeatureBuilder1::GetGeometryCenter() const
size_t const count = poly.size();
for (size_t i = 0; i < count; ++i)
ret += poly[i];
return (ret / count);
return ret / count;
}
void FeatureBuilder1::SetCenter(m2::PointD const & p)
@ -165,21 +165,26 @@ namespace
bool FeatureBuilder1::PreSerialize()
{
if (!m_Params.IsValid()) return false;
static const int8_t defaultCode = StringUtf8Multilang::GetLangIndex("default");
static const int8_t intCode = StringUtf8Multilang::GetLangIndex("int_name");
switch (m_Params.GetGeomType())
{
case GEOM_POINT:
// If we don't have name and have house number, than replace them.
if (m_Params.name.IsEmpty() && !m_Params.house.IsEmpty())
m_Params.name.AddString(0, m_Params.house.Get());
m_Params.name.AddString(defaultCode, m_Params.house.Get());
// We need refs for motorway's junctions. Try to update name always, not only for junctions.
// if (feature::IsJunction(m_Params.m_Types)) { ... }
if (m_Params.name.IsEmpty() && !m_Params.ref.empty())
m_Params.name.AddString(0, m_Params.ref);
if (m_Params.name.IsEmpty() && (!m_Params.ref.empty() || m_Params.flats.empty()))
{
m_Params.name.AddString(defaultCode, m_Params.ref);
m_Params.name.AddString(intCode, m_Params.flats);
}
m_Params.house.Clear();
m_Params.ref.clear();
m_Params.flats.clear();
break;
case GEOM_LINE:

8
generator/osm2type.cpp
View file

@ -192,8 +192,12 @@ namespace ftype
m_params.ref = v;
// get house number
if (k == "addr:housenumber") m_params.AddHouseNumber(v);
if (k == "addr:housename") m_params.AddHouseName(v);
if (k == "addr:housenumber")
m_params.AddHouseNumber(v);
if (k == "addr:housename")
m_params.AddHouseName(v);
if (k == "addr:flats")
m_params.flats = v;
// get population rank
if (k == "population")

1
indexer/feature_data.hpp
View file

@ -106,6 +106,7 @@ struct FeatureParamsBase
StringUtf8Multilang name;
StringNumericOptimal house;
string ref;
string flats;
int8_t layer;
uint8_t rank;