diff options
| author | Maxim Pimenov <m@maps.me> | 2018-09-12 14:22:15 +0300 |
|---|---|---|
| committer | Vlad Mihaylenko <vxmihaylenko@gmail.com> | 2018-09-14 15:14:36 +0300 |
| commit | c7e09657fa5cc6fd5600252b41e9774b83c0a45d (patch) | |
| tree | 0c1636a81a6afba6ae87b3040096bb86bf862c81 /generator/osm2type.cpp | |
| parent | 4a44e1d009cf30dbb9fe759260aeef221a7be561 (diff) | |
[base] Unified stl_add and stl_helpers.
Diffstat (limited to 'generator/osm2type.cpp')
| -rw-r--r-- | generator/osm2type.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index bcd50b8a2a..e488f15969 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -9,7 +9,7 @@ #include "geometry/mercator.hpp" #include "base/assert.hpp" -#include "base/stl_add.hpp" +#include "base/stl_helpers.hpp" #include "base/string_utils.hpp" #include <cstdint> @@ -233,7 +233,7 @@ namespace ftype { Classificator const & c = classif(); - my::StringIL arr[] = + base::StringIL arr[] = { {"entrance"}, {"highway"}, {"building", "address"}, {"hwtag", "oneway"}, {"hwtag", "private"}, @@ -439,13 +439,13 @@ namespace ftype if (!isHighway || (surface.empty() && smoothness.empty())) return string(); - static my::StringIL pavedSurfaces = {"paved", "asphalt", "cobblestone", "cobblestone:flattened", - "sett", "concrete", "concrete:lanes", "concrete:plates", - "paving_stones", "metal", "wood"}; - static my::StringIL badSurfaces = {"cobblestone", "sett", "metal", "wood", "grass", "gravel", - "mud", "sand", "snow", "woodchips"}; - static my::StringIL badSmoothness = {"bad", "very_bad", "horrible", "very_horrible", "impassable", - "robust_wheels", "high_clearance", "off_road_wheels", "rough"}; + static base::StringIL pavedSurfaces = {"paved", "asphalt", "cobblestone", "cobblestone:flattened", + "sett", "concrete", "concrete:lanes", "concrete:plates", + "paving_stones", "metal", "wood"}; + static base::StringIL badSurfaces = {"cobblestone", "sett", "metal", "wood", "grass", "gravel", + "mud", "sand", "snow", "woodchips"}; + static base::StringIL badSmoothness = {"bad", "very_bad", "horrible", "very_horrible", "impassable", + "robust_wheels", "high_clearance", "off_road_wheels", "rough"}; bool isPaved = false; bool isGood = true; |