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

Generating city_roads section based on cities, town and villages.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-10-12 15:48:33 +03:00 • committed by Tatiana Yan
parent c594e3110f
commit 6d588948b2
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/generator_tests_support/test_mwm_builder.cpp
View file

@ -80,7 +80,7 @@ bool TestMwmBuilder::Add(FeatureBuilder1 & fb)
{
CHECK(m_collector, ("It's not possible to add features after call to Finish()."));
if (ftypes::IsTownOrCity(fb.GetTypes()) && fb.GetGeomType() == feature::GEOM_AREA)
if (ftypes::IsCityTownOrVillage(fb.GetTypes()) && fb.GetGeomType() == feature::GEOM_AREA)
{
auto const & metadata = fb.GetMetadataForTesting();
uint64_t testId;

2
generator/generator_tool/generator_tool.cpp
View file

@ -113,6 +113,8 @@ DEFINE_bool(generate_regions_kv, false,
DEFINE_bool(dump_cities_boundaries, false, "Dump cities boundaries to a file");
DEFINE_bool(generate_cities_boundaries, false, "Generate cities boundaries section");
DEFINE_string(cities_boundaries_data, "", "File with cities boundaries");
DEFINE_string(cities_boundaries_data_for_routing, "",
"File with cities boundaries for generation city_roads section.");
DEFINE_bool(generate_world, false, "Generate separate world file.");
DEFINE_bool(split_by_polygons, false,

2
generator/translator_planet.cpp
View file

@ -211,7 +211,7 @@ void TranslatorPlanet::EmitArea(FeatureBuilder1 & ft, FeatureParams params,
if (!ft.IsGeometryClosed())
return;
if (ftypes::IsTownOrCity(params.m_types))
if (ftypes::IsCityTownOrVillage(params.m_types))
{
auto fb = ft;
fn(fb);

4
indexer/ftypes_matcher.hpp
View file

@ -261,13 +261,13 @@ public:
};
template <typename Types>
bool IsTownOrCity(Types const & types)
bool IsCityTownOrVillage(Types const & types)
{
feature::TypesHolder h;
for (auto const t : types)
h.Add(t);
auto const type = IsLocalityChecker::Instance().GetType(h);
return type == TOWN || type == CITY;
return type == CITY || type == TOWN || type == VILLAGE;
}
/// @name Get city radius and population.