[traffxml] Remove openlr dependency, disable OpenLrV3TraffDecoder

Signed-off-by: mvglasow <michael -at- vonglasow.com>
This commit is contained in:
mvglasow
2025-07-25 17:25:17 +03:00
parent a25602dbe0
commit bebac8d8a7
5 changed files with 12 additions and 3 deletions

View File

@@ -17,7 +17,6 @@ omim_add_library(${PROJECT_NAME} ${SRC})
target_link_libraries(${PROJECT_NAME}
pugixml
openlr
coding
)

View File

@@ -22,7 +22,6 @@ omim_add_executable(${PROJECT_NAME} ${SRC})
set_target_properties(${PROJECT_NAME} PROPERTIES AUTOUIC ON AUTOMOC ON)
target_link_libraries(${PROJECT_NAME}
openlr
qt_common
map
gflags::gflags

View File

@@ -7,9 +7,12 @@
#include "indexer/feature.hpp"
// Only needed for OpenlrTraffDecoder, see below
#if 0
#include "openlr/decoded_path.hpp"
#include "openlr/openlr_decoder.hpp"
#include "openlr/openlr_model.hpp"
#endif
#include "routing/async_router.hpp"
#include "routing/checkpoints.hpp"
@@ -236,6 +239,8 @@ void TraffDecoder::DecodeMessage(traffxml::TraffMessage & message)
}
}
// Disabled for now, as the OpenLR-based decoder is slow, buggy and not well suited to the task.
#if 0
OpenLrV3TraffDecoder::OpenLrV3TraffDecoder(DataSource & dataSource, CountryInfoGetterFn countryInfoGetter,
const CountryParentNameGetterFn & countryParentNameGetter,
std::map<std::string, TraffMessage> & messageCache)
@@ -451,6 +456,7 @@ void OpenLrV3TraffDecoder::DecodeLocation(traffxml::TraffMessage & message, traf
decoded[paths[i].m_path[j].GetFeatureId().m_mwmId][traffic::TrafficInfo::RoadSegmentId(fid, segment, direction)] = traffic::SpeedGroup::Unknown;
}
}
#endif
double RoutingTraffDecoder::TraffEstimator::GetUTurnPenalty(Purpose /* purpose */) const
{

View File

@@ -5,8 +5,11 @@
#include "indexer/data_source.hpp"
#include "indexer/mwm_set.hpp"
// Only needed for OpenlrTraffDecoder, see below
#if 0
#include "openlr/openlr_decoder.hpp"
#include "openlr/openlr_model.hpp"
#endif
#include "routing/index_router.hpp"
#include "routing/regions_decl.hpp"
@@ -85,6 +88,8 @@ protected:
private:
};
// Disabled for now, as the OpenLR-based decoder is slow, buggy and not well suited to the task.
#if 0
/**
* @brief A `TraffDecoder` implementation which internally uses the version 3 OpenLR decoder.
*/
@@ -170,6 +175,7 @@ private:
*/
openlr::OpenLRDecoder m_openLrDecoder;
};
#endif
/**
* @brief A `TraffDecoder` implementation which internally uses the routing engine.