From 6381d42e8456e1660385421df7e4b760fee0e1bd Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Sat, 29 Jan 2022 11:00:36 +0300 Subject: [PATCH] [generator] smoothness=intermediate without surface is now unpaved_good. Signed-off-by: Viktor Govako --- generator/generator_tests/osm_type_test.cpp | 4 +++- generator/osm2type.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 17cc6a512d..4c301b47aa 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -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"); diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index d064c68265..786121971d 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -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) {