b17cbb4c47
Currently OSRM parses traffic signal nodes without consideration for the direction in which the signal applies. This can lead to duplicated routing penalties, especially when a forward and backward signal are in close proximity on a way. This commit adds support for directed signals to the extraction and graph creation. Signal penalties are only applied in the direction specified by the OSM tag. We add the assignment of traffic directions to the lua scripts, maintaining backwards compatibility with the existing boolean traffic states. As part of the changes to the internal structures used for tracking traffic signals during extraction, we stop serialising/deserialising signals to the `.osrm` file. The traffic signals are only used by `osrm-extract` so whilst this is a data format change, it will not break any existing user processes.
46 lines
1.3 KiB
C++
46 lines
1.3 KiB
C++
#ifndef GEOMETRY_COMPRESSOR_HPP
|
|
#define GEOMETRY_COMPRESSOR_HPP
|
|
|
|
#include "extractor/scripting_environment.hpp"
|
|
#include "util/typedefs.hpp"
|
|
|
|
#include "traffic_signals.hpp"
|
|
#include "util/node_based_graph.hpp"
|
|
|
|
#include <memory>
|
|
#include <unordered_set>
|
|
#include <vector>
|
|
|
|
namespace osrm
|
|
{
|
|
namespace extractor
|
|
{
|
|
|
|
class CompressedEdgeContainer;
|
|
struct TurnRestriction;
|
|
struct UnresolvedManeuverOverride;
|
|
|
|
class GraphCompressor
|
|
{
|
|
using EdgeData = util::NodeBasedDynamicGraph::EdgeData;
|
|
|
|
public:
|
|
void Compress(const std::unordered_set<NodeID> &barrier_nodes,
|
|
const TrafficSignals &traffic_signals,
|
|
ScriptingEnvironment &scripting_environment,
|
|
std::vector<TurnRestriction> &turn_restrictions,
|
|
std::vector<UnresolvedManeuverOverride> &maneuver_overrides,
|
|
util::NodeBasedDynamicGraph &graph,
|
|
const std::vector<NodeBasedEdgeAnnotation> &node_data_container,
|
|
CompressedEdgeContainer &geometry_compressor);
|
|
|
|
private:
|
|
void PrintStatistics(unsigned original_number_of_nodes,
|
|
unsigned original_number_of_edges,
|
|
const util::NodeBasedDynamicGraph &graph) const;
|
|
};
|
|
} // namespace extractor
|
|
} // namespace osrm
|
|
|
|
#endif
|