drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-26 07:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[routing] OSM tag based time and turn penalties

Browse Source 
Signed-off-by: Henry Sternberg <dev@bluelightmaps.com>
Co-Authored-By: eisa01 <eisa01@gmail.com>
Co-Authored-By: x7z4w <x7z4w@noreply.codeberg.org>
Co-Authored-By: Yannik Bloscheck <git@yannikbloscheck.com>
This commit is contained in:
Henry Sternberg
2025-07-28 17:48:44 +01:00
committed by x7z4w
parent daf2a7d8e7
commit c59b63d784
29 changed files with 1301 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
libs/routing/index_graph_loader.cpp
View File

@@ -5,6 +5,8 @@
#include "routing/restriction_loader.hpp"
#include "routing/road_access.hpp"
#include "routing/road_access_serialization.hpp"
#include "routing/road_penalty.hpp"
#include "routing/road_penalty_serialization.hpp"
#include "routing/route.hpp"
#include "routing/speed_camera_ser_des.hpp"
@@ -138,7 +140,7 @@ IndexGraphLoaderImpl::GraphPtrT IndexGraphLoaderImpl::CreateIndexGraph(NumMwmId
geometry = make_shared<Geometry>(GeometryLoader::Create(handle, std::move(vehicleModel), m_loadAltitudes));
}
auto graph = make_unique<IndexGraph>(geometry, m_estimator, m_avoidRoutingOptions);
auto graph = make_unique<IndexGraph>(geometry, m_estimator, m_avoidRoutingOptions, &value->GetRegionData());
graph->SetCurrentTimeGetter(m_currentTimeGetter);
DeserializeIndexGraph(*value, m_vehicleType, *graph);
@@ -209,6 +211,40 @@ bool ReadRoadAccessFromMwm(MwmValue const & mwmValue, VehicleType vehicleType, R
return false;
}
bool ReadRoadPenaltyFromMwm(MwmValue const & mwmValue, VehicleType vehicleType, RoadPenalty & roadPenalty)
{
try
{
auto const reader = mwmValue.m_cont.GetReader(ROAD_PENALTY_FILE_TAG);
ReaderSource src(reader);
// Read number of vehicle types
uint32_t numVehicleTypes = ReadPrimitiveFromSource<uint32_t>(src);
CHECK_EQUAL(numVehicleTypes, static_cast<uint32_t>(VehicleType::Count), ());
// Skip to the correct vehicle type
for (uint32_t i = 0; i < static_cast<uint32_t>(vehicleType); ++i)
{
RoadPenalty dummy;
RoadPenaltySerializer::Deserialize(src, dummy, static_cast<VehicleType>(i));
}
// Read the penalty data for this vehicle type
RoadPenaltySerializer::Deserialize(src, roadPenalty, vehicleType);
return true;
}
catch (Reader::OpenException const &)
{
// This is expected for older mwm files - not an error
LOG(LDEBUG, (ROAD_PENALTY_FILE_TAG, "section not found - using legacy penalty system"));
}
catch (Reader::Exception const & e)
{
LOG(LERROR, ("Error while reading", ROAD_PENALTY_FILE_TAG, "section.", e.Msg()));
}
return false;
}
// static
unique_ptr<IndexGraphLoader> IndexGraphLoader::Create(VehicleType vehicleType, bool loadAltitudes,
shared_ptr<VehicleModelFactoryInterface> vehicleModelFactory,
@@ -244,6 +280,10 @@ void DeserializeIndexGraph(MwmValue const & mwmValue, VehicleType vehicleType, I
RoadAccess roadAccess;
if (ReadRoadAccessFromMwm(mwmValue, vehicleType, roadAccess))
graph.SetRoadAccess(std::move(roadAccess));
RoadPenalty roadPenalty;
if (ReadRoadPenaltyFromMwm(mwmValue, vehicleType, roadPenalty))
graph.SetRoadPenalty(std::move(roadPenalty));
}
uint32_t DeserializeIndexGraphNumRoads(MwmValue const & mwmValue, VehicleType vehicleType)