Fix formatting

include/extractor/class_data.hpp

@@ -31,6 +31,6 @@ inline bool isValidClassName(const std::string &name)
                return std::isalnum(c);
            }) == name.end();
 }
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif

include/extractor/compressed_edge_container.hpp

@@ -80,6 +80,6 @@ class CompressedEdgeContainer
     std::unordered_map<EdgeID, unsigned> m_reverse_edge_id_to_zipped_index_map;
     std::unique_ptr<SegmentDataContainer> segment_data;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // GEOMETRY_COMPRESSOR_HPP_

include/extractor/compressed_node_based_graph_edge.hpp

@@ -12,6 +12,6 @@ struct CompressedNodeBasedGraphEdge
     NodeID source;
     NodeID target;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_COMPRESSED_NODE_BASED_GRAPH_EDGE_HPP

include/extractor/conditional_turn_penalty.hpp

@@ -19,6 +19,6 @@ struct ConditionalTurnPenalty
     std::vector<util::OpeningHours> conditions;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_CONDITIONAL_TURN_PENALTY_HPP_

include/extractor/datasources.hpp

@@ -43,6 +43,6 @@ class Datasources
     std::array<std::uint32_t, MAX_NUM_SOURES> lengths;
     std::array<char, MAX_LENGTH_NAME * MAX_NUM_SOURES> sources;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif

include/extractor/edge_based_edge.hpp

@@ -94,6 +94,6 @@ inline bool EdgeBasedEdge::operator<(const EdgeBasedEdge &other) const
     return std::tie(source, target, data.weight, unidirectional) <
            std::tie(other.source, other.target, other.data.weight, other_is_unidirectional);
 }
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* EDGE_BASED_EDGE_HPP */

include/extractor/edge_based_graph_factory.hpp

@@ -171,6 +171,6 @@ class EdgeBasedGraphFactory
     // mapping of node-based edges to edge-based nodes
     std::vector<NodeID> nbe_to_ebn_mapping;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* EDGE_BASED_GRAPH_FACTORY_HPP_ */

include/extractor/edge_based_node.hpp

@@ -14,6 +14,6 @@ struct EdgeBasedNode
     std::uint32_t segregated : 1;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_EDGE_BASED_NODE_HPP_

include/extractor/edge_based_node_segment.hpp

@@ -46,6 +46,6 @@ struct EdgeBasedNodeSegment
     unsigned short fwd_segment_position : 15; // segment id in a compressed geometry
     bool is_startpoint : 1;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACT_EDGE_BASED_NODE_SEGMENT_HPP

include/extractor/extraction_containers.hpp

@@ -89,6 +89,6 @@ class ExtractionContainers
     void PrepareData(ScriptingEnvironment &scripting_environment,
                      const std::string &names_data_path);
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* EXTRACTION_CONTAINERS_HPP */

include/extractor/extraction_helper_functions.hpp

@@ -134,6 +134,6 @@ inline std::string canonicalizeStringList(std::string strlist, const std::string
     return strlist;
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // EXTRACTION_HELPER_FUNCTIONS_HPP

include/extractor/extraction_node.hpp

@@ -17,6 +17,6 @@ struct ExtractionNode
     TrafficLightClass::Direction traffic_lights;
     bool barrier;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // EXTRACTION_NODE_HPP

include/extractor/extraction_relation.hpp

@@ -197,6 +197,6 @@ class ExtractionRelationContainer
     RelationRefMap rel_refs;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // EXTRACTION_RELATION_HPP

include/extractor/extraction_segment.hpp

@@ -24,6 +24,6 @@ struct ExtractionSegment
     double weight;
     double duration;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif

include/extractor/extraction_turn.hpp

@@ -129,6 +129,6 @@ struct ExtractionTurn
     double weight;
     double duration;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif

include/extractor/extraction_way.hpp

@@ -128,6 +128,6 @@ struct ExtractionWay
     std::uint8_t highway_turn_classification : 4;
     std::uint8_t access_turn_classification : 4;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // EXTRACTION_WAY_HPP

include/extractor/extractor.hpp

@@ -118,6 +118,6 @@ class Extractor
                               LaneDescriptionMap lane_description_map,
                               ScriptingEnvironment &scripting_environment);
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* EXTRACTOR_HPP */

include/extractor/extractor_callbacks.hpp

@@ -93,6 +93,6 @@ class ExtractorCallbacks
     // warning: caller needs to take care of synchronization!
     void ProcessManeuverOverride(const InputManeuverOverride &override);
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* EXTRACTOR_CALLBACKS_HPP */

include/extractor/extractor_config.hpp

@@ -89,6 +89,6 @@ struct ExtractorConfig final : storage::IOConfig
     bool use_locations_cache = true;
     bool dump_nbg_graph = false;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // EXTRACTOR_CONFIG_HPP

include/extractor/files.hpp

@@ -574,6 +574,6 @@ void readCompressedNodeBasedGraph(const boost::filesystem::path &path, EdgeListT
 
     storage::serialization::read(reader, "/extractor/cnbg", edge_list);
 }
-} // namespace osrm
+} // namespace osrm::extractor::files
 
 #endif

include/extractor/graph_compressor.hpp

@@ -37,6 +37,6 @@ class GraphCompressor
                          unsigned original_number_of_edges,
                          const util::NodeBasedDynamicGraph &graph) const;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif

include/extractor/internal_extractor_edge.hpp

@@ -84,6 +84,6 @@ struct InternalExtractorEdge
     // coordinate of the source node
     util::Coordinate source_coordinate;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // INTERNAL_EXTRACTOR_EDGE_HPP

include/extractor/intersection/constants.hpp

@@ -26,6 +26,6 @@ const auto constexpr ASSUMED_LANE_WIDTH = 3.25;
 // how far apart can roads be at the most, when thinking about merging them?
 const auto constexpr MERGABLE_ANGLE_DIFFERENCE = 95.0;
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif // OSRM_EXTRACTOR_INTERSECTION_CONSTANTS_HPP_

include/extractor/intersection/coordinate_extractor.hpp

@@ -247,6 +247,6 @@ class CoordinateExtractor
                         const std::uint8_t considered_lanes) const;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif // OSRM_EXTRACTOR_INTERSECTION_COORDINATE_EXTRACTOR_HPP_

include/extractor/intersection/have_identical_names.hpp

@@ -16,6 +16,6 @@ bool HaveIdenticalNames(const NameID lhs,
                         const NameTable &name_table,
                         const SuffixTable &street_name_suffix_table);
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif /*OSRM_EXTRACTOR_INTERSECTION_HAVE_IDENTICAL_NAMES_HPP_*/

include/extractor/intersection/intersection_analysis.hpp

@@ -85,6 +85,6 @@ getConnectedRoadsForEdgeGeometries(const util::NodeBasedDynamicGraph &graph,
 // for getConnectedRoads.
 IntersectionEdge skipDegreeTwoNodes(const util::NodeBasedDynamicGraph &graph,
                                     IntersectionEdge road);
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif

include/extractor/intersection/intersection_edge.hpp

@@ -38,6 +38,6 @@ struct IntersectionEdgeGeometry
 };
 
 using IntersectionEdgeGeometries = std::vector<IntersectionEdgeGeometry>;
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif

include/extractor/intersection/intersection_view.hpp

@@ -228,6 +228,6 @@ struct IntersectionView final : std::vector<IntersectionViewData>,      //
     using Base = std::vector<IntersectionViewData>;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif /* OSRM_EXTRACTOR_INTERSECTION_INTERSECTION_VIEW_HPP_*/

include/extractor/intersection/node_based_graph_walker.hpp

@@ -307,6 +307,6 @@ struct DistanceToNextIntersectionAccumulator
     double distance = 0.;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor::intersection
 
 #endif

include/extractor/intersection_bearings_container.hpp

@@ -104,6 +104,6 @@ template <storage::Ownership Ownership> class IntersectionBearingsContainer
 using IntersectionBearingsContainer =
     detail::IntersectionBearingsContainer<storage::Ownership::Container>;
 using IntersectionBearingsView = detail::IntersectionBearingsContainer<storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif

include/extractor/location_dependent_data.hpp

@@ -46,6 +46,6 @@ struct LocationDependentData
     std::vector<std::pair<polygon_bands_t, std::size_t>> polygons;
     std::vector<properties_t> properties;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif

include/extractor/maneuver_override.hpp

@@ -141,7 +141,7 @@ struct UnresolvedManeuverOverride
 
     static std::string Name() { return "maneuver override"; };
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 // custom specialization of std::hash can be injected in namespace std
 namespace std

include/extractor/maneuver_override_relation_parser.hpp

@@ -57,6 +57,6 @@ class ManeuverOverrideRelationParser
     ManeuverOverrideRelationParser();
     boost::optional<InputManeuverOverride> TryParse(const osmium::Relation &relation) const;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* RESTRICTION_PARSER_HPP */

include/extractor/name_table.hpp

@@ -113,6 +113,6 @@ template <storage::Ownership Ownership> class NameTableImpl
 
 using NameTable = detail::NameTableImpl<storage::Ownership::Container>;
 using NameTableView = detail::NameTableImpl<storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_NAME_TABLE_HPP

include/extractor/nbg_to_ebg.hpp

@@ -13,6 +13,6 @@ struct NBGToEBG
     NodeID u, v;
     NodeID forward_ebg_node, backward_ebg_node;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif

include/extractor/node_based_edge.hpp

@@ -205,6 +205,6 @@ static_assert(sizeof(extractor::NodeBasedEdge) == 32,
               "bigger than expected. This will influence "
               "memory consumption.");
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* NODE_BASED_EDGE_HPP */

include/extractor/node_based_graph_factory.hpp

@@ -102,6 +102,6 @@ class NodeBasedGraphFactory
     extractor::CompressedEdgeContainer compressed_edge_container;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_NODE_BASED_GRAPH_FACTORY_HPP_

include/extractor/node_data_container.hpp

@@ -127,6 +127,6 @@ using EdgeBasedNodeDataExternalContainer =
 using EdgeBasedNodeDataContainer =
     detail::EdgeBasedNodeDataContainerImpl<storage::Ownership::Container>;
 using EdgeBasedNodeDataView = detail::EdgeBasedNodeDataContainerImpl<storage::Ownership::View>;
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif

include/extractor/node_restriction_map.hpp

@@ -72,6 +72,6 @@ struct UnconditionalOnly
 using RestrictionMap = NodeRestrictionMap<UnconditionalOnly>;
 using ConditionalRestrictionMap = NodeRestrictionMap<ConditionalOnly>;
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_NODE_RESTRICTION_MAP_HPP_

include/extractor/nodes_of_way.hpp

@@ -48,6 +48,6 @@ struct NodesOfWay
         return node_ids[node_ids.size() - 1];
     }
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* NODES_OF_WAY_HPP */

include/extractor/packed_osm_ids.hpp

@@ -14,6 +14,6 @@ using PackedOSMIDs = util::detail::PackedVector<OSMNodeID, 34, Ownership>;
 
 using PackedOSMIDsView = detail::PackedOSMIDs<storage::Ownership::View>;
 using PackedOSMIDs = detail::PackedOSMIDs<storage::Ownership::Container>;
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif

include/extractor/profile_properties.hpp

@@ -136,6 +136,6 @@ struct ProfileProperties
     bool force_split_edges = false;
     bool call_tagless_node_function = true;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif

include/extractor/query_node.hpp

@@ -46,6 +46,6 @@ struct QueryNode
                          MAX_OSM_NODEID);
     }
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // QUERY_NODE_HPP

include/extractor/raster_source.hpp

@@ -171,6 +171,6 @@ class RasterCache
     // the instance
     static RasterCache *g_instance;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* RASTER_SOURCE_HPP */

include/extractor/restriction.hpp

@@ -61,6 +61,6 @@ struct TurnRestriction
 
     static std::string Name() { return "turn restriction"; };
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // RESTRICTION_HPP

include/extractor/restriction_graph.hpp

@@ -129,6 +129,6 @@ struct RestrictionGraph
 
 RestrictionGraph constructRestrictionGraph(const std::vector<TurnRestriction> &turn_restrictions);
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_RESTRICTION_GRAPH_HPP_

include/extractor/restriction_parser.hpp

@@ -54,6 +54,6 @@ class RestrictionParser
     std::set<std::string> restrictions;
     osmium::tags::KeyFilter filter;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* RESTRICTION_PARSER_HPP */

include/extractor/road_classification.hpp

@@ -221,6 +221,6 @@ inline bool obviousByRoadClass(const RoadClassification in_classification,
             compare_candidate.IsLowPriorityRoadClass());
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_CLASSIFICATION_DATA_HPP_

include/extractor/scripting_environment_lua.hpp

@@ -108,6 +108,6 @@ class Sol2ScriptingEnvironment final : public ScriptingEnvironment
     tbb::enumerable_thread_specific<std::unique_ptr<LuaScriptingContext>> script_contexts;
     const LocationDependentData location_dependent_data;
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* SCRIPTING_ENVIRONMENT_LUA_HPP */

include/extractor/segment_data_container.hpp

@@ -223,6 +223,6 @@ template <storage::Ownership Ownership> class SegmentDataContainerImpl
 
 using SegmentDataView = detail::SegmentDataContainerImpl<storage::Ownership::View>;
 using SegmentDataContainer = detail::SegmentDataContainerImpl<storage::Ownership::Container>;
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif

include/extractor/serialization.hpp

@@ -218,6 +218,6 @@ inline void read(storage::tar::FileReader &reader,
     std::string buffer;
     util::serialization::read(reader, name, name_table.indexed_data);
 }
-} // namespace osrm
+} // namespace osrm::extractor::serialization
 
 #endif

include/extractor/suffix_table.hpp

@@ -37,6 +37,6 @@ class SuffixTable final
     std::unordered_set<std::string_view> suffix_set;
 };
 
-} /* namespace osrm */
+} // namespace osrm::extractor
 
 #endif /* OSRM_EXTRACTOR_SUFFIX_LIST_HPP_ */

include/extractor/tarjan_scc.hpp

@@ -178,6 +178,6 @@ template <typename GraphT> class TarjanSCC
 
     unsigned GetComponentID(const NodeID node) const { return components_index[node]; }
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* TARJAN_SCC_HPP */

include/extractor/traffic_lights.hpp

@@ -12,6 +12,6 @@ enum Direction
     DIRECTION_FORWARD = 2,
     DIRECTION_REVERSE = 3
 };
-} // namespace osrm
+} // namespace osrm::extractor::TrafficLightClass
 
 #endif // OSRM_EXTRACTOR_TRAFFIC_LIGHTS_DATA_HPP_

include/extractor/traffic_signals.hpp

@@ -20,6 +20,6 @@ struct TrafficSignals
         return bidirectional_nodes.count(to) > 0 || unidirectional_segments.count({from, to}) > 0;
     }
 };
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_TRAFFIC_SIGNALS_HPP

include/extractor/travel_mode.hpp

@@ -101,6 +101,6 @@ inline std::string travelModeToString(const TravelMode mode)
     return token;
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* TRAVEL_MODE_HPP */

include/extractor/turn_lane_types.hpp

@@ -98,6 +98,6 @@ inline TurnLanesIndexedArray transformTurnLaneMapIntoArrays(const LaneDescriptio
     return std::make_tuple(std::move(turn_lane_offsets), std::move(turn_lane_masks));
 }
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif /* OSRM_GUIDANCE_TURN_LANE_TYPES_HPP_ */

include/extractor/turn_path.hpp

@@ -262,5 +262,5 @@ struct TurnPath
     };
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 #endif // OSRM_TURN_PATH_HPP

include/extractor/turn_path_compressor.hpp

@@ -46,6 +46,6 @@ class TurnPathCompressor
     std::unordered_multimap<NodeID, TurnPath *> ends;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_TURN_PATH_COMPRESSOR_HPP_

include/extractor/turn_path_filter.hpp

@@ -14,6 +14,6 @@ namespace osrm::extractor
 // `restrictions = removeInvalidRestrictions(std::move(restrictions))`
 template <typename T>
 std::vector<T> removeInvalidTurnPaths(std::vector<T>, const util::NodeBasedDynamicGraph &);
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_TURN_PATH_FILTER_HPP_

include/extractor/way_restriction_map.hpp

@@ -67,6 +67,6 @@ class WayRestrictionMap
     const RestrictionGraph &restriction_graph;
 };
 
-} // namespace osrm
+} // namespace osrm::extractor
 
 #endif // OSRM_EXTRACTOR_WAY_RESTRICTION_MAP_HPP_