drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-05 20:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[traffxml] Use custom EdgeEstimator for decoding

Browse Source 
Signed-off-by: mvglasow <michael -at- vonglasow.com>
This commit is contained in:
mvglasow
2025-05-26 19:49:36 +03:00
parent 9afb28aaa1
commit f566f6f0ef
3 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
routing/index_router.cpp
View File

@@ -280,7 +280,7 @@ IndexRouter::IndexRouter(VehicleType vehicleType, bool loadAltitudes,
CountryParentNameGetterFn const & countryParentNameGetterFn,
TCountryFileFn const & countryFileFn, CountryRectFn const & countryRectFn,
shared_ptr<NumMwmIds> numMwmIds, unique_ptr<m4::Tree<NumMwmId>> numMwmTree,
DataSource & dataSource)
std::shared_ptr<EdgeEstimator> estimator, DataSource & dataSource)
: m_vehicleType(vehicleType)
, m_loadAltitudes(loadAltitudes)
, m_name("astar-bidirectional-" + ToString(m_vehicleType))
@@ -296,10 +296,7 @@ IndexRouter::IndexRouter(VehicleType vehicleType, bool loadAltitudes,
? IRoadGraph::Mode::IgnoreOnewayTag
: IRoadGraph::Mode::ObeyOnewayTag,
m_vehicleModelFactory)
, m_estimator(EdgeEstimator::Create(
m_vehicleType, CalcMaxSpeed(*m_numMwmIds, *m_vehicleModelFactory, m_vehicleType),
CalcOffroadSpeed(*m_vehicleModelFactory), m_trafficStash,
&dataSource, m_numMwmIds))
, m_estimator(estimator)
, m_directionsEngine(CreateDirectionsEngine(m_vehicleType, m_numMwmIds, m_dataSource))
, m_countryParentNameGetterFn(countryParentNameGetterFn)
{

15
routing/index_router.hpp
View File

@@ -110,9 +110,15 @@ protected:
/**
* @brief Creates a new `IndexRouter` instance.
*
* This constructor is intended for use by the TraFF decoder, not for normal routing. It lacks the
* `TrafficCache` argument and never creates a traffic stash. This creates a router instance which
* ignores the traffic situation, regardless of the vehicle type.
* This constructor is intended for use by the TraFF decoder, not for normal routing. It differs
* from the general-purpose constructor in two ways.
*
* It takes an explicit `EdgeEstimator` argument, instance, which gives the caller fine-grained
* control over the cost calculations used for routing by supplying an `EdgeEstimator` of their
* choice.
*
* It also lacks the `TrafficCache` argument and never creates a traffic stash. This creates a
* router instance which ignores the traffic situation, regardless of the vehicle type.
*
* @param vehicleType The vehichle type
* @param loadAltitudes Whether to load altitudes
@@ -121,13 +127,14 @@ protected:
* @param countryRectFn Function which returns the rect for a country
* @param numMwmIds
* @param numMwmTree
* @param estimator An edge estimator
* @param dataSource The MWM data source
*/
IndexRouter(VehicleType vehicleType, bool loadAltitudes,
CountryParentNameGetterFn const & countryParentNameGetterFn,
TCountryFileFn const & countryFileFn, CountryRectFn const & countryRectFn,
std::shared_ptr<NumMwmIds> numMwmIds, std::unique_ptr<m4::Tree<NumMwmId>> numMwmTree,
DataSource & dataSource);
std::shared_ptr<EdgeEstimator> estimator, DataSource & dataSource);
private:
RouterResultCode CalculateSubrouteJointsMode(IndexGraphStarter & starter,