diff options
| author | Lev Dragunov <l.dragunov@corp.mail.ru> | 2015-10-06 17:50:12 +0300 |
|---|---|---|
| committer | Lev Dragunov <l.dragunov@corp.mail.ru> | 2015-10-19 16:04:14 +0300 |
| commit | 8d52b0e54123f623c5556c0af5a4b50880b8ea84 (patch) | |
| tree | 4be29a150c63a31f753bc9871c94f227cfc8beca /generator | |
| parent | f274104956473bd507eaa14faa862be6a1b2a73c (diff) | |
[routing] New node start weight calculation.
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/feature_builder.cpp | 3 | ||||
| -rw-r--r-- | generator/generator_tests/osm_type_test.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp index 8aba7ab405..1ee871fdab 100644 --- a/generator/feature_builder.cpp +++ b/generator/feature_builder.cpp @@ -196,9 +196,8 @@ namespace bool FeatureBuilder1::IsRoad() const { - static routing::CarModel const carModel; static routing::PedestrianModel const pedModel; - return carModel.IsRoad(m_params.m_Types) || pedModel.IsRoad(m_params.m_Types); + return routing::CarModel::Instance().IsRoad(m_params.m_Types) || pedModel.IsRoad(m_params.m_Types); } bool FeatureBuilder1::PreSerialize() diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 1054ad0ca0..63e36888e4 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -550,7 +550,7 @@ UNIT_TEST(OsmType_Hwtag) UNIT_TEST(OsmType_Ferry) { - routing::CarModel carModel; + routing::CarModel const & carModel = routing::CarModel::Instance(); char const * arr[][2] = { { "motorcar", "yes" }, |