Fix regressed formating
This commit is contained in:
parent
2592cd2e58
commit
fddc19e98d
@ -177,7 +177,8 @@ class SharedDataFacade final : public BaseDataFacade
|
|||||||
osmnodeid_list_ptr,
|
osmnodeid_list_ptr,
|
||||||
data_layout->num_entries[storage::SharedDataLayout::OSM_NODE_ID_LIST]);
|
data_layout->num_entries[storage::SharedDataLayout::OSM_NODE_ID_LIST]);
|
||||||
// We (ab)use the number of coordinates here because we know we have the same amount of ids
|
// We (ab)use the number of coordinates here because we know we have the same amount of ids
|
||||||
m_osmnodeid_list.set_number_of_entries(data_layout->num_entries[storage::SharedDataLayout::COORDINATE_LIST]);
|
m_osmnodeid_list.set_number_of_entries(
|
||||||
|
data_layout->num_entries[storage::SharedDataLayout::COORDINATE_LIST]);
|
||||||
|
|
||||||
auto travel_mode_list_ptr = data_layout->GetBlockPtr<extractor::TravelMode>(
|
auto travel_mode_list_ptr = data_layout->GetBlockPtr<extractor::TravelMode>(
|
||||||
shared_memory, storage::SharedDataLayout::TRAVEL_MODE);
|
shared_memory, storage::SharedDataLayout::TRAVEL_MODE);
|
||||||
|
@ -12,7 +12,6 @@ namespace osrm
|
|||||||
namespace util
|
namespace util
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Since OSM node IDs are (at the time of writing) not quite yet overflowing 32 bits, and
|
* Since OSM node IDs are (at the time of writing) not quite yet overflowing 32 bits, and
|
||||||
* will predictably be containable within 33 bits for a long time, the following packs
|
* will predictably be containable within 33 bits for a long time, the following packs
|
||||||
@ -28,9 +27,9 @@ template <typename T, bool UseSharedMemory=false> class PackedVector
|
|||||||
static const constexpr std::size_t PACKSIZE = BITSIZE * ELEMSIZE;
|
static const constexpr std::size_t PACKSIZE = BITSIZE * ELEMSIZE;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the size of the packed vector datastructure with `elements` packed elements (the size of
|
* Returns the size of the packed vector datastructure with `elements` packed elements (the size
|
||||||
|
* of
|
||||||
* its underlying uint64 vector)
|
* its underlying uint64 vector)
|
||||||
*/
|
*/
|
||||||
inline static std::size_t elements_to_blocks(std::size_t elements)
|
inline static std::size_t elements_to_blocks(std::size_t elements)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include "extractor/guidance/turn_instruction.hpp"
|
|
||||||
#include "engine/guidance/post_processing.hpp"
|
#include "engine/guidance/post_processing.hpp"
|
||||||
|
#include "extractor/guidance/turn_instruction.hpp"
|
||||||
|
|
||||||
#include "engine/guidance/assemble_steps.hpp"
|
#include "engine/guidance/assemble_steps.hpp"
|
||||||
#include "engine/guidance/toolkit.hpp"
|
#include "engine/guidance/toolkit.hpp"
|
||||||
|
@ -328,8 +328,11 @@ Status TilePlugin::HandleRequest(const api::TileParameters ¶meters, std::str
|
|||||||
max_datasource_id = std::max(max_datasource_id, forward_datasource);
|
max_datasource_id = std::max(max_datasource_id, forward_datasource);
|
||||||
max_datasource_id = std::max(max_datasource_id, reverse_datasource);
|
max_datasource_id = std::max(max_datasource_id, reverse_datasource);
|
||||||
|
|
||||||
const auto encode_tile_line = [&layer_writer, &edge, &id, &max_datasource_id, &used_weights](
|
const auto encode_tile_line = [&layer_writer,
|
||||||
const detail::FixedLine &tile_line,
|
&edge,
|
||||||
|
&id,
|
||||||
|
&max_datasource_id,
|
||||||
|
&used_weights](const detail::FixedLine &tile_line,
|
||||||
const std::uint32_t speed_kmh,
|
const std::uint32_t speed_kmh,
|
||||||
const std::size_t duration,
|
const std::size_t duration,
|
||||||
const std::uint8_t datasource,
|
const std::uint8_t datasource,
|
||||||
@ -371,8 +374,8 @@ Status TilePlugin::HandleRequest(const api::TileParameters ¶meters, std::str
|
|||||||
duration); // duration value offset
|
duration); // duration value offset
|
||||||
field.add_element(4); // "name" tag key offset
|
field.add_element(4); // "name" tag key offset
|
||||||
|
|
||||||
field.add_element(130 + max_datasource_id + 1 +
|
field.add_element(130 + max_datasource_id + 1 + used_weights.size() +
|
||||||
used_weights.size() + name); // name value offset
|
name); // name value offset
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
#include "extractor/guidance/motorway_handler.hpp"
|
||||||
#include "extractor/guidance/classification_data.hpp"
|
#include "extractor/guidance/classification_data.hpp"
|
||||||
#include "extractor/guidance/constants.hpp"
|
#include "extractor/guidance/constants.hpp"
|
||||||
#include "extractor/guidance/motorway_handler.hpp"
|
|
||||||
#include "extractor/guidance/toolkit.hpp"
|
#include "extractor/guidance/toolkit.hpp"
|
||||||
|
|
||||||
#include "util/guidance/toolkit.hpp"
|
#include "util/guidance/toolkit.hpp"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include "extractor/guidance/constants.hpp"
|
|
||||||
#include "extractor/guidance/roundabout_handler.hpp"
|
#include "extractor/guidance/roundabout_handler.hpp"
|
||||||
|
#include "extractor/guidance/constants.hpp"
|
||||||
#include "extractor/guidance/toolkit.hpp"
|
#include "extractor/guidance/toolkit.hpp"
|
||||||
|
|
||||||
#include "util/coordinate_calculation.hpp"
|
#include "util/coordinate_calculation.hpp"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
#include "extractor/guidance/turn_analysis.hpp"
|
||||||
#include "extractor/guidance/classification_data.hpp"
|
#include "extractor/guidance/classification_data.hpp"
|
||||||
#include "extractor/guidance/constants.hpp"
|
#include "extractor/guidance/constants.hpp"
|
||||||
#include "extractor/guidance/turn_analysis.hpp"
|
|
||||||
|
|
||||||
#include "util/coordinate.hpp"
|
#include "util/coordinate.hpp"
|
||||||
#include "util/coordinate_calculation.hpp"
|
#include "util/coordinate_calculation.hpp"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
#include "extractor/guidance/turn_handler.hpp"
|
||||||
#include "extractor/guidance/constants.hpp"
|
#include "extractor/guidance/constants.hpp"
|
||||||
#include "extractor/guidance/intersection_scenario_three_way.hpp"
|
#include "extractor/guidance/intersection_scenario_three_way.hpp"
|
||||||
#include "extractor/guidance/toolkit.hpp"
|
#include "extractor/guidance/toolkit.hpp"
|
||||||
#include "extractor/guidance/turn_handler.hpp"
|
|
||||||
|
|
||||||
#include "util/guidance/toolkit.hpp"
|
#include "util/guidance/toolkit.hpp"
|
||||||
|
|
||||||
|
@ -247,7 +247,8 @@ int Storage::Run()
|
|||||||
coordinate_list_size);
|
coordinate_list_size);
|
||||||
// we'll read a list of OSM node IDs from the same data, so set the block size for the same
|
// we'll read a list of OSM node IDs from the same data, so set the block size for the same
|
||||||
// number of items:
|
// number of items:
|
||||||
shared_layout_ptr->SetBlockSize<std::uint64_t>(SharedDataLayout::OSM_NODE_ID_LIST,
|
shared_layout_ptr->SetBlockSize<std::uint64_t>(
|
||||||
|
SharedDataLayout::OSM_NODE_ID_LIST,
|
||||||
util::PackedVector<OSMNodeID>::elements_to_blocks(coordinate_list_size));
|
util::PackedVector<OSMNodeID>::elements_to_blocks(coordinate_list_size));
|
||||||
|
|
||||||
// load geometries sizes
|
// load geometries sizes
|
||||||
|
Loading…
Reference in New Issue
Block a user