Fix formatting

This commit is contained in:
Dennis Luxen
2022-12-20 18:00:11 +01:00
parent d7c44f0bc0
commit 7c06726a35
454 changed files with 461 additions and 461 deletions
+1 -1
View File
@@ -72,7 +72,7 @@ void benchmark(BenchStaticRTree &rtree, unsigned num_queries)
return rtree.Nearest(q, 10);
});
}
} // namespace osrm
} // namespace osrm::benchmarks
int main(int argc, char **argv)
{
+1 -1
View File
@@ -123,4 +123,4 @@ int Contractor::Run()
return 0;
}
} // namespace osrm
} // namespace osrm::contractor
+1 -1
View File
@@ -83,4 +83,4 @@ void search(ContractorHeap &heap,
relaxNode(heap, graph, node, node_weight, forbidden_node);
}
}
} // namespace osrm
} // namespace osrm::contractor
+1 -1
View File
@@ -766,4 +766,4 @@ std::vector<bool> contractGraph(ContractorGraph &graph,
return std::move(node_data.is_core);
}
} // namespace osrm
} // namespace osrm::contractor
+1 -1
View File
@@ -181,4 +181,4 @@ int Customizer::Run(const CustomizationConfig &config)
return 0;
}
} // namespace osrm
} // namespace osrm::customizer
+1 -1
View File
@@ -288,4 +288,4 @@ util::json::Array makeRouteLegs(std::vector<guidance::RouteLeg> legs,
}
return json_legs;
}
} // namespace osrm
} // namespace osrm::engine::api::json
@@ -63,4 +63,4 @@ MMapMemoryAllocator::~MMapMemoryAllocator() {}
const storage::SharedDataIndex &MMapMemoryAllocator::GetIndex() { return index; }
} // namespace osrm
} // namespace osrm::engine::datafacade
@@ -34,4 +34,4 @@ ProcessMemoryAllocator::~ProcessMemoryAllocator() {}
const storage::SharedDataIndex &ProcessMemoryAllocator::GetIndex() { return index; }
} // namespace osrm
} // namespace osrm::engine::datafacade
@@ -37,4 +37,4 @@ SharedMemoryAllocator::~SharedMemoryAllocator() {}
const storage::SharedDataIndex &SharedMemoryAllocator::GetIndex() { return index; }
} // namespace osrm
} // namespace osrm::engine::datafacade
+1 -1
View File
@@ -117,4 +117,4 @@ std::vector<util::Coordinate> douglasPeucker(std::vector<util::Coordinate>::cons
return simplified_geometry;
}
} // namespace osrm
} // namespace osrm::engine
+1 -1
View File
@@ -25,4 +25,4 @@ bool EngineConfig::IsValid() const
storage_config.IsValid()) &&
limits_valid;
}
} // namespace osrm
} // namespace osrm::engine
+1 -1
View File
@@ -86,4 +86,4 @@ std::vector<util::Coordinate> assembleOverview(const std::vector<LegGeometry> &l
return overview_geometry;
}
} // namespace osrm
} // namespace osrm::engine::guidance
+1 -1
View File
@@ -23,4 +23,4 @@ Route assembleRoute(const std::vector<RouteLeg> &route_legs)
return Route{distance, duration, weight};
}
} // namespace osrm
} // namespace osrm::engine::guidance
+1 -1
View File
@@ -44,4 +44,4 @@ std::pair<short, short> getArriveBearings(const LegGeometry &leg_geometry,
return std::make_pair<short, short>(
std::round(util::coordinate_calculation::bearing(pre_turn_coordinate, turn_coordinate)), 0);
}
} // namespace osrm
} // namespace osrm::engine::guidance::detail
@@ -415,4 +415,4 @@ bool straightTurnFollowedByChoiceless(const RouteStepIterator step_entering_inte
noIntermediaryIntersections(*step_entering_intersection);
}
} /* namespace osrm */
} // namespace osrm::engine::guidance
+1 -1
View File
@@ -663,4 +663,4 @@ RouteSteps collapseSegregatedTurnInstructions(RouteSteps steps)
return steps;
}
} // namespace osrm
} // namespace osrm::engine::guidance
+1 -1
View File
@@ -205,4 +205,4 @@ std::vector<RouteStep> anticipateLaneChange(std::vector<RouteStep> steps,
return steps;
}
} // namespace osrm
} // namespace osrm::engine::guidance
+1 -1
View File
@@ -714,4 +714,4 @@ void applyOverrides(const datafacade::BaseDataFacade &facade,
}
}
} // namespace osrm
} // namespace osrm::engine::guidance
+1 -1
View File
@@ -81,4 +81,4 @@ std::vector<RouteStep> suppressShortNameSegments(std::vector<RouteStep> steps)
return removeNoTurnInstructions(std::move(steps));
}
} // namespace osrm
} // namespace osrm::engine::guidance
+1 -1
View File
@@ -122,4 +122,4 @@ bool Hint::IsValid(const util::Coordinate new_input_coordinates,
return true;
}
} // namespace osrm
} // namespace osrm::engine
+1 -1
View File
@@ -310,4 +310,4 @@ Status MatchPlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
return Status::Ok;
}
} // namespace osrm
} // namespace osrm::engine::plugins
+1 -1
View File
@@ -53,4 +53,4 @@ Status NearestPlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms
return Status::Ok;
}
} // namespace osrm
} // namespace osrm::engine::plugins
+1 -1
View File
@@ -153,4 +153,4 @@ Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
return Status::Ok;
}
} // namespace osrm
} // namespace osrm::engine::plugins
+1 -1
View File
@@ -691,4 +691,4 @@ Status TilePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
return Status::Ok;
}
} // namespace osrm
} // namespace osrm::engine::plugins
+1 -1
View File
@@ -293,4 +293,4 @@ Status TripPlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
return Status::Ok;
}
} // namespace osrm
} // namespace osrm::engine::plugins
+1 -1
View File
@@ -182,4 +182,4 @@ Status ViaRoutePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithm
return Status::Ok;
}
} // namespace osrm
} // namespace osrm::engine::plugins
+1 -1
View File
@@ -71,4 +71,4 @@ std::int32_t decode_polyline_integer(std::string::const_iterator &first,
result = ((result & 1) == 1) ? ~(result >> 1) : (result >> 1);
return static_cast<std::int32_t>(result);
}
} // namespace osrm
} // namespace osrm::engine::detail
@@ -850,4 +850,4 @@ InternalManyRoutesResult alternativePathSearch(SearchEngineData<Algorithm> &engi
return InternalManyRoutesResult{{std::move(primary_route), std::move(secondary_route)}};
}
} // namespace osrm
} // namespace osrm::engine::routing_algorithms
@@ -956,4 +956,4 @@ InternalManyRoutesResult alternativePathSearch(SearchEngineData<Algorithm> &sear
return InternalManyRoutesResult{std::move(routes)};
}
} // namespace osrm
} // namespace osrm::engine::routing_algorithms
@@ -87,4 +87,4 @@ InternalRouteResult directShortestPathSearch(SearchEngineData<mld::Algorithm> &e
return extractRoute(facade, weight, endpoint_candidates, unpacked_nodes, unpacked_edges);
}
} // namespace osrm
} // namespace osrm::engine::routing_algorithms
@@ -247,4 +247,4 @@ manyToManySearch(SearchEngineData<ch::Algorithm> &engine_working_data,
return std::make_pair(std::move(durations_table), std::move(distances_table));
}
} // namespace osrm
} // namespace osrm::engine::routing_algorithms
@@ -672,4 +672,4 @@ manyToManySearch(SearchEngineData<mld::Algorithm> &engine_working_data,
calculate_distance);
}
} // namespace osrm
} // namespace osrm::engine::routing_algorithms
@@ -453,7 +453,7 @@ mapMatching(SearchEngineData<mld::Algorithm> &engine_working_data,
const std::vector<boost::optional<double>> &trace_gps_precision,
const bool allow_splitting);
} // namespace osrm
} // namespace osrm::engine::routing_algorithms
//[1] "Hidden Markov Map Matching Through Noise and Sparseness"; P. Newson and J. Krumm; 2009; ACM
// GIS
@@ -103,4 +103,4 @@ PhantomEndpoints endpointsFromCandidates(const PhantomEndpointCandidates &candid
return PhantomEndpoints{*source_it, *target_it};
}
} // namespace osrm
} // namespace osrm::engine::routing_algorithms
@@ -202,4 +202,4 @@ double getNetworkDistance(SearchEngineData<Algorithm> &engine_working_data,
return getPathDistance(facade, unpacked_path, source_phantom, target_phantom);
}
} // namespace osrm
} // namespace osrm::engine::routing_algorithms::ch
@@ -17,4 +17,4 @@ shortestPathSearch(SearchEngineData<mld::Algorithm> &engine_working_data,
const std::vector<PhantomNodeCandidates> &waypoint_candidates,
const boost::optional<bool> continue_straight_at_waypoint);
} // namespace osrm
} // namespace osrm::engine::routing_algorithms
+1 -1
View File
@@ -265,4 +265,4 @@ std::vector<TurnData> getTileTurns(const DataFacade<mld::Algorithm> &facade,
return generateTurns(facade, edges, sorted_edge_indexes, edge_finder);
}
} // namespace osrm
} // namespace osrm::engine::routing_algorithms
+1 -1
View File
@@ -128,4 +128,4 @@ void SearchEngineData<MLD>::InitializeOrClearManyToManyThreadLocalStorage(
many_to_many_heap.reset(new ManyToManyQueryHeap(number_of_nodes, number_of_boundary_nodes));
}
}
} // namespace osrm
} // namespace osrm::engine
+1 -1
View File
@@ -397,4 +397,4 @@ std::unique_ptr<SegmentDataContainer> CompressedEdgeContainer::ToSegmentData()
return std::move(segment_data);
}
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -1289,4 +1289,4 @@ EdgeBasedGraphFactory::IndexConditionals(std::vector<Conditional> &&conditionals
return indexed_restrictions;
}
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -1308,4 +1308,4 @@ void ExtractionContainers::PrepareRestrictions(const ReferencedWays &restriction
}
}
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -909,4 +909,4 @@ void Extractor::ProcessGuidanceTurns(
util::Log() << "ok, after " << TIMER_SEC(write_guidance_data) << "s";
}
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -490,4 +490,4 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti
external_memory.way_node_id_offsets.push_back(external_memory.used_node_id_list.size());
}
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -417,4 +417,4 @@ void GraphCompressor::PrintStatistics(unsigned original_number_of_nodes,
util::Log() << "Node compression ratio: " << new_node_count / (double)original_number_of_nodes;
util::Log() << "Edge compression ratio: " << new_edge_count / (double)original_number_of_edges;
}
} // namespace osrm
} // namespace osrm::extractor
@@ -1167,4 +1167,4 @@ CoordinateExtractor::RegressionLine(const std::vector<util::Coordinate> &coordin
return {coord_between_front, coord_between_back};
}
} // namespace osrm
} // namespace osrm::extractor::intersection
@@ -21,4 +21,4 @@ bool HaveIdenticalNames(const NameID lhs,
!util::guidance::requiresNameAnnounced(rhs, lhs, name_table, street_name_suffix_table);
}
} // namespace osrm
} // namespace osrm::extractor::intersection
+1 -1
View File
@@ -33,4 +33,4 @@ std::string toString(const IntersectionViewData &view)
return result;
}
} // namespace osrm
} // namespace osrm::extractor::intersection
@@ -852,4 +852,4 @@ IntersectionEdge skipDegreeTwoNodes(const util::NodeBasedDynamicGraph &graph, In
return road;
}
} // namespace osrm
} // namespace osrm::extractor::intersection
@@ -612,4 +612,4 @@ bool MergableRoadDetector::IsLinkRoad(const NodeID intersection_node,
.annotation_data));
}
} // namespace osrm
} // namespace osrm::extractor::intersection
@@ -285,4 +285,4 @@ void IntersectionFinderAccumulator::update(const NodeID from_node,
{from_node, via_edge});
}
} // namespace osrm
} // namespace osrm::extractor::intersection
+1 -1
View File
@@ -273,4 +273,4 @@ std::vector<std::size_t> LocationDependentData::GetPropertyIndexes(const point_t
return result;
}
} // namespace osrm
} // namespace osrm::extractor
@@ -134,4 +134,4 @@ ManeuverOverrideRelationParser::TryParse(const osmium::Relation &relation) const
}
return maneuver_override;
}
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -236,4 +236,4 @@ void NodeBasedGraphFactory::ReleaseOsmNodes()
extractor::PackedOSMIDs().swap(osm_node_ids);
}
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -167,4 +167,4 @@ RasterContainer::GetRasterInterpolateFromSource(unsigned int source_id, double l
}
RasterCache *RasterCache::g_instance = NULL;
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -282,4 +282,4 @@ RestrictionGraph::EdgeRange RestrictionGraph::GetEdges(RestrictionID id) const
edges.begin() + node.edges_begin_idx + node.num_edges);
}
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -282,4 +282,4 @@ bool RestrictionParser::ShouldIgnoreRestriction(const std::string &except_tag_st
}
return restrictions.find(current_string) != restrictions.end();
}
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -1249,4 +1249,4 @@ void LuaScriptingContext::ProcessWay(const osmium::Way &way,
}
}
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -31,4 +31,4 @@ bool SuffixTable::isSuffix(std::string_view possible_suffix) const
return suffix_set.count(possible_suffix) > 0;
}
} /* namespace osrm */
} // namespace osrm::extractor
+1 -1
View File
@@ -158,4 +158,4 @@ void TurnPathCompressor::Compress(const NodeID from, const NodeID via, const Nod
vias.erase(via);
}
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -82,4 +82,4 @@ template std::vector<UnresolvedManeuverOverride>
removeInvalidTurnPaths<>(std::vector<UnresolvedManeuverOverride>,
const util::NodeBasedDynamicGraph &);
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -119,4 +119,4 @@ NodeID WayRestrictionMap::RemapIfRestrictionVia(const NodeID edge_based_target_n
return edge_based_target_node;
}
} // namespace osrm
} // namespace osrm::extractor
+1 -1
View File
@@ -89,4 +89,4 @@ Intersection DrivewayHandler::operator()(const NodeID nid,
return intersection;
}
} // namespace osrm
} // namespace osrm::guidance
+1 -1
View File
@@ -347,4 +347,4 @@ void annotateTurns(const util::NodeBasedDynamicGraph &node_based_graph,
<< bearing_class_hash.data.size() << " Bearing Classes";
}
} // namespace osrm
} // namespace osrm::guidance
+1 -1
View File
@@ -486,4 +486,4 @@ bool IntersectionHandler::isSameName(const EdgeID source_edge_id, const EdgeID t
street_name_suffix_table); //
}
} // namespace osrm
} // namespace osrm::guidance
+1 -1
View File
@@ -560,4 +560,4 @@ Intersection MotorwayHandler::fallback(Intersection intersection) const
return intersection;
}
} // namespace osrm
} // namespace osrm::guidance
+1 -1
View File
@@ -498,4 +498,4 @@ Intersection RoundaboutHandler::handleRoundabouts(const RoundaboutType roundabou
return intersection;
}
} // namespace osrm
} // namespace osrm::guidance
@@ -286,4 +286,4 @@ std::unordered_set<EdgeID> findSegregatedNodes(const extractor::NodeBasedGraphFa
return segregated_edges;
}
} // namespace osrm
} // namespace osrm::guidance
+1 -1
View File
@@ -874,4 +874,4 @@ SliproadHandler::scaledThresholdByRoadClass(const double max_threshold,
return scaled;
}
} // namespace osrm
} // namespace osrm::guidance
+1 -1
View File
@@ -75,4 +75,4 @@ SuppressModeHandler::operator()(const NodeID, const EdgeID, Intersection interse
return intersection;
}
} // namespace osrm
} // namespace osrm::guidance
+1 -1
View File
@@ -197,4 +197,4 @@ Intersection TurnAnalysis::setTurnTypes(const NodeID node_prior_to_intersection,
return intersection;
}
} // namespace osrm
} // namespace osrm::guidance
+1 -1
View File
@@ -91,4 +91,4 @@ classifyIntersection(Intersection intersection, const osrm::util::Coordinate &lo
return std::make_pair(entry_class, bearing_class);
}
} // namespace osrm
} // namespace osrm::guidance
+1 -1
View File
@@ -141,4 +141,4 @@ bool findPreviousIntersection(const NodeID node_v,
return true;
}
} // namespace osrm
} // namespace osrm::guidance::lanes
+1 -1
View File
@@ -843,4 +843,4 @@ void TurnHandler::handleDistinctConflict(const EdgeID via_edge,
}
}
} // namespace osrm
} // namespace osrm::guidance
+1 -1
View File
@@ -345,4 +345,4 @@ LaneDataVector handleNoneValueAtSimpleTurn(LaneDataVector lane_data,
return lane_data;
}
} // namespace osrm
} // namespace osrm::guidance::lanes
+1 -1
View File
@@ -150,4 +150,4 @@ bool hasTag(const TurnLaneType::Mask tag, const LaneDataVector &data)
return findTag(tag, data) != data.cend();
}
} // namespace osrm
} // namespace osrm::guidance::lanes
+1 -1
View File
@@ -809,4 +809,4 @@ Intersection TurnLaneHandler::handleSliproadTurn(Intersection intersection,
return simpleMatchTuplesToTurns(std::move(intersection), lane_data, combined_id);
}
} // namespace osrm
} // namespace osrm::guidance::lanes
+1 -1
View File
@@ -268,4 +268,4 @@ Intersection triviallyMatchLanesToTurns(Intersection intersection,
return intersection;
}
} // namespace osrm
} // namespace osrm::guidance::lanes
+1 -1
View File
@@ -50,4 +50,4 @@ const BisectionGraphView::EdgeT &BisectionGraphView::Edge(const EdgeID eid) cons
return bisection_graph.Edge(eid);
}
} // namespace osrm
} // namespace osrm::partitioner
+1 -1
View File
@@ -138,4 +138,4 @@ bisectionToPartition(const std::vector<BisectionID> &node_to_bisection_id,
return std::make_tuple(std::move(partitions), std::move(num_cells));
}
} // namespace osrm
} // namespace osrm::partitioner
+1 -1
View File
@@ -307,4 +307,4 @@ bool DinicMaxFlow::Validate(const BisectionGraphView &view,
return separated && in_range_source && in_range_sink;
}
} // namespace osrm
} // namespace osrm::partitioner
+1 -1
View File
@@ -157,4 +157,4 @@ DinicMaxFlow::MinCut computeInertialFlowCut(const BisectionGraphView &view,
return bestMinCut(view, num_slopes, source_sink_rate, balance);
}
} // namespace osrm
} // namespace osrm::partitioner
+1 -1
View File
@@ -198,4 +198,4 @@ int Partitioner::Run(const PartitionerConfig &config)
return 0;
}
} // namespace osrm
} // namespace osrm::partitioner
+1 -1
View File
@@ -105,4 +105,4 @@ const std::vector<BisectionID> &RecursiveBisection::BisectionIDs() const
std::uint32_t RecursiveBisection::SCCDepth() const { return internal_state.SCCDepth(); }
} // namespace osrm
} // namespace osrm::partitioner
@@ -179,4 +179,4 @@ const std::vector<BisectionID> &RecursiveBisectionState::BisectionIDs() const
std::uint32_t RecursiveBisectionState::SCCDepth() const { return scc_levels; }
} // namespace osrm
} // namespace osrm::partitioner
+1 -1
View File
@@ -64,4 +64,4 @@ std::vector<std::uint32_t> makePermutation(const DynamicEdgeBasedGraph &graph,
return util::orderingToPermutation(ordering);
}
} // namespace osrm
} // namespace osrm::partitioner
+1 -1
View File
@@ -20,4 +20,4 @@ NodeID TarjanGraphWrapper::GetTarget(const EdgeID eid) const
return bisection_graph.Edge(eid).target;
}
} // namespace osrm
} // namespace osrm::partitioner
+1 -1
View File
@@ -106,4 +106,4 @@ boost::optional<engine::api::TileParameters> parseParameters(std::string::iterat
return detail::parseParameters<engine::api::TileParameters, TileParametersGrammar<>>(iter, end);
}
} // namespace osrm
} // namespace osrm::server::api
+1 -1
View File
@@ -89,4 +89,4 @@ boost::optional<ParsedURL> parseURL(std::string::iterator &iter, const std::stri
return boost::none;
}
} // namespace osrm
} // namespace osrm::server::api
+1 -1
View File
@@ -218,4 +218,4 @@ std::vector<char> Connection::compress_buffers(const std::vector<char> &uncompre
return compressed_data;
}
} // namespace osrm
} // namespace osrm::server
+1 -1
View File
@@ -100,4 +100,4 @@ boost::asio::const_buffer reply::status_to_buffer(const reply::status_type statu
}
reply::reply() : status(ok) {}
} // namespace osrm
} // namespace osrm::server::http
+1 -1
View File
@@ -175,4 +175,4 @@ void RequestHandler::HandleRequest(const http::request &current_request, http::r
<< ", uri: " << current_request.uri;
}
}
} // namespace osrm
} // namespace osrm::server
+1 -1
View File
@@ -296,4 +296,4 @@ bool RequestParser::is_digit(const int character) const
{
return character >= '0' && character <= '9';
}
} // namespace osrm
} // namespace osrm::server
+1 -1
View File
@@ -74,4 +74,4 @@ engine::Status MatchService::RunQuery(std::size_t prefix_length,
}
return BaseService::routing_machine.Match(*parameters, result);
}
} // namespace osrm
} // namespace osrm::server::service
+1 -1
View File
@@ -68,4 +68,4 @@ engine::Status NearestService::RunQuery(std::size_t prefix_length,
}
return BaseService::routing_machine.Nearest(*parameters, result);
}
} // namespace osrm
} // namespace osrm::server::service
+1 -1
View File
@@ -72,4 +72,4 @@ engine::Status RouteService::RunQuery(std::size_t prefix_length,
}
return BaseService::routing_machine.Route(*parameters, result);
}
} // namespace osrm
} // namespace osrm::server::service
+1 -1
View File
@@ -103,4 +103,4 @@ engine::Status TableService::RunQuery(std::size_t prefix_length,
}
return BaseService::routing_machine.Table(*parameters, result);
}
} // namespace osrm
} // namespace osrm::server::service
+1 -1
View File
@@ -43,4 +43,4 @@ engine::Status TileService::RunQuery(std::size_t prefix_length,
result = std::string();
return BaseService::routing_machine.Tile(*parameters, result);
}
} // namespace osrm
} // namespace osrm::server::service
+1 -1
View File
@@ -76,4 +76,4 @@ engine::Status TripService::RunQuery(std::size_t prefix_length,
}
return BaseService::routing_machine.Trip(*parameters, result);
}
} // namespace osrm
} // namespace osrm::server::service
+1 -1
View File
@@ -49,4 +49,4 @@ engine::Status ServiceHandler::RunQuery(api::ParsedURL parsed_url,
return service->RunQuery(parsed_url.prefix_length, parsed_url.query, result);
}
} // namespace osrm
} // namespace osrm::server
+1 -1
View File
@@ -38,4 +38,4 @@ std::vector<std::string> IOConfig::GetMissingFiles() const
}
return missingFiles;
}
} // namespace osrm
} // namespace osrm::storage

Some files were not shown because too many files have changed in this diff Show More