5266ac1635
Currently OSRM only supports turn restrictions with a single via-node or one via-way. OSM allows for multiple via-ways to represent longer and more complex restrictions. This PR extends the use of duplicate nodes for representng via-way turn restrictions to also support multi via-way restrictions. Effectively, this increases the edge-based graph size by the number of edges in multi via-way restrictions. However, given the low number of these restrictions it has little effect on total graph size. In addition, we add a new step in the extraction phase that constructs a restriction graph to support more complex relationships between restrictions, such as nested restrictions and overlapping restrictions.
88 lines
3.2 KiB
C++
88 lines
3.2 KiB
C++
#ifndef EXTRACTION_CONTAINERS_HPP
|
|
#define EXTRACTION_CONTAINERS_HPP
|
|
|
|
#include "extractor/internal_extractor_edge.hpp"
|
|
#include "extractor/nodes_of_way.hpp"
|
|
#include "extractor/query_node.hpp"
|
|
#include "extractor/restriction.hpp"
|
|
#include "extractor/scripting_environment.hpp"
|
|
|
|
#include "storage/tar_fwd.hpp"
|
|
|
|
#include <unordered_map>
|
|
|
|
namespace osrm
|
|
{
|
|
namespace extractor
|
|
{
|
|
|
|
/**
|
|
* Uses memory containers to store all the data that
|
|
* is collected by the extractor callbacks.
|
|
*
|
|
* The data is the filtered, aggregated and finally written to disk.
|
|
*/
|
|
class ExtractionContainers
|
|
{
|
|
using ReferencedWays = std::unordered_map<OSMWayID, NodesOfWay>;
|
|
// The relationship between way and nodes is lost during node preparation.
|
|
// We identify the ways and nodes relevant to restrictions/overrides prior to
|
|
// node processing so that they can be referenced in the preparation phase.
|
|
ReferencedWays IdentifyRestrictionWays();
|
|
ReferencedWays IdentifyManeuverOverrideWays();
|
|
|
|
void PrepareNodes();
|
|
void PrepareManeuverOverrides(const ReferencedWays &maneuver_override_ways);
|
|
void PrepareRestrictions(const ReferencedWays &restriction_ways);
|
|
void PrepareEdges(ScriptingEnvironment &scripting_environment);
|
|
|
|
void WriteNodes(storage::tar::FileWriter &file_out) const;
|
|
void WriteEdges(storage::tar::FileWriter &file_out) const;
|
|
void WriteMetadata(storage::tar::FileWriter &file_out) const;
|
|
void WriteCharData(const std::string &file_name);
|
|
|
|
public:
|
|
using NodeIDVector = std::vector<OSMNodeID>;
|
|
using NodeVector = std::vector<QueryNode>;
|
|
using EdgeVector = std::vector<InternalExtractorEdge>;
|
|
using AnnotationDataVector = std::vector<NodeBasedEdgeAnnotation>;
|
|
using NameCharData = std::vector<unsigned char>;
|
|
using NameOffsets = std::vector<size_t>;
|
|
using WayIDVector = std::vector<OSMWayID>;
|
|
using WayNodeIDOffsets = std::vector<size_t>;
|
|
|
|
std::vector<OSMNodeID> barrier_nodes;
|
|
std::vector<OSMNodeID> traffic_signals;
|
|
NodeIDVector used_node_id_list;
|
|
NodeVector all_nodes_list;
|
|
EdgeVector all_edges_list;
|
|
AnnotationDataVector all_edges_annotation_data_list;
|
|
NameCharData name_char_data;
|
|
NameOffsets name_offsets;
|
|
WayIDVector ways_list;
|
|
// Offsets into used nodes for each way_list entry
|
|
WayNodeIDOffsets way_node_id_offsets;
|
|
|
|
unsigned max_internal_node_id;
|
|
|
|
// List of restrictions (conditional and unconditional) before we transform them into the
|
|
// output types. Input containers reference OSMNodeIDs. We can only transform them to the
|
|
// correct internal IDs after we've read everything. Without a multi-parse approach,
|
|
// we have to remember the output restrictions before converting them to the internal formats
|
|
std::vector<InputTurnRestriction> restrictions_list;
|
|
std::vector<TurnRestriction> turn_restrictions;
|
|
|
|
std::vector<InputManeuverOverride> external_maneuver_overrides_list;
|
|
std::vector<UnresolvedManeuverOverride> internal_maneuver_overrides;
|
|
|
|
ExtractionContainers();
|
|
|
|
void PrepareData(ScriptingEnvironment &scripting_environment,
|
|
const std::string &osrm_path,
|
|
const std::string &names_data_path);
|
|
};
|
|
} // namespace extractor
|
|
} // namespace osrm
|
|
|
|
#endif /* EXTRACTION_CONTAINERS_HPP */
|