diff --git a/libs/editor/editor_tests/feature_type_to_osm_test.cpp b/libs/editor/editor_tests/feature_type_to_osm_test.cpp index 662ea93ba..231023007 100644 --- a/libs/editor/editor_tests/feature_type_to_osm_test.cpp +++ b/libs/editor/editor_tests/feature_type_to_osm_test.cpp @@ -9,8 +9,8 @@ using namespace editor; UNIT_TEST(loadConfigFile) { + // loadConfigFile() is executed in the constructor TypeToOSMTranslator typeToOsm; - typeToOsm.loadConfigFile(); } UNIT_TEST(osmTagsFromType) diff --git a/libs/editor/feature_type_to_osm.hpp b/libs/editor/feature_type_to_osm.hpp index c1da3bbed..ad4fe6fba 100644 --- a/libs/editor/feature_type_to_osm.hpp +++ b/libs/editor/feature_type_to_osm.hpp @@ -6,6 +6,7 @@ namespace editor { + struct OSMTag { std::string key; @@ -14,17 +15,14 @@ struct OSMTag class TypeToOSMTranslator { - public: TypeToOSMTranslator(); void loadConfigFile(); - //static void osmTagsFromType(uint32_t type); - std::vector osmTagsFromType(uint32_t type); + std::vector osmTagsFromType(uint32_t type); private: std::map> m_storage; - }; TypeToOSMTranslator & getOSMTranslator();