drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-20 05:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[routing] Relaxed roundabout skip turns check (driveway, parking_aisle).

Browse Source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako
2025-06-29 18:31:43 -03:00
committed by Konstantin Pastbin
parent 014b54b1f7
commit effc8ba5d1
8 changed files with 129 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
routing/turns_generator_utils.cpp
View File

@@ -1,8 +1,11 @@
#include "routing/turns_generator_utils.hpp"
#include "platform/measurement_utils.hpp"
#include "geometry/mercator.hpp"
#include "routing/turns.hpp"
#include "platform/measurement_utils.hpp"
#include "geometry/mercator.hpp"
namespace routing
{
namespace turns
@@ -19,7 +22,9 @@ bool IsHighway(HighwayClass hwClass, bool isLink)
bool IsSmallRoad(HighwayClass hwClass)
{
return hwClass == HighwayClass::LivingStreet ||
hwClass == HighwayClass::Service || hwClass == HighwayClass::Pedestrian;
hwClass == HighwayClass::Service ||
hwClass == HighwayClass::ServiceMinor ||
hwClass == HighwayClass::Pedestrian;
}
int CalcDiffRoadClasses(HighwayClass const left, HighwayClass const right)
@@ -120,7 +125,8 @@ double CalcEstimatedTimeToPass(double const distanceMeters, HighwayClass const h
case HighwayClass::Secondary: speedKmph = 70.0; break;
case HighwayClass::Tertiary: speedKmph = 50.0; break;
case HighwayClass::LivingStreet: speedKmph = 20.0; break;
case HighwayClass::Service: speedKmph = 10.0; break;
case HighwayClass::Service:
case HighwayClass::ServiceMinor: speedKmph = 10.0; break;
case HighwayClass::Pedestrian: speedKmph = 5.0; break;
default: speedKmph = 50.0; break;
}