1- #ifndef OSRM_EXTRACTOR_PREDATAFACADE_STRING_VIEWER_HPP
2- #define OSRM_EXTRACTOR_PREDATAFACADE_STRING_VIEWER_HPP
1+ #ifndef OSRM_EXTRACTOR_STRING_TABLE_HPP
2+ #define OSRM_EXTRACTOR_STRING_TABLE_HPP
33
44#include " util/indexed_data.hpp"
55#include " util/typedefs.hpp"
@@ -12,20 +12,20 @@ namespace osrm::extractor
1212
1313namespace detail
1414{
15- template <storage::Ownership Ownership> class PreDatafacadeStringViewerImpl ;
15+ template <storage::Ownership Ownership> class StringTableImpl ;
1616} // namespace detail
1717
1818namespace serialization
1919{
2020template <storage::Ownership Ownership>
2121inline void read (storage::tar::FileReader &reader,
2222 const std::string &name,
23- detail::PreDatafacadeStringViewerImpl <Ownership> &index_data);
23+ detail::StringTableImpl <Ownership> &index_data);
2424
2525template <storage::Ownership Ownership>
2626inline void write (storage::tar::FileWriter &writer,
2727 const std::string &name,
28- const detail::PreDatafacadeStringViewerImpl <Ownership> &index_data);
28+ const detail::StringTableImpl <Ownership> &index_data);
2929} // namespace serialization
3030
3131namespace detail
@@ -44,17 +44,17 @@ namespace detail
4444//
4545// Offset 0 is name, 1 is destination, 2 is pronunciation, 3 is ref, 4 is exits
4646// See datafacades and extractor callbacks for details.
47- template <storage::Ownership Ownership> class PreDatafacadeStringViewerImpl
47+ template <storage::Ownership Ownership> class StringTableImpl
4848{
4949 public:
5050 using IndexedData =
5151 util::detail::IndexedDataImpl<util::VariableGroupBlock<16 , std::string_view>, Ownership>;
5252 using ResultType = typename IndexedData::ResultType;
5353 using ValueType = typename IndexedData::ValueType;
5454
55- PreDatafacadeStringViewerImpl () {}
55+ StringTableImpl () {}
5656
57- PreDatafacadeStringViewerImpl (IndexedData indexed_data_) : indexed_data{std::move (indexed_data_)} {}
57+ StringTableImpl (IndexedData indexed_data_) : indexed_data{std::move (indexed_data_)} {}
5858
5959 std::string_view GetNameForID (const StringViewID id) const
6060 {
@@ -100,23 +100,25 @@ template <storage::Ownership Ownership> class PreDatafacadeStringViewerImpl
100100
101101 friend void serialization::read<Ownership>(storage::tar::FileReader &reader,
102102 const std::string &name,
103- PreDatafacadeStringViewerImpl &index_data);
103+ StringTableImpl &index_data);
104104
105105 friend void serialization::write<Ownership>(storage::tar::FileWriter &writer,
106106 const std::string &name,
107- const PreDatafacadeStringViewerImpl &index_data);
107+ const StringTableImpl &index_data);
108108
109109 private:
110110 IndexedData indexed_data;
111111};
112112} // namespace detail
113113
114- using PreDatafacadeStringViewer = detail::PreDatafacadeStringViewerImpl <storage::Ownership::Container>;
115- using PreDatafacadeStringViewerView = detail::PreDatafacadeStringViewerImpl <storage::Ownership::View>;
114+ using StringTable = detail::StringTableImpl <storage::Ownership::Container>;
115+ using StringTableView = detail::StringTableImpl <storage::Ownership::View>;
116116
117117// Backwards compatibility aliases (deprecated)
118- using NameTable = PreDatafacadeStringViewer;
119- using NameTableView = PreDatafacadeStringViewerView;
118+ using NameTable = StringTable;
119+ using NameTableView = StringTableView;
120+ using PreDatafacadeStringViewer = StringTable;
121+ using PreDatafacadeStringViewerView = StringTableView;
120122} // namespace osrm::extractor
121123
122- #endif // OSRM_EXTRACTOR_PREDATAFACADE_STRING_VIEWER_HPP
124+ #endif // OSRM_EXTRACTOR_STRING_TABLE_HPP
0 commit comments