Skip to content

backend/enh/additional-fallback-for-rectified-distance-calculation #1064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
H-C-21 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

backend/enh/additional-fallback-for-rectified-distance-calculation #1064

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions lib/mobility-core/src/Kernel/External/Maps/Interface.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ snapToRoadWithFallback entityId mbMapServiceToRectifyDistantPointsFailure includ
logError $ "Snap to road rectification failed with all the configured providers"
return ([], Left "Snap to road rectification failed with all the configured providers")
callSnapToRoadWithRectification mapServiceCfg (preferredProvider : restProviders) = do
mapsConfig <- getProviderConfig preferredProvider
droppedPointsThreshold <- asks (.droppedPointsThreshold)
maxStraightLineRectificationThreshold <- asks (.maxStraightLineRectificationThreshold)
let straightDistancePoints = getEverySnippetWhichIsNot (< droppedPointsThreshold) req.points -- point with dist > 2000
Expand All @@ -261,15 +260,15 @@ snapToRoadWithFallback entityId mbMapServiceToRectifyDistantPointsFailure includ
let (pointsOutOfThreshold, distance) = foldl' (\(accPoints, accDis) (x1, dis) -> (accPoints <> [x1], accDis + dis)) ([], 0) distanceRectified
let splitSnapToRoadCalls = filter (not . (<= 1) . length) $ splitWith pointsOutOfThreshold req.points
logDebug $ "Split snap-to-road calls: " <> show splitSnapToRoadCalls
pointsRes <- withTryCatch "callSnapToRoadWithRectification" $ mapM (\section -> snapToRoad entityId mapsConfig (req {points = section})) splitSnapToRoadCalls
pointsRes <- withTryCatch "callSnapToRoadWithRectification" $ mapM (\section -> snapToRoadWithFallback' (preferredProvider : restProviders) (req {points = section} :: SnapToRoadReq)) splitSnapToRoadCalls
logDebug $ "Snap-to-road results: " <> show pointsRes
case pointsRes of
Right result -> do
let (totalSectorsDistance, snappedPoints) = foldl' (\(accDis, snappedPoints') res -> (res.distance + accDis, snappedPoints' <> res.snappedPoints)) (0, []) result
let snapToRoadResp =
SnapToRoadResp
{ distance = totalSectorsDistance + (if includeRectifiedDistance then distance else 0),
distanceWithUnit = convertHighPrecMetersToDistance req.distanceUnit $ totalSectorsDistance + distance,
distanceWithUnit = convertHighPrecMetersToDistance req.distanceUnit $ totalSectorsDistance + (if includeRectifiedDistance then distance else 0),
confidence = 1,
snappedPoints = snappedPoints
}
Expand All @@ -279,6 +278,28 @@ snapToRoadWithFallback entityId mbMapServiceToRectifyDistantPointsFailure includ
(servicesUsed, snapResponse) <- callSnapToRoadWithRectification mapServiceCfg restProviders
return (servicesUsed ++ [preferredProvider, SelfTuned], snapResponse)

snapToRoadWithFallback' providersList req' = do
case providersList of
[] ->
throwError $ InternalError "Snap to road failed with all the configured providers"
(preferredProvider : restProviders) -> do
confidenceThreshold <- getConfidenceThreshold
mapsConfig <- getProviderConfig preferredProvider
result <- withTryCatch "snapToRoadWithFallback'" $ snapToRoad entityId mapsConfig req'
case result of
Left err -> do
logError $ "Snap to road failed with error' : " <> show err <> " - Provider : " <> show preferredProvider
snapToRoadWithFallback' restProviders req'
Right res ->
if res.confidence < confidenceThreshold
then
if null restProviders
then do
logError $ "Snap to road fallback' confidence threshold not met with all the configured providers"
return res
else snapToRoadWithFallback' restProviders req'
else return res

snapToRoad ::
( EncFlow m r,
CoreMetrics m,
Expand Down