mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-25 15:23:52 +00:00
@@ -13,9 +13,9 @@ UNIT_TEST(testIfTestRuns)
|
||||
|
||||
classificator::Load();
|
||||
|
||||
FeatureTypeToOSM typeToOsm;
|
||||
TypeToOSMTranslator typeToOsm;
|
||||
uint32_t type = classif().GetTypeByReadableObjectName("amenity-restaurant");
|
||||
std::vector<OSMTag> resultVector = typeToOsm.typeToOSM(type);
|
||||
std::vector<OSMTag> resultVector = typeToOsm.osmTagsFromType(type);
|
||||
|
||||
TEST_EQUAL(resultVector.size(), 1, ());
|
||||
OSMTag const & result = resultVector.front();
|
||||
@@ -25,6 +25,6 @@ UNIT_TEST(testIfTestRuns)
|
||||
|
||||
UNIT_TEST(loadConfigFile)
|
||||
{
|
||||
FeatureTypeToOSM typeToOsm;
|
||||
TypeToOSMTranslator typeToOsm;
|
||||
typeToOsm.loadConfigFile();
|
||||
}
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
|
||||
namespace editor
|
||||
{
|
||||
FeatureTypeToOSM::FeatureTypeToOSM()
|
||||
TypeToOSMTranslator::TypeToOSMTranslator()
|
||||
{
|
||||
loadConfigFile();
|
||||
}
|
||||
|
||||
void FeatureTypeToOSM::loadConfigFile() {
|
||||
void TypeToOSMTranslator::loadConfigFile() {
|
||||
LOG(LINFO, ("Hello from loadConfigFile"));
|
||||
|
||||
m_storage.clear();
|
||||
@@ -97,9 +97,9 @@ namespace editor
|
||||
ASSERT_FAIL("Don't run further tests-------------------");
|
||||
}
|
||||
|
||||
std::vector<OSMTag> FeatureTypeToOSM::typeToOSM(uint32_t type)
|
||||
std::vector<OSMTag> TypeToOSMTranslator::osmTagsFromType(uint32_t type)
|
||||
{
|
||||
LOG(LINFO, ("Computing typeToOSM for Type: ", type, "/ " , classif().GetReadableObjectName(type)));
|
||||
LOG(LINFO, ("Computing osmTagsFromType for Type: ", type, "/ " , classif().GetReadableObjectName(type)));
|
||||
|
||||
std::vector<OSMTag> result;
|
||||
|
||||
@@ -108,9 +108,9 @@ std::vector<OSMTag> FeatureTypeToOSM::typeToOSM(uint32_t type)
|
||||
return result;
|
||||
}
|
||||
|
||||
FeatureTypeToOSM & getOSMTranslator()
|
||||
TypeToOSMTranslator & getOSMTranslator()
|
||||
{
|
||||
static FeatureTypeToOSM translator;
|
||||
static TypeToOSMTranslator translator;
|
||||
return translator;
|
||||
}
|
||||
} // namespace osm
|
||||
@@ -12,21 +12,21 @@ struct OSMTag
|
||||
std::string value;
|
||||
};
|
||||
|
||||
class FeatureTypeToOSM
|
||||
class TypeToOSMTranslator
|
||||
{
|
||||
|
||||
public:
|
||||
FeatureTypeToOSM();
|
||||
TypeToOSMTranslator();
|
||||
|
||||
void loadConfigFile();
|
||||
//static void typeToOSM(uint32_t type);
|
||||
std::vector<OSMTag> typeToOSM(uint32_t type);
|
||||
//static void osmTagsFromType(uint32_t type);
|
||||
std::vector<OSMTag> osmTagsFromType(uint32_t type);
|
||||
|
||||
private:
|
||||
std::map<uint32_t, std::vector<OSMTag>> m_storage;
|
||||
|
||||
};
|
||||
|
||||
FeatureTypeToOSM & getOSMTranslator();
|
||||
TypeToOSMTranslator & getOSMTranslator();
|
||||
|
||||
} // namespace osm
|
||||
Reference in New Issue
Block a user