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

[generator] Added smoothness=intermediate. Added more paving tags.

Browse source 
Signed-off-by: vng <viktor.govako@gmail.com>
This commit is contained in:
vng 2021-07-03 12:51:52 +03:00 • committed by Alexander Borsuk
parent 13e38a38a6
commit 92bd6b609d
2 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
generator/generator_tests/osm_type_test.cpp
View file

@ -532,17 +532,26 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Surface)
TestSurfaceTypes("asphalt", "", "", "paved_good");
TestSurfaceTypes("asphalt", "bad", "", "paved_bad");
TestSurfaceTypes("asphalt", "", "0", "paved_bad");
TestSurfaceTypes("fine_gravel", "intermediate", "", "paved_bad");
TestSurfaceTypes("gravel", "intermediate", "", "unpaved_bad");
TestSurfaceTypes("paved", "intermediate", "", "paved_good");
TestSurfaceTypes("", "intermediate", "", "paved_good");
TestSurfaceTypes("paved", "", "2", "paved_good");
TestSurfaceTypes("", "excellent", "", "paved_good");
TestSurfaceTypes("wood", "", "", "paved_bad");
TestSurfaceTypes("wood", "good", "", "paved_good");
TestSurfaceTypes("wood", "", "3", "paved_good");
TestSurfaceTypes("pebblestone", "", "4", "paved_good");
TestSurfaceTypes("unpaved", "", "", "unpaved_good");
TestSurfaceTypes("mud", "", "", "unpaved_bad");
/// @todo Is it ok here that default no-tags equals to smoothness=bad?
TestSurfaceTypes("", "bad", "", "unpaved_good");
TestSurfaceTypes("", "horrible", "", "unpaved_bad");
TestSurfaceTypes("ground", "", "1", "unpaved_bad");
TestSurfaceTypes("mud", "", "3", "unpaved_good");
TestSurfaceTypes("ground", "", "5", "unpaved_good");
TestSurfaceTypes("unknown", "", "", "unpaved_good");
TestSurfaceTypes("", "unknown", "", "unpaved_good");
}

55
generator/osm2type.cpp
View file

@ -442,57 +442,46 @@ string DetermineSurface(OsmElement * p)
return {};
static base::StringIL pavedSurfaces = {
"paved", "asphalt", "cobblestone", "cobblestone:flattened",
"sett", "concrete", "concrete:lanes", "concrete:plates",
"paving_stones", "metal", "wood", "chipseal"};
"paved", "asphalt", "cobblestone", "cobblestone:flattened", "unhewn_cobblestone",
"sett", "concrete", "concrete:lanes", "concrete:plates", "pebblestone",
"paving_stones", "metal", "wood", "chipseal", "fine_gravel" };
static base::StringIL badSurfaces = {"cobblestone", "sett", "metal", "wood", "grass",
"gravel", "mud", "sand", "snow", "woodchips"};
static base::StringIL badSurfaces = {"cobblestone", "sett", "pebblestone" "metal", "wood", "grass", "dirt", "earth",
"fine_gravel", "gravel", "unhewn_cobblestone", "mud", "sand", "snow", "woodchips", "ground" };
static base::StringIL badSmoothness = {
"bad", "very_bad", "horrible", "very_horrible", "impassable",
"robust_wheels", "high_clearance", "off_road_wheels", "rough"};
static base::StringIL goodSmoothness = { "excellent", "good", "intermediate" };
auto const Has = [](base::StringIL const & il, std::string const & v)
{
return std::find(il.begin(), il.end(), v) != il.end();
};
bool isPaved = false;
bool isGood = true;
if (!surface.empty())
{
for (auto const & value : pavedSurfaces)
{
if (surface == value)
isPaved = true;
}
}
isPaved = Has(pavedSurfaces, surface);
else
{
isPaved = smoothness == "excellent" || smoothness == "good";
}
isPaved = !smoothness.empty() && Has(goodSmoothness, smoothness);
if (!smoothness.empty())
{
for (auto const & value : badSmoothness)
{
if (smoothness == value)
isGood = false;
}
if (smoothness == "intermediate" && !surface.empty())
isGood = !Has(badSurfaces, surface);
else
isGood = !Has(badSmoothness, smoothness);
/// @todo Hm, looks like some hack, but will not change it now ..
if (smoothness == "bad" && !isPaved)
isGood = true;
}
else if (surface_grade == "0" || surface_grade == "1")
{
isGood = false;
}
else
{
if (surface_grade != "3")
{
for (auto const & value : badSurfaces)
{
if (surface == value)
isGood = false;
}
}
}
else if (surface_grade.empty() || surface_grade == "2")
isGood = surface.empty() || !Has(badSurfaces, surface);
string psurface = isPaved ? "paved_" : "unpaved_";
psurface += isGood ? "good" : "bad";