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

[generator] Fixed GetFeatureId(CompositeId const & id).

Browse source
This commit is contained in:
Maksim Andrianov 2019-11-21 17:34:19 +03:00 • committed by mpimenov
parent 3bf828e64b
commit 99e0205996
4 changed files with 53 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
generator/gen_mwm_info.cpp
View file

@ -41,15 +41,15 @@ void OsmID2FeatureID::AddIds(CompositeId const & osmId, uint32_t featureId)
m_data.emplace_back(osmId, featureId);
}
boost::optional<uint32_t> OsmID2FeatureID::GetFeatureId(CompositeId const & id) const
std::vector<uint32_t> OsmID2FeatureID::GetFeatureIds(CompositeId const & id) const
{
auto const it = std::lower_bound(std::cbegin(m_data), std::cend(m_data), id,
[](auto const & l, auto const & r) { return l.first < r; });
if (it == std::cend(m_data) || it->first != id)
return {};
std::vector<uint32_t> ids;
auto it = std::lower_bound(std::cbegin(m_data), std::cend(m_data), id,
[](auto const & l, auto const & r) { return l.first < r; });
while (it != std::cend(m_data) && it->first == id)
ids.emplace_back((it++)->second);
CHECK_NOT_EQUAL(std::next(it)->first, id, (id));
return it->second;
return ids;
}
std::vector<uint32_t> OsmID2FeatureID::GetFeatureIds(base::GeoObjectId mainId) const

2
generator/gen_mwm_info.hpp
View file

@ -37,7 +37,7 @@ public:
bool ReadFromFile(std::string const & filename);
void AddIds(CompositeId const & osmId, uint32_t featureId);
boost::optional<uint32_t> GetFeatureId(CompositeId const & id) const;
std::vector<uint32_t> GetFeatureIds(CompositeId const & id) const;
std::vector<uint32_t> GetFeatureIds(base::GeoObjectId mainId) const;
Version GetVersion() const;

26
generator/generator_tests/gen_mwm_info_tests.cpp
View file

@ -57,10 +57,28 @@ UNIT_TEST(OsmID2FeatureID_GetFeatureId)
};
TEST_EQUAL(mapping.GetFeatureIds(kCid1.m_additionalId), answer, ());
}
TEST_EQUAL(*mapping.GetFeatureId(kCid1), kId1, ());
TEST_EQUAL(*mapping.GetFeatureId(kCid2), kId2, ());
TEST_EQUAL(*mapping.GetFeatureId(kCid3), kId3, ());
TEST(!mapping.GetFeatureId(generator::CompositeId(base::GeoObjectId())), ());
{
std::vector<uint32_t> const answer{
kId1,
};
TEST_EQUAL(mapping.GetFeatureIds(kCid1), answer, ());
}
{
std::vector<uint32_t> const answer{
kId2
};
TEST_EQUAL(mapping.GetFeatureIds(kCid3), answer, ());
}
{
std::vector<uint32_t> const answer{
kId3,
};
TEST_EQUAL(mapping.GetFeatureIds(kCid3), answer, ());
}
{
std::vector<uint32_t> const answer;
TEST_EQUAL(mapping.GetFeatureIds(generator::CompositeId(base::GeoObjectId())), answer, ());
}
}
UNIT_TEST(OsmID2FeatureID_ReadWrite)

27
generator/hierarchy.cpp
View file

@ -6,6 +6,7 @@
#include "geometry/rect2d.hpp"
#include "base/assert.hpp"
#include <algorithm>
#include <cmath>
#include <fstream>
@ -192,12 +193,30 @@ HierarchyLineEnricher::HierarchyLineEnricher(std::string const & osm2FtIdsPath,
boost::optional<m2::PointD> HierarchyLineEnricher::GetFeatureCenter(CompositeId const & id) const
{
auto const optId = m_osm2FtIds.GetFeatureId(id);
if (!optId)
auto const optIds = m_osm2FtIds.GetFeatureIds(id);
if (optIds.empty())
return {};
auto const ftPtr = m_featureGetter.GetFeatureByIndex(*optId);
return ftPtr ? feature::GetCenter(*ftPtr) : boost::optional<m2::PointD>();
std::unordered_map<std::underlying_type_t<feature::GeomType>, m2::PointD> m;
for (auto optId : optIds)
{
auto const ftPtr = m_featureGetter.GetFeatureByIndex(optId);
if (!ftPtr)
continue;
m.emplace(base::Underlying(ftPtr->GetGeomType()), feature::GetCenter(*ftPtr));
}
for (auto type : {
base::Underlying(feature::GeomType::Point),
base::Underlying(feature::GeomType::Area),
base::Underlying(feature::GeomType::Line)})
{
if (m.count(type) != 0)
return m[type];
}
return {};
}
HierarchyLinesBuilder::HierarchyLinesBuilder(HierarchyBuilder::Node::Ptrs && nodes)