From be92d9fddd9a1eabab271614efd2f17ca7592311 Mon Sep 17 00:00:00 2001 From: vng Date: Wed, 11 Nov 2015 18:17:04 +0300 Subject: [PATCH] Review fixes. --- generator/generator_tests/feature_builder_test.cpp | 4 +--- generator/generator_tests/types_helper.hpp | 5 ++++- .../generator_tests_support/test_mwm_builder.hpp | 11 +++++++++-- indexer/feature_data.hpp | 2 ++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/generator/generator_tests/feature_builder_test.cpp b/generator/generator_tests/feature_builder_test.cpp index 4c588788c8..01fac43596 100644 --- a/generator/generator_tests/feature_builder_test.cpp +++ b/generator/generator_tests/feature_builder_test.cpp @@ -184,9 +184,7 @@ UNIT_TEST(FBuilder_PointAddress) { classificator::Load(); - char const * arr[][2] = { - { "addr:housenumber", "39/79" } - }; + char const * arr[][2] = { { "addr:housenumber", "39/79" } }; OsmElement e; FillXmlElement(arr, ARRAY_SIZE(arr), &e); diff --git a/generator/generator_tests/types_helper.hpp b/generator/generator_tests/types_helper.hpp index 294fc36f7c..47c091e5d2 100644 --- a/generator/generator_tests/types_helper.hpp +++ b/generator/generator_tests/types_helper.hpp @@ -5,6 +5,9 @@ #include "indexer/classificator.hpp" #include "indexer/feature_data.hpp" +#include "std/string.hpp" +#include "std/vector.hpp" + namespace tests { @@ -36,4 +39,4 @@ inline uint32_t GetType(StringIL const & lst) return classif().GetTypeByPath(lst); } -} +} // namespace tests diff --git a/generator/generator_tests_support/test_mwm_builder.hpp b/generator/generator_tests_support/test_mwm_builder.hpp index 1c5400755f..ce552e6025 100644 --- a/generator/generator_tests_support/test_mwm_builder.hpp +++ b/generator/generator_tests_support/test_mwm_builder.hpp @@ -8,8 +8,15 @@ class Classificator; class FeatureBuilder1; -namespace feature { class FeaturesCollector; } -namespace platform { class LocalCountryFile; } + +namespace feature +{ +class FeaturesCollector; +} +namespace platform +{ +class LocalCountryFile; +} class TestMwmBuilder { diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp index c2efc0535f..07acea5c37 100644 --- a/indexer/feature_data.hpp +++ b/indexer/feature_data.hpp @@ -132,6 +132,8 @@ struct FeatureParamsBase bool CheckValid() const; string DebugString() const; + + /// @return true if feature doesn't have any drawable strings (names, houses, etc). bool IsEmptyNames() const; template