Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'max_locations_distance_table' of https://github.com/frodrigo/osrm-backend into frodrigo-max_locations_distance_table

Browse Source 
Conflicts:
	Library/OSRM.h
	Library/OSRM_impl.cpp
	Library/OSRM_impl.h
This commit is contained in:
Dennis Luxen
2015-01-08 14:49:10 +01:00
parent 1328be2b61 12f2acc9ff
commit 48b131eb5c
9 changed files with 101 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/simpleclient.cpp
+8 -7
View File
@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <osrm/json_container.hpp>
#include <osrm/route_parameters.hpp>
#include <osrm/server_paths.hpp>
#include <osrm/ServerConfig.h>
#include <string>
@@ -44,16 +44,17 @@ int main(int argc, const char *argv[])
{
std::string ip_address;
int ip_port, requested_thread_num;
bool use_shared_memory = false, trial_run = false;
ServerPaths server_paths;
bool trial_run = false;
ServerConfig server_config;
const unsigned init_result = GenerateServerProgramOptions(argc,
argv,
server_paths,
server_config.server_paths,
ip_address,
ip_port,
requested_thread_num,
use_shared_memory,
trial_run);
server_config.use_shared_memory,
trial_run,
server_config.max_locations_distance_table);
if (init_result == INIT_OK_DO_NOT_START_ENGINE)
{
@@ -65,7 +66,7 @@ int main(int argc, const char *argv[])
}
SimpleLogger().Write() << "starting up engines, " << g_GIT_DESCRIPTION;
OSRM routing_machine(server_paths, use_shared_memory);
OSRM routing_machine(server_config);
RouteParameters route_parameters;
route_parameters.zoom_level = 18; // no generalization