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

[generator] smoothness=intermediate without surface is now unpaved_good.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2022-01-29 11:00:36 +03:00
parent e0b1385900
commit 6381d42e84
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
generator/generator_tests/osm_type_test.cpp
View file

@ -522,10 +522,12 @@ 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("", "intermediate", "", "unpaved_good");
TestSurfaceTypes("paved", "", "2", "paved_good");
TestSurfaceTypes("", "excellent", "", "paved_good");
TestSurfaceTypes("wood", "", "", "paved_bad");

2
generator/osm2type.cpp
View file

@ -460,7 +460,7 @@ string DetermineSurface(OsmElement * p)
"robust_wheels", "high_clearance", "off_road_wheels", "rough"
};
static base::StringIL goodSmoothness = { "excellent", "good", "intermediate" };
static base::StringIL goodSmoothness = { "excellent", "good" };
auto const Has = [](base::StringIL const & il, std::string const & v)
{