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

[generator] PlaceProcessor: tune IsWorsePlace.

Browse source
This commit is contained in:
tatiana-yan 2020-06-01 11:15:28 +03:00 • committed by mpimenov
parent f1f63edf2e
commit c49064f234
2 changed files with 43 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
generator/generator_integration_tests/features_tests.cpp
View file

@ -128,16 +128,16 @@ CountryFeaturesCounters constexpr kWorldCounters(945 /* fbs */, 364406 /* geomet
0 /* bookingHotels */);
CountryFeaturesCounters constexpr kNorthAucklandCounters(
1812333 /* fbs */, 12196704 /* geometryPoints */, 1007584 /* point */, 205634 /* line */,
599115 /* area */, 212614 /* poi */, 521 /* cityTownOrVillage */, 3557 /* bookingHotels */);
1812333 /* fbs */, 12196970 /* geometryPoints */, 1007583 /* point */, 205634 /* line */,
599116 /* area */, 212615 /* poi */, 521 /* cityTownOrVillage */, 3557 /* bookingHotels */);
CountryFeaturesCounters constexpr kNorthWellingtonCounters(
797846 /* fbs */, 7771680 /* geometryPoints */, 460559 /* point */, 87011 /* line */,
250276 /* area */, 95897 /* poi */, 297 /* cityTownOrVillage */, 1062 /* bookingHotels */);
CountryFeaturesCounters constexpr kSouthCanterburyCounters(
637244 /* fbs */, 6984549 /* geometryPoints */, 397961 /* point */, 81697 /* line */,
157586 /* area */, 89700 /* poi */, 331 /* cityTownOrVillage */, 2085 /* bookingHotels */);
637244 /* fbs */, 6984675 /* geometryPoints */, 397960 /* point */, 81697 /* line */,
157587 /* area */, 89700 /* poi */, 331 /* cityTownOrVillage */, 2085 /* bookingHotels */);
CountryFeaturesCounters constexpr kSouthSouthlandCounters(
340637 /* fbs */, 5342359 /* geometryPoints */, 185994 /* point */, 40117 /* line */,

51
generator/place_processor.cpp
View file

@ -47,47 +47,74 @@ template <typename T>
bool IsWorsePlace(T const & left, T const & right)
{
double constexpr kRankCoeff = 1.0;
double constexpr kIsCapitalCoeff = 0.1;
double constexpr kLangsCountCoeff = 1.0;
double constexpr kIsPointCoeff = 0.1;
double constexpr kIsNodeCoeff = 0.1;
double constexpr kAreaCoeff = 0.1;
double constexpr kAreaCoeff = 0.05;
double constexpr kIsCapitalCoeff = 0.1;
double constexpr kIsNodeCoeff = 0.15;
double constexpr kIsAreaTooBigCoeff = -0.5;
auto const normalizeRank = [](uint8_t rank) {
return static_cast<double>(rank) / static_cast<double>(std::numeric_limits<uint8_t>::max());
};
auto const normalizeLangsCount = [](uint8_t langsCount) {
return static_cast<double>(langsCount) /
static_cast<double>(StringUtf8Multilang::kMaxSupportedLanguages);
};
auto const normalizeArea = [](double area) {
double const kMaxAreaM2 = 2e9;
// We need to compare areas to choose bigger feature from multipolygonal features.
// |kMaxAreaM2| should be greater than cities exclaves (like airports or Zelenograd for Moscow).
double const kMaxAreaM2 = 4e8;
area = base::Clamp(area, 0.0, kMaxAreaM2);
return area / kMaxAreaM2;
};
auto const isAreaTooBig = [](ftypes::LocalityType type, double area) {
// 100*100 km. There are few such big cities in the world (Beijing, Tokyo). These cities are
// well-maped and have node which we want to prefer because relation boundaries may include big
// exclaves and/or have bad center: https://www.openstreetmap.org/relation/1543125.
if (type == ftypes::LocalityType::City)
return area > 1e10;
// ~14*14 km
if (type == ftypes::LocalityType::Town)
return area > 2e8;
// 10*10 km
if (type == ftypes::LocalityType::Village)
return area > 1e8;
return false;
};
static_assert(kRankCoeff >= 0, "");
static_assert(kIsCapitalCoeff >= 0, "");
static_assert(kLangsCountCoeff >= 0, "");
static_assert(kAreaCoeff >= 0, "");
static_assert(kIsCapitalCoeff >= 0, "");
static_assert(kIsAreaTooBigCoeff <= 0, "");
auto const getScore = [&](auto const place) {
auto const rank = place.GetRank();
auto const isCapital = ftypes::IsCapitalChecker::Instance()(GetPlaceType(place));
auto const langsCount = place.GetMultilangName().CountLangs();
auto const isPoint = place.IsPoint();
auto const area = mercator::AreaOnEarth(place.GetLimitRect());
auto const placeType = GetPlaceType(place);
auto const isCapital = ftypes::IsCapitalChecker::Instance()(placeType);
auto const type = place.GetMostGenericOsmId().GetType();
auto const isNode = (type == base::GeoObjectId::Type::OsmNode) ||
(type == base::GeoObjectId::Type::ObsoleteOsmNode);
auto const area = mercator::AreaOnEarth(place.GetLimitRect());
auto const tooBig =
isAreaTooBig(ftypes::IsLocalityChecker::Instance().GetType(placeType), area);
return kRankCoeff * normalizeRank(rank) +
kIsCapitalCoeff * (isCapital ? 1.0 : 0.0) +
kLangsCountCoeff * normalizeLangsCount(langsCount) +
kIsPointCoeff * (isPoint ? 1.0 : 0.0) +
kAreaCoeff * normalizeArea(area) +
kIsCapitalCoeff * (isCapital ? 1.0 : 0.0) +
kIsNodeCoeff * (isNode ? 1.0 : 0.0) +
kAreaCoeff * normalizeArea(area);
kIsAreaTooBigCoeff * (tooBig ? 1.0 : 0.0);
};
return getScore(left) < getScore(right);