Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

clean up derived classed and their functions to correctly use final keyword:

Browse Source 
functions marked as final need to be marked virtual. use override specifier to do so
This commit is contained in:
Dennis Luxen 2015-01-28 10:10:28 +01:00
parent 86ca9bd0f9
commit 2a8084b6c6
12 changed files with 148 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Server/data_structures/internal_datafacade.hpp
View File

@ -46,7 +46,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <osrm/coordinate.hpp> #include <osrm/coordinate.hpp>
#include <osrm/server_paths.hpp> #include <osrm/server_paths.hpp>
template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<EdgeDataT> template <class EdgeDataT> class InternalDataFacade final : public BaseDataFacade<EdgeDataT>
{ {
private: private:
@ -309,52 +309,60 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
} }
// search graph access // search graph access
unsigned GetNumberOfNodes() const final { return m_query_graph->GetNumberOfNodes(); } unsigned GetNumberOfNodes() const override final { return m_query_graph->GetNumberOfNodes(); }
unsigned GetNumberOfEdges() const final { return m_query_graph->GetNumberOfEdges(); } unsigned GetNumberOfEdges() const override final { return m_query_graph->GetNumberOfEdges(); }
unsigned GetOutDegree(const NodeID n) const final { return m_query_graph->GetOutDegree(n); } unsigned GetOutDegree(const NodeID n) const override final
{
return m_query_graph->GetOutDegree(n);
}
NodeID GetTarget(const EdgeID e) const final { return m_query_graph->GetTarget(e); } NodeID GetTarget(const EdgeID e) const override final { return m_query_graph->GetTarget(e); }
// EdgeDataT &GetEdgeData(const EdgeID e) final { return m_query_graph->GetEdgeData(e); } // EdgeDataT &GetEdgeData(const EdgeID e) override final { return m_query_graph->GetEdgeData(e);
// }
EdgeDataT &GetEdgeData(const EdgeID e) const final { return m_query_graph->GetEdgeData(e); } EdgeDataT &GetEdgeData(const EdgeID e) const override final
{
return m_query_graph->GetEdgeData(e);
}
EdgeID BeginEdges(const NodeID n) const final { return m_query_graph->BeginEdges(n); } EdgeID BeginEdges(const NodeID n) const override final { return m_query_graph->BeginEdges(n); }
EdgeID EndEdges(const NodeID n) const final { return m_query_graph->EndEdges(n); } EdgeID EndEdges(const NodeID n) const override final { return m_query_graph->EndEdges(n); }
EdgeRange GetAdjacentEdgeRange(const NodeID node) const final EdgeRange GetAdjacentEdgeRange(const NodeID node) const override final
{ {
return m_query_graph->GetAdjacentEdgeRange(node); return m_query_graph->GetAdjacentEdgeRange(node);
}; };
// searches for a specific edge // searches for a specific edge
EdgeID FindEdge(const NodeID from, const NodeID to) const final EdgeID FindEdge(const NodeID from, const NodeID to) const override final
{ {
return m_query_graph->FindEdge(from, to); return m_query_graph->FindEdge(from, to);
} }
EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const final EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const override final
{ {
return m_query_graph->FindEdgeInEitherDirection(from, to); return m_query_graph->FindEdgeInEitherDirection(from, to);
} }
EdgeID FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const final EdgeID
FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const override final
{ {
return m_query_graph->FindEdgeIndicateIfReverse(from, to, result); return m_query_graph->FindEdgeIndicateIfReverse(from, to, result);
} }
// node and edge information access // node and edge information access
FixedPointCoordinate GetCoordinateOfNode(const unsigned id) const final FixedPointCoordinate GetCoordinateOfNode(const unsigned id) const override final
{ {
return m_coordinate_list->at(id); return m_coordinate_list->at(id);
}; };
bool EdgeIsCompressed(const unsigned id) const { return m_edge_is_compressed.at(id); } bool EdgeIsCompressed(const unsigned id) const { return m_edge_is_compressed.at(id); }
TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const final TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const override final
{ {
return m_turn_instruction_list.at(id); return m_turn_instruction_list.at(id);
} }
@ -363,7 +371,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate, bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
FixedPointCoordinate &result, FixedPointCoordinate &result,
const unsigned zoom_level = 18) final const unsigned zoom_level = 18) override final
{ {
if (!m_static_rtree.get()) if (!m_static_rtree.get())
{ {
@ -375,7 +383,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
} }
bool IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate, bool IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
PhantomNode &resulting_phantom_node) final PhantomNode &resulting_phantom_node) override final
{ {
std::vector<PhantomNode> resulting_phantom_node_vector; std::vector<PhantomNode> resulting_phantom_node_vector;
auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate, auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate,
@ -391,7 +399,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
bool bool
IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate, IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
std::vector<PhantomNode> &resulting_phantom_node_vector, std::vector<PhantomNode> &resulting_phantom_node_vector,
const unsigned number_of_results) final const unsigned number_of_results) override final
{ {
if (!m_static_rtree.get()) if (!m_static_rtree.get())
{ {
@ -402,14 +410,14 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
input_coordinate, resulting_phantom_node_vector, number_of_results); input_coordinate, resulting_phantom_node_vector, number_of_results);
} }
unsigned GetCheckSum() const final { return m_check_sum; } unsigned GetCheckSum() const override final { return m_check_sum; }
unsigned GetNameIndexFromEdgeID(const unsigned id) const final unsigned GetNameIndexFromEdgeID(const unsigned id) const override final
{ {
return m_name_ID_list.at(id); return m_name_ID_list.at(id);
}; };
void GetName(const unsigned name_id, std::string &result) const final void GetName(const unsigned name_id, std::string &result) const override final
{ {
if (UINT_MAX == name_id) if (UINT_MAX == name_id)
{ {
@ -427,13 +435,13 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
} }
} }
virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const final virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const override final
{ {
return m_via_node_list.at(id); return m_via_node_list.at(id);
} }
virtual void GetUncompressedGeometry(const unsigned id, virtual void GetUncompressedGeometry(const unsigned id,
std::vector<unsigned> &result_nodes) const final std::vector<unsigned> &result_nodes) const override final
{ {
const unsigned begin = m_geometry_indices.at(id); const unsigned begin = m_geometry_indices.at(id);
const unsigned end = m_geometry_indices.at(id + 1); const unsigned end = m_geometry_indices.at(id + 1);
@ -443,7 +451,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
m_geometry_list.begin() + end); m_geometry_list.begin() + end);
} }
std::string GetTimestamp() const final { return m_timestamp; } std::string GetTimestamp() const override final { return m_timestamp; }
}; };
#endif // INTERNAL_DATAFACADE_HPP #endif // INTERNAL_DATAFACADE_HPP

55
Server/data_structures/shared_datafacade.hpp
View File

@ -43,7 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDataT> template <class EdgeDataT> class SharedDataFacade final : public BaseDataFacade<EdgeDataT>
{ {
private: private:
@ -282,54 +282,61 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
} }
// search graph access // search graph access
unsigned GetNumberOfNodes() const final { return m_query_graph->GetNumberOfNodes(); } unsigned GetNumberOfNodes() const override final { return m_query_graph->GetNumberOfNodes(); }
unsigned GetNumberOfEdges() const final { return m_query_graph->GetNumberOfEdges(); } unsigned GetNumberOfEdges() const override final { return m_query_graph->GetNumberOfEdges(); }
unsigned GetOutDegree(const NodeID n) const final { return m_query_graph->GetOutDegree(n); } unsigned GetOutDegree(const NodeID n) const override final
{
return m_query_graph->GetOutDegree(n);
}
NodeID GetTarget(const EdgeID e) const final { return m_query_graph->GetTarget(e); } NodeID GetTarget(const EdgeID e) const override final { return m_query_graph->GetTarget(e); }
EdgeDataT &GetEdgeData(const EdgeID e) const final { return m_query_graph->GetEdgeData(e); } EdgeDataT &GetEdgeData(const EdgeID e) const override final
{
return m_query_graph->GetEdgeData(e);
}
EdgeID BeginEdges(const NodeID n) const final { return m_query_graph->BeginEdges(n); } EdgeID BeginEdges(const NodeID n) const override final { return m_query_graph->BeginEdges(n); }
EdgeID EndEdges(const NodeID n) const final { return m_query_graph->EndEdges(n); } EdgeID EndEdges(const NodeID n) const override final { return m_query_graph->EndEdges(n); }
EdgeRange GetAdjacentEdgeRange(const NodeID node) const final EdgeRange GetAdjacentEdgeRange(const NodeID node) const override final
{ {
return m_query_graph->GetAdjacentEdgeRange(node); return m_query_graph->GetAdjacentEdgeRange(node);
}; };
// searches for a specific edge // searches for a specific edge
EdgeID FindEdge(const NodeID from, const NodeID to) const final EdgeID FindEdge(const NodeID from, const NodeID to) const override final
{ {
return m_query_graph->FindEdge(from, to); return m_query_graph->FindEdge(from, to);
} }
EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const final EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const override final
{ {
return m_query_graph->FindEdgeInEitherDirection(from, to); return m_query_graph->FindEdgeInEitherDirection(from, to);
} }
EdgeID FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const final EdgeID
FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const override final
{ {
return m_query_graph->FindEdgeIndicateIfReverse(from, to, result); return m_query_graph->FindEdgeIndicateIfReverse(from, to, result);
} }
// node and edge information access // node and edge information access
FixedPointCoordinate GetCoordinateOfNode(const NodeID id) const final FixedPointCoordinate GetCoordinateOfNode(const NodeID id) const override final
{ {
return m_coordinate_list->at(id); return m_coordinate_list->at(id);
}; };
virtual bool EdgeIsCompressed(const unsigned id) const final virtual bool EdgeIsCompressed(const unsigned id) const override final
{ {
return m_edge_is_compressed.at(id); return m_edge_is_compressed.at(id);
} }
virtual void GetUncompressedGeometry(const unsigned id, virtual void GetUncompressedGeometry(const unsigned id,
std::vector<unsigned> &result_nodes) const final std::vector<unsigned> &result_nodes) const override final
{ {
const unsigned begin = m_geometry_indices.at(id); const unsigned begin = m_geometry_indices.at(id);
const unsigned end = m_geometry_indices.at(id + 1); const unsigned end = m_geometry_indices.at(id + 1);
@ -339,12 +346,12 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
m_geometry_list.begin() + end); m_geometry_list.begin() + end);
} }
virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const final virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const override final
{ {
return m_via_node_list.at(id); return m_via_node_list.at(id);
} }
TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const final TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const override final
{ {
return m_turn_instruction_list.at(id); return m_turn_instruction_list.at(id);
} }
@ -353,7 +360,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate, bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
FixedPointCoordinate &result, FixedPointCoordinate &result,
const unsigned zoom_level = 18) final const unsigned zoom_level = 18) override final
{ {
if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first) if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
{ {
@ -365,7 +372,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
} }
bool IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate, bool IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
PhantomNode &resulting_phantom_node) final PhantomNode &resulting_phantom_node) override final
{ {
std::vector<PhantomNode> resulting_phantom_node_vector; std::vector<PhantomNode> resulting_phantom_node_vector;
auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate, auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate,
@ -381,7 +388,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
bool bool
IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate, IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
std::vector<PhantomNode> &resulting_phantom_node_vector, std::vector<PhantomNode> &resulting_phantom_node_vector,
const unsigned number_of_results) final const unsigned number_of_results) override final
{ {
if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first) if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
{ {
@ -392,14 +399,14 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
input_coordinate, resulting_phantom_node_vector, number_of_results); input_coordinate, resulting_phantom_node_vector, number_of_results);
} }
unsigned GetCheckSum() const final { return m_check_sum; } unsigned GetCheckSum() const override final { return m_check_sum; }
unsigned GetNameIndexFromEdgeID(const unsigned id) const final unsigned GetNameIndexFromEdgeID(const unsigned id) const override final
{ {
return m_name_ID_list.at(id); return m_name_ID_list.at(id);
}; };
void GetName(const unsigned name_id, std::string &result) const final void GetName(const unsigned name_id, std::string &result) const override final
{ {
if (UINT_MAX == name_id) if (UINT_MAX == name_id)
{ {
@ -417,7 +424,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
} }
} }
std::string GetTimestamp() const final { return m_timestamp; } std::string GetTimestamp() const override final { return m_timestamp; }
}; };
#endif // SHARED_DATAFACADE_HPP #endif // SHARED_DATAFACADE_HPP

4
descriptors/gpx_descriptor.hpp
View File

@ -65,9 +65,9 @@ template <class DataFacadeT> class GPXDescriptor final : public BaseDescriptor<D
public: public:
explicit GPXDescriptor(DataFacadeT *facade) : facade(facade) {} explicit GPXDescriptor(DataFacadeT *facade) : facade(facade) {}
void SetConfig(const DescriptorConfig &c) final { config = c; } virtual void SetConfig(const DescriptorConfig &c) final { config = c; }
void Run(const InternalRouteResult &raw_route, JSON::Object &json_result) final virtual void Run(const InternalRouteResult &raw_route, JSON::Object &json_result) final
{ {
JSON::Array json_route; JSON::Array json_route;
if (raw_route.shortest_path_length != INVALID_EDGE_WEIGHT) if (raw_route.shortest_path_length != INVALID_EDGE_WEIGHT)

4
descriptors/json_descriptor.hpp
View File

@ -77,7 +77,7 @@ template <class DataFacadeT> class JSONDescriptor final : public BaseDescriptor<
{ {
} }
void SetConfig(const DescriptorConfig &c) final { config = c; } void SetConfig(const DescriptorConfig &c) override final { config = c; }
unsigned DescribeLeg(const std::vector<PathData> route_leg, unsigned DescribeLeg(const std::vector<PathData> route_leg,
const PhantomNodes &leg_phantoms, const PhantomNodes &leg_phantoms,
@ -100,7 +100,7 @@ template <class DataFacadeT> class JSONDescriptor final : public BaseDescriptor<
return added_element_count; return added_element_count;
} }
void Run(const InternalRouteResult &raw_route, JSON::Object &json_result) final void Run(const InternalRouteResult &raw_route, JSON::Object &json_result) override final
{ {
if (INVALID_EDGE_WEIGHT == raw_route.shortest_path_length) if (INVALID_EDGE_WEIGHT == raw_route.shortest_path_length)
{ {

5
plugins/distance_table.hpp
View File

@ -65,9 +65,10 @@ template <class DataFacadeT> class DistanceTablePlugin final : public BasePlugin
virtual ~DistanceTablePlugin() {} virtual ~DistanceTablePlugin() {}
const std::string GetDescriptor() const final { return descriptor_string; } const std::string GetDescriptor() const override final { return descriptor_string; }
int HandleRequest(const RouteParameters &route_parameters, JSON::Object &json_result) final int HandleRequest(const RouteParameters &route_parameters,
JSON::Object &json_result) override final
{ {
if (!check_all_coordinates(route_parameters.coordinates)) if (!check_all_coordinates(route_parameters.coordinates))
{ {

5
plugins/hello_world.hpp
View File

@ -45,9 +45,10 @@ class HelloWorldPlugin final : public BasePlugin
public: public:
HelloWorldPlugin() : descriptor_string("hello") {} HelloWorldPlugin() : descriptor_string("hello") {}
virtual ~HelloWorldPlugin() {} virtual ~HelloWorldPlugin() {}
const std::string GetDescriptor() const final { return descriptor_string; } const std::string GetDescriptor() const override final { return descriptor_string; }
int HandleRequest(const RouteParameters &routeParameters, JSON::Object &json_result) final int HandleRequest(const RouteParameters &routeParameters,
JSON::Object &json_result) override final
{ {
std::string temp_string; std::string temp_string;
json_result.values["title"] = "Hello World"; json_result.values["title"] = "Hello World";

5
plugins/locate.hpp
View File

@ -42,9 +42,10 @@ template <class DataFacadeT> class LocatePlugin final : public BasePlugin
{ {
public: public:
explicit LocatePlugin(DataFacadeT *facade) : descriptor_string("locate"), facade(facade) {} explicit LocatePlugin(DataFacadeT *facade) : descriptor_string("locate"), facade(facade) {}
const std::string GetDescriptor() const final { return descriptor_string; } const std::string GetDescriptor() const override final { return descriptor_string; }
int HandleRequest(const RouteParameters &route_parameters, JSON::Object &json_result) final int HandleRequest(const RouteParameters &route_parameters,
JSON::Object &json_result) override final
{ {
// check number of parameters // check number of parameters
if (route_parameters.coordinates.empty() || if (route_parameters.coordinates.empty() ||

5
plugins/nearest.hpp
View File

@ -47,9 +47,10 @@ template <class DataFacadeT> class NearestPlugin final : public BasePlugin
public: public:
explicit NearestPlugin(DataFacadeT *facade) : facade(facade), descriptor_string("nearest") {} explicit NearestPlugin(DataFacadeT *facade) : facade(facade), descriptor_string("nearest") {}
const std::string GetDescriptor() const final { return descriptor_string; } const std::string GetDescriptor() const override final { return descriptor_string; }
int HandleRequest(const RouteParameters &route_parameters, JSON::Object &json_result) final int HandleRequest(const RouteParameters &route_parameters,
JSON::Object &json_result) override final
{ {
// check number of parameters // check number of parameters
if (route_parameters.coordinates.empty() || if (route_parameters.coordinates.empty() ||

5
plugins/timestamp.hpp
View File

@ -43,8 +43,9 @@ template <class DataFacadeT> class TimestampPlugin final : public BasePlugin
: facade(facade), descriptor_string("timestamp") : facade(facade), descriptor_string("timestamp")
{ {
} }
const std::string GetDescriptor() const final { return descriptor_string; } const std::string GetDescriptor() const override final { return descriptor_string; }
int HandleRequest(const RouteParameters &route_parameters, JSON::Object &json_result) final int HandleRequest(const RouteParameters &route_parameters,
JSON::Object &json_result) override final
{ {
json_result.values["status"] = 0; json_result.values["status"] = 0;
const std::string timestamp = facade->GetTimestamp(); const std::string timestamp = facade->GetTimestamp();

5
plugins/viaroute.hpp
View File

@ -69,9 +69,10 @@ template <class DataFacadeT> class ViaRoutePlugin final : public BasePlugin
virtual ~ViaRoutePlugin() {} virtual ~ViaRoutePlugin() {}
const std::string GetDescriptor() const final { return descriptor_string; } const std::string GetDescriptor() const override final { return descriptor_string; }
int HandleRequest(const RouteParameters &route_parameters, JSON::Object &json_result) final int HandleRequest(const RouteParameters &route_parameters,
JSON::Object &json_result) override final
{ {
if (!check_all_coordinates(route_parameters.coordinates)) if (!check_all_coordinates(route_parameters.coordinates))
{ {

56
server/data_structures/internal_datafacade.hpp
View File

@ -46,7 +46,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <osrm/coordinate.hpp> #include <osrm/coordinate.hpp>
#include <osrm/server_paths.hpp> #include <osrm/server_paths.hpp>
template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<EdgeDataT> template <class EdgeDataT> class InternalDataFacade final : public BaseDataFacade<EdgeDataT>
{ {
private: private:
@ -309,52 +309,60 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
} }
// search graph access // search graph access
unsigned GetNumberOfNodes() const final { return m_query_graph->GetNumberOfNodes(); } unsigned GetNumberOfNodes() const override final { return m_query_graph->GetNumberOfNodes(); }
unsigned GetNumberOfEdges() const final { return m_query_graph->GetNumberOfEdges(); } unsigned GetNumberOfEdges() const override final { return m_query_graph->GetNumberOfEdges(); }
unsigned GetOutDegree(const NodeID n) const final { return m_query_graph->GetOutDegree(n); } unsigned GetOutDegree(const NodeID n) const override final
{
return m_query_graph->GetOutDegree(n);
}
NodeID GetTarget(const EdgeID e) const final { return m_query_graph->GetTarget(e); } NodeID GetTarget(const EdgeID e) const override final { return m_query_graph->GetTarget(e); }
// EdgeDataT &GetEdgeData(const EdgeID e) final { return m_query_graph->GetEdgeData(e); } // EdgeDataT &GetEdgeData(const EdgeID e) override final { return m_query_graph->GetEdgeData(e);
// }
EdgeDataT &GetEdgeData(const EdgeID e) const final { return m_query_graph->GetEdgeData(e); } EdgeDataT &GetEdgeData(const EdgeID e) const override final
{
return m_query_graph->GetEdgeData(e);
}
EdgeID BeginEdges(const NodeID n) const final { return m_query_graph->BeginEdges(n); } EdgeID BeginEdges(const NodeID n) const override final { return m_query_graph->BeginEdges(n); }
EdgeID EndEdges(const NodeID n) const final { return m_query_graph->EndEdges(n); } EdgeID EndEdges(const NodeID n) const override final { return m_query_graph->EndEdges(n); }
EdgeRange GetAdjacentEdgeRange(const NodeID node) const final EdgeRange GetAdjacentEdgeRange(const NodeID node) const override final
{ {
return m_query_graph->GetAdjacentEdgeRange(node); return m_query_graph->GetAdjacentEdgeRange(node);
}; };
// searches for a specific edge // searches for a specific edge
EdgeID FindEdge(const NodeID from, const NodeID to) const final EdgeID FindEdge(const NodeID from, const NodeID to) const override final
{ {
return m_query_graph->FindEdge(from, to); return m_query_graph->FindEdge(from, to);
} }
EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const final EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const override final
{ {
return m_query_graph->FindEdgeInEitherDirection(from, to); return m_query_graph->FindEdgeInEitherDirection(from, to);
} }
EdgeID FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const final EdgeID
FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const override final
{ {
return m_query_graph->FindEdgeIndicateIfReverse(from, to, result); return m_query_graph->FindEdgeIndicateIfReverse(from, to, result);
} }
// node and edge information access // node and edge information access
FixedPointCoordinate GetCoordinateOfNode(const unsigned id) const final FixedPointCoordinate GetCoordinateOfNode(const unsigned id) const override final
{ {
return m_coordinate_list->at(id); return m_coordinate_list->at(id);
}; };
bool EdgeIsCompressed(const unsigned id) const { return m_edge_is_compressed.at(id); } bool EdgeIsCompressed(const unsigned id) const { return m_edge_is_compressed.at(id); }
TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const final TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const override final
{ {
return m_turn_instruction_list.at(id); return m_turn_instruction_list.at(id);
} }
@ -363,7 +371,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate, bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
FixedPointCoordinate &result, FixedPointCoordinate &result,
const unsigned zoom_level = 18) final const unsigned zoom_level = 18) override final
{ {
if (!m_static_rtree.get()) if (!m_static_rtree.get())
{ {
@ -375,7 +383,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
} }
bool IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate, bool IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
PhantomNode &resulting_phantom_node) final PhantomNode &resulting_phantom_node) override final
{ {
std::vector<PhantomNode> resulting_phantom_node_vector; std::vector<PhantomNode> resulting_phantom_node_vector;
auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate, auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate,
@ -391,7 +399,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
bool bool
IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate, IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
std::vector<PhantomNode> &resulting_phantom_node_vector, std::vector<PhantomNode> &resulting_phantom_node_vector,
const unsigned number_of_results) final const unsigned number_of_results) override final
{ {
if (!m_static_rtree.get()) if (!m_static_rtree.get())
{ {
@ -402,14 +410,14 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
input_coordinate, resulting_phantom_node_vector, number_of_results); input_coordinate, resulting_phantom_node_vector, number_of_results);
} }
unsigned GetCheckSum() const final { return m_check_sum; } unsigned GetCheckSum() const override final { return m_check_sum; }
unsigned GetNameIndexFromEdgeID(const unsigned id) const final unsigned GetNameIndexFromEdgeID(const unsigned id) const override final
{ {
return m_name_ID_list.at(id); return m_name_ID_list.at(id);
}; };
void GetName(const unsigned name_id, std::string &result) const final void GetName(const unsigned name_id, std::string &result) const override final
{ {
if (UINT_MAX == name_id) if (UINT_MAX == name_id)
{ {
@ -427,13 +435,13 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
} }
} }
virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const final virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const override final
{ {
return m_via_node_list.at(id); return m_via_node_list.at(id);
} }
virtual void GetUncompressedGeometry(const unsigned id, virtual void GetUncompressedGeometry(const unsigned id,
std::vector<unsigned> &result_nodes) const final std::vector<unsigned> &result_nodes) const override final
{ {
const unsigned begin = m_geometry_indices.at(id); const unsigned begin = m_geometry_indices.at(id);
const unsigned end = m_geometry_indices.at(id + 1); const unsigned end = m_geometry_indices.at(id + 1);
@ -443,7 +451,7 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
m_geometry_list.begin() + end); m_geometry_list.begin() + end);
} }
std::string GetTimestamp() const final { return m_timestamp; } std::string GetTimestamp() const override final { return m_timestamp; }
}; };
#endif // INTERNAL_DATAFACADE_HPP #endif // INTERNAL_DATAFACADE_HPP

55
server/data_structures/shared_datafacade.hpp
View File

@ -43,7 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDataT> template <class EdgeDataT> class SharedDataFacade final : public BaseDataFacade<EdgeDataT>
{ {
private: private:
@ -282,54 +282,61 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
} }
// search graph access // search graph access
unsigned GetNumberOfNodes() const final { return m_query_graph->GetNumberOfNodes(); } unsigned GetNumberOfNodes() const override final { return m_query_graph->GetNumberOfNodes(); }
unsigned GetNumberOfEdges() const final { return m_query_graph->GetNumberOfEdges(); } unsigned GetNumberOfEdges() const override final { return m_query_graph->GetNumberOfEdges(); }
unsigned GetOutDegree(const NodeID n) const final { return m_query_graph->GetOutDegree(n); } unsigned GetOutDegree(const NodeID n) const override final
{
return m_query_graph->GetOutDegree(n);
}
NodeID GetTarget(const EdgeID e) const final { return m_query_graph->GetTarget(e); } NodeID GetTarget(const EdgeID e) const override final { return m_query_graph->GetTarget(e); }
EdgeDataT &GetEdgeData(const EdgeID e) const final { return m_query_graph->GetEdgeData(e); } EdgeDataT &GetEdgeData(const EdgeID e) const override final
{
return m_query_graph->GetEdgeData(e);
}
EdgeID BeginEdges(const NodeID n) const final { return m_query_graph->BeginEdges(n); } EdgeID BeginEdges(const NodeID n) const override final { return m_query_graph->BeginEdges(n); }
EdgeID EndEdges(const NodeID n) const final { return m_query_graph->EndEdges(n); } EdgeID EndEdges(const NodeID n) const override final { return m_query_graph->EndEdges(n); }
EdgeRange GetAdjacentEdgeRange(const NodeID node) const final EdgeRange GetAdjacentEdgeRange(const NodeID node) const override final
{ {
return m_query_graph->GetAdjacentEdgeRange(node); return m_query_graph->GetAdjacentEdgeRange(node);
}; };
// searches for a specific edge // searches for a specific edge
EdgeID FindEdge(const NodeID from, const NodeID to) const final EdgeID FindEdge(const NodeID from, const NodeID to) const override final
{ {
return m_query_graph->FindEdge(from, to); return m_query_graph->FindEdge(from, to);
} }
EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const final EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const override final
{ {
return m_query_graph->FindEdgeInEitherDirection(from, to); return m_query_graph->FindEdgeInEitherDirection(from, to);
} }
EdgeID FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const final EdgeID
FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const override final
{ {
return m_query_graph->FindEdgeIndicateIfReverse(from, to, result); return m_query_graph->FindEdgeIndicateIfReverse(from, to, result);
} }
// node and edge information access // node and edge information access
FixedPointCoordinate GetCoordinateOfNode(const NodeID id) const final FixedPointCoordinate GetCoordinateOfNode(const NodeID id) const override final
{ {
return m_coordinate_list->at(id); return m_coordinate_list->at(id);
}; };
virtual bool EdgeIsCompressed(const unsigned id) const final virtual bool EdgeIsCompressed(const unsigned id) const override final
{ {
return m_edge_is_compressed.at(id); return m_edge_is_compressed.at(id);
} }
virtual void GetUncompressedGeometry(const unsigned id, virtual void GetUncompressedGeometry(const unsigned id,
std::vector<unsigned> &result_nodes) const final std::vector<unsigned> &result_nodes) const override final
{ {
const unsigned begin = m_geometry_indices.at(id); const unsigned begin = m_geometry_indices.at(id);
const unsigned end = m_geometry_indices.at(id + 1); const unsigned end = m_geometry_indices.at(id + 1);
@ -339,12 +346,12 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
m_geometry_list.begin() + end); m_geometry_list.begin() + end);
} }
virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const final virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const override final
{ {
return m_via_node_list.at(id); return m_via_node_list.at(id);
} }
TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const final TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const override final
{ {
return m_turn_instruction_list.at(id); return m_turn_instruction_list.at(id);
} }
@ -353,7 +360,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate, bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
FixedPointCoordinate &result, FixedPointCoordinate &result,
const unsigned zoom_level = 18) final const unsigned zoom_level = 18) override final
{ {
if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first) if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
{ {
@ -365,7 +372,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
} }
bool IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate, bool IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
PhantomNode &resulting_phantom_node) final PhantomNode &resulting_phantom_node) override final
{ {
std::vector<PhantomNode> resulting_phantom_node_vector; std::vector<PhantomNode> resulting_phantom_node_vector;
auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate, auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate,
@ -381,7 +388,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
bool bool
IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate, IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
std::vector<PhantomNode> &resulting_phantom_node_vector, std::vector<PhantomNode> &resulting_phantom_node_vector,
const unsigned number_of_results) final const unsigned number_of_results) override final
{ {
if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first) if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
{ {
@ -392,14 +399,14 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
input_coordinate, resulting_phantom_node_vector, number_of_results); input_coordinate, resulting_phantom_node_vector, number_of_results);
} }
unsigned GetCheckSum() const final { return m_check_sum; } unsigned GetCheckSum() const override final { return m_check_sum; }
unsigned GetNameIndexFromEdgeID(const unsigned id) const final unsigned GetNameIndexFromEdgeID(const unsigned id) const override final
{ {
return m_name_ID_list.at(id); return m_name_ID_list.at(id);
}; };
void GetName(const unsigned name_id, std::string &result) const final void GetName(const unsigned name_id, std::string &result) const override final
{ {
if (UINT_MAX == name_id) if (UINT_MAX == name_id)
{ {
@ -417,7 +424,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
} }
} }
std::string GetTimestamp() const final { return m_timestamp; } std::string GetTimestamp() const override final { return m_timestamp; }
}; };
#endif // SHARED_DATAFACADE_HPP #endif // SHARED_DATAFACADE_HPP