tomasz.sowa/allplacefinder
1
0
Fork 0
Code Issues Pull Requests Releases Activity

add a two ways algorithm for building a hints file for the otp backend

Browse Source
This commit is contained in:
Tomasz Sowa
2024-04-16 15:41:49 +02:00
parent e8ac579fcb
commit a652a9d230
9 changed files with 256 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
placefinder/main.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2021, Tomasz Sowa
* Copyright (c) 2021-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,13 +38,30 @@
#include "params.h"
#define ALLPLACEFINDER_VERSION_MAJOR 0
#define ALLPLACEFINDER_VERSION_MINOR 2
#define ALLPLACEFINDER_VERSION_PATCH 0
#define ALLPLACEFINDER_COPYRIGHT_YEAR_FROM 2021
#define ALLPLACEFINDER_COPYRIGHT_YEAR_TO 2024
void print_syntax()
{
std::cout << "placefinder options:" << std::endl;
std::cout << " -h print this help" << std::endl;
std::cout << " --osm-file file_name - a path to osm file name" << std::endl;
std::cout << " --lookup-dir dir_name - a path to lookup dir" << std::endl;
std::cout << " --create-lookup-dir - create a lookup dir, you have to provide a path in --lookup-dir parameter" << std::endl;
std::cout << "placefinder " << ALLPLACEFINDER_VERSION_MAJOR << "." << ALLPLACEFINDER_VERSION_MINOR << "." << ALLPLACEFINDER_VERSION_PATCH << std::endl;
std::cout << "Copyright (c) " << ALLPLACEFINDER_COPYRIGHT_YEAR_FROM << "-" << ALLPLACEFINDER_COPYRIGHT_YEAR_TO << ", Tomasz Sowa" << std::endl;
std::cout << std::endl;
std::cout << "Usage: placefinder [options]" << std::endl;
std::cout << "Options:" << std::endl;
std::cout << " -h print this help" << std::endl;
std::cout << " --osm-file file_name - a path to osm file name" << std::endl;
std::cout << " --lookup-dir dir_name - a path to lookup dir" << std::endl;
std::cout << " --create-lookup-dir - create a lookup dir, you have to provide a path in --lookup-dir parameter" << std::endl;
std::cout << " --create-hints-file - create a hints file used by the backend-winix-otp" << std::endl;
std::cout << " --hints-file-name file_name - a hints file name used when using --create-hints-file" << std::endl;
std::cout << " --use-two-ways-hints-file-alg - use a two way algorithm when building the hints file" << std::endl;
}
@@ -76,6 +93,9 @@ bool parse_parameters(const pt::Space & parameters, allplacefinder::Params & par
const pt::Space * osm_file = parameters.get_space(L"osm-file");
const pt::Space * lookup_dir = parameters.get_space(L"lookup-dir");
const pt::Space * create_lookup_dir = parameters.get_space(L"create-lookup-dir");
const pt::Space * create_hints_file = parameters.get_space(L"create-hints-file");
const pt::Space * hints_file_name = parameters.get_space(L"hints-file-name");
const pt::Space * use_two_ways_hints_file_alg = parameters.get_space(L"use-two-ways-hints-file-alg");
bool ok = true;
if( osm_file )
@@ -88,7 +108,14 @@ bool parse_parameters(const pt::Space & parameters, allplacefinder::Params & par
ok = ok && parse_parametr(lookup_dir, params.lookup_dir, "--lookup-dir parametr can be used only once");
}
if( hints_file_name )
{
ok = ok && parse_parametr(hints_file_name, params.hints_file_name, "--hints-file-name parametr can be used only once");
}
params.create_lookup_dir = (create_lookup_dir != nullptr);
params.create_hints_file = (create_hints_file != nullptr);
params.use_two_ways_hints_file_algorithm = (use_two_ways_hints_file_alg != nullptr);
return ok;
}
@@ -97,17 +124,32 @@ int make_action(allplacefinder::Params & params)
{
int status = 3;
if( params.create_lookup_dir && params.create_hints_file )
{
std::cerr << "You cannot use both --create-lookup-dir and --create-hints-file parameters" << std::endl;
return 5; // IMPROVEME put these constants somewhere
}
if( params.create_lookup_dir )
{
allplacefinder::Finder finder;
status = finder.create_lookup_dir(params) ? 0 : 4;
}
else
if( params.create_hints_file )
{
allplacefinder::Finder finder;
status = finder.create_hints_file(params) ? 0 : 4;
}
else
{
print_syntax();
}
return status;
}
int main(int argc, const char ** argv)
{
pt::Space options, arguments;
@@ -116,6 +158,7 @@ allplacefinder::Params params;
arguments.add(L"osm-file", 1);
arguments.add(L"lookup-dir", 1);
arguments.add(L"hints-file-name", 1);
pt::MainOptionsParser::Status status = options_parser.parse(argc, argv, options, arguments);
@@ -133,17 +176,6 @@ allplacefinder::Params params;
if( parse_parameters(options, params) )
{
// ------------------
// for debug purposes
//params.create_lookup_dir = true;
//params.osm_file = L"/home/tomek/data/test.xml";
//params.osm_file = L"/home/tomek/data/wroclaw_map.xml";
//params.lookup_dir = L"/home/tomek/data/lookup-dir";
//params.lookup_dir = L"/data/lookup-dir";
// ------------------
return make_action(params);
}