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

Sync with Clang38 Format

Browse Source
This commit is contained in:
Daniel J. Hofmann
2016-06-02 13:14:33 +02:00
parent c490752ca7
commit 448f8377fb
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/api/json_factory.cpp
+1 -1
View File
@@ -199,7 +199,7 @@ util::json::Object makeRouteStep(guidance::RouteStep step, util::json::Value geo
if (!step.pronunciation.empty())
route_step.values["pronunciation"] = std::move(step.pronunciation);
if (!step.destinations.empty())
route_step.values["destinations"] = std::move(step.destinations);
route_step.values["destinations"] = std::move(step.destinations);
if (!step.rotary_name.empty())
route_step.values["rotary_name"] = std::move(step.rotary_name);
src/extractor/extractor_callbacks.cpp
+6 -5
View File
@@ -152,11 +152,13 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti
if (string_map.end() == name_iterator)
{
auto name_length = std::min<unsigned>(MAX_STRING_LENGTH, parsed_way.name.size());
auto destinations_length = std::min<unsigned>(MAX_STRING_LENGTH, parsed_way.destinations.size());
auto pronunciation_length = std::min<unsigned>(MAX_STRING_LENGTH, parsed_way.pronunciation.size());
auto destinations_length =
std::min<unsigned>(MAX_STRING_LENGTH, parsed_way.destinations.size());
auto pronunciation_length =
std::min<unsigned>(MAX_STRING_LENGTH, parsed_way.pronunciation.size());
external_memory.name_char_data.reserve(name_id + name_length + destinations_length + pronunciation_length);
external_memory.name_char_data.reserve(name_id + name_length + destinations_length +
pronunciation_length);
std::copy(parsed_way.name.c_str(),
parsed_way.name.c_str() + name_length,
@@ -166,7 +168,6 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti
parsed_way.destinations.c_str() + destinations_length,
std::back_inserter(external_memory.name_char_data));
std::copy(parsed_way.pronunciation.c_str(),
parsed_way.pronunciation.c_str() + pronunciation_length,
std::back_inserter(external_memory.name_char_data));