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

Allow multiple GeoJSON files

Browse Source
This commit is contained in:
Michael Krasnyk
2017-08-18 15:27:49 +02:00
parent fb02a4c674
commit fc39e0ce1a
7 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extractor/location_dependent_data.cpp
+9 -1
View File
@@ -18,7 +18,15 @@ namespace osrm
namespace extractor
{
LocationDependentData::LocationDependentData(const boost::filesystem::path &file_path)
LocationDependentData::LocationDependentData(const std::vector<boost::filesystem::path> &file_paths)
{
for (const auto &path : file_paths)
{
loadLocationDependentData(path);
}
}
void LocationDependentData::loadLocationDependentData(const boost::filesystem::path &file_path)
{
if (file_path.empty())
return;
src/extractor/scripting_environment_lua.cpp
+3 -2
View File
@@ -81,8 +81,9 @@ template <class T> double lonToDouble(T const &object)
}
Sol2ScriptingEnvironment::Sol2ScriptingEnvironment(
const std::string &file_name, const boost::filesystem::path &location_dependent_data_path)
: file_name(file_name), location_dependent_data(location_dependent_data_path)
const std::string &file_name,
const std::vector<boost::filesystem::path> &location_dependent_data_paths)
: file_name(file_name), location_dependent_data(location_dependent_data_paths)
{
util::Log() << "Using script " << file_name;
}