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.
116 lines
4.8 KiB
C++
116 lines
4.8 KiB
C++
/*
|
|
|
|
Copyright (c) 2017, Project OSRM contributors
|
|
All rights reserved.
|
|
|
|
Redistribution and use in source and binary forms, with or without modification,
|
|
are permitted provided that the following conditions are met:
|
|
|
|
Redistributions of source code must retain the above copyright notice, this list
|
|
of conditions and the following disclaimer.
|
|
Redistributions in binary form must reproduce the above copyright notice, this
|
|
list of conditions and the following disclaimer in the documentation and/or
|
|
other materials provided with the distribution.
|
|
|
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
|
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
#ifndef EXTRACTOR_HPP
|
|
#define EXTRACTOR_HPP
|
|
|
|
#include "extractor/edge_based_edge.hpp"
|
|
#include "extractor/edge_based_graph_factory.hpp"
|
|
#include "extractor/extractor_config.hpp"
|
|
#include "extractor/graph_compressor.hpp"
|
|
#include "extractor/maneuver_override.hpp"
|
|
#include "extractor/packed_osm_ids.hpp"
|
|
|
|
#include "guidance/guidance_processing.hpp"
|
|
#include "guidance/turn_data_container.hpp"
|
|
|
|
#include "util/guidance/bearing_class.hpp"
|
|
#include "util/guidance/entry_class.hpp"
|
|
#include "util/guidance/turn_lanes.hpp"
|
|
|
|
#include "restriction_graph.hpp"
|
|
#include "traffic_signals.hpp"
|
|
#include "util/typedefs.hpp"
|
|
|
|
namespace osrm
|
|
{
|
|
namespace extractor
|
|
{
|
|
|
|
class ScriptingEnvironment;
|
|
struct ProfileProperties;
|
|
|
|
class Extractor
|
|
{
|
|
public:
|
|
Extractor(ExtractorConfig extractor_config) : config(std::move(extractor_config)) {}
|
|
int run(ScriptingEnvironment &scripting_environment);
|
|
|
|
private:
|
|
ExtractorConfig config;
|
|
|
|
std::tuple<LaneDescriptionMap,
|
|
std::vector<TurnRestriction>,
|
|
std::vector<UnresolvedManeuverOverride>,
|
|
TrafficSignals>
|
|
ParseOSMData(ScriptingEnvironment &scripting_environment, const unsigned number_of_threads);
|
|
|
|
EdgeID BuildEdgeExpandedGraph(
|
|
// input data
|
|
const util::NodeBasedDynamicGraph &node_based_graph,
|
|
const std::vector<util::Coordinate> &coordinates,
|
|
const CompressedEdgeContainer &compressed_edge_container,
|
|
const std::unordered_set<NodeID> &barrier_nodes,
|
|
const TrafficSignals &traffic_signals,
|
|
const RestrictionGraph &restriction_graph,
|
|
const std::unordered_set<EdgeID> &segregated_edges,
|
|
const NameTable &name_table,
|
|
const std::vector<UnresolvedManeuverOverride> &maneuver_overrides,
|
|
const LaneDescriptionMap &turn_lane_map,
|
|
// for calculating turn penalties
|
|
ScriptingEnvironment &scripting_environment,
|
|
// output data
|
|
EdgeBasedNodeDataContainer &edge_based_nodes_container,
|
|
std::vector<EdgeBasedNodeSegment> &edge_based_node_segments,
|
|
std::vector<EdgeWeight> &edge_based_node_weights,
|
|
std::vector<EdgeDuration> &edge_based_node_durations,
|
|
std::vector<EdgeDistance> &edge_based_node_distances,
|
|
util::DeallocatingVector<EdgeBasedEdge> &edge_based_edge_list,
|
|
std::uint32_t &connectivity_checksum);
|
|
|
|
void FindComponents(unsigned max_edge_id,
|
|
const util::DeallocatingVector<EdgeBasedEdge> &input_edge_list,
|
|
const std::vector<EdgeBasedNodeSegment> &input_node_segments,
|
|
EdgeBasedNodeDataContainer &nodes_container) const;
|
|
void BuildRTree(std::vector<EdgeBasedNodeSegment> edge_based_node_segments,
|
|
const std::vector<util::Coordinate> &coordinates);
|
|
|
|
void ProcessGuidanceTurns(const util::NodeBasedDynamicGraph &node_based_graph,
|
|
const EdgeBasedNodeDataContainer &edge_based_node_container,
|
|
const std::vector<util::Coordinate> &node_coordinates,
|
|
const CompressedEdgeContainer &compressed_edge_container,
|
|
const std::unordered_set<NodeID> &barrier_nodes,
|
|
const RestrictionGraph &restriction_graph,
|
|
const NameTable &name_table,
|
|
LaneDescriptionMap lane_description_map,
|
|
ScriptingEnvironment &scripting_environment);
|
|
};
|
|
} // namespace extractor
|
|
} // namespace osrm
|
|
|
|
#endif /* EXTRACTOR_HPP */
|