drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-07 21:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[traffxml] Remove openlr dependency, disable OpenLrV3TraffDecoder

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

1
qt/CMakeLists.txt
View File

@@ -70,7 +70,6 @@ target_link_libraries(${PROJECT_NAME}
qt_common qt_common
map map
gflags::gflags gflags::gflags
openlr
traffxml traffxml
) )

1
traffxml/CMakeLists.txt
View File

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

1
traffxml/traff_assessment_tool/CMakeLists.txt
View File

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

6
traffxml/traff_decoder.cpp
View File

@@ -7,9 +7,12 @@
#include "indexer/feature.hpp" #include "indexer/feature.hpp"
// Only needed for OpenlrTraffDecoder, see below
#if 0
#include "openlr/decoded_path.hpp" #include "openlr/decoded_path.hpp"
#include "openlr/openlr_decoder.hpp" #include "openlr/openlr_decoder.hpp"
#include "openlr/openlr_model.hpp" #include "openlr/openlr_model.hpp"
#endif
#include "routing/async_router.hpp" #include "routing/async_router.hpp"
#include "routing/checkpoints.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, OpenLrV3TraffDecoder::OpenLrV3TraffDecoder(DataSource & dataSource, CountryInfoGetterFn countryInfoGetter,
const CountryParentNameGetterFn & countryParentNameGetter, const CountryParentNameGetterFn & countryParentNameGetter,
std::map<std::string, TraffMessage> & messageCache) 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; 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 double RoutingTraffDecoder::TraffEstimator::GetUTurnPenalty(Purpose /* purpose */) const
{ {

6
traffxml/traff_decoder.hpp
View File

@@ -5,8 +5,11 @@
#include "indexer/data_source.hpp" #include "indexer/data_source.hpp"
#include "indexer/mwm_set.hpp" #include "indexer/mwm_set.hpp"
// Only needed for OpenlrTraffDecoder, see below
#if 0
#include "openlr/openlr_decoder.hpp" #include "openlr/openlr_decoder.hpp"
#include "openlr/openlr_model.hpp" #include "openlr/openlr_model.hpp"
#endif
#include "routing/index_router.hpp" #include "routing/index_router.hpp"
#include "routing/regions_decl.hpp" #include "routing/regions_decl.hpp"
@@ -85,6 +88,8 @@ protected:
private: 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. * @brief A `TraffDecoder` implementation which internally uses the version 3 OpenLR decoder.
*/ */
@@ -170,6 +175,7 @@ private:
*/ */
openlr::OpenLRDecoder m_openLrDecoder; openlr::OpenLRDecoder m_openLrDecoder;
}; };
#endif
/** /**
* @brief A `TraffDecoder` implementation which internally uses the routing engine. * @brief A `TraffDecoder` implementation which internally uses the routing engine.