organicmaps/geocore
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

try fix generator_tool paths

Browse source
This commit is contained in:
LaGrunge 2019-10-14 19:38:57 +03:00 • committed by cc-engineering
parent aed8ac3dca
commit d37030b1a8
2 changed files with 9 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
generator/generate_info.hpp
View file

@ -32,8 +32,8 @@ struct GenerateInfo
// Directory for result .mwm files.
std::string m_targetDir;
// Directory for all intermediate files.
std::string m_intermediateDir;
// Directory for all files.
std::string m_dataPath;
// Current generated file name if --output option is defined.
std::string m_fileName;
@ -42,29 +42,9 @@ struct GenerateInfo
OsmSourceType m_osmFileType;
std::string m_osmFileName;
std::string m_bookingDataFilename;
std::string m_opentableDataFilename;
std::string m_promoCatalogCitiesFilename;
std::string m_brandsFilename;
std::string m_brandsTranslationsFilename;
std::string m_popularPlacesFilename;
std::string m_idToWikidataFilename;
std::string m_citiesBoundariesFilename;
uint32_t m_versionDate = 0;
std::vector<std::string> m_bucketNames;
bool m_createWorld = false;
bool m_haveBordersForWholeWorld = false;
bool m_makeCoasts = false;
bool m_emitCoasts = false;
bool m_genAddresses = false;
bool m_failOnCoasts = false;
bool m_preloadCache = false;
bool m_verbose = false;
@ -107,7 +87,7 @@ struct GenerateInfo
std::string GetIntermediateFileName(std::string const & fileName,
std::string const & ext = "") const
{
return base::JoinPath(m_intermediateDir, fileName + ext);
return base::JoinPath(m_dataPath, fileName + ext);
}
std::string GetAddressesFileName() const

19
generator/generator_tool/generator_tool.cpp
View file

@ -45,16 +45,14 @@ char const * GetDataPathHelp()
{
static string const kHelp =
"Directory where the generated mwms are put into. Also used as the path for helper "
"functions, such as those that calculate statistics and regenerate sections. "
"Default: " +
Platform::GetCurrentWorkingDirectory() + "/../../data'.";
"functions, such as those that calculate statistics and regenerate sections. ";
return kHelp.c_str();
}
} // namespace
struct CliCommandOptions
{
std::string m_intermediate_data_path;
std::string m_osm_file_type;
std::string m_osm_file_name;
std::string m_node_storage;
@ -104,9 +102,6 @@ CliCommandOptions DefineOptions(int argc, char * argv[])
("user_resource_path",
po::value(&o.m_user_resource_path)->default_value(""),
"User defined resource path for classificator.txt and etc.")
("intermediate_data_path",
po::value(&o.m_intermediate_data_path)->default_value(""),
"Path to stored nodes, ways, relations.")
("output",
po::value(&o.m_output)->default_value(""),
"File name for process (without 'mwm' ext).")
@ -231,15 +226,13 @@ int GeneratorToolMain(int argc, char ** argv)
feature::GenerateInfo genInfo;
genInfo.m_verbose = options.m_verbose;
genInfo.m_intermediateDir = options.m_intermediate_data_path.empty()
? path
: base::AddSlashIfNeeded(options.m_intermediate_data_path);
genInfo.m_dataPath = path;
genInfo.m_targetDir = genInfo.m_tmpDir = path;
/// @todo Probably, it's better to add separate option for .mwm.tmp files.
if (!options.m_intermediate_data_path.empty())
if (!options.m_data_path.empty())
{
string const tmpPath = base::JoinPath(genInfo.m_intermediateDir, "tmp");
string const tmpPath = base::JoinPath(genInfo.m_dataPath, "tmp");
if (Platform::MkDir(tmpPath) != Platform::ERR_UNKNOWN)
genInfo.m_tmpDir = tmpPath;
}
@ -259,7 +252,7 @@ int GeneratorToolMain(int argc, char ** argv)
// Generate intermediate files.
if (options.m_preprocess)
{
DataVersion{options.m_osm_file_name}.DumpToPath(genInfo.m_intermediateDir);
DataVersion{options.m_osm_file_name}.DumpToPath(genInfo.m_dataPath);
LOG(LINFO, ("Generating intermediate data ...."));
if (!GenerateIntermediateData(genInfo))