Skip to content

Integrates RouteOptions#toBuilder #2416

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

Merged
LukasPaczos merged 1 commit into from
Jan 24, 2020
Merged

Integrates RouteOptions#toBuilder #2416

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ext {
version = [
mapboxMapSdk : '8.5.1',
mapboxSdkServices : '5.1.0-SNAPSHOT',
mapboxSdkDirectionsModels : '5.1.0-SNAPSHOT',
mapboxSdkDirectionsModels : '5.1.0-20200123.133519-5',
mapboxEvents : '4.5.1',
mapboxCore : '1.3.0',
mapboxNavigator : '9.0.2',
Expand Down
39 changes: 0 additions & 39 deletions libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import com.mapbox.annotation.navigation.module.MapboxNavigationModuleType
import com.mapbox.api.directions.v5.models.DirectionsRoute
import com.mapbox.api.directions.v5.models.RouteOptions
import com.mapbox.geojson.Point
import com.mapbox.navigation.base.extensions.applyDefaultParams
import com.mapbox.navigation.base.extensions.bearings
import com.mapbox.navigation.base.extensions.ifNonNull
import com.mapbox.navigation.base.options.NavigationOptions
Expand Down Expand Up @@ -315,41 +314,3 @@ class MapboxNavigation(
private const val DEFAULT_REROUTE_BEARING_TOLERANCE = 90.0
}
}

private fun RouteOptions.toBuilder(): RouteOptions.Builder {
val builder = RouteOptions.builder()
.applyDefaultParams()
.accessToken(this.accessToken())
.alternatives(this.alternatives())
.annotations(this.annotations())
.approaches(this.approaches())
.bannerInstructions(this.bannerInstructions())
.baseUrl(this.baseUrl())
.bearings(this.bearings())
.continueStraight(this.continueStraight())
.coordinates(this.coordinates())
.geometries(this.geometries())
.language(this.language())
.overview(this.overview())
.profile(this.profile())
.radiuses(this.radiuses())
.requestUuid(this.requestUuid())
.roundaboutExits(this.roundaboutExits())
.steps(this.steps())
.user(this.user())
.voiceInstructions(this.voiceInstructions())
.voiceUnits(this.voiceUnits())
.waypointIndices(this.waypointIndices())
.waypointNames(this.waypointNames())
.waypointTargets(this.waypointTargets())

// todo fix mapbox-java annotation
this.exclude()?.let {
builder.exclude(it)
}
this.walkingOptions()?.let {
builder.walkingOptions(it)
}

return builder
}