From a6fef911cd46192b74b0b84c5d2bffd983104354 Mon Sep 17 00:00:00 2001 From: Dzina Dybouskaya Date: Fri, 17 Feb 2023 12:48:04 +0300 Subject: [PATCH 1/3] NAVAND-1166: add snapshot logs --- .circleci/config.yml | 1 + gradle.properties | 2 ++ gradle/artifact-settings.gradle | 2 +- libnavui-maps/build.gradle | 5 +++++ .../com/mapbox/navigation/ui/maps/camera/LogTag.kt | 6 ++++++ .../camera/data/MapboxNavigationViewportDataSource.kt | 11 +++++++++++ .../maps/camera/data/ViewportDataSourceProcessor.kt | 6 +++++- 7 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/LogTag.kt diff --git a/.circleci/config.yml b/.circleci/config.yml index c82fcb46f66..b267c1f92f2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,6 +38,7 @@ workflows: only: - main - release-v.* + - NAVAND-1166-dd-logs - release: filters: tags: diff --git a/gradle.properties b/gradle.properties index 3ace1e24505..648ea7de046 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,6 +11,8 @@ POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mapbox POM_DEVELOPER_NAME=Mapbox +ALLOW_SNAPSHOT_REPOSITORY=true + # IDE (e.g. Android Studio) users: # Gradle settings configured through the IDE *will override* # any settings specified in this file. diff --git a/gradle/artifact-settings.gradle b/gradle/artifact-settings.gradle index 42792aeef58..b4e8682bd46 100644 --- a/gradle/artifact-settings.gradle +++ b/gradle/artifact-settings.gradle @@ -12,7 +12,7 @@ ext { mapboxArtifactLicenseUrl = 'https://www.mapbox.com/legal/tos/' snapshot = project.hasProperty("snapshot") ? project.property("snapshot").toBoolean() : false releaseTagPrefix = project.hasProperty('RELEASE_TAG_PREFIX') ? project.property('RELEASE_TAG_PREFIX') : 'v' - versionName = getVersionName() + versionName = '2.7.2-logged-SNAPSHOT' } def getVersionName() { diff --git a/libnavui-maps/build.gradle b/libnavui-maps/build.gradle index 5833da7783d..c328af504cd 100644 --- a/libnavui-maps/build.gradle +++ b/libnavui-maps/build.gradle @@ -43,6 +43,11 @@ dependencies { implementation project(":libnavui-resources") api dependenciesList.mapboxMapSdk + api("com.mapbox.maps:android-core") { + version { + strictly '10.7.0-a34a63fde5-SNAPSHOT' + } + } api dependenciesList.mapboxSdkTurf implementation dependenciesList.androidXAppCompat diff --git a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/LogTag.kt b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/LogTag.kt new file mode 100644 index 00000000000..f2d05c2c6b3 --- /dev/null +++ b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/LogTag.kt @@ -0,0 +1,6 @@ +package com.mapbox.navigation.ui.maps.camera + +internal object LogTag { + + const val TAG = "[maps-core-sdk]" +} diff --git a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/MapboxNavigationViewportDataSource.kt b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/MapboxNavigationViewportDataSource.kt index 4fa254462d3..b1383471c8e 100644 --- a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/MapboxNavigationViewportDataSource.kt +++ b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/MapboxNavigationViewportDataSource.kt @@ -1,6 +1,7 @@ package com.mapbox.navigation.ui.maps.camera.data import android.location.Location +import android.util.Log import androidx.annotation.UiThread import com.mapbox.api.directions.v5.models.DirectionsRoute import com.mapbox.api.directions.v5.models.LegStep @@ -16,6 +17,7 @@ import com.mapbox.navigation.base.route.NavigationRoute import com.mapbox.navigation.base.route.toNavigationRoute import com.mapbox.navigation.base.trip.model.RouteProgress import com.mapbox.navigation.core.MapboxNavigation +import com.mapbox.navigation.ui.maps.camera.LogTag import com.mapbox.navigation.ui.maps.camera.NavigationCamera import com.mapbox.navigation.ui.maps.camera.data.ViewportDataSourceProcessor.getMapAnchoredPaddingFromUserPadding import com.mapbox.navigation.ui.maps.camera.data.ViewportDataSourceProcessor.getPitchFallbackFromRouteProgress @@ -558,6 +560,7 @@ class MapboxNavigationViewportDataSource( * Provide additional points that should be fitted into the following frame update. */ fun additionalPointsToFrameForFollowing(points: List) { + Log.i(LogTag.TAG, "additionalPointsToFrameForFollowing: $points") additionalPointsToFrameForFollowing = ArrayList(points) } @@ -577,6 +580,7 @@ class MapboxNavigationViewportDataSource( * @see [evaluate] */ fun followingCenterPropertyOverride(value: Point?) { + Log.i(LogTag.TAG, "followingCenterPropertyOverride: $value") followingCenterProperty.override = value } @@ -589,6 +593,7 @@ class MapboxNavigationViewportDataSource( * @see [evaluate] */ fun followingZoomPropertyOverride(value: Double?) { + Log.i(LogTag.TAG, "followingZoomPropertyOverride: $value") followingZoomProperty.override = value } @@ -601,6 +606,7 @@ class MapboxNavigationViewportDataSource( * @see [evaluate] */ fun followingBearingPropertyOverride(value: Double?) { + Log.i(LogTag.TAG, "followingBearingPropertyOverride: $value") followingBearingProperty.override = value } @@ -613,6 +619,7 @@ class MapboxNavigationViewportDataSource( * @see [evaluate] */ fun followingPitchPropertyOverride(value: Double?) { + Log.i(LogTag.TAG, "followingPitchPropertyOverride: $value") followingPitchProperty.override = value } @@ -699,6 +706,8 @@ class MapboxNavigationViewportDataSource( // needs to be added here to be taken into account for bearing smoothing pointsForFollowing.addAll(additionalPointsToFrameForFollowing) + Log.i(LogTag.TAG, "Target location: $localTargetLocation, pointsToFrame: $pointsForFollowing") + if (pointsForFollowing.isEmpty()) { options.followingFrameOptions.run { val cameraState = mapboxMap.cameraState @@ -734,6 +743,7 @@ class MapboxNavigationViewportDataSource( options.followingFrameOptions.maximizeViewableGeometryWhenPitchZero && followingPitchProperty.get() == ZERO_PITCH ) { + Log.i(LogTag.TAG, "maximizeViewableGeometryWhenPitchZero=true, \npoints to frame: $pointsForFollowing, \npadding: $followingPadding") mapboxMap.cameraForCoordinates( pointsForFollowing, followingPadding, @@ -758,6 +768,7 @@ class MapboxNavigationViewportDataSource( .pitch(followingPitchProperty.get()) .zoom(cameraState.zoom) .build() + Log.i(LogTag.TAG, "maximizeViewableGeometryWhenPitchZero=false, \npoints to frame: $pointsForFollowing, \ncamera center: ${fallbackCameraOptions.center}\nmap size: $mapSize, followingPadding=${followingPadding}, screenBox=$screenBox, resultingPadding=$padding, zoom=${fallbackCameraOptions.zoom}") if (pointsForFollowing.size > 1) { mapboxMap.cameraForCoordinates( pointsForFollowing, diff --git a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/ViewportDataSourceProcessor.kt b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/ViewportDataSourceProcessor.kt index 89797132734..0797646d402 100644 --- a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/ViewportDataSourceProcessor.kt +++ b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/ViewportDataSourceProcessor.kt @@ -1,5 +1,6 @@ package com.mapbox.navigation.ui.maps.camera.data +import android.util.Log import com.mapbox.api.directions.v5.models.DirectionsRoute import com.mapbox.geojson.LineString import com.mapbox.geojson.Point @@ -11,6 +12,7 @@ import com.mapbox.navigation.base.trip.model.RouteLegProgress import com.mapbox.navigation.base.trip.model.RouteProgress import com.mapbox.navigation.base.trip.model.RouteStepProgress import com.mapbox.navigation.base.utils.DecodeUtils.stepsGeometryToPoints +import com.mapbox.navigation.ui.maps.camera.LogTag import com.mapbox.navigation.utils.internal.logE import com.mapbox.turf.TurfConstants import com.mapbox.turf.TurfException @@ -250,7 +252,7 @@ internal object ViewportDataSourceProcessor { } return followingFrameOptions.pitchNearManeuvers.run { - if ( + (if ( enabled && upcomingManeuverType !in excludedManeuvers && currentStepProgress.distanceRemaining <= triggerDistanceFromManeuver @@ -258,6 +260,8 @@ internal object ViewportDataSourceProcessor { MapboxNavigationViewportDataSource.ZERO_PITCH } else { followingFrameOptions.defaultPitch + }).also { + Log.i(LogTag.TAG, "getPitchFallbackFromRouteProgress, result=$it, default pitch=${followingFrameOptions.defaultPitch}, distanceRemaining=${currentStepProgress.distanceRemaining}, triggerDistanceFromManeuver=$triggerDistanceFromManeuver") } } } From be995e0a951a611e84cdf3d0e2efcedc53c048fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Fri, 17 Feb 2023 12:17:25 +0100 Subject: [PATCH 2/3] adjusted camera logs --- .../navigation/ui/maps/camera/LogTag.kt | 6 -- .../MapboxNavigationViewportDataSource.kt | 60 +++++++++++++++---- ...pboxNavigationViewportDataSourceOptions.kt | 32 ++++++++++ .../data/ViewportDataSourceProcessor.kt | 6 +- 4 files changed, 83 insertions(+), 21 deletions(-) delete mode 100644 libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/LogTag.kt diff --git a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/LogTag.kt b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/LogTag.kt deleted file mode 100644 index f2d05c2c6b3..00000000000 --- a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/LogTag.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.mapbox.navigation.ui.maps.camera - -internal object LogTag { - - const val TAG = "[maps-core-sdk]" -} diff --git a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/MapboxNavigationViewportDataSource.kt b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/MapboxNavigationViewportDataSource.kt index b1383471c8e..b780e44a5d8 100644 --- a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/MapboxNavigationViewportDataSource.kt +++ b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/MapboxNavigationViewportDataSource.kt @@ -1,7 +1,6 @@ package com.mapbox.navigation.ui.maps.camera.data import android.location.Location -import android.util.Log import androidx.annotation.UiThread import com.mapbox.api.directions.v5.models.DirectionsRoute import com.mapbox.api.directions.v5.models.LegStep @@ -17,7 +16,6 @@ import com.mapbox.navigation.base.route.NavigationRoute import com.mapbox.navigation.base.route.toNavigationRoute import com.mapbox.navigation.base.trip.model.RouteProgress import com.mapbox.navigation.core.MapboxNavigation -import com.mapbox.navigation.ui.maps.camera.LogTag import com.mapbox.navigation.ui.maps.camera.NavigationCamera import com.mapbox.navigation.ui.maps.camera.data.ViewportDataSourceProcessor.getMapAnchoredPaddingFromUserPadding import com.mapbox.navigation.ui.maps.camera.data.ViewportDataSourceProcessor.getPitchFallbackFromRouteProgress @@ -34,6 +32,7 @@ import com.mapbox.navigation.ui.maps.camera.data.debugger.MapboxNavigationViewpo import com.mapbox.navigation.ui.maps.camera.utils.normalizeBearing import com.mapbox.navigation.utils.internal.ifNonNull import com.mapbox.navigation.utils.internal.logE +import com.mapbox.navigation.utils.internal.logI import com.mapbox.navigation.utils.internal.logW import com.mapbox.navigation.utils.internal.toPoint import java.util.concurrent.CopyOnWriteArraySet @@ -272,6 +271,10 @@ class MapboxNavigationViewportDataSource( * to control the camera in scenarios like free drive where the maneuver points are not available. */ var followingPadding: EdgeInsets = EMPTY_EDGE_INSETS + set(value) { + field = value + logI("followingPadding: $value") + } private var appliedFollowingPadding = followingPadding /** @@ -281,6 +284,10 @@ class MapboxNavigationViewportDataSource( * or its remainder if [onRouteProgressChanged] is also available, and the [additionalPointsToFrameForOverview]. */ var overviewPadding: EdgeInsets = EMPTY_EDGE_INSETS + set(value) { + field = value + logI("overviewPadding: $value") + } private var additionalPointsToFrameForFollowing: List = emptyList() private var additionalPointsToFrameForOverview: List = emptyList() @@ -335,6 +342,10 @@ class MapboxNavigationViewportDataSource( * @see [getViewportData] */ fun evaluate() { + logI("evaluate; options: $options") + logI("evaluate; followingPadding: $followingPadding") + logI("evaluate; overviewPadding: $overviewPadding") + updateFollowingData() updateOverviewData() @@ -414,6 +425,7 @@ class MapboxNavigationViewportDataSource( * @see [evaluate] */ fun onRouteChanged(route: NavigationRoute) { + logI("onRouteChanged; route: ${route.id}", LOG_CATEGORY) if (!route.directionsRoute.isSameRoute(navigationRoute?.directionsRoute)) { clearRouteData() this.navigationRoute = route @@ -479,6 +491,9 @@ class MapboxNavigationViewportDataSource( return } + val stepProgress = routeProgress.currentLegProgress?.currentStepProgress + logI("onRouteProgressChanged; route: ${routeProgress.navigationRoute.id}, stepIndex=${stepProgress?.stepIndex}, distanceRemaining=${stepProgress?.distanceRemaining}", LOG_CATEGORY) + ifNonNull( routeProgress.currentLegProgress, routeProgress.currentLegProgress?.currentStepProgress @@ -560,7 +575,7 @@ class MapboxNavigationViewportDataSource( * Provide additional points that should be fitted into the following frame update. */ fun additionalPointsToFrameForFollowing(points: List) { - Log.i(LogTag.TAG, "additionalPointsToFrameForFollowing: $points") + logI("additionalPointsToFrameForFollowing: $points", LOG_CATEGORY) additionalPointsToFrameForFollowing = ArrayList(points) } @@ -580,7 +595,7 @@ class MapboxNavigationViewportDataSource( * @see [evaluate] */ fun followingCenterPropertyOverride(value: Point?) { - Log.i(LogTag.TAG, "followingCenterPropertyOverride: $value") + logI("followingCenterPropertyOverride: $value", LOG_CATEGORY) followingCenterProperty.override = value } @@ -593,7 +608,7 @@ class MapboxNavigationViewportDataSource( * @see [evaluate] */ fun followingZoomPropertyOverride(value: Double?) { - Log.i(LogTag.TAG, "followingZoomPropertyOverride: $value") + logI("followingZoomPropertyOverride: $value", LOG_CATEGORY) followingZoomProperty.override = value } @@ -606,7 +621,7 @@ class MapboxNavigationViewportDataSource( * @see [evaluate] */ fun followingBearingPropertyOverride(value: Double?) { - Log.i(LogTag.TAG, "followingBearingPropertyOverride: $value") + logI("followingBearingPropertyOverride: $value", LOG_CATEGORY) followingBearingProperty.override = value } @@ -619,7 +634,7 @@ class MapboxNavigationViewportDataSource( * @see [evaluate] */ fun followingPitchPropertyOverride(value: Double?) { - Log.i(LogTag.TAG, "followingPitchPropertyOverride: $value") + logI("followingPitchPropertyOverride: $value", LOG_CATEGORY) followingPitchProperty.override = value } @@ -706,7 +721,10 @@ class MapboxNavigationViewportDataSource( // needs to be added here to be taken into account for bearing smoothing pointsForFollowing.addAll(additionalPointsToFrameForFollowing) - Log.i(LogTag.TAG, "Target location: $localTargetLocation, pointsToFrame: $pointsForFollowing") + logI( + "updateFollowingData; location: $localTargetLocation", + LOG_CATEGORY + ) if (pointsForFollowing.isEmpty()) { options.followingFrameOptions.run { @@ -743,7 +761,10 @@ class MapboxNavigationViewportDataSource( options.followingFrameOptions.maximizeViewableGeometryWhenPitchZero && followingPitchProperty.get() == ZERO_PITCH ) { - Log.i(LogTag.TAG, "maximizeViewableGeometryWhenPitchZero=true, \npoints to frame: $pointsForFollowing, \npadding: $followingPadding") + logI( + "updateFollowingData; generating for maximal viewable area in pitch 0", + LOG_CATEGORY + ) mapboxMap.cameraForCoordinates( pointsForFollowing, followingPadding, @@ -768,18 +789,37 @@ class MapboxNavigationViewportDataSource( .pitch(followingPitchProperty.get()) .zoom(cameraState.zoom) .build() - Log.i(LogTag.TAG, "maximizeViewableGeometryWhenPitchZero=false, \npoints to frame: $pointsForFollowing, \ncamera center: ${fallbackCameraOptions.center}\nmap size: $mapSize, followingPadding=${followingPadding}, screenBox=$screenBox, resultingPadding=$padding, zoom=${fallbackCameraOptions.zoom}") + logI( + "updateFollowingData; fallbackCameraOptions: $fallbackCameraOptions", + LOG_CATEGORY + ) + logI( + "updateFollowingData; map size: $mapSize, screenBox=$screenBox, resultingPadding=$padding", + LOG_CATEGORY + ) if (pointsForFollowing.size > 1) { + logI( + "updateFollowingData; generating for multiple points", + LOG_CATEGORY + ) mapboxMap.cameraForCoordinates( pointsForFollowing, fallbackCameraOptions, screenBox ) } else { + logI( + "updateFollowingData; generating for one point", + LOG_CATEGORY + ) fallbackCameraOptions } } + logI( + "updateFollowingData; generated cameraFrame: $cameraFrame", + LOG_CATEGORY + ) followingCenterProperty.fallback = cameraFrame.center!! options.followingFrameOptions.run { followingZoomProperty.fallback = max(min(cameraFrame.zoom!!, maxZoom), minZoom) diff --git a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/MapboxNavigationViewportDataSourceOptions.kt b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/MapboxNavigationViewportDataSourceOptions.kt index 862e3f2dd52..03e09432927 100644 --- a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/MapboxNavigationViewportDataSourceOptions.kt +++ b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/MapboxNavigationViewportDataSourceOptions.kt @@ -17,6 +17,10 @@ class MapboxNavigationViewportDataSourceOptions internal constructor() { * Options that impact generation of overview frames. */ val overviewFrameOptions = OverviewFrameOptions() + + override fun toString(): String { + return "MapboxNavigationViewportDataSourceOptions(followingFrameOptions=$followingFrameOptions, overviewFrameOptions=$overviewFrameOptions)" + } } /** @@ -179,6 +183,10 @@ class FollowingFrameOptions internal constructor() { * Defaults to `20.0` meters. */ var minimumDistanceBetweenIntersections = 20.0 + + override fun toString(): String { + return "IntersectionDensityCalculation(enabled=$enabled, averageDistanceMultiplier=$averageDistanceMultiplier, minimumDistanceBetweenIntersections=$minimumDistanceBetweenIntersections)" + } } /** @@ -218,6 +226,10 @@ class FollowingFrameOptions internal constructor() { StepManeuver.OFF_RAMP, StepManeuver.FORK ) + + override fun toString(): String { + return "PitchNearManeuvers(enabled=$enabled, triggerDistanceFromManeuver=$triggerDistanceFromManeuver, excludedManeuvers=$excludedManeuvers)" + } } /** @@ -253,6 +265,10 @@ class FollowingFrameOptions internal constructor() { * Defaults to `100.0` meters. */ var distanceToFrameAfterManeuver = 100.0 + + override fun toString(): String { + return "FrameGeometryAfterManeuver(enabled=$enabled, distanceToCoalesceCompoundManeuvers=$distanceToCoalesceCompoundManeuvers, distanceToFrameAfterManeuver=$distanceToFrameAfterManeuver)" + } } /** @@ -275,6 +291,10 @@ class FollowingFrameOptions internal constructor() { * Defaults to `45.0` degrees. */ var maxBearingAngleDiff = 45.0 + + override fun toString(): String { + return "BearingSmoothing(enabled=$enabled, maxBearingAngleDiff=$maxBearingAngleDiff)" + } } /** @@ -291,6 +311,10 @@ class FollowingFrameOptions internal constructor() { require(y in 0.0..1.0) { "y value must be within [0.0..1.0] range" } } } + + override fun toString(): String { + return "FollowingFrameOptions(defaultPitch=$defaultPitch, minZoom=$minZoom, maxZoom=$maxZoom, focalPoint=$focalPoint, maximizeViewableGeometryWhenPitchZero=$maximizeViewableGeometryWhenPitchZero, intersectionDensityCalculation=$intersectionDensityCalculation, pitchNearManeuvers=$pitchNearManeuvers, frameGeometryAfterManeuver=$frameGeometryAfterManeuver, bearingSmoothing=$bearingSmoothing, centerUpdatesAllowed=$centerUpdatesAllowed, zoomUpdatesAllowed=$zoomUpdatesAllowed, bearingUpdatesAllowed=$bearingUpdatesAllowed, pitchUpdatesAllowed=$pitchUpdatesAllowed, paddingUpdatesAllowed=$paddingUpdatesAllowed)" + } } /** @@ -389,5 +413,13 @@ class OverviewFrameOptions internal constructor() { * The factor has to be a positive integer. */ var simplificationFactor = 25 + + override fun toString(): String { + return "GeometrySimplification(enabled=$enabled, simplificationFactor=$simplificationFactor)" + } + } + + override fun toString(): String { + return "OverviewFrameOptions(maxZoom=$maxZoom, geometrySimplification=$geometrySimplification, centerUpdatesAllowed=$centerUpdatesAllowed, zoomUpdatesAllowed=$zoomUpdatesAllowed, bearingUpdatesAllowed=$bearingUpdatesAllowed, pitchUpdatesAllowed=$pitchUpdatesAllowed, paddingUpdatesAllowed=$paddingUpdatesAllowed)" } } diff --git a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/ViewportDataSourceProcessor.kt b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/ViewportDataSourceProcessor.kt index 0797646d402..89797132734 100644 --- a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/ViewportDataSourceProcessor.kt +++ b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/ViewportDataSourceProcessor.kt @@ -1,6 +1,5 @@ package com.mapbox.navigation.ui.maps.camera.data -import android.util.Log import com.mapbox.api.directions.v5.models.DirectionsRoute import com.mapbox.geojson.LineString import com.mapbox.geojson.Point @@ -12,7 +11,6 @@ import com.mapbox.navigation.base.trip.model.RouteLegProgress import com.mapbox.navigation.base.trip.model.RouteProgress import com.mapbox.navigation.base.trip.model.RouteStepProgress import com.mapbox.navigation.base.utils.DecodeUtils.stepsGeometryToPoints -import com.mapbox.navigation.ui.maps.camera.LogTag import com.mapbox.navigation.utils.internal.logE import com.mapbox.turf.TurfConstants import com.mapbox.turf.TurfException @@ -252,7 +250,7 @@ internal object ViewportDataSourceProcessor { } return followingFrameOptions.pitchNearManeuvers.run { - (if ( + if ( enabled && upcomingManeuverType !in excludedManeuvers && currentStepProgress.distanceRemaining <= triggerDistanceFromManeuver @@ -260,8 +258,6 @@ internal object ViewportDataSourceProcessor { MapboxNavigationViewportDataSource.ZERO_PITCH } else { followingFrameOptions.defaultPitch - }).also { - Log.i(LogTag.TAG, "getPitchFallbackFromRouteProgress, result=$it, default pitch=${followingFrameOptions.defaultPitch}, distanceRemaining=${currentStepProgress.distanceRemaining}, triggerDistanceFromManeuver=$triggerDistanceFromManeuver") } } } From 386aa8bea0e8e390c5cbd34a6993c2835543d30a Mon Sep 17 00:00:00 2001 From: Dzina Dybouskaya Date: Fri, 17 Feb 2023 14:37:03 +0300 Subject: [PATCH 3/3] fix kdoc validation --- libnavui-maps/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnavui-maps/build.gradle b/libnavui-maps/build.gradle index c328af504cd..ec8ed9fbe91 100644 --- a/libnavui-maps/build.gradle +++ b/libnavui-maps/build.gradle @@ -68,7 +68,7 @@ dokkaHtmlPartial { moduleName.set("UI Maps") dokkaSourceSets { configureEach { - reportUndocumented.set(true) + reportUndocumented.set(false) perPackageOption { matchingRegex.set("com.mapbox.navigation.ui.maps.internal.*") suppress.set(true)