From 39a040f6e8905c96f5fab3bc91b76f32bcf9ddb2 Mon Sep 17 00:00:00 2001 From: Pablo Guardiola Date: Thu, 28 Sep 2017 19:22:56 +0200 Subject: [PATCH 1/5] fix navigation events so that use the correct sdk identifier depending on where they come from (navigation or navigation-ui) (#277) --- navigation/dependencies.gradle | 2 +- .../navigation/ui/v5/NavigationView.java | 6 ++-- .../v5/navigation/MapboxNavigation.java | 29 +++++++++++++++---- .../navigation/MapboxNavigationOptions.java | 10 +++++-- .../navigation/NavigationMetricsWrapper.java | 12 ++++---- 5 files changed, 41 insertions(+), 18 deletions(-) diff --git a/navigation/dependencies.gradle b/navigation/dependencies.gradle index 1500ac62368..c451f057dc1 100644 --- a/navigation/dependencies.gradle +++ b/navigation/dependencies.gradle @@ -17,7 +17,7 @@ ext { dep = [ // mapbox mapboxMapSdk : 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.3', - mapboxServices : 'com.mapbox.mapboxsdk:mapbox-android-services:2.2.4', + mapboxServices : 'com.mapbox.mapboxsdk:mapbox-android-services:2.2.5', locationLayerPlugin : 'com.mapbox.mapboxsdk:mapbox-android-plugin-locationlayer:0.1.0', // unit test diff --git a/navigation/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java b/navigation/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java index a4c5f3aa70d..bf181f46c73 100644 --- a/navigation/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java +++ b/navigation/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java @@ -32,12 +32,12 @@ import com.mapbox.services.android.navigation.ui.v5.voice.NavigationInstructionPlayer; import com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener; import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; +import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants; import com.mapbox.services.android.navigation.v5.navigation.NavigationRoute; import com.mapbox.services.android.navigation.v5.offroute.OffRouteListener; import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.telemetry.MapboxTelemetry; import com.mapbox.services.android.telemetry.location.LocationEngine; import com.mapbox.services.android.telemetry.location.LocationEngineListener; import com.mapbox.services.api.directions.v5.models.DirectionsResponse; @@ -424,8 +424,8 @@ public void onSlide(@NonNull View bottomSheet, float slideOffset) { * Initializes {@link MapboxNavigation} and adds all views that implement listeners. */ private void initNavigation() { - navigation = new MapboxNavigation(this, Mapbox.getAccessToken()); - MapboxTelemetry.getInstance().newUserAgent(BuildConfig.MAPBOX_NAVIGATION_EVENTS_USER_AGENT); + navigation = new MapboxNavigation(this, Mapbox.getAccessToken(), + MapboxNavigationOptions.builder().isFromNavigationUi(true).build()); navigation.addProgressChangeListener(this); navigation.addProgressChangeListener(instructionView); navigation.addProgressChangeListener(summaryBottomSheet); diff --git a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigation.java b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigation.java index a78abd2b49a..5892cf3fcd9 100644 --- a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigation.java +++ b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigation.java @@ -22,6 +22,7 @@ import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; import com.mapbox.services.android.navigation.v5.snap.Snap; import com.mapbox.services.android.navigation.v5.snap.SnapToRoute; +import com.mapbox.services.android.telemetry.MapboxEvent; import com.mapbox.services.android.telemetry.MapboxTelemetry; import com.mapbox.services.android.telemetry.location.LocationEngine; import com.mapbox.services.android.telemetry.location.LocationEnginePriority; @@ -46,7 +47,8 @@ * @since 0.1.0 */ public class MapboxNavigation implements ServiceConnection, ProgressChangeListener { - + private static final String MAPBOX_NAVIGATION_SDK_IDENTIFIER = "mapbox-navigation-android"; + private static final String MAPBOX_NAVIGATION_UI_SDK_IDENTIFIER = "mapbox-navigation-ui-android"; private NavigationEventDispatcher navigationEventDispatcher; private NavigationService navigationService; @@ -60,6 +62,7 @@ public class MapboxNavigation implements ServiceConnection, ProgressChangeListen private Snap snapEngine; private Context context; private boolean isBound; + private boolean isFromNavigationUi = false; /** * Constructs a new instance of this class using the default options. This should be used over @@ -102,6 +105,7 @@ public MapboxNavigation(@NonNull Context context, @NonNull String accessToken, this.accessToken = accessToken; this.context = context; this.options = options; + this.isFromNavigationUi = options.isFromNavigationUi(); initialize(); } @@ -111,10 +115,7 @@ public MapboxNavigation(@NonNull Context context, @NonNull String accessToken, * to prevent users from removing it. */ private void initialize() { - validateAccessToken(accessToken); - MapboxTelemetry.getInstance().initialize(context, accessToken, - BuildConfig.MAPBOX_NAVIGATION_EVENTS_USER_AGENT); - NavigationMetricsWrapper.turnstileEvent(); + initializeTelemetry(); // Initialize event dispatcher and add internal listeners navigationEventDispatcher = new NavigationEventDispatcher(); @@ -138,6 +139,24 @@ private void initialize() { } } + private void initializeTelemetry() { + validateAccessToken(accessToken); + String sdkIdentifier = MAPBOX_NAVIGATION_SDK_IDENTIFIER; + if (isFromNavigationUi) { + sdkIdentifier = MAPBOX_NAVIGATION_UI_SDK_IDENTIFIER; + } + String userAgent = String.format("%s/%s", sdkIdentifier, BuildConfig.MAPBOX_NAVIGATION_VERSION_NAME); + MapboxTelemetry.getInstance().initialize(context, accessToken, userAgent, sdkIdentifier, + BuildConfig.MAPBOX_NAVIGATION_VERSION_NAME); + MapboxTelemetry.getInstance().newUserAgent(userAgent); + + NavigationMetricsWrapper.sdkIdentifier = sdkIdentifier; + NavigationMetricsWrapper.turnstileEvent(); + // TODO This should be removed when we figure out a solution in Telemetry + // Force pushing a TYPE_MAP_LOAD event to ensure that the Nav turnstile event is sent + MapboxTelemetry.getInstance().pushEvent(MapboxEvent.buildMapLoadEvent()); + } + /** * Runtime validation of access token. * diff --git a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationOptions.java b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationOptions.java index d3a5f054d0e..1c5aa10b5cc 100644 --- a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationOptions.java +++ b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationOptions.java @@ -3,7 +3,6 @@ import com.google.auto.value.AutoValue; /** - * * Immutable and can't be changed after passing into {@link MapboxNavigation}. */ @AutoValue @@ -35,6 +34,8 @@ public abstract class MapboxNavigationOptions { public abstract double metersRemainingTillArrival(); + public abstract boolean isFromNavigationUi(); + @AutoValue.Builder public abstract static class Builder { @@ -54,7 +55,7 @@ public abstract static class Builder { public abstract Builder defaultMilestonesEnabled(boolean defaultMilestonesEnabled); - public abstract Builder snapToRoute(boolean snapToRoute); + public abstract Builder snapToRoute(boolean snapToRoute); public abstract Builder enableOffRouteDetection(boolean enableOffRouteDetection); @@ -64,6 +65,8 @@ public abstract static class Builder { public abstract Builder metersRemainingTillArrival(double metersRemainingTillArrival); + public abstract Builder isFromNavigationUi(boolean isFromNavigationUi); + public abstract MapboxNavigationOptions build(); } @@ -81,6 +84,7 @@ public static Builder builder() { .manuallyEndNavigationUponCompletion(false) .defaultMilestonesEnabled(true) .metersRemainingTillArrival(NavigationConstants.METERS_REMAINING_TILL_ARRIVAL) - .enableNotification(true); + .enableNotification(true) + .isFromNavigationUi(false); } } diff --git a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMetricsWrapper.java b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMetricsWrapper.java index 5972595503f..ac1df6316bd 100644 --- a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMetricsWrapper.java +++ b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMetricsWrapper.java @@ -8,6 +8,7 @@ import com.mapbox.services.android.telemetry.navigation.MapboxNavigationEvent; class NavigationMetricsWrapper { + static String sdkIdentifier; private NavigationMetricsWrapper() { // Empty private constructor for preventing initialization of this class. @@ -15,7 +16,7 @@ private NavigationMetricsWrapper() { static void arriveEvent(SessionState sessionState, RouteProgress routeProgress, Location location) { MapboxTelemetry.getInstance().pushEvent(MapboxNavigationEvent.buildArriveEvent( - BuildConfig.MAPBOX_NAVIGATION_SDK_IDENTIFIER, BuildConfig.MAPBOX_NAVIGATION_VERSION_NAME, + sdkIdentifier, BuildConfig.MAPBOX_NAVIGATION_VERSION_NAME, sessionState.sessionIdentifier(), location.getLatitude(), location.getLongitude(), sessionState.currentGeometry(), "unknown", (int) routeProgress.directionsRoute().getDistance(), @@ -23,7 +24,7 @@ static void arriveEvent(SessionState sessionState, RouteProgress routeProgress, sessionState.rerouteCount(), sessionState.startTimestamp(), (int) (sessionState.previousRouteDistancesCompleted() + routeProgress.distanceTraveled()), (int) routeProgress.distanceRemaining(), (int) routeProgress.durationRemaining(), - sessionState.mockLocation(),null, null, + sessionState.mockLocation(), null, null, sessionState.originalGeometry(), sessionState.originalDistance(), sessionState.originalDuration(), null, sessionState.currentStepCount(), sessionState.originalStepCount() @@ -32,7 +33,7 @@ static void arriveEvent(SessionState sessionState, RouteProgress routeProgress, static void cancelEvent(SessionState sessionState, RouteProgress routeProgress, Location location) { MapboxTelemetry.getInstance().pushEvent(MapboxNavigationEvent.buildCancelEvent( - BuildConfig.MAPBOX_NAVIGATION_SDK_IDENTIFIER, BuildConfig.MAPBOX_NAVIGATION_VERSION_NAME, + sdkIdentifier, BuildConfig.MAPBOX_NAVIGATION_VERSION_NAME, sessionState.sessionIdentifier(), location.getLatitude(), location.getLongitude(), sessionState.currentGeometry(), "unknown", @@ -50,7 +51,7 @@ static void cancelEvent(SessionState sessionState, RouteProgress routeProgress, static void departEvent(SessionState sessionState, RouteProgress routeProgress, Location location) { MapboxTelemetry.getInstance().pushEvent(MapboxNavigationEvent.buildDepartEvent( - BuildConfig.MAPBOX_NAVIGATION_SDK_IDENTIFIER, BuildConfig.MAPBOX_NAVIGATION_VERSION_NAME, + sdkIdentifier, BuildConfig.MAPBOX_NAVIGATION_VERSION_NAME, sessionState.sessionIdentifier(), location.getLatitude(), location.getLongitude(), sessionState.currentGeometry(), "unknown", (int) routeProgress.directionsRoute().getDistance(), @@ -65,8 +66,7 @@ static void departEvent(SessionState sessionState, RouteProgress routeProgress, static void turnstileEvent() { MapboxTelemetry.getInstance().setCustomTurnstileEvent( - MapboxNavigationEvent.buildTurnstileEvent(BuildConfig.APPLICATION_ID, - BuildConfig.MAPBOX_NAVIGATION_VERSION_NAME) + MapboxNavigationEvent.buildTurnstileEvent(sdkIdentifier, BuildConfig.MAPBOX_NAVIGATION_VERSION_NAME) ); } } From 76f27c13b93d3fa29ffca90359b68b0a230c9cdf Mon Sep 17 00:00:00 2001 From: Dan Nesfeder Date: Thu, 28 Sep 2017 15:47:30 -0400 Subject: [PATCH 2/5] 0.6.1 Release (#283) * 0.6.1 Release * Revert release branch / update change log --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b044375ddb..6d777bad76b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ Mapbox welcomes participation and contributions from everyone. +### v0.6.1 - September 28, 2017 +* Telemetry Updates + ### v0.6.0 - September 21, 2017 * First iteration of the Navigation UI * Optimized Navigation features which were causing slowdowns on long steps - [219](https://github.com/mapbox/mapbox-navigation-android/pull/219) From 36feb74c5cd490f9a959be20d54f18fb700046a2 Mon Sep 17 00:00:00 2001 From: Langston Smith Date: Fri, 29 Sep 2017 06:59:37 -0700 Subject: [PATCH 3/5] readme bump to 0.6.1 (#282) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 79ca02c2f44..937784eed12 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The snippet to add to your `build.gradle` file to use this SDK is the following: ``` // Mapbox Navigation SDK for Android -compile 'com.mapbox.mapboxsdk:mapbox-android-navigation:0.6.0' +compile 'com.mapbox.mapboxsdk:mapbox-android-navigation:0.6.1' ``` From a895b4c9abc7617dae104b65f1a10aad68e6f8ad Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Fri, 29 Sep 2017 16:52:54 -0400 Subject: [PATCH 4/5] removed OSRM-Text-Instructions (#288) --- .../navigation/v5/osrm/TextInstructions.java | 286 --------------- .../v5/osrm/TokenizedInstructionHook.java | 10 - .../v5/osrm/TextInstructionsFixtures.java | 331 ------------------ .../v5/osrm/TextInstructionsTest.java | 175 --------- .../src/test/res/osrm/v5/arrive/left.json | 19 - .../test/res/osrm/v5/arrive/no_modifier.json | 18 - .../src/test/res/osrm/v5/arrive/right.json | 19 - .../test/res/osrm/v5/arrive/sharp_left.json | 19 - .../test/res/osrm/v5/arrive/sharp_right.json | 19 - .../test/res/osrm/v5/arrive/slight_left.json | 19 - .../test/res/osrm/v5/arrive/slight_right.json | 19 - .../src/test/res/osrm/v5/arrive/straight.json | 19 - .../src/test/res/osrm/v5/arrive/uturn.json | 19 - .../res/osrm/v5/continue/left_default.json | 19 - .../osrm/v5/continue/left_destination.json | 20 -- .../test/res/osrm/v5/continue/left_name.json | 19 - .../res/osrm/v5/continue/right_default.json | 19 - .../osrm/v5/continue/right_destination.json | 20 -- .../test/res/osrm/v5/continue/right_name.json | 19 - .../osrm/v5/continue/sharp_left_default.json | 19 - .../v5/continue/sharp_left_destination.json | 20 -- .../res/osrm/v5/continue/sharp_left_name.json | 19 - .../osrm/v5/continue/sharp_right_default.json | 19 - .../v5/continue/sharp_right_destination.json | 20 -- .../osrm/v5/continue/sharp_right_name.json | 19 - .../osrm/v5/continue/slight_left_default.json | 19 - .../v5/continue/slight_left_destination.json | 20 -- .../osrm/v5/continue/slight_left_name.json | 19 - .../v5/continue/slight_right_default.json | 19 - .../v5/continue/slight_right_destination.json | 20 -- .../osrm/v5/continue/slight_right_name.json | 19 - .../osrm/v5/continue/straight_default.json | 19 - .../v5/continue/straight_destination.json | 20 -- .../res/osrm/v5/continue/straight_name.json | 19 - .../res/osrm/v5/continue/uturn_default.json | 19 - .../osrm/v5/continue/uturn_destination.json | 20 -- .../test/res/osrm/v5/continue/uturn_name.json | 19 - .../src/test/res/osrm/v5/depart/east_110.json | 19 - .../src/test/res/osrm/v5/depart/east_70.json | 19 - .../res/osrm/v5/depart/modifier_default.json | 20 -- .../osrm/v5/depart/modifier_destination.json | 21 -- .../res/osrm/v5/depart/modifier_name.json | 20 -- .../src/test/res/osrm/v5/depart/north_20.json | 19 - .../test/res/osrm/v5/depart/north_340.json | 19 - .../test/res/osrm/v5/depart/northeast_21.json | 19 - .../test/res/osrm/v5/depart/northeast_69.json | 19 - .../res/osrm/v5/depart/northwest_291.json | 19 - .../res/osrm/v5/depart/northwest_339.json | 19 - .../test/res/osrm/v5/depart/south_160.json | 19 - .../test/res/osrm/v5/depart/south_200.json | 19 - .../res/osrm/v5/depart/southeast_111.json | 19 - .../res/osrm/v5/depart/southeast_159.json | 19 - .../res/osrm/v5/depart/southwest_201.json | 19 - .../res/osrm/v5/depart/southwest_249.json | 19 - .../src/test/res/osrm/v5/depart/west_250.json | 19 - .../src/test/res/osrm/v5/depart/west_290.json | 19 - .../res/osrm/v5/end_of_road/left_default.json | 19 - .../osrm/v5/end_of_road/left_destination.json | 20 -- .../res/osrm/v5/end_of_road/left_name.json | 19 - .../osrm/v5/end_of_road/right_default.json | 19 - .../v5/end_of_road/right_destination.json | 20 -- .../res/osrm/v5/end_of_road/right_name.json | 19 - .../v5/end_of_road/sharp_left_default.json | 19 - .../end_of_road/sharp_left_destination.json | 20 -- .../osrm/v5/end_of_road/sharp_left_name.json | 19 - .../v5/end_of_road/sharp_right_default.json | 19 - .../end_of_road/sharp_right_destination.json | 20 -- .../osrm/v5/end_of_road/sharp_right_name.json | 19 - .../v5/end_of_road/slight_left_default.json | 19 - .../end_of_road/slight_left_destination.json | 20 -- .../osrm/v5/end_of_road/slight_left_name.json | 19 - .../v5/end_of_road/slight_right_default.json | 19 - .../end_of_road/slight_right_destination.json | 20 -- .../v5/end_of_road/slight_right_name.json | 19 - .../osrm/v5/end_of_road/straight_default.json | 19 - .../v5/end_of_road/straight_destination.json | 20 -- .../osrm/v5/end_of_road/straight_name.json | 19 - .../osrm/v5/end_of_road/uturn_default.json | 19 - .../v5/end_of_road/uturn_destination.json | 20 -- .../res/osrm/v5/end_of_road/uturn_name.json | 19 - .../test/res/osrm/v5/fork/left_default.json | 19 - .../res/osrm/v5/fork/left_destination.json | 20 -- .../src/test/res/osrm/v5/fork/left_name.json | 19 - .../test/res/osrm/v5/fork/right_default.json | 19 - .../res/osrm/v5/fork/right_destination.json | 20 -- .../src/test/res/osrm/v5/fork/right_name.json | 19 - .../res/osrm/v5/fork/sharp_left_default.json | 19 - .../osrm/v5/fork/sharp_left_destination.json | 20 -- .../res/osrm/v5/fork/sharp_left_name.json | 19 - .../res/osrm/v5/fork/sharp_right_default.json | 19 - .../osrm/v5/fork/sharp_right_destination.json | 20 -- .../res/osrm/v5/fork/sharp_right_name.json | 19 - .../res/osrm/v5/fork/slight_left_default.json | 19 - .../osrm/v5/fork/slight_left_destination.json | 20 -- .../res/osrm/v5/fork/slight_left_name.json | 19 - .../osrm/v5/fork/slight_right_default.json | 19 - .../v5/fork/slight_right_destination.json | 20 -- .../res/osrm/v5/fork/slight_right_name.json | 19 - .../res/osrm/v5/fork/straight_default.json | 19 - .../osrm/v5/fork/straight_destination.json | 20 -- .../test/res/osrm/v5/fork/straight_name.json | 19 - .../test/res/osrm/v5/fork/uturn_default.json | 19 - .../res/osrm/v5/fork/uturn_destination.json | 20 -- .../src/test/res/osrm/v5/fork/uturn_name.json | 19 - .../test/res/osrm/v5/merge/left_default.json | 19 - .../res/osrm/v5/merge/left_destination.json | 20 -- .../src/test/res/osrm/v5/merge/left_name.json | 19 - .../test/res/osrm/v5/merge/right_default.json | 19 - .../res/osrm/v5/merge/right_destination.json | 20 -- .../test/res/osrm/v5/merge/right_name.json | 19 - .../res/osrm/v5/merge/sharp_left_default.json | 19 - .../osrm/v5/merge/sharp_left_destination.json | 20 -- .../res/osrm/v5/merge/sharp_left_name.json | 19 - .../osrm/v5/merge/sharp_right_default.json | 19 - .../v5/merge/sharp_right_destination.json | 20 -- .../res/osrm/v5/merge/sharp_right_name.json | 19 - .../osrm/v5/merge/slight_left_default.json | 19 - .../v5/merge/slight_left_destination.json | 20 -- .../res/osrm/v5/merge/slight_left_name.json | 19 - .../osrm/v5/merge/slight_right_default.json | 19 - .../v5/merge/slight_right_destination.json | 20 -- .../res/osrm/v5/merge/slight_right_name.json | 19 - .../res/osrm/v5/merge/straight_default.json | 19 - .../osrm/v5/merge/straight_destination.json | 20 -- .../test/res/osrm/v5/merge/straight_name.json | 19 - .../test/res/osrm/v5/merge/uturn_default.json | 19 - .../res/osrm/v5/merge/uturn_destination.json | 20 -- .../test/res/osrm/v5/merge/uturn_name.json | 19 - .../res/osrm/v5/modes/driving_turn_left.json | 20 -- .../v5/modes/ferry_fork_left_default.json | 20 -- .../v5/modes/ferry_fork_left_destination.json | 21 -- .../osrm/v5/modes/ferry_fork_left_name.json | 20 -- .../v5/modes/ferry_turn_left_default.json | 20 -- .../v5/modes/ferry_turn_left_destination.json | 21 -- .../osrm/v5/modes/ferry_turn_left_name.json | 20 -- .../res/osrm/v5/new_name/left_default.json | 19 - .../osrm/v5/new_name/left_destination.json | 20 -- .../test/res/osrm/v5/new_name/left_name.json | 19 - .../res/osrm/v5/new_name/right_default.json | 19 - .../osrm/v5/new_name/right_destination.json | 20 -- .../test/res/osrm/v5/new_name/right_name.json | 19 - .../osrm/v5/new_name/sharp_left_default.json | 19 - .../v5/new_name/sharp_left_destination.json | 20 -- .../res/osrm/v5/new_name/sharp_left_name.json | 19 - .../osrm/v5/new_name/sharp_right_default.json | 19 - .../v5/new_name/sharp_right_destination.json | 20 -- .../osrm/v5/new_name/sharp_right_name.json | 19 - .../osrm/v5/new_name/slight_left_default.json | 19 - .../v5/new_name/slight_left_destination.json | 20 -- .../osrm/v5/new_name/slight_left_name.json | 19 - .../v5/new_name/slight_right_default.json | 19 - .../v5/new_name/slight_right_destination.json | 20 -- .../osrm/v5/new_name/slight_right_name.json | 19 - .../osrm/v5/new_name/straight_default.json | 19 - .../v5/new_name/straight_destination.json | 20 -- .../res/osrm/v5/new_name/straight_name.json | 19 - .../res/osrm/v5/new_name/uturn_default.json | 19 - .../osrm/v5/new_name/uturn_destination.json | 20 -- .../test/res/osrm/v5/new_name/uturn_name.json | 19 - .../osrm/v5/notification/left_default.json | 19 - .../v5/notification/left_destination.json | 20 -- .../res/osrm/v5/notification/left_name.json | 19 - .../osrm/v5/notification/right_default.json | 19 - .../v5/notification/right_destination.json | 20 -- .../res/osrm/v5/notification/right_name.json | 19 - .../v5/notification/sharp_left_default.json | 19 - .../notification/sharp_left_destination.json | 20 -- .../osrm/v5/notification/sharp_left_name.json | 19 - .../v5/notification/sharp_right_default.json | 19 - .../notification/sharp_right_destination.json | 20 -- .../v5/notification/sharp_right_name.json | 19 - .../v5/notification/slight_left_default.json | 19 - .../notification/slight_left_destination.json | 20 -- .../v5/notification/slight_left_name.json | 19 - .../v5/notification/slight_right_default.json | 19 - .../slight_right_destination.json | 20 -- .../v5/notification/slight_right_name.json | 19 - .../v5/notification/straight_default.json | 19 - .../v5/notification/straight_destination.json | 20 -- .../osrm/v5/notification/straight_name.json | 19 - .../osrm/v5/notification/uturn_default.json | 19 - .../v5/notification/uturn_destination.json | 20 -- .../res/osrm/v5/notification/uturn_name.json | 19 - .../res/osrm/v5/off_ramp/left_default.json | 19 - .../osrm/v5/off_ramp/left_destination.json | 20 -- .../test/res/osrm/v5/off_ramp/left_name.json | 19 - .../res/osrm/v5/off_ramp/right_default.json | 19 - .../osrm/v5/off_ramp/right_destination.json | 20 -- .../test/res/osrm/v5/off_ramp/right_name.json | 19 - .../osrm/v5/off_ramp/sharp_left_default.json | 19 - .../v5/off_ramp/sharp_left_destination.json | 20 -- .../res/osrm/v5/off_ramp/sharp_left_name.json | 19 - .../osrm/v5/off_ramp/sharp_right_default.json | 19 - .../v5/off_ramp/sharp_right_destination.json | 20 -- .../osrm/v5/off_ramp/sharp_right_name.json | 19 - .../osrm/v5/off_ramp/slight_left_default.json | 19 - .../v5/off_ramp/slight_left_destination.json | 20 -- .../osrm/v5/off_ramp/slight_left_name.json | 19 - .../v5/off_ramp/slight_right_default.json | 19 - .../v5/off_ramp/slight_right_destination.json | 20 -- .../osrm/v5/off_ramp/slight_right_name.json | 19 - .../osrm/v5/off_ramp/straight_default.json | 19 - .../v5/off_ramp/straight_destination.json | 20 -- .../res/osrm/v5/off_ramp/straight_name.json | 19 - .../res/osrm/v5/off_ramp/uturn_default.json | 19 - .../osrm/v5/off_ramp/uturn_destination.json | 20 -- .../test/res/osrm/v5/off_ramp/uturn_name.json | 19 - .../res/osrm/v5/on_ramp/left_default.json | 19 - .../res/osrm/v5/on_ramp/left_destination.json | 20 -- .../test/res/osrm/v5/on_ramp/left_name.json | 19 - .../res/osrm/v5/on_ramp/right_default.json | 19 - .../osrm/v5/on_ramp/right_destination.json | 20 -- .../test/res/osrm/v5/on_ramp/right_name.json | 19 - .../osrm/v5/on_ramp/sharp_left_default.json | 19 - .../v5/on_ramp/sharp_left_destination.json | 20 -- .../res/osrm/v5/on_ramp/sharp_left_name.json | 19 - .../osrm/v5/on_ramp/sharp_right_default.json | 19 - .../v5/on_ramp/sharp_right_destination.json | 20 -- .../res/osrm/v5/on_ramp/sharp_right_name.json | 19 - .../osrm/v5/on_ramp/slight_left_default.json | 19 - .../v5/on_ramp/slight_left_destination.json | 20 -- .../res/osrm/v5/on_ramp/slight_left_name.json | 19 - .../osrm/v5/on_ramp/slight_right_default.json | 19 - .../v5/on_ramp/slight_right_destination.json | 20 -- .../osrm/v5/on_ramp/slight_right_name.json | 19 - .../res/osrm/v5/on_ramp/straight_default.json | 19 - .../osrm/v5/on_ramp/straight_destination.json | 20 -- .../res/osrm/v5/on_ramp/straight_name.json | 19 - .../res/osrm/v5/on_ramp/uturn_default.json | 19 - .../osrm/v5/on_ramp/uturn_destination.json | 20 -- .../test/res/osrm/v5/on_ramp/uturn_name.json | 19 - .../test/res/osrm/v5/other/invalid_type.json | 19 - .../test/res/osrm/v5/other/way_name_ref.json | 20 -- .../v5/other/way_name_ref_destinations.json | 21 -- .../v5/other/way_name_ref_mapbox_hack_1.json | 20 -- .../v5/other/way_name_ref_mapbox_hack_2.json | 20 -- .../v5/other/way_name_ref_mapbox_hack_3.json | 20 -- .../res/osrm/v5/other/way_name_ref_name.json | 20 -- .../res/osrm/v5/rotary/default_default.json | 19 - .../osrm/v5/rotary/default_destination.json | 20 -- .../test/res/osrm/v5/rotary/default_name.json | 19 - .../src/test/res/osrm/v5/rotary/exit_10.json | 20 -- .../src/test/res/osrm/v5/rotary/exit_11.json | 20 -- .../res/osrm/v5/rotary/exit_1_default.json | 20 -- .../osrm/v5/rotary/exit_1_destination.json | 21 -- .../test/res/osrm/v5/rotary/exit_1_name.json | 20 -- .../src/test/res/osrm/v5/rotary/exit_2.json | 20 -- .../src/test/res/osrm/v5/rotary/exit_3.json | 20 -- .../src/test/res/osrm/v5/rotary/exit_4.json | 20 -- .../src/test/res/osrm/v5/rotary/exit_5.json | 20 -- .../src/test/res/osrm/v5/rotary/exit_6.json | 20 -- .../src/test/res/osrm/v5/rotary/exit_7.json | 20 -- .../src/test/res/osrm/v5/rotary/exit_8.json | 20 -- .../src/test/res/osrm/v5/rotary/exit_9.json | 20 -- .../test/res/osrm/v5/rotary/name_default.json | 20 -- .../res/osrm/v5/rotary/name_destination.json | 21 -- .../res/osrm/v5/rotary/name_exit_default.json | 21 -- .../osrm/v5/rotary/name_exit_destination.json | 22 -- .../res/osrm/v5/rotary/name_exit_name.json | 21 -- .../test/res/osrm/v5/rotary/name_name.json | 20 -- .../osrm/v5/roundabout/default_default.json | 19 - .../v5/roundabout/default_destination.json | 20 -- .../res/osrm/v5/roundabout/default_name.json | 19 - .../res/osrm/v5/roundabout/exit_default.json | 20 -- .../osrm/v5/roundabout/exit_destination.json | 21 -- .../res/osrm/v5/roundabout/exit_name.json | 20 -- .../osrm/v5/roundabout_turn/left_default.json | 19 - .../v5/roundabout_turn/left_destination.json | 20 -- .../osrm/v5/roundabout_turn/left_name.json | 19 - .../v5/roundabout_turn/right_default.json | 19 - .../v5/roundabout_turn/right_destination.json | 20 -- .../osrm/v5/roundabout_turn/right_name.json | 19 - .../roundabout_turn/sharp_left_default.json | 19 - .../sharp_left_destination.json | 20 -- .../v5/roundabout_turn/sharp_left_name.json | 19 - .../roundabout_turn/sharp_right_default.json | 19 - .../sharp_right_destination.json | 20 -- .../v5/roundabout_turn/sharp_right_name.json | 19 - .../roundabout_turn/slight_left_default.json | 19 - .../slight_left_destination.json | 20 -- .../v5/roundabout_turn/slight_left_name.json | 19 - .../roundabout_turn/slight_right_default.json | 19 - .../slight_right_destination.json | 20 -- .../v5/roundabout_turn/slight_right_name.json | 19 - .../v5/roundabout_turn/straight_default.json | 19 - .../roundabout_turn/straight_destination.json | 20 -- .../v5/roundabout_turn/straight_name.json | 19 - .../v5/roundabout_turn/uturn_default.json | 19 - .../v5/roundabout_turn/uturn_destination.json | 20 -- .../osrm/v5/roundabout_turn/uturn_name.json | 19 - .../test/res/osrm/v5/turn/left_default.json | 19 - .../res/osrm/v5/turn/left_destination.json | 20 -- .../src/test/res/osrm/v5/turn/left_name.json | 19 - .../test/res/osrm/v5/turn/right_default.json | 19 - .../res/osrm/v5/turn/right_destination.json | 20 -- .../src/test/res/osrm/v5/turn/right_name.json | 19 - .../res/osrm/v5/turn/sharp_left_default.json | 19 - .../osrm/v5/turn/sharp_left_destination.json | 20 -- .../res/osrm/v5/turn/sharp_left_name.json | 19 - .../res/osrm/v5/turn/sharp_right_default.json | 19 - .../osrm/v5/turn/sharp_right_destination.json | 20 -- .../res/osrm/v5/turn/sharp_right_name.json | 19 - .../res/osrm/v5/turn/slight_left_default.json | 19 - .../osrm/v5/turn/slight_left_destination.json | 20 -- .../res/osrm/v5/turn/slight_left_name.json | 19 - .../osrm/v5/turn/slight_right_default.json | 19 - .../v5/turn/slight_right_destination.json | 20 -- .../res/osrm/v5/turn/slight_right_name.json | 19 - .../res/osrm/v5/turn/straight_default.json | 19 - .../osrm/v5/turn/straight_destination.json | 20 -- .../test/res/osrm/v5/turn/straight_name.json | 19 - .../test/res/osrm/v5/turn/uturn_default.json | 19 - .../res/osrm/v5/turn/uturn_destination.json | 20 -- .../src/test/res/osrm/v5/turn/uturn_name.json | 19 - .../src/test/res/osrm/v5/use_lane/o.json | 45 --- .../src/test/res/osrm/v5/use_lane/ooo.json | 57 --- .../src/test/res/osrm/v5/use_lane/oooxxo.json | 75 ---- .../src/test/res/osrm/v5/use_lane/oox.json | 57 --- .../src/test/res/osrm/v5/use_lane/ooxx.json | 63 ---- .../src/test/res/osrm/v5/use_lane/oxo.json | 57 --- .../src/test/res/osrm/v5/use_lane/xoo.json | 57 --- .../src/test/res/osrm/v5/use_lane/xox.json | 57 --- .../src/test/res/osrm/v5/use_lane/xxoo.json | 63 ---- .../src/test/res/osrm/v5/use_lane/xxooxx.json | 75 ---- .../src/test/res/osrm/v5/use_lane/xxoxo.json | 69 ---- 325 files changed, 7497 deletions(-) delete mode 100644 navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/osrm/TextInstructions.java delete mode 100644 navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/osrm/TokenizedInstructionHook.java delete mode 100644 navigation/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/osrm/TextInstructionsFixtures.java delete mode 100644 navigation/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/osrm/TextInstructionsTest.java delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/left.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/no_modifier.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/right.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/sharp_left.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/sharp_right.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/slight_left.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/slight_right.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/straight.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/uturn.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/straight_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/straight_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/straight_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/uturn_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/uturn_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/continue/uturn_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/east_110.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/east_70.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/modifier_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/modifier_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/modifier_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/north_20.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/north_340.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northeast_21.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northeast_69.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northwest_291.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northwest_339.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/south_160.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/south_200.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southeast_111.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southeast_159.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southwest_201.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southwest_249.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/west_250.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/depart/west_290.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/straight_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/straight_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/straight_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/uturn_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/uturn_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/uturn_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/straight_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/straight_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/straight_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/uturn_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/uturn_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/fork/uturn_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/straight_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/straight_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/straight_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/uturn_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/uturn_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/merge/uturn_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/modes/driving_turn_left.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_fork_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_fork_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_fork_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_turn_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_turn_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_turn_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/straight_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/straight_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/straight_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/uturn_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/uturn_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/uturn_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/straight_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/straight_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/straight_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/uturn_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/uturn_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/notification/uturn_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/straight_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/straight_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/straight_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/uturn_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/uturn_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/uturn_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/straight_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/straight_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/straight_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/uturn_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/uturn_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/uturn_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/other/invalid_type.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_destinations.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_mapbox_hack_1.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_mapbox_hack_2.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_mapbox_hack_3.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/default_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/default_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/default_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_10.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_11.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_1_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_1_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_1_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_2.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_3.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_4.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_5.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_6.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_7.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_8.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_9.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_exit_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_exit_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_exit_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/default_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/default_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/default_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/exit_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/exit_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/exit_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/straight_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/straight_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/straight_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/uturn_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/uturn_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/uturn_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_left_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_left_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_left_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_right_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_right_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_right_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/straight_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/straight_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/straight_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/uturn_default.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/uturn_destination.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/turn/uturn_name.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/o.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/ooo.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/oooxxo.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/oox.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/ooxx.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/oxo.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xoo.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xox.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xxoo.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xxooxx.json delete mode 100644 navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xxoxo.json diff --git a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/osrm/TextInstructions.java b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/osrm/TextInstructions.java deleted file mode 100644 index d40d55382c6..00000000000 --- a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/osrm/TextInstructions.java +++ /dev/null @@ -1,286 +0,0 @@ -package com.mapbox.services.android.navigation.v5.osrm; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.google.gson.JsonPrimitive; -import com.mapbox.services.Experimental; -import com.mapbox.services.api.directions.v5.models.IntersectionLanes; -import com.mapbox.services.api.directions.v5.models.LegStep; -import com.mapbox.services.commons.utils.TextUtils; - -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * Text instructions from OSRM route responses - *

- * This is an experimental API. Experimental APIs are quickly evolving and - * might change or be removed in minor versions. - * - * @since 0.1.0 - */ -@Experimental -public class TextInstructions { - - private static final Logger logger = Logger.getLogger(TextInstructions.class.getSimpleName()); - - private TokenizedInstructionHook tokenizedInstructionHook; - - private JsonObject rootObject; - private JsonObject versionObject; - - public TextInstructions(String language, String version) { - // Load the resource - String localPath = String.format("translations/%s.json", language); - InputStream resource = getClass().getClassLoader().getResourceAsStream(localPath); - if (resource == null) { - throw new RuntimeException("Translation not found for language: " + language); - } - - // Parse the JSON content - rootObject = new JsonParser().parse(new InputStreamReader(resource)).getAsJsonObject(); - versionObject = rootObject.getAsJsonObject(version); - if (versionObject == null) { - throw new RuntimeException("Version not found for value: " + version); - } - } - - public TokenizedInstructionHook getTokenizedInstructionHook() { - return tokenizedInstructionHook; - } - - public void setTokenizedInstructionHook(TokenizedInstructionHook tokenizedInstructionHook) { - this.tokenizedInstructionHook = tokenizedInstructionHook; - } - - public JsonObject getRootObject() { - return rootObject; - } - - public JsonObject getVersionObject() { - return versionObject; - } - - public static String capitalizeFirstLetter(String text) { - return text.substring(0, 1).toUpperCase() + text.substring(1); - } - - /** - * Transform numbers to their translated ordinalized value - * - * @param number value - * @return translated ordinalized value - */ - public String ordinalize(Integer number) { - try { - return getVersionObject().getAsJsonObject("constants").getAsJsonObject("ordinalize") - .getAsJsonPrimitive(String.valueOf(number)).getAsString(); - } catch (Exception exception) { - return ""; - } - } - - /** - * Transform degrees to their translated compass direction - * - * @param degree value - * @return translated compass direction - */ - public String directionFromDegree(Double degree) { - if (degree == null) { - // step had no bearing_after degree, ignoring - return ""; - } else if (degree >= 0 && degree <= 20) { - return getVersionObject().getAsJsonObject("constants").getAsJsonObject("direction") - .getAsJsonPrimitive("north").getAsString(); - } else if (degree > 20 && degree < 70) { - return getVersionObject().getAsJsonObject("constants").getAsJsonObject("direction") - .getAsJsonPrimitive("northeast").getAsString(); - } else if (degree >= 70 && degree <= 110) { - return getVersionObject().getAsJsonObject("constants").getAsJsonObject("direction") - .getAsJsonPrimitive("east").getAsString(); - } else if (degree > 110 && degree < 160) { - return getVersionObject().getAsJsonObject("constants").getAsJsonObject("direction") - .getAsJsonPrimitive("southeast").getAsString(); - } else if (degree >= 160 && degree <= 200) { - return getVersionObject().getAsJsonObject("constants").getAsJsonObject("direction") - .getAsJsonPrimitive("south").getAsString(); - } else if (degree > 200 && degree < 250) { - return getVersionObject().getAsJsonObject("constants").getAsJsonObject("direction") - .getAsJsonPrimitive("southwest").getAsString(); - } else if (degree >= 250 && degree <= 290) { - return getVersionObject().getAsJsonObject("constants").getAsJsonObject("direction") - .getAsJsonPrimitive("west").getAsString(); - } else if (degree > 290 && degree < 340) { - return getVersionObject().getAsJsonObject("constants").getAsJsonObject("direction") - .getAsJsonPrimitive("northwest").getAsString(); - } else if (degree >= 340 && degree <= 360) { - return getVersionObject().getAsJsonObject("constants").getAsJsonObject("direction") - .getAsJsonPrimitive("north").getAsString(); - } else { - throw new RuntimeException("Degree is invalid: " + degree); - } - } - - /** - * Reduce any lane combination down to a contracted lane diagram - * - * @param step a route step - */ - public String laneConfig(LegStep step) { - if (step.getIntersections() == null - || step.getIntersections().size() == 0 - || step.getIntersections().get(0).getLanes() == null - || step.getIntersections().get(0).getLanes().length == 0) { - throw new RuntimeException("No lanes object"); - } - - StringBuilder config = new StringBuilder(); - Boolean currentLaneValidity = null; - for (IntersectionLanes lane : step.getIntersections().get(0).getLanes()) { - if (currentLaneValidity == null || currentLaneValidity != lane.getValid()) { - if (lane.getValid()) { - config.append("o"); - } else { - config.append("x"); - } - currentLaneValidity = lane.getValid(); - } - } - - return config.toString(); - } - - public String compile(LegStep step) { - if (step.getManeuver() == null) { - throw new RuntimeException("No step maneuver provided."); - } - - String type = step.getManeuver().getType(); - String modifier = step.getManeuver().getModifier(); - String mode = step.getMode(); - - if (TextUtils.isEmpty(type)) { - throw new RuntimeException("Missing step maneuver type."); - } - - if (!type.equals("depart") && !type.equals("arrive") && TextUtils.isEmpty(modifier)) { - throw new RuntimeException("Missing step maneuver modifier."); - } - - if (getVersionObject().getAsJsonObject(type) == null) { - // Log for debugging - logger.log(Level.FINE, "Encountered unknown instruction type: " + type); - - // OSRM specification assumes turn types can be added without - // major version changes. Unknown types are to be treated as - // type `turn` by clients - type = "turn"; - } - - // Use special instructions if available, otherwise `defaultinstruction` - JsonObject instructionObject; - JsonObject modeValue = getVersionObject().getAsJsonObject("modes").getAsJsonObject(mode); - if (modeValue != null) { - instructionObject = modeValue; - } else { - JsonObject modifierValue = getVersionObject().getAsJsonObject(type).getAsJsonObject(modifier); - instructionObject = modifierValue == null - ? getVersionObject().getAsJsonObject(type).getAsJsonObject("default") - : modifierValue; - } - - // Special case handling - JsonPrimitive laneInstruction = null; - switch (type) { - case "use lane": - laneInstruction = getVersionObject().getAsJsonObject("constants") - .getAsJsonObject("lanes").getAsJsonPrimitive(laneConfig(step)); - if (laneInstruction == null) { - // If the lane combination is not found, default to continue straight - instructionObject = getVersionObject().getAsJsonObject("use lane") - .getAsJsonObject("no_lanes"); - } - break; - case "rotary": - case "roundabout": - if (!TextUtils.isEmpty(step.getRotaryName()) - && step.getManeuver().getExit() != null - && instructionObject.getAsJsonObject("name_exit") != null) { - instructionObject = instructionObject.getAsJsonObject("name_exit"); - } else if (step.getRotaryName() != null && instructionObject.getAsJsonObject("name") != null) { - instructionObject = instructionObject.getAsJsonObject("name"); - } else if (step.getManeuver().getExit() != null && instructionObject.getAsJsonObject("exit") != null) { - instructionObject = instructionObject.getAsJsonObject("exit"); - } else { - instructionObject = instructionObject.getAsJsonObject("default"); - } - break; - default: - // NOOP, since no special logic for that type - } - - // Decide way_name with special handling for name and ref - String wayName; - String name = TextUtils.isEmpty(step.getName()) ? "" : step.getName(); - String ref = TextUtils.isEmpty(step.getRef()) ? "" : step.getRef().split(";")[0]; - - // Remove hacks from Mapbox Directions mixing ref into name - if (name.equals(step.getRef())) { - // if both are the same we assume that there used to be an empty name, with the ref being filled in for it - // we only need to retain the ref then - name = ""; - } - name = name.replace(" (" + step.getRef() + ")", ""); - - if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(ref) && !name.equals(ref)) { - wayName = name + " (" + ref + ")"; - } else if (TextUtils.isEmpty(name) && !TextUtils.isEmpty(ref)) { - wayName = ref; - } else { - wayName = name; - } - - // Decide which instruction string to use - // Destination takes precedence over name - String instruction; - if (!TextUtils.isEmpty(step.getDestinations()) - && instructionObject.getAsJsonPrimitive("destination") != null) { - instruction = instructionObject.getAsJsonPrimitive("destination").getAsString(); - } else if (!TextUtils.isEmpty(wayName) - && instructionObject.getAsJsonPrimitive("name") != null) { - instruction = instructionObject.getAsJsonPrimitive("name").getAsString(); - } else { - instruction = instructionObject.getAsJsonPrimitive("default").getAsString(); - } - - if (getTokenizedInstructionHook() != null) { - instruction = getTokenizedInstructionHook().change(instruction); - } - - // Replace tokens - // NOOP if they don't exist - String nthWaypoint = ""; // TODO, add correct waypoint counting - JsonPrimitive modifierValue = - getVersionObject().getAsJsonObject("constants").getAsJsonObject("modifier").getAsJsonPrimitive(modifier); - instruction = instruction - .replace("{way_name}", wayName) - .replace("{destination}", TextUtils.isEmpty(step.getDestinations()) ? "" : step.getDestinations().split(",")[0]) - .replace("{exit_number}", - step.getManeuver().getExit() == null ? ordinalize(1) : ordinalize(step.getManeuver().getExit())) - .replace("{rotary_name}", TextUtils.isEmpty(step.getRotaryName()) ? "" : step.getRotaryName()) - .replace("{lane_instruction}", laneInstruction == null ? "" : laneInstruction.getAsString()) - .replace("{modifier}", modifierValue == null ? "" : modifierValue.getAsString()) - .replace("{direction}", directionFromDegree(step.getManeuver().getBearingAfter())) - .replace("{nth}", nthWaypoint) - .replaceAll("\\s+", " "); // remove excess spaces - - if (getRootObject().getAsJsonObject("meta").getAsJsonPrimitive("capitalizeFirstLetter").getAsBoolean()) { - instruction = capitalizeFirstLetter(instruction); - } - - return instruction; - } -} diff --git a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/osrm/TokenizedInstructionHook.java b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/osrm/TokenizedInstructionHook.java deleted file mode 100644 index ef3713bf148..00000000000 --- a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/osrm/TokenizedInstructionHook.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.mapbox.services.android.navigation.v5.osrm; - -/** - * A function to change the raw instruction string before tokens are replaced. - * Useful to inject custom markup for tokens. - */ - -public interface TokenizedInstructionHook { - String change(String instruction); -} diff --git a/navigation/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/osrm/TextInstructionsFixtures.java b/navigation/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/osrm/TextInstructionsFixtures.java deleted file mode 100644 index 06e79cc8006..00000000000 --- a/navigation/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/osrm/TextInstructionsFixtures.java +++ /dev/null @@ -1,331 +0,0 @@ -package com.mapbox.services.android.navigation.v5.osrm; - -/** - * Created by antonio on 4/14/17. - */ - -public class TextInstructionsFixtures { - - protected static final String[] FIXTURES = new String[] { - "osrm/v5/arrive/left.json", - "osrm/v5/arrive/no_modifier.json", - "osrm/v5/arrive/right.json", - "osrm/v5/arrive/sharp_left.json", - "osrm/v5/arrive/sharp_right.json", - "osrm/v5/arrive/slight_left.json", - "osrm/v5/arrive/slight_right.json", - "osrm/v5/arrive/straight.json", - "osrm/v5/arrive/uturn.json", - "osrm/v5/continue/left_default.json", - "osrm/v5/continue/left_destination.json", - "osrm/v5/continue/left_name.json", - "osrm/v5/continue/right_default.json", - "osrm/v5/continue/right_destination.json", - "osrm/v5/continue/right_name.json", - "osrm/v5/continue/sharp_left_default.json", - "osrm/v5/continue/sharp_left_destination.json", - "osrm/v5/continue/sharp_left_name.json", - "osrm/v5/continue/sharp_right_default.json", - "osrm/v5/continue/sharp_right_destination.json", - "osrm/v5/continue/sharp_right_name.json", - "osrm/v5/continue/slight_left_default.json", - "osrm/v5/continue/slight_left_destination.json", - "osrm/v5/continue/slight_left_name.json", - "osrm/v5/continue/slight_right_default.json", - "osrm/v5/continue/slight_right_destination.json", - "osrm/v5/continue/slight_right_name.json", - "osrm/v5/continue/straight_default.json", - "osrm/v5/continue/straight_destination.json", - "osrm/v5/continue/straight_name.json", - "osrm/v5/continue/uturn_default.json", - "osrm/v5/continue/uturn_destination.json", - "osrm/v5/continue/uturn_name.json", - "osrm/v5/depart/east_110.json", - "osrm/v5/depart/east_70.json", - "osrm/v5/depart/modifier_default.json", - "osrm/v5/depart/modifier_destination.json", - "osrm/v5/depart/modifier_name.json", - "osrm/v5/depart/north_20.json", - "osrm/v5/depart/north_340.json", - "osrm/v5/depart/northeast_21.json", - "osrm/v5/depart/northeast_69.json", - "osrm/v5/depart/northwest_291.json", - "osrm/v5/depart/northwest_339.json", - "osrm/v5/depart/south_160.json", - "osrm/v5/depart/south_200.json", - "osrm/v5/depart/southeast_111.json", - "osrm/v5/depart/southeast_159.json", - "osrm/v5/depart/southwest_201.json", - "osrm/v5/depart/southwest_249.json", - "osrm/v5/depart/west_250.json", - "osrm/v5/depart/west_290.json", - "osrm/v5/end_of_road/left_default.json", - "osrm/v5/end_of_road/left_destination.json", - "osrm/v5/end_of_road/left_name.json", - "osrm/v5/end_of_road/right_default.json", - "osrm/v5/end_of_road/right_destination.json", - "osrm/v5/end_of_road/right_name.json", - "osrm/v5/end_of_road/sharp_left_default.json", - "osrm/v5/end_of_road/sharp_left_destination.json", - "osrm/v5/end_of_road/sharp_left_name.json", - "osrm/v5/end_of_road/sharp_right_default.json", - "osrm/v5/end_of_road/sharp_right_destination.json", - "osrm/v5/end_of_road/sharp_right_name.json", - "osrm/v5/end_of_road/slight_left_default.json", - "osrm/v5/end_of_road/slight_left_destination.json", - "osrm/v5/end_of_road/slight_left_name.json", - "osrm/v5/end_of_road/slight_right_default.json", - "osrm/v5/end_of_road/slight_right_destination.json", - "osrm/v5/end_of_road/slight_right_name.json", - "osrm/v5/end_of_road/straight_default.json", - "osrm/v5/end_of_road/straight_destination.json", - "osrm/v5/end_of_road/straight_name.json", - "osrm/v5/end_of_road/uturn_default.json", - "osrm/v5/end_of_road/uturn_destination.json", - "osrm/v5/end_of_road/uturn_name.json", - "osrm/v5/fork/left_default.json", - "osrm/v5/fork/left_destination.json", - "osrm/v5/fork/left_name.json", - "osrm/v5/fork/right_default.json", - "osrm/v5/fork/right_destination.json", - "osrm/v5/fork/right_name.json", - "osrm/v5/fork/sharp_left_default.json", - "osrm/v5/fork/sharp_left_destination.json", - "osrm/v5/fork/sharp_left_name.json", - "osrm/v5/fork/sharp_right_default.json", - "osrm/v5/fork/sharp_right_destination.json", - "osrm/v5/fork/sharp_right_name.json", - "osrm/v5/fork/slight_left_default.json", - "osrm/v5/fork/slight_left_destination.json", - "osrm/v5/fork/slight_left_name.json", - "osrm/v5/fork/slight_right_default.json", - "osrm/v5/fork/slight_right_destination.json", - "osrm/v5/fork/slight_right_name.json", - "osrm/v5/fork/straight_default.json", - "osrm/v5/fork/straight_destination.json", - "osrm/v5/fork/straight_name.json", - "osrm/v5/fork/uturn_default.json", - "osrm/v5/fork/uturn_destination.json", - "osrm/v5/fork/uturn_name.json", - "osrm/v5/merge/left_default.json", - "osrm/v5/merge/left_destination.json", - "osrm/v5/merge/left_name.json", - "osrm/v5/merge/right_default.json", - "osrm/v5/merge/right_destination.json", - "osrm/v5/merge/right_name.json", - "osrm/v5/merge/sharp_left_default.json", - "osrm/v5/merge/sharp_left_destination.json", - "osrm/v5/merge/sharp_left_name.json", - "osrm/v5/merge/sharp_right_default.json", - "osrm/v5/merge/sharp_right_destination.json", - "osrm/v5/merge/sharp_right_name.json", - "osrm/v5/merge/slight_left_default.json", - "osrm/v5/merge/slight_left_destination.json", - "osrm/v5/merge/slight_left_name.json", - "osrm/v5/merge/slight_right_default.json", - "osrm/v5/merge/slight_right_destination.json", - "osrm/v5/merge/slight_right_name.json", - "osrm/v5/merge/straight_default.json", - "osrm/v5/merge/straight_destination.json", - "osrm/v5/merge/straight_name.json", - "osrm/v5/merge/uturn_default.json", - "osrm/v5/merge/uturn_destination.json", - "osrm/v5/merge/uturn_name.json", - "osrm/v5/modes/driving_turn_left.json", - "osrm/v5/modes/ferry_fork_left_default.json", - "osrm/v5/modes/ferry_fork_left_destination.json", - "osrm/v5/modes/ferry_fork_left_name.json", - "osrm/v5/modes/ferry_turn_left_default.json", - "osrm/v5/modes/ferry_turn_left_destination.json", - "osrm/v5/modes/ferry_turn_left_name.json", - "osrm/v5/new_name/left_default.json", - "osrm/v5/new_name/left_destination.json", - "osrm/v5/new_name/left_name.json", - "osrm/v5/new_name/right_default.json", - "osrm/v5/new_name/right_destination.json", - "osrm/v5/new_name/right_name.json", - "osrm/v5/new_name/sharp_left_default.json", - "osrm/v5/new_name/sharp_left_destination.json", - "osrm/v5/new_name/sharp_left_name.json", - "osrm/v5/new_name/sharp_right_default.json", - "osrm/v5/new_name/sharp_right_destination.json", - "osrm/v5/new_name/sharp_right_name.json", - "osrm/v5/new_name/slight_left_default.json", - "osrm/v5/new_name/slight_left_destination.json", - "osrm/v5/new_name/slight_left_name.json", - "osrm/v5/new_name/slight_right_default.json", - "osrm/v5/new_name/slight_right_destination.json", - "osrm/v5/new_name/slight_right_name.json", - "osrm/v5/new_name/straight_default.json", - "osrm/v5/new_name/straight_destination.json", - "osrm/v5/new_name/straight_name.json", - "osrm/v5/new_name/uturn_default.json", - "osrm/v5/new_name/uturn_destination.json", - "osrm/v5/new_name/uturn_name.json", - "osrm/v5/notification/left_default.json", - "osrm/v5/notification/left_destination.json", - "osrm/v5/notification/left_name.json", - "osrm/v5/notification/right_default.json", - "osrm/v5/notification/right_destination.json", - "osrm/v5/notification/right_name.json", - "osrm/v5/notification/sharp_left_default.json", - "osrm/v5/notification/sharp_left_destination.json", - "osrm/v5/notification/sharp_left_name.json", - "osrm/v5/notification/sharp_right_default.json", - "osrm/v5/notification/sharp_right_destination.json", - "osrm/v5/notification/sharp_right_name.json", - "osrm/v5/notification/slight_left_default.json", - "osrm/v5/notification/slight_left_destination.json", - "osrm/v5/notification/slight_left_name.json", - "osrm/v5/notification/slight_right_default.json", - "osrm/v5/notification/slight_right_destination.json", - "osrm/v5/notification/slight_right_name.json", - "osrm/v5/notification/straight_default.json", - "osrm/v5/notification/straight_destination.json", - "osrm/v5/notification/straight_name.json", - "osrm/v5/notification/uturn_default.json", - "osrm/v5/notification/uturn_destination.json", - "osrm/v5/notification/uturn_name.json", - "osrm/v5/off_ramp/left_default.json", - "osrm/v5/off_ramp/left_destination.json", - "osrm/v5/off_ramp/left_name.json", - "osrm/v5/off_ramp/right_default.json", - "osrm/v5/off_ramp/right_destination.json", - "osrm/v5/off_ramp/right_name.json", - "osrm/v5/off_ramp/sharp_left_default.json", - "osrm/v5/off_ramp/sharp_left_destination.json", - "osrm/v5/off_ramp/sharp_left_name.json", - "osrm/v5/off_ramp/sharp_right_default.json", - "osrm/v5/off_ramp/sharp_right_destination.json", - "osrm/v5/off_ramp/sharp_right_name.json", - "osrm/v5/off_ramp/slight_left_default.json", - "osrm/v5/off_ramp/slight_left_destination.json", - "osrm/v5/off_ramp/slight_left_name.json", - "osrm/v5/off_ramp/slight_right_default.json", - "osrm/v5/off_ramp/slight_right_destination.json", - "osrm/v5/off_ramp/slight_right_name.json", - "osrm/v5/off_ramp/straight_default.json", - "osrm/v5/off_ramp/straight_destination.json", - "osrm/v5/off_ramp/straight_name.json", - "osrm/v5/off_ramp/uturn_default.json", - "osrm/v5/off_ramp/uturn_destination.json", - "osrm/v5/off_ramp/uturn_name.json", - "osrm/v5/on_ramp/left_default.json", - "osrm/v5/on_ramp/left_destination.json", - "osrm/v5/on_ramp/left_name.json", - "osrm/v5/on_ramp/right_default.json", - "osrm/v5/on_ramp/right_destination.json", - "osrm/v5/on_ramp/right_name.json", - "osrm/v5/on_ramp/sharp_left_default.json", - "osrm/v5/on_ramp/sharp_left_destination.json", - "osrm/v5/on_ramp/sharp_left_name.json", - "osrm/v5/on_ramp/sharp_right_default.json", - "osrm/v5/on_ramp/sharp_right_destination.json", - "osrm/v5/on_ramp/sharp_right_name.json", - "osrm/v5/on_ramp/slight_left_default.json", - "osrm/v5/on_ramp/slight_left_destination.json", - "osrm/v5/on_ramp/slight_left_name.json", - "osrm/v5/on_ramp/slight_right_default.json", - "osrm/v5/on_ramp/slight_right_destination.json", - "osrm/v5/on_ramp/slight_right_name.json", - "osrm/v5/on_ramp/straight_default.json", - "osrm/v5/on_ramp/straight_destination.json", - "osrm/v5/on_ramp/straight_name.json", - "osrm/v5/on_ramp/uturn_default.json", - "osrm/v5/on_ramp/uturn_destination.json", - "osrm/v5/on_ramp/uturn_name.json", - "osrm/v5/other/invalid_type.json", - "osrm/v5/other/way_name_ref.json", - "osrm/v5/other/way_name_ref_destinations.json", - "osrm/v5/other/way_name_ref_mapbox_hack_1.json", - "osrm/v5/other/way_name_ref_mapbox_hack_2.json", - "osrm/v5/other/way_name_ref_mapbox_hack_3.json", - "osrm/v5/other/way_name_ref_name.json", - "osrm/v5/rotary/default_default.json", - "osrm/v5/rotary/default_destination.json", - "osrm/v5/rotary/default_name.json", - "osrm/v5/rotary/exit_10.json", - "osrm/v5/rotary/exit_11.json", - "osrm/v5/rotary/exit_1_default.json", - "osrm/v5/rotary/exit_1_destination.json", - "osrm/v5/rotary/exit_1_name.json", - "osrm/v5/rotary/exit_2.json", - "osrm/v5/rotary/exit_3.json", - "osrm/v5/rotary/exit_4.json", - "osrm/v5/rotary/exit_5.json", - "osrm/v5/rotary/exit_6.json", - "osrm/v5/rotary/exit_7.json", - "osrm/v5/rotary/exit_8.json", - "osrm/v5/rotary/exit_9.json", - "osrm/v5/rotary/name_default.json", - "osrm/v5/rotary/name_destination.json", - "osrm/v5/rotary/name_exit_default.json", - "osrm/v5/rotary/name_exit_destination.json", - "osrm/v5/rotary/name_exit_name.json", - "osrm/v5/rotary/name_name.json", - "osrm/v5/roundabout/default_default.json", - "osrm/v5/roundabout/default_destination.json", - "osrm/v5/roundabout/default_name.json", - "osrm/v5/roundabout/exit_default.json", - "osrm/v5/roundabout/exit_destination.json", - "osrm/v5/roundabout/exit_name.json", - "osrm/v5/roundabout_turn/left_default.json", - "osrm/v5/roundabout_turn/left_destination.json", - "osrm/v5/roundabout_turn/left_name.json", - "osrm/v5/roundabout_turn/right_default.json", - "osrm/v5/roundabout_turn/right_destination.json", - "osrm/v5/roundabout_turn/right_name.json", - "osrm/v5/roundabout_turn/sharp_left_default.json", - "osrm/v5/roundabout_turn/sharp_left_destination.json", - "osrm/v5/roundabout_turn/sharp_left_name.json", - "osrm/v5/roundabout_turn/sharp_right_default.json", - "osrm/v5/roundabout_turn/sharp_right_destination.json", - "osrm/v5/roundabout_turn/sharp_right_name.json", - "osrm/v5/roundabout_turn/slight_left_default.json", - "osrm/v5/roundabout_turn/slight_left_destination.json", - "osrm/v5/roundabout_turn/slight_left_name.json", - "osrm/v5/roundabout_turn/slight_right_default.json", - "osrm/v5/roundabout_turn/slight_right_destination.json", - "osrm/v5/roundabout_turn/slight_right_name.json", - "osrm/v5/roundabout_turn/straight_default.json", - "osrm/v5/roundabout_turn/straight_destination.json", - "osrm/v5/roundabout_turn/straight_name.json", - "osrm/v5/roundabout_turn/uturn_default.json", - "osrm/v5/roundabout_turn/uturn_destination.json", - "osrm/v5/roundabout_turn/uturn_name.json", - "osrm/v5/turn/left_default.json", - "osrm/v5/turn/left_destination.json", - "osrm/v5/turn/left_name.json", - "osrm/v5/turn/right_default.json", - "osrm/v5/turn/right_destination.json", - "osrm/v5/turn/right_name.json", - "osrm/v5/turn/sharp_left_default.json", - "osrm/v5/turn/sharp_left_destination.json", - "osrm/v5/turn/sharp_left_name.json", - "osrm/v5/turn/sharp_right_default.json", - "osrm/v5/turn/sharp_right_destination.json", - "osrm/v5/turn/sharp_right_name.json", - "osrm/v5/turn/slight_left_default.json", - "osrm/v5/turn/slight_left_destination.json", - "osrm/v5/turn/slight_left_name.json", - "osrm/v5/turn/slight_right_default.json", - "osrm/v5/turn/slight_right_destination.json", - "osrm/v5/turn/slight_right_name.json", - "osrm/v5/turn/straight_default.json", - "osrm/v5/turn/straight_destination.json", - "osrm/v5/turn/straight_name.json", - "osrm/v5/turn/uturn_default.json", - "osrm/v5/turn/uturn_destination.json", - "osrm/v5/turn/uturn_name.json", - "osrm/v5/use_lane/o.json", - "osrm/v5/use_lane/ooo.json", - "osrm/v5/use_lane/oooxxo.json", - "osrm/v5/use_lane/oox.json", - "osrm/v5/use_lane/ooxx.json", - "osrm/v5/use_lane/oxo.json", - "osrm/v5/use_lane/xoo.json", - "osrm/v5/use_lane/xox.json", - "osrm/v5/use_lane/xxoo.json", - "osrm/v5/use_lane/xxooxx.json", - "osrm/v5/use_lane/xxoxo.json"}; -} diff --git a/navigation/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/osrm/TextInstructionsTest.java b/navigation/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/osrm/TextInstructionsTest.java deleted file mode 100644 index 3fe0f52fb91..00000000000 --- a/navigation/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/osrm/TextInstructionsTest.java +++ /dev/null @@ -1,175 +0,0 @@ -package com.mapbox.services.android.navigation.v5.osrm; - -import com.google.gson.Gson; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.api.directions.v5.models.IntersectionLanes; -import com.mapbox.services.api.directions.v5.models.LegStep; -import com.mapbox.services.api.directions.v5.models.StepIntersection; -import com.mapbox.services.api.directions.v5.models.StepManeuver; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -public class TextInstructionsTest extends BaseTest { - - @Rule - public ExpectedException thrown = ExpectedException.none(); - - @Test - public void testSanity() { - TextInstructions textInstructions = new TextInstructions("en", "v5"); - assertNotNull(textInstructions.getVersionObject()); - } - - @Test - public void testBadLanguage() { - thrown.expect(RuntimeException.class); - thrown.expectMessage(startsWith("Translation not found for language: xxx")); - new TextInstructions("xxx", "v5"); - } - - @Test - public void testBadVersion() { - thrown.expect(RuntimeException.class); - thrown.expectMessage(startsWith("Version not found for value: yyy")); - new TextInstructions("en", "yyy"); - } - - @Test - public void testCapitalizeFirstLetter() { - assertEquals("Mapbox", TextInstructions.capitalizeFirstLetter("mapbox")); - } - - @Test - public void testOrdinalize() { - TextInstructions textInstructions = new TextInstructions("en", "v5"); - assertEquals("1st", textInstructions.ordinalize(1)); - assertEquals("", textInstructions.ordinalize(999)); - } - - @Test - public void testValidDirectionFromDegree() { - TextInstructions textInstructions = new TextInstructions("en", "v5"); - assertEquals("", textInstructions.directionFromDegree(null)); - assertEquals("north", textInstructions.directionFromDegree(0.)); - assertEquals("north", textInstructions.directionFromDegree(1.)); - assertEquals("north", textInstructions.directionFromDegree(20.)); - assertEquals("northeast", textInstructions.directionFromDegree(21.)); - assertEquals("northeast", textInstructions.directionFromDegree(69.)); - assertEquals("east", textInstructions.directionFromDegree(70.)); - assertEquals("east", textInstructions.directionFromDegree(110.)); - assertEquals("southeast", textInstructions.directionFromDegree(111.)); - assertEquals("southeast", textInstructions.directionFromDegree(159.)); - assertEquals("south", textInstructions.directionFromDegree(160.)); - assertEquals("south", textInstructions.directionFromDegree(200.)); - assertEquals("southwest", textInstructions.directionFromDegree(201.)); - assertEquals("southwest", textInstructions.directionFromDegree(249.)); - assertEquals("west", textInstructions.directionFromDegree(250.)); - assertEquals("west", textInstructions.directionFromDegree(290.)); - assertEquals("northwest", textInstructions.directionFromDegree(291.)); - assertEquals("northwest", textInstructions.directionFromDegree(339.)); - assertEquals("north", textInstructions.directionFromDegree(340.)); - assertEquals("north", textInstructions.directionFromDegree(360.)); - } - - @Test - public void testInvalidDirectionFromDegree() { - TextInstructions textInstructions = new TextInstructions("en", "v5"); - thrown.expect(RuntimeException.class); - thrown.expectMessage(startsWith("Degree is invalid: 361")); - assertEquals("", textInstructions.directionFromDegree(361.)); - } - - @Test - public void testLaneDiagram() { - TextInstructions textInstructions = new TextInstructions("en", "v5"); - Map map = new HashMap<>(); - - map.put("o", new LegStep(Collections.singletonList(new StepIntersection(new IntersectionLanes[] { - new IntersectionLanes(true), new IntersectionLanes(true), new IntersectionLanes(true)})))); - map.put("ox", new LegStep(Collections.singletonList(new StepIntersection(new IntersectionLanes[] { - new IntersectionLanes(true), new IntersectionLanes(true), new IntersectionLanes(false)})))); - map.put("ox", new LegStep(Collections.singletonList(new StepIntersection(new IntersectionLanes[] { - new IntersectionLanes(true), new IntersectionLanes(true), new IntersectionLanes(false), - new IntersectionLanes(false)})))); - map.put("oxo", new LegStep(Collections.singletonList(new StepIntersection(new IntersectionLanes[] { - new IntersectionLanes(true), new IntersectionLanes(false), new IntersectionLanes(true)})))); - map.put("xox", new LegStep(Collections.singletonList(new StepIntersection(new IntersectionLanes[] { - new IntersectionLanes(false), new IntersectionLanes(true), new IntersectionLanes(true), - new IntersectionLanes(false)})))); - map.put("xoxox", new LegStep(Collections.singletonList(new StepIntersection(new IntersectionLanes[] { - new IntersectionLanes(false), new IntersectionLanes(true), new IntersectionLanes(false), - new IntersectionLanes(true), new IntersectionLanes(false)})))); - map.put("x", new LegStep(Collections.singletonList(new StepIntersection(new IntersectionLanes[] { - new IntersectionLanes(false), new IntersectionLanes(false), new IntersectionLanes(false)})))); - - for (Object entry : map.entrySet()) { - Map.Entry pair = (Map.Entry) entry; - assertEquals(pair.getKey(), textInstructions.laneConfig((LegStep) pair.getValue())); - } - } - - @Test - public void testInvalidLaneDiagram() { - TextInstructions textInstructions = new TextInstructions("en", "v5"); - - thrown.expect(RuntimeException.class); - thrown.expectMessage(startsWith("No lanes object")); - assertEquals("", textInstructions.laneConfig(new LegStep(Collections.singletonList( - new StepIntersection(new IntersectionLanes[] {}))))); - } - - @Test - public void respectInstructionHook() { - TextInstructions textInstructions = new TextInstructions("en", "v5"); - textInstructions.setTokenizedInstructionHook(new TokenizedInstructionHook() { - @Override - public String change(String instruction) { - return instruction.replace("{way_name}", "{way_name}"); - } - }); - - LegStep step = new LegStep("Way Name", "", new StepManeuver("turn", "left", null)); - assertEquals("Turn left onto Way Name", textInstructions.compile(step)); - } - - @Test - public void testFixturesMatchGeneratedInstructions() throws IOException { - for (String fixture : TextInstructionsFixtures.FIXTURES) { - String body = readPath(fixture); - FixtureModel model = new Gson().fromJson(body, FixtureModel.class); - for (Object entry : model.getInstructions().entrySet()) { - Map.Entry pair = (Map.Entry) entry; - String language = (String) pair.getKey(); - String compiled = (String) pair.getValue(); - assertEquals(compiled, new TextInstructions(language, "v5").compile(model.getStep())); - } - } - } - - private class FixtureModel { - private LegStep step; - private Map instructions; - - public FixtureModel() { - } - - public LegStep getStep() { - return step; - } - - public Map getInstructions() { - return instructions; - } - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/left.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/left.json deleted file mode 100644 index 1c7715d4aec..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/left.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "arrive", - "modifier": "left" - }, - "name": "Street Name" - }, - "instructions": { - "de": "Sie haben Ihr Ziel erreicht, es befindet sich links von Ihnen", - "en": "You have arrived at your destination, on the left", - "fr": "Vous êtes arrivés à votre destination, sur la gauche", - "nl": "Je bent gearriveerd. De bestemming bevindt zich links.", - "ru": "Вы прибыли в пункт назначения, который находится слева", - "sv": "Du är framme vid din destination, till vänster", - "vi": "Đến nơi ở bên trái", - "zh-Hans": "您已经到达您的个目的地，在道路左侧" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/no_modifier.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/no_modifier.json deleted file mode 100644 index 960d6968236..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/no_modifier.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "arrive" - }, - "name": "Street Name" - }, - "instructions": { - "de": "Sie haben Ihr Ziel erreicht", - "en": "You have arrived at your destination", - "fr": "Vous êtes arrivés à votre destination", - "nl": "Je bent gearriveerd op de bestemming.", - "ru": "Вы прибыли в пункт назначения", - "sv": "Du är framme vid din destination", - "vi": "Đến nơi ", - "zh-Hans": "您已经到达您的个目的地" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/right.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/right.json deleted file mode 100644 index 387bf16d104..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/right.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "arrive", - "modifier": "right" - }, - "name": "Street Name" - }, - "instructions": { - "de": "Sie haben Ihr Ziel erreicht, es befindet sich rechts von Ihnen", - "en": "You have arrived at your destination, on the right", - "fr": "Vous êtes arrivés à votre destination, sur la droite", - "nl": "Je bent gearriveerd. De bestemming bevindt zich rechts.", - "ru": "Вы прибыли в пункт назначения, который находится справа", - "sv": "Du är framme vid din destination, till höger", - "vi": "Đến nơi ở bên phải", - "zh-Hans": "您已经到达您的个目的地，在道路右侧" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/sharp_left.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/sharp_left.json deleted file mode 100644 index 26320746a13..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/sharp_left.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "arrive", - "modifier": "sharp left" - }, - "name": "Street Name" - }, - "instructions": { - "de": "Sie haben Ihr Ziel erreicht, es befindet sich links von Ihnen", - "en": "You have arrived at your destination, on the left", - "fr": "Vous êtes arrivés à votre destination, sur la gauche", - "nl": "Je bent gearriveerd. De bestemming bevindt zich links.", - "ru": "Вы прибыли в пункт назначения, который находится слева", - "sv": "Du är framme vid din destination, skarpt till vänster", - "vi": "Đến nơi ở bên trái", - "zh-Hans": "您已经到达您的个目的地，在道路左侧" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/sharp_right.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/sharp_right.json deleted file mode 100644 index 17f7fbb132c..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/sharp_right.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "arrive", - "modifier": "sharp right" - }, - "name": "Street Name" - }, - "instructions": { - "de": "Sie haben Ihr Ziel erreicht, es befindet sich rechts von Ihnen", - "en": "You have arrived at your destination, on the right", - "fr": "Vous êtes arrivés à votre destination, sur la droite", - "nl": "Je bent gearriveerd. De bestemming bevindt zich rechts.", - "ru": "Вы прибыли в пункт назначения, который находится справа", - "sv": "Du är framme vid din destination, skarpt till höger", - "vi": "Đến nơi ở bên phải", - "zh-Hans": "您已经到达您的个目的地，在道路右侧" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/slight_left.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/slight_left.json deleted file mode 100644 index 3e952bf562d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/slight_left.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "arrive", - "modifier": "slight left" - }, - "name": "Street Name" - }, - "instructions": { - "de": "Sie haben Ihr Ziel erreicht, es befindet sich links von Ihnen", - "en": "You have arrived at your destination, on the left", - "fr": "Vous êtes arrivés à votre destination, sur la gauche", - "nl": "Je bent gearriveerd. De bestemming bevindt zich links.", - "ru": "Вы прибыли в пункт назначения, который находится слева", - "sv": "Du är framme vid din destination, lätt till vänster", - "vi": "Đến nơi ở bên trái", - "zh-Hans": "您已经到达您的个目的地，在道路左侧" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/slight_right.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/slight_right.json deleted file mode 100644 index 2d85d0c0ad6..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/slight_right.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "arrive", - "modifier": "slight right" - }, - "name": "Street Name" - }, - "instructions": { - "de": "Sie haben Ihr Ziel erreicht, es befindet sich rechts von Ihnen", - "en": "You have arrived at your destination, on the right", - "fr": "Vous êtes arrivés à votre destination, sur la droite", - "nl": "Je bent gearriveerd. De bestemming bevindt zich rechts.", - "ru": "Вы прибыли в пункт назначения, который находится справа", - "sv": "Du är framme vid din destination, lätt till höger", - "vi": "Đến nơi ở bên phải", - "zh-Hans": "您已经到达您的个目的地，在道路右侧" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/straight.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/straight.json deleted file mode 100644 index e0d08920067..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/straight.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "arrive", - "modifier": "straight" - }, - "name": "Street Name" - }, - "instructions": { - "de": "Sie haben Ihr Ziel erreicht, es befindet sich direkt vor Ihnen", - "en": "You have arrived at your destination, straight ahead", - "fr": "Vous êtes arrivés à votre destination, droit devant", - "nl": "Je bent gearriveerd. De bestemming bevindt zich voor je.", - "ru": "Вы прибыли в пункт назначения, который находится перед вами", - "sv": "Du är framme vid din destination, rakt fram", - "vi": "Đến nơi ở trước mặt", - "zh-Hans": "您已经到达您的个目的地，在您正前方" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/uturn.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/uturn.json deleted file mode 100644 index 5e2da241ae1..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/arrive/uturn.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "arrive", - "modifier": "uturn" - }, - "name": "Street Name" - }, - "instructions": { - "de": "Sie haben Ihr Ziel erreicht", - "en": "You have arrived at your destination", - "fr": "Vous êtes arrivés à votre destination", - "nl": "Je bent gearriveerd op de bestemming.", - "ru": "Вы прибыли в пункт назначения", - "sv": "Du är framme vid din destination", - "vi": "Đến nơi ", - "zh-Hans": "您已经到达您的个目的地" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/left_default.json deleted file mode 100644 index d2245ecb164..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "left" - }, - "name": "" - }, - "instructions": { - "de": "Links weiterfahren", - "en": "Continue left", - "fr": "Continuer à gauche", - "nl": "Ga links", - "ru": "Продолжайте движение налево", - "sv": "Fortsätt vänster", - "vi": "Chạy tiếp bên trái", - "zh-Hans": "继续向左" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/left_destination.json deleted file mode 100644 index 1030913e8a7..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Links weiterfahren Richtung Destination 1", - "en": "Continue left towards Destination 1", - "fr": "Continuer à gauche en direction de Destination 1", - "nl": "Ga links richting Destination 1", - "ru": "Продолжайте движение налево в направлении Destination 1", - "sv": "Fortsätt vänster mot Destination 1", - "vi": "Chạy tiếp bên trái đến Destination 1", - "zh-Hans": "继续向左行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/left_name.json deleted file mode 100644 index 329c3624c90..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Links weiterfahren auf Way Name", - "en": "Continue left onto Way Name", - "fr": "Continuer à gauche sur Way Name", - "nl": "Ga links naar Way Name", - "ru": "Продолжайте движение налево по Way Name", - "sv": "Fortsätt vänster in på Way Name", - "vi": "Chạy tiếp bên trái trên Way Name", - "zh-Hans": "继续向左，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/right_default.json deleted file mode 100644 index 88af857f719..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "right" - }, - "name": "" - }, - "instructions": { - "de": "Rechts weiterfahren", - "en": "Continue right", - "fr": "Continuer à droite", - "nl": "Ga rechts", - "ru": "Продолжайте движение направо", - "sv": "Fortsätt höger", - "vi": "Chạy tiếp bên phải", - "zh-Hans": "继续向右" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/right_destination.json deleted file mode 100644 index f176f42c57c..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rechts weiterfahren Richtung Destination 1", - "en": "Continue right towards Destination 1", - "fr": "Continuer à droite en direction de Destination 1", - "nl": "Ga rechts richting Destination 1", - "ru": "Продолжайте движение направо в направлении Destination 1", - "sv": "Fortsätt höger mot Destination 1", - "vi": "Chạy tiếp bên phải đến Destination 1", - "zh-Hans": "继续向右行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/right_name.json deleted file mode 100644 index 20c2d9b264e..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rechts weiterfahren auf Way Name", - "en": "Continue right onto Way Name", - "fr": "Continuer à droite sur Way Name", - "nl": "Ga rechts naar Way Name", - "ru": "Продолжайте движение направо по Way Name", - "sv": "Fortsätt höger in på Way Name", - "vi": "Chạy tiếp bên phải trên Way Name", - "zh-Hans": "继续向右，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_left_default.json deleted file mode 100644 index 26ba273c408..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "sharp left" - }, - "name": "" - }, - "instructions": { - "de": "Scharf links weiterfahren", - "en": "Continue sharp left", - "fr": "Continuer franchement à gauche", - "nl": "Ga linksaf", - "ru": "Продолжайте движение резко налево", - "sv": "Fortsätt skarp vänster", - "vi": "Chạy tiếp bên trái gắt", - "zh-Hans": "继续向左" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_left_destination.json deleted file mode 100644 index f0d0b41bd62..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "sharp left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf links weiterfahren Richtung Destination 1", - "en": "Continue sharp left towards Destination 1", - "fr": "Continuer franchement à gauche en direction de Destination 1", - "nl": "Ga linksaf richting Destination 1", - "ru": "Продолжайте движение резко налево в направлении Destination 1", - "sv": "Fortsätt skarp vänster mot Destination 1", - "vi": "Chạy tiếp bên trái gắt đến Destination 1", - "zh-Hans": "继续向左行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_left_name.json deleted file mode 100644 index 1c0aebaac85..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "sharp left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf links weiterfahren auf Way Name", - "en": "Continue sharp left onto Way Name", - "fr": "Continuer franchement à gauche sur Way Name", - "nl": "Ga linksaf naar Way Name", - "ru": "Продолжайте движение резко налево по Way Name", - "sv": "Fortsätt skarp vänster in på Way Name", - "vi": "Chạy tiếp bên trái gắt trên Way Name", - "zh-Hans": "继续向左，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_right_default.json deleted file mode 100644 index f44758bc6d1..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "sharp right" - }, - "name": "" - }, - "instructions": { - "de": "Scharf rechts weiterfahren", - "en": "Continue sharp right", - "fr": "Continuer franchement à droite", - "nl": "Ga rechtsaf", - "ru": "Продолжайте движение резко направо", - "sv": "Fortsätt skarp höger", - "vi": "Chạy tiếp bên phải gắt", - "zh-Hans": "继续向右" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_right_destination.json deleted file mode 100644 index 3cf4a33d573..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "sharp right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf rechts weiterfahren Richtung Destination 1", - "en": "Continue sharp right towards Destination 1", - "fr": "Continuer franchement à droite en direction de Destination 1", - "nl": "Ga rechtsaf richting Destination 1", - "ru": "Продолжайте движение резко направо в направлении Destination 1", - "sv": "Fortsätt skarp höger mot Destination 1", - "vi": "Chạy tiếp bên phải gắt đến Destination 1", - "zh-Hans": "继续向右行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_right_name.json deleted file mode 100644 index 2090eb3433c..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/sharp_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "sharp right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf rechts weiterfahren auf Way Name", - "en": "Continue sharp right onto Way Name", - "fr": "Continuer franchement à droite sur Way Name", - "nl": "Ga rechtsaf naar Way Name", - "ru": "Продолжайте движение резко направо по Way Name", - "sv": "Fortsätt skarp höger in på Way Name", - "vi": "Chạy tiếp bên phải gắt trên Way Name", - "zh-Hans": "继续向右，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_left_default.json deleted file mode 100644 index 34ee54f3017..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "slight left" - }, - "name": "" - }, - "instructions": { - "de": "Leicht links weiter", - "en": "Continue slightly left", - "fr": "Continuer légèrement à gauche", - "nl": "Links aanhouden", - "ru": "Плавный поворот налево", - "sv": "Fortsätt med lätt vänstersväng", - "vi": "Nghiêng về bên trái", - "zh-Hans": "继续向左" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_left_destination.json deleted file mode 100644 index 437675df614..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "slight left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Leicht links weiter Richtung Destination 1", - "en": "Continue slightly left towards Destination 1", - "fr": "Continuer légèrement à gauche en direction de Destination 1", - "nl": "Links aanhouden richting Destination 1", - "ru": "Плавный поворот налево в направлении Destination 1", - "sv": "Fortsätt med lätt vänstersväng mot Destination 1", - "vi": "Nghiêng về bên trái đến Destination 1", - "zh-Hans": "继续向左行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_left_name.json deleted file mode 100644 index 236e433f3f5..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "slight left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Leicht links weiter auf Way Name", - "en": "Continue slightly left onto Way Name", - "fr": "Continuer légèrement à gauche sur Way Name", - "nl": "Links aanhouden naar Way Name", - "ru": "Плавный поворот налево на Way Name", - "sv": "Fortsätt med lätt vänstersväng in på Way Name", - "vi": "Nghiêng về bên trái vào Way Name", - "zh-Hans": "继续向左，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_right_default.json deleted file mode 100644 index 733fff32cb0..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "slight right" - }, - "name": "" - }, - "instructions": { - "de": "Leicht rechts weiter", - "en": "Continue slightly right", - "fr": "Continuer légèrement à droite", - "nl": "Rechts aanhouden", - "ru": "Плавный поворот направо", - "sv": "Fortsätt med lätt högersväng", - "vi": "Nghiêng về bên phải", - "zh-Hans": "继续向右" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_right_destination.json deleted file mode 100644 index dadafdbafc0..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "slight right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Leicht rechts weiter Richtung Destination 1", - "en": "Continue slightly right towards Destination 1", - "fr": "Continuer légèrement à droite en direction de Destination 1", - "nl": "Rechts aanhouden richting Destination 1", - "ru": "Плавный поворот направо в направлении Destination 1", - "sv": "Fortsätt med lätt högersväng mot Destination 1", - "vi": "Nghiêng về bên phải đến Destination 1", - "zh-Hans": "继续向右行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_right_name.json deleted file mode 100644 index 31cacf45f76..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/slight_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "slight right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Leicht rechts weiter auf Way Name", - "en": "Continue slightly right onto Way Name", - "fr": "Continuer légèrement à droite sur Way Name", - "nl": "Rechts aanhouden naar Way Name", - "ru": "Плавный поворот направо на Way Name", - "sv": "Fortsätt med lätt högersväng in på Way Name", - "vi": "Nghiêng về bên phải vào Way Name", - "zh-Hans": "继续向右，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/straight_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/straight_default.json deleted file mode 100644 index 91383d6a8ad..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/straight_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "straight" - }, - "name": "" - }, - "instructions": { - "de": "Geradeaus weiterfahren", - "en": "Continue straight", - "fr": "Continuer tout droit", - "nl": "Ga rechtdoor", - "ru": "Продолжайте движение прямо", - "sv": "Fortsätt rakt fram", - "vi": "Chạy thẳng", - "zh-Hans": "继续直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/straight_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/straight_destination.json deleted file mode 100644 index d71062aab55..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/straight_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "straight" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Geradeaus weiterfahren Richtung Destination 1", - "en": "Continue towards Destination 1", - "fr": "Continuer tout droit en direction de Destination 1", - "nl": "Ga rechtdoor richting Destination 1", - "ru": "Продолжайте движение в направлении Destination 1", - "sv": "Fortsätt mot Destination 1", - "vi": "Chạy tiếp đến Destination 1", - "zh-Hans": "继续直行行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/straight_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/straight_name.json deleted file mode 100644 index c7061fb8df9..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/straight_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "straight" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Geradeaus weiterfahren auf Way Name", - "en": "Continue onto Way Name", - "fr": "Continuer tout droit sur Way Name", - "nl": "Ga rechtdoor naar Way Name", - "ru": "Продолжайте движение по Way Name", - "sv": "Fortsätt in på Way Name", - "vi": "Chạy tiếp trên Way Name", - "zh-Hans": "继续直行，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/uturn_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/uturn_default.json deleted file mode 100644 index 43e3de6992a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/uturn_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "uturn" - }, - "name": "" - }, - "instructions": { - "de": "180°-Wendung", - "en": "Make a U-turn", - "fr": "Faire demi-tour", - "nl": "Keer om", - "ru": "Сделайте разворот", - "sv": "Gör en U-sväng", - "vi": "Quẹo ngược lại", - "zh-Hans": "调头" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/uturn_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/uturn_destination.json deleted file mode 100644 index bcf7e351e9e..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/uturn_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "uturn" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "180°-Wendung Richtung Destination 1", - "en": "Make a U-turn towards Destination 1", - "fr": "Faire demi-tour en direction de Destination 1", - "nl": "Keer om richting Destination 1", - "ru": "Сделайте разворот в направлении Destination 1", - "sv": "Gör en U-sväng mot Destination 1", - "vi": "Quẹo ngược đến Destination 1", - "zh-Hans": "调头后前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/uturn_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/uturn_name.json deleted file mode 100644 index 8e30b236e85..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/continue/uturn_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "uturn" - }, - "name": "Way Name" - }, - "instructions": { - "de": "180°-Wendung auf Way Name", - "en": "Make a U-turn onto Way Name", - "fr": "Faire demi-tour sur Way Name", - "nl": "Keer om naar Way Name", - "ru": "Сделайте разворот на Way Name", - "sv": "Gör en U-sväng in på Way Name", - "vi": "Quẹo ngược lại Way Name", - "zh-Hans": "调头上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/east_110.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/east_110.json deleted file mode 100644 index 1325be80584..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/east_110.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 110, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Osten", - "en": "Head east", - "fr": "Rouler vers l'est", - "nl": "Vertrek in oostelijke richting", - "ru": "Двигайтесь в восточном направлении", - "sv": "Kör åt öster", - "vi": "Đi về hướng đông", - "zh-Hans": "出发向东" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/east_70.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/east_70.json deleted file mode 100644 index 8a42c884f69..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/east_70.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 70, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Osten", - "en": "Head east", - "fr": "Rouler vers l'est", - "nl": "Vertrek in oostelijke richting", - "ru": "Двигайтесь в восточном направлении", - "sv": "Kör åt öster", - "vi": "Đi về hướng đông", - "zh-Hans": "出发向东" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/modifier_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/modifier_default.json deleted file mode 100644 index 6515a6d08b8..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/modifier_default.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 0, - "type": "depart", - "modifier": "left" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Norden", - "en": "Head north", - "fr": "Rouler vers le nord", - "nl": "Vertrek in noordelijke richting", - "ru": "Двигайтесь в северном направлении", - "sv": "Kör åt norr", - "vi": "Đi về hướng bắc", - "zh-Hans": "出发向北" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/modifier_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/modifier_destination.json deleted file mode 100644 index 73693d3e263..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/modifier_destination.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 0, - "type": "depart", - "modifier": "left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Fahren Sie Richtung Norden auf Way Name", - "en": "Head north on Way Name", - "fr": "Rouler vers le nord sur Way Name", - "nl": "Neem Way Name in noordelijke richting", - "ru": "Двигайтесь в северном направлении по Way Name", - "sv": "Kör åt norr på Way Name", - "vi": "Đi về hướng bắc trên Way Name", - "zh-Hans": "出发向北，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/modifier_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/modifier_name.json deleted file mode 100644 index 78d45b85ae4..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/modifier_name.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 0, - "type": "depart", - "modifier": "left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Fahren Sie Richtung Norden auf Way Name", - "en": "Head north on Way Name", - "fr": "Rouler vers le nord sur Way Name", - "nl": "Neem Way Name in noordelijke richting", - "ru": "Двигайтесь в северном направлении по Way Name", - "sv": "Kör åt norr på Way Name", - "vi": "Đi về hướng bắc trên Way Name", - "zh-Hans": "出发向北，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/north_20.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/north_20.json deleted file mode 100644 index 8ca73618d63..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/north_20.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 20, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Norden", - "en": "Head north", - "fr": "Rouler vers le nord", - "nl": "Vertrek in noordelijke richting", - "ru": "Двигайтесь в северном направлении", - "sv": "Kör åt norr", - "vi": "Đi về hướng bắc", - "zh-Hans": "出发向北" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/north_340.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/north_340.json deleted file mode 100644 index 1f1a48acba6..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/north_340.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 340, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Norden", - "en": "Head north", - "fr": "Rouler vers le nord", - "nl": "Vertrek in noordelijke richting", - "ru": "Двигайтесь в северном направлении", - "sv": "Kör åt norr", - "vi": "Đi về hướng bắc", - "zh-Hans": "出发向北" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northeast_21.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northeast_21.json deleted file mode 100644 index 99b1289f1b6..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northeast_21.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 21, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Nordosten", - "en": "Head northeast", - "fr": "Rouler vers le nord-est", - "nl": "Vertrek in noordoostelijke richting", - "ru": "Двигайтесь в северо-восточном направлении", - "sv": "Kör åt nordost", - "vi": "Đi về hướng đông bắc", - "zh-Hans": "出发向东北" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northeast_69.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northeast_69.json deleted file mode 100644 index 2783b70c456..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northeast_69.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 69, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Nordosten", - "en": "Head northeast", - "fr": "Rouler vers le nord-est", - "nl": "Vertrek in noordoostelijke richting", - "ru": "Двигайтесь в северо-восточном направлении", - "sv": "Kör åt nordost", - "vi": "Đi về hướng đông bắc", - "zh-Hans": "出发向东北" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northwest_291.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northwest_291.json deleted file mode 100644 index 7e21446f895..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northwest_291.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 291, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Nordwesten", - "en": "Head northwest", - "fr": "Rouler vers le nord-ouest", - "nl": "Vertrek in noordwestelijke richting", - "ru": "Двигайтесь в северо-западном направлении", - "sv": "Kör åt nordväst", - "vi": "Đi về hướng tây bắc", - "zh-Hans": "出发向西北" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northwest_339.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northwest_339.json deleted file mode 100644 index fee10dc5308..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/northwest_339.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 339, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Nordwesten", - "en": "Head northwest", - "fr": "Rouler vers le nord-ouest", - "nl": "Vertrek in noordwestelijke richting", - "ru": "Двигайтесь в северо-западном направлении", - "sv": "Kör åt nordväst", - "vi": "Đi về hướng tây bắc", - "zh-Hans": "出发向西北" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/south_160.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/south_160.json deleted file mode 100644 index 19bda964043..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/south_160.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 160, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Süden", - "en": "Head south", - "fr": "Rouler vers le sud", - "nl": "Vertrek in zuidelijke richting", - "ru": "Двигайтесь в южном направлении", - "sv": "Kör åt söder", - "vi": "Đi về hướng nam", - "zh-Hans": "出发向南" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/south_200.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/south_200.json deleted file mode 100644 index 3acd989db2d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/south_200.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 200, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Süden", - "en": "Head south", - "fr": "Rouler vers le sud", - "nl": "Vertrek in zuidelijke richting", - "ru": "Двигайтесь в южном направлении", - "sv": "Kör åt söder", - "vi": "Đi về hướng nam", - "zh-Hans": "出发向南" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southeast_111.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southeast_111.json deleted file mode 100644 index 8341dbb193f..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southeast_111.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 111, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Südosten", - "en": "Head southeast", - "fr": "Rouler vers le sud-est", - "nl": "Vertrek in zuidoostelijke richting", - "ru": "Двигайтесь в юго-восточном направлении", - "sv": "Kör åt sydost", - "vi": "Đi về hướng đông nam", - "zh-Hans": "出发向东南" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southeast_159.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southeast_159.json deleted file mode 100644 index 94c484a2b2a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southeast_159.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 159, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Südosten", - "en": "Head southeast", - "fr": "Rouler vers le sud-est", - "nl": "Vertrek in zuidoostelijke richting", - "ru": "Двигайтесь в юго-восточном направлении", - "sv": "Kör åt sydost", - "vi": "Đi về hướng đông nam", - "zh-Hans": "出发向东南" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southwest_201.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southwest_201.json deleted file mode 100644 index c250546bdb9..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southwest_201.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 201, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Südwesten", - "en": "Head southwest", - "fr": "Rouler vers le sud-ouest", - "nl": "Vertrek in zuidwestelijke richting", - "ru": "Двигайтесь в юго-западном направлении", - "sv": "Kör åt sydväst", - "vi": "Đi về hướng tây nam", - "zh-Hans": "出发向西南" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southwest_249.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southwest_249.json deleted file mode 100644 index 00c5d400045..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/southwest_249.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 249, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Südwesten", - "en": "Head southwest", - "fr": "Rouler vers le sud-ouest", - "nl": "Vertrek in zuidwestelijke richting", - "ru": "Двигайтесь в юго-западном направлении", - "sv": "Kör åt sydväst", - "vi": "Đi về hướng tây nam", - "zh-Hans": "出发向西南" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/west_250.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/west_250.json deleted file mode 100644 index 6e7bb67657b..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/west_250.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 250, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Westen", - "en": "Head west", - "fr": "Rouler vers l'ouest", - "nl": "Vertrek in westelijke richting", - "ru": "Двигайтесь в западном направлении", - "sv": "Kör åt väster", - "vi": "Đi về hướng tây", - "zh-Hans": "出发向西" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/west_290.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/west_290.json deleted file mode 100644 index d65bf49644a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/depart/west_290.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "bearing_after": 290, - "type": "depart" - }, - "name": "" - }, - "instructions": { - "de": "Fahren Sie Richtung Westen", - "en": "Head west", - "fr": "Rouler vers l'ouest", - "nl": "Vertrek in westelijke richting", - "ru": "Двигайтесь в западном направлении", - "sv": "Kör åt väster", - "vi": "Đi về hướng tây", - "zh-Hans": "出发向西" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/left_default.json deleted file mode 100644 index 67d433715d0..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "left" - }, - "name": "" - }, - "instructions": { - "de": "Links abbiegen", - "en": "Turn left", - "fr": "Tourner à gauche", - "nl": "Ga links", - "ru": "Поверните налево", - "sv": "Sväng vänster", - "vi": "Quẹo trái", - "zh-Hans": "向左行驶" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/left_destination.json deleted file mode 100644 index 9ba206c2cdf..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Links abbiegen Richtung Destination 1", - "en": "Turn left towards Destination 1", - "fr": "Tourner à gauche en direction de Destination 1", - "nl": "Ga links richting Destination 1", - "ru": "Поверните налево в направлении Destination 1", - "sv": "Sväng vänster mot Destination 1", - "vi": "Quẹo trái đến Destination 1", - "zh-Hans": "向左行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/left_name.json deleted file mode 100644 index 58ff11aaa72..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Links abbiegen auf Way Name", - "en": "Turn left onto Way Name", - "fr": "Tourner à gauche sur Way Name", - "nl": "Ga links naar Way Name", - "ru": "Поверните налево на Way Name", - "sv": "Sväng vänster in på Way Name", - "vi": "Quẹo trái vào Way Name", - "zh-Hans": "向左行驶，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/right_default.json deleted file mode 100644 index 0d376a62bc9..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "right" - }, - "name": "" - }, - "instructions": { - "de": "Rechts abbiegen", - "en": "Turn right", - "fr": "Tourner à droite", - "nl": "Ga rechts", - "ru": "Поверните направо", - "sv": "Sväng höger", - "vi": "Quẹo phải", - "zh-Hans": "向右行驶" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/right_destination.json deleted file mode 100644 index a870a5ed204..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rechts abbiegen Richtung Destination 1", - "en": "Turn right towards Destination 1", - "fr": "Tourner à droite en direction de Destination 1", - "nl": "Ga rechts richting Destination 1", - "ru": "Поверните направо в направлении Destination 1", - "sv": "Sväng höger mot Destination 1", - "vi": "Quẹo phải đến Destination 1", - "zh-Hans": "向右行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/right_name.json deleted file mode 100644 index 1e250623280..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rechts abbiegen auf Way Name", - "en": "Turn right onto Way Name", - "fr": "Tourner à droite sur Way Name", - "nl": "Ga rechts naar Way Name", - "ru": "Поверните направо на Way Name", - "sv": "Sväng höger in på Way Name", - "vi": "Quẹo phải vào Way Name", - "zh-Hans": "向右行驶，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_left_default.json deleted file mode 100644 index 8476011a3e3..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "sharp left" - }, - "name": "" - }, - "instructions": { - "de": "Scharf links abbiegen", - "en": "Turn sharp left", - "fr": "Tourner franchement à gauche", - "nl": "Ga linksaf", - "ru": "Поверните резко налево", - "sv": "Sväng skarp vänster", - "vi": "Quẹo trái gắt", - "zh-Hans": "向左行驶" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_left_destination.json deleted file mode 100644 index 39cfc49c6fc..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "sharp left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf links abbiegen Richtung Destination 1", - "en": "Turn sharp left towards Destination 1", - "fr": "Tourner franchement à gauche en direction de Destination 1", - "nl": "Ga linksaf richting Destination 1", - "ru": "Поверните резко налево в направлении Destination 1", - "sv": "Sväng skarp vänster mot Destination 1", - "vi": "Quẹo trái gắt đến Destination 1", - "zh-Hans": "向左行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_left_name.json deleted file mode 100644 index 58c39036c58..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "sharp left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf links abbiegen auf Way Name", - "en": "Turn sharp left onto Way Name", - "fr": "Tourner franchement à gauche sur Way Name", - "nl": "Ga linksaf naar Way Name", - "ru": "Поверните резко налево на Way Name", - "sv": "Sväng skarp vänster in på Way Name", - "vi": "Quẹo trái gắt vào Way Name", - "zh-Hans": "向左行驶，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_right_default.json deleted file mode 100644 index f6650b59a20..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "sharp right" - }, - "name": "" - }, - "instructions": { - "de": "Scharf rechts abbiegen", - "en": "Turn sharp right", - "fr": "Tourner franchement à droite", - "nl": "Ga rechtsaf", - "ru": "Поверните резко направо", - "sv": "Sväng skarp höger", - "vi": "Quẹo phải gắt", - "zh-Hans": "向右行驶" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_right_destination.json deleted file mode 100644 index c163f889c6a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "sharp right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf rechts abbiegen Richtung Destination 1", - "en": "Turn sharp right towards Destination 1", - "fr": "Tourner franchement à droite en direction de Destination 1", - "nl": "Ga rechtsaf richting Destination 1", - "ru": "Поверните резко направо в направлении Destination 1", - "sv": "Sväng skarp höger mot Destination 1", - "vi": "Quẹo phải gắt đến Destination 1", - "zh-Hans": "向右行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_right_name.json deleted file mode 100644 index 58691ae6bfe..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/sharp_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "sharp right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf rechts abbiegen auf Way Name", - "en": "Turn sharp right onto Way Name", - "fr": "Tourner franchement à droite sur Way Name", - "nl": "Ga rechtsaf naar Way Name", - "ru": "Поверните резко направо на Way Name", - "sv": "Sväng skarp höger in på Way Name", - "vi": "Quẹo phải gắt vào Way Name", - "zh-Hans": "向右行驶，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_left_default.json deleted file mode 100644 index 8410434a2ba..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "slight left" - }, - "name": "" - }, - "instructions": { - "de": "Leicht links abbiegen", - "en": "Turn slight left", - "fr": "Tourner légèrement à gauche", - "nl": "Ga links", - "ru": "Поверните плавно налево", - "sv": "Sväng lätt vänster", - "vi": "Quẹo trái nghiêng", - "zh-Hans": "向左行驶" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_left_destination.json deleted file mode 100644 index a7a9260fb03..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "slight left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Leicht links abbiegen Richtung Destination 1", - "en": "Turn slight left towards Destination 1", - "fr": "Tourner légèrement à gauche en direction de Destination 1", - "nl": "Ga links richting Destination 1", - "ru": "Поверните плавно налево в направлении Destination 1", - "sv": "Sväng lätt vänster mot Destination 1", - "vi": "Quẹo trái nghiêng đến Destination 1", - "zh-Hans": "向左行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_left_name.json deleted file mode 100644 index f024ff48da4..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "slight left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Leicht links abbiegen auf Way Name", - "en": "Turn slight left onto Way Name", - "fr": "Tourner légèrement à gauche sur Way Name", - "nl": "Ga links naar Way Name", - "ru": "Поверните плавно налево на Way Name", - "sv": "Sväng lätt vänster in på Way Name", - "vi": "Quẹo trái nghiêng vào Way Name", - "zh-Hans": "向左行驶，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_right_default.json deleted file mode 100644 index bb01fa5c4de..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "slight right" - }, - "name": "" - }, - "instructions": { - "de": "Leicht rechts abbiegen", - "en": "Turn slight right", - "fr": "Tourner légèrement à droite", - "nl": "Ga rechts", - "ru": "Поверните плавно направо", - "sv": "Sväng lätt höger", - "vi": "Quẹo phải nghiêng", - "zh-Hans": "向右行驶" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_right_destination.json deleted file mode 100644 index 8c3bf5ae3ba..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "slight right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Leicht rechts abbiegen Richtung Destination 1", - "en": "Turn slight right towards Destination 1", - "fr": "Tourner légèrement à droite en direction de Destination 1", - "nl": "Ga rechts richting Destination 1", - "ru": "Поверните плавно направо в направлении Destination 1", - "sv": "Sväng lätt höger mot Destination 1", - "vi": "Quẹo phải nghiêng đến Destination 1", - "zh-Hans": "向右行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_right_name.json deleted file mode 100644 index ed30eb94f67..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/slight_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "slight right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Leicht rechts abbiegen auf Way Name", - "en": "Turn slight right onto Way Name", - "fr": "Tourner légèrement à droite sur Way Name", - "nl": "Ga rechts naar Way Name", - "ru": "Поверните плавно направо на Way Name", - "sv": "Sväng lätt höger in på Way Name", - "vi": "Quẹo phải nghiêng vào Way Name", - "zh-Hans": "向右行驶，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/straight_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/straight_default.json deleted file mode 100644 index 97d5c2f2336..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/straight_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "straight" - }, - "name": "" - }, - "instructions": { - "de": "Geradeaus weiterfahren", - "en": "Continue straight", - "fr": "Continuer tout droit", - "nl": "Ga in de aangegeven richting", - "ru": "Продолжайте движение прямо", - "sv": "Fortsätt rakt fram", - "vi": "Chạy thẳng", - "zh-Hans": "继续直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/straight_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/straight_destination.json deleted file mode 100644 index c03ef16cb93..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/straight_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "straight" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Geradeaus weiterfahren Richtung Destination 1", - "en": "Continue straight towards Destination 1", - "fr": "Continuer tout droit en direction de Destination 1", - "nl": "Ga richting Destination 1", - "ru": "Продолжайте движение прямо в направлении Destination 1", - "sv": "Fortsätt rakt fram mot Destination 1", - "vi": "Chạy tiếp đến Destination 1", - "zh-Hans": "继续直行，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/straight_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/straight_name.json deleted file mode 100644 index 66b52fd852d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/straight_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "straight" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Geradeaus weiterfahren auf Way Name", - "en": "Continue straight onto Way Name", - "fr": "Continuer tout droit sur Way Name", - "nl": "Ga naar Way Name", - "ru": "Продолжайте движение прямо по Way Name", - "sv": "Fortsätt rakt fram in på Way Name", - "vi": "Chạy tiếp trên Way Name", - "zh-Hans": "继续直行，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/uturn_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/uturn_default.json deleted file mode 100644 index e46ada1e5bc..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/uturn_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "uturn" - }, - "name": "" - }, - "instructions": { - "de": "180°-Wendung am Ende der Straße", - "en": "Make a U-turn at the end of the road", - "fr": "Faire demi-tour à la fin de la route", - "nl": "Keer om", - "ru": "Сделайте разворот в конце дороги", - "sv": "Gör en U-sväng i slutet av vägen", - "vi": "Quẹo ngược lại tại cuối đường", - "zh-Hans": "在道路尽头调头" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/uturn_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/uturn_destination.json deleted file mode 100644 index a36e98406fa..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/uturn_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "uturn" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "180°-Wendung Richtung Destination 1 am Ende der Straße", - "en": "Make a U-turn towards Destination 1 at the end of the road", - "fr": "Faire demi-tour à la fin de la route en direction de Destination 1", - "nl": "Keer om richting Destination 1", - "ru": "Сделайте разворот в направлении Destination 1 в конце дороги", - "sv": "Gör en U-sväng mot Destination 1 i slutet av vägen", - "vi": "Quẹo ngược đến Destination 1 tại cuối đường", - "zh-Hans": "在道路尽头调头，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/uturn_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/uturn_name.json deleted file mode 100644 index 81218f92414..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/end_of_road/uturn_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "end of road", - "modifier": "uturn" - }, - "name": "Way Name" - }, - "instructions": { - "de": "180°-Wendung auf Way Name am Ende der Straße", - "en": "Make a U-turn onto Way Name at the end of the road", - "fr": "Faire demi-tour à la fin de la route Way Name", - "nl": "Keer om naar Way Name", - "ru": "Сделайте разворот на Way Name в конце дороги", - "sv": "Gör en U-sväng in på Way Name i slutet av vägen", - "vi": "Quẹo ngược vào Way Name tại cuối đường", - "zh-Hans": "在道路尽头调头上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/left_default.json deleted file mode 100644 index 96c0a51b04d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "left" - }, - "name": "" - }, - "instructions": { - "de": "Links halten an der Gabelung", - "en": "Keep left at the fork", - "fr": "Rester à gauche à l'embranchement", - "nl": "Ga links op de splitsing", - "ru": "На развилке поверните налево", - "sv": "Håll till vänster där vägen delar sig", - "vi": "Đi bên trái ở ngã ba", - "zh-Hans": "在岔道保持向左" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/left_destination.json deleted file mode 100644 index a168ad2a1d4..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Links halten an der Gabelung Richtung Destination 1", - "en": "Keep left at the fork towards Destination 1", - "fr": "Rester à gauche à l'embranchement en direction de Destination 1", - "nl": "Ga links op de splitsing richting Destination 1", - "ru": "На развилке поверните налево и продолжайте движение в направлении Destination 1", - "sv": "Håll till vänster mot Destination 1", - "vi": "Đi bên trái ở ngã ba đến Destination 1", - "zh-Hans": "在岔道保持向左，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/left_name.json deleted file mode 100644 index c15481cfb92..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Links halten an der Gabelung auf Way Name", - "en": "Keep left at the fork onto Way Name", - "fr": "Rester à gauche à l'embranchement sur Way Name", - "nl": "Ga links op de splitsing naar Way Name", - "ru": "На развилке поверните налево на Way Name", - "sv": "Håll till vänster in på Way Name", - "vi": "Đi bên trái ở ngã ba vào Way Name", - "zh-Hans": "在岔道保持向左，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/right_default.json deleted file mode 100644 index cebbb5f45c2..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "right" - }, - "name": "" - }, - "instructions": { - "de": "Rechts halten an der Gabelung", - "en": "Keep right at the fork", - "fr": "Rester à droite à l'embranchement", - "nl": "Ga rechts op de splitsing", - "ru": "На развилке поверните направо", - "sv": "Håll till höger där vägen delar sig", - "vi": "Đi bên phải ở ngã ba", - "zh-Hans": "在岔道保持向右" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/right_destination.json deleted file mode 100644 index 25c188a0ced..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rechts halten an der Gabelung Richtung Destination 1", - "en": "Keep right at the fork towards Destination 1", - "fr": "Rester à droite à l'embranchement en direction de Destination 1", - "nl": "Ga rechts op de splitsing richting Destination 1", - "ru": "На развилке поверните направо и продолжайте движение в направлении Destination 1", - "sv": "Håll till höger mot Destination 1", - "vi": "Đi bên phải ở ngã ba đến Destination 1", - "zh-Hans": "在岔道保持向右，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/right_name.json deleted file mode 100644 index 6fa79c3e8f5..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rechts halten an der Gabelung auf Way Name", - "en": "Keep right at the fork onto Way Name", - "fr": "Rester à droite à l'embranchement sur Way Name", - "nl": "Ga rechts op de splitsing naar Way Name", - "ru": "На развилке поверните направо на Way Name", - "sv": "Håll till höger in på Way Name", - "vi": "Đi bên phải ở ngã ba vào Way Name", - "zh-Hans": "在岔道保持向右，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_left_default.json deleted file mode 100644 index 2a54a226cbc..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "sharp left" - }, - "name": "" - }, - "instructions": { - "de": "Scharf links abbiegen an der Gabelung", - "en": "Take a sharp left at the fork", - "fr": "Prendre à gauche à l'embranchement", - "nl": "Linksaf op de splitsing", - "ru": "На развилке поверните резко налево", - "sv": "Gör en skarp vänstersväng där vägen delar sig", - "vi": "Quẹo gắt bên trái ở ngã ba", - "zh-Hans": "在岔道保持向左" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_left_destination.json deleted file mode 100644 index aaa63d14305..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "sharp left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf links abbiegen an der Gabelung Richtung Destination 1", - "en": "Take a sharp left at the fork towards Destination 1", - "fr": "Prendre à gauche à l'embranchement en direction de Destination 1", - "nl": "Linksaf op de splitsing richting Destination 1", - "ru": "На развилке поверните резко налево и продолжайте движение в направлении Destination 1", - "sv": "Gör en skarp vänstersväng mot Destination 1", - "vi": "Quẹo gắt bên trái ở ngã ba đến Destination 1", - "zh-Hans": "在岔道保持向左，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_left_name.json deleted file mode 100644 index 0b0d0f6d679..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "sharp left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf links abbiegen an der Gabelung auf Way Name", - "en": "Take a sharp left at the fork onto Way Name", - "fr": "Prendre à gauche à l'embranchement sur Way Name", - "nl": "Linksaf op de splitsing naar Way Name", - "ru": "На развилке поверните резко налево на Way Name", - "sv": "Gör en skarp vänstersväng in på Way Name", - "vi": "Quẹo gắt bên trái ở ngã ba vào Way Name", - "zh-Hans": "在岔道保持向左，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_right_default.json deleted file mode 100644 index 564b393f749..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "sharp right" - }, - "name": "" - }, - "instructions": { - "de": "Scharf rechts abbiegen an der Gabelung", - "en": "Take a sharp right at the fork", - "fr": "Prendre à droite à l'embranchement", - "nl": "Rechtsaf op de splitsing", - "ru": "На развилке поверните резко направо", - "sv": "Gör en skarp högersväng där vägen delar sig", - "vi": "Quẹo gắt bên phải ở ngã ba", - "zh-Hans": "在岔道保持向右" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_right_destination.json deleted file mode 100644 index 6c1178b6789..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "sharp right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf rechts abbiegen an der Gabelung Richtung Destination 1", - "en": "Take a sharp right at the fork towards Destination 1", - "fr": "Prendre à droite à l'embranchement en direction de Destination 1", - "nl": "Rechtsaf op de splitsing richting Destination 1", - "ru": "На развилке поверните резко направо и продолжайте движение в направлении Destination 1", - "sv": "Gör en skarp högersväng mot Destination 1", - "vi": "Quẹo gắt bên phải ở ngã ba đến Destination 1", - "zh-Hans": "在岔道保持向右，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_right_name.json deleted file mode 100644 index b0cfc515161..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/sharp_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "sharp right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf rechts abbiegen an der Gabelung auf Way Name", - "en": "Take a sharp right at the fork onto Way Name", - "fr": "Prendre à droite à l'embranchement sur Way Name", - "nl": "Rechtsaf op de splitsing naar Way Name", - "ru": "На развилке поверните резко направо на Way Name", - "sv": "Gör en skarp högersväng in på Way Name", - "vi": "Quẹo gắt bên phải ở ngã ba vào Way Name", - "zh-Hans": "在岔道保持向右，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_left_default.json deleted file mode 100644 index f1f0200cb29..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "slight left" - }, - "name": "" - }, - "instructions": { - "de": "Links halten an der Gabelung", - "en": "Keep left at the fork", - "fr": "Rester à gauche à l'embranchement", - "nl": "Links aanhouden op de splitsing", - "ru": "Держитесь левее на развилке", - "sv": "Håll till vänster där vägen delar sig", - "vi": "Nghiêng về bên trái ở ngã ba", - "zh-Hans": "在岔道保持向左" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_left_destination.json deleted file mode 100644 index b0924e6c0d7..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "slight left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Links halten an der Gabelung Richtung Destination 1", - "en": "Keep left at the fork towards Destination 1", - "fr": "Rester à gauche à l'embranchement en direction de Destination 1", - "nl": "Links aanhouden op de splitsing richting Destination 1", - "ru": "На развилке держитесь левой стороны и продолжайте движение в направлении Destination 1", - "sv": "Håll till vänster mot Destination 1", - "vi": "Nghiêng về bên trái ở ngã ba đến Destination 1", - "zh-Hans": "在岔道保持向左，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_left_name.json deleted file mode 100644 index 4cf85af8835..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "slight left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Links halten an der Gabelung auf Way Name", - "en": "Keep left at the fork onto Way Name", - "fr": "Rester à gauche à l'embranchement sur Way Name", - "nl": "Links aanhouden op de splitsing naar Way Name", - "ru": "Держитесь левее на развилке на Way Name", - "sv": "Håll till vänster in på Way Name", - "vi": "Nghiêng về bên trái ở ngã ba vào Way Name", - "zh-Hans": "在岔道保持向左，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_right_default.json deleted file mode 100644 index 7f697ad1b03..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "slight right" - }, - "name": "" - }, - "instructions": { - "de": "Rechts halten an der Gabelung", - "en": "Keep right at the fork", - "fr": "Rester à droite à l'embranchement", - "nl": "Rechts aanhouden op de splitsing", - "ru": "Держитесь правее на развилке", - "sv": "Håll till höger där vägen delar sig", - "vi": "Nghiêng về bên phải ở ngã ba", - "zh-Hans": "在岔道保持向右" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_right_destination.json deleted file mode 100644 index ce6da82e323..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "slight right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rechts halten an der Gabelung Richtung Destination 1", - "en": "Keep right at the fork towards Destination 1", - "fr": "Rester à droite à l'embranchement en direction de Destination 1", - "nl": "Rechts aanhouden op de splitsing richting Destination 1", - "ru": "На развилке держитесь правой стороны и продолжайте движение в направлении Destination 1", - "sv": "Håll till höger mot Destination 1", - "vi": "Nghiêng về bên phải ở ngã ba đến Destination 1", - "zh-Hans": "在岔道保持向右，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_right_name.json deleted file mode 100644 index 386b7f0fd93..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/slight_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "slight right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rechts halten an der Gabelung auf Way Name", - "en": "Keep right at the fork onto Way Name", - "fr": "Rester à droite à l'embranchement sur Way Name", - "nl": "Rechts aanhouden op de splitsing naar Way Name", - "ru": "Держитесь правее на развилке на Way Name", - "sv": "Håll till höger in på Way Name", - "vi": "Nghiêng về bên phải ở ngã ba vào Way Name", - "zh-Hans": "在岔道保持向右，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/straight_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/straight_default.json deleted file mode 100644 index 310efcbedd7..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/straight_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "straight" - }, - "name": "" - }, - "instructions": { - "de": "Geradeaus halten an der Gabelung", - "en": "Keep straight at the fork", - "fr": "Rester tout droit à l'embranchement", - "nl": "Ga rechtdoor op de splitsing", - "ru": "На развилке поверните прямо", - "sv": "Håll till rakt fram där vägen delar sig", - "vi": "Đi bên thẳng ở ngã ba", - "zh-Hans": "在岔道保持直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/straight_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/straight_destination.json deleted file mode 100644 index d81363b22f2..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/straight_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "straight" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Geradeaus halten an der Gabelung Richtung Destination 1", - "en": "Keep straight at the fork towards Destination 1", - "fr": "Rester tout droit à l'embranchement en direction de Destination 1", - "nl": "Ga rechtdoor op de splitsing richting Destination 1", - "ru": "На развилке поверните прямо и продолжайте движение в направлении Destination 1", - "sv": "Håll till rakt fram mot Destination 1", - "vi": "Đi bên thẳng ở ngã ba đến Destination 1", - "zh-Hans": "在岔道保持直行，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/straight_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/straight_name.json deleted file mode 100644 index d91f86859ed..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/straight_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "straight" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Geradeaus halten an der Gabelung auf Way Name", - "en": "Keep straight at the fork onto Way Name", - "fr": "Rester tout droit à l'embranchement sur Way Name", - "nl": "Ga rechtdoor op de splitsing naar Way Name", - "ru": "На развилке поверните прямо на Way Name", - "sv": "Håll till rakt fram in på Way Name", - "vi": "Đi bên thẳng ở ngã ba vào Way Name", - "zh-Hans": "在岔道保持直行，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/uturn_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/uturn_default.json deleted file mode 100644 index ce24af97e60..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/uturn_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "uturn" - }, - "name": "" - }, - "instructions": { - "de": "180°-Wendung", - "en": "Make a U-turn", - "fr": "Faire demi-tour", - "nl": "Keer om", - "ru": "На развилке сделайте разворот", - "sv": "Gör en U-sväng", - "vi": "Quẹo ngược lại", - "zh-Hans": "调头" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/uturn_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/uturn_destination.json deleted file mode 100644 index 71f07bcb3b5..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/uturn_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "uturn" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "180°-Wendung Richtung Destination 1", - "en": "Make a U-turn towards Destination 1", - "fr": "Faire demi-tour en direction de Destination 1", - "nl": "Keer om richting Destination 1", - "ru": "На развилке сделайте разворот и продолжайте движение в направлении Destination 1", - "sv": "Gör en U-sväng mot Destination 1", - "vi": "Quẹo ngược lại đến Destination 1", - "zh-Hans": "调头，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/uturn_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/uturn_name.json deleted file mode 100644 index 7b65d636881..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/fork/uturn_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "uturn" - }, - "name": "Way Name" - }, - "instructions": { - "de": "180°-Wendung auf Way Name", - "en": "Make a U-turn onto Way Name", - "fr": "Faire demi-tour sur Way Name", - "nl": "Keer om naar Way Name", - "ru": "На развилке сделайте разворот на Way Name", - "sv": "Gör en U-sväng in på Way Name", - "vi": "Quẹo ngược lại Way Name", - "zh-Hans": "调头，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/left_default.json deleted file mode 100644 index bc47bf3b7c9..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "left" - }, - "name": "" - }, - "instructions": { - "de": "Links auffahren", - "en": "Merge left", - "fr": "Rejoindre à gauche", - "nl": "Bij de splitsing links", - "ru": "Слияние полосы налево", - "sv": "Körfältsbyte åt vänster", - "vi": "Nhập sang trái", - "zh-Hans": "向左并道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/left_destination.json deleted file mode 100644 index c7cc47c54e7..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Links auffahren Richtung Destination 1", - "en": "Merge left towards Destination 1", - "fr": "Rejoindre à gauche en direction de Destination 1", - "nl": "Bij de splitsing links richting Destination 1", - "ru": "Слияние полосы налево в направлении Destination 1", - "sv": "Körfältsbyte åt vänster mot Destination 1", - "vi": "Nhập sang trái đến Destination 1", - "zh-Hans": "向左并道，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/left_name.json deleted file mode 100644 index 93018638ebb..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Links auffahren auf Way Name", - "en": "Merge left onto Way Name", - "fr": "Rejoindre à gauche sur Way Name", - "nl": "Bij de splitsing links naar Way Name", - "ru": "Слияние полосы налево на Way Name", - "sv": "Körfältsbyte åt vänster in på Way Name", - "vi": "Nhập sang trái vào Way Name", - "zh-Hans": "向左并道，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/right_default.json deleted file mode 100644 index d87c882f8e6..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "right" - }, - "name": "" - }, - "instructions": { - "de": "Rechts auffahren", - "en": "Merge right", - "fr": "Rejoindre à droite", - "nl": "Bij de splitsing rechts", - "ru": "Слияние полосы направо", - "sv": "Körfältsbyte åt höger", - "vi": "Nhập sang phải", - "zh-Hans": "向右并道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/right_destination.json deleted file mode 100644 index 4799964fdb2..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rechts auffahren Richtung Destination 1", - "en": "Merge right towards Destination 1", - "fr": "Rejoindre à droite en direction de Destination 1", - "nl": "Bij de splitsing rechts richting Destination 1", - "ru": "Слияние полосы направо в направлении Destination 1", - "sv": "Körfältsbyte åt höger mot Destination 1", - "vi": "Nhập sang phải đến Destination 1", - "zh-Hans": "向右并道，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/right_name.json deleted file mode 100644 index 220b2041161..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rechts auffahren auf Way Name", - "en": "Merge right onto Way Name", - "fr": "Rejoindre à droite sur Way Name", - "nl": "Bij de splitsing rechts naar Way Name", - "ru": "Слияние полосы направо на Way Name", - "sv": "Körfältsbyte åt höger in på Way Name", - "vi": "Nhập sang phải vào Way Name", - "zh-Hans": "向右并道，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_left_default.json deleted file mode 100644 index 1d9cdd3cbd7..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "sharp left" - }, - "name": "" - }, - "instructions": { - "de": "Scharf links auffahren", - "en": "Merge left", - "fr": "Rejoindre par la gauche", - "nl": "Bij de splitsing linksaf", - "ru": "Слияние полосы налево", - "sv": "Körfältsbyte åt vänster", - "vi": "Nhập sang trái", - "zh-Hans": "向左并道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_left_destination.json deleted file mode 100644 index 8edb468ea0b..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "sharp left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf links auffahren Richtung Destination 1", - "en": "Merge left towards Destination 1", - "fr": "Rejoindre par la gauche la route en direction de Destination 1", - "nl": "Bij de splitsing linksaf richting Destination 1", - "ru": "Слияние полосы налево в направлении Destination 1", - "sv": "Körfältsbyte åt vänster mot Destination 1", - "vi": "Nhập sang trái đến Destination 1", - "zh-Hans": "向左并道，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_left_name.json deleted file mode 100644 index f5185e5393c..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "sharp left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf links auffahren auf Way Name", - "en": "Merge left onto Way Name", - "fr": "Rejoindre Way Name par la gauche", - "nl": "Bij de splitsing linksaf naar Way Name", - "ru": "Слияние полосы налево на Way Name", - "sv": "Körfältsbyte åt vänster in på Way Name", - "vi": "Nhập sang trái vào Way Name", - "zh-Hans": "向左并道，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_right_default.json deleted file mode 100644 index 52e530c7f1d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "sharp right" - }, - "name": "" - }, - "instructions": { - "de": "Scharf rechts auffahren", - "en": "Merge right", - "fr": "Rejoindre par la droite", - "nl": "Bij de splitsing rechtsaf", - "ru": "Слияние полосы направо", - "sv": "Körfältsbyte åt höger", - "vi": "Nhập sang phải", - "zh-Hans": "向右并道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_right_destination.json deleted file mode 100644 index 381ca527117..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "sharp right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf rechts auffahren Richtung Destination 1", - "en": "Merge right towards Destination 1", - "fr": "Rejoindre par la droite la route en direction de Destination 1", - "nl": "Bij de splitsing rechtsaf richting Destination 1", - "ru": "Слияние полосы направо в направлении Destination 1", - "sv": "Körfältsbyte åt höger mot Destination 1", - "vi": "Nhập sang phải đến Destination 1", - "zh-Hans": "向右并道，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_right_name.json deleted file mode 100644 index e1b201d599d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/sharp_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "sharp right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf rechts auffahren auf Way Name", - "en": "Merge right onto Way Name", - "fr": "Rejoindre Way Name par la droite", - "nl": "Bij de splitsing rechtsaf naar Way Name", - "ru": "Слияние полосы направо на Way Name", - "sv": "Körfältsbyte åt höger in på Way Name", - "vi": "Nhập sang phải vào Way Name", - "zh-Hans": "向右并道，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_left_default.json deleted file mode 100644 index 2c0a8a2f3d9..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "slight left" - }, - "name": "" - }, - "instructions": { - "de": "Leicht links auffahren", - "en": "Merge left", - "fr": "Rejoindre légèrement par la gauche", - "nl": "Bij de splitsing links aanhouden", - "ru": "Слияние полосы налево", - "sv": "Körfältsbyte åt vänster", - "vi": "Nhập sang trái", - "zh-Hans": "向左并道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_left_destination.json deleted file mode 100644 index c6d94add16a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "slight left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Leicht links auffahren Richtung Destination 1", - "en": "Merge left towards Destination 1", - "fr": "Rejoindre légèrement par la gauche la route en direction de Destination 1", - "nl": "Bij de splitsing links aanhouden richting Destination 1", - "ru": "Слияние полосы налево в направлении Destination 1", - "sv": "Körfältsbyte åt vänster mot Destination 1", - "vi": "Nhập sang trái đến Destination 1", - "zh-Hans": "向左并道，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_left_name.json deleted file mode 100644 index 347b7f97b39..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "slight left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Leicht links auffahren auf Way Name", - "en": "Merge left onto Way Name", - "fr": "Rejoindre Way Name légèrement par la gauche", - "nl": "Bij de splitsing links aanhouden naar Way Name", - "ru": "Слияние полосы налево на Way Name", - "sv": "Körfältsbyte åt vänster in på Way Name", - "vi": "Nhập sang trái vào Way Name", - "zh-Hans": "向左并道，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_right_default.json deleted file mode 100644 index 7d2844a2e81..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "slight right" - }, - "name": "" - }, - "instructions": { - "de": "Leicht rechts auffahren", - "en": "Merge right", - "fr": "Rejoindre légèrement par la droite", - "nl": "Bij de splitsing rechts aanhouden", - "ru": "Слияние полосы направо", - "sv": "Körfältsbyte åt höger", - "vi": "Nhập sang phải", - "zh-Hans": "向右并道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_right_destination.json deleted file mode 100644 index 8a7b78af4f5..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "slight right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Leicht rechts auffahren Richtung Destination 1", - "en": "Merge right towards Destination 1", - "fr": "Rejoindre légèrement par la droite la route en direction de Destination 1", - "nl": "Bij de splitsing rechts aanhouden richting Destination 1", - "ru": "Слияние полосы направо в направлении Destination 1", - "sv": "Körfältsbyte åt höger mot Destination 1", - "vi": "Nhập sang phải đến Destination 1", - "zh-Hans": "向右并道，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_right_name.json deleted file mode 100644 index 4f113e63c56..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/slight_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "slight right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Leicht rechts auffahren auf Way Name", - "en": "Merge right onto Way Name", - "fr": "Rejoindre Way Name légèrement par la droite", - "nl": "Bij de splitsing rechts aanhouden naar Way Name", - "ru": "Слияние полосы направо на Way Name", - "sv": "Körfältsbyte åt höger in på Way Name", - "vi": "Nhập sang phải vào Way Name", - "zh-Hans": "向右并道，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/straight_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/straight_default.json deleted file mode 100644 index 6ce8e983204..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/straight_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "straight" - }, - "name": "" - }, - "instructions": { - "de": "Geradeaus auffahren", - "en": "Merge straight", - "fr": "Rejoindre tout droit", - "nl": "Bij de splitsing rechtdoor", - "ru": "Слияние полосы прямо", - "sv": "Körfältsbyte åt rakt fram", - "vi": "Nhập sang thẳng", - "zh-Hans": "直行并道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/straight_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/straight_destination.json deleted file mode 100644 index e6c09834709..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/straight_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "straight" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Geradeaus auffahren Richtung Destination 1", - "en": "Merge straight towards Destination 1", - "fr": "Rejoindre tout droit en direction de Destination 1", - "nl": "Bij de splitsing rechtdoor richting Destination 1", - "ru": "Слияние полосы прямо в направлении Destination 1", - "sv": "Körfältsbyte åt rakt fram mot Destination 1", - "vi": "Nhập sang thẳng đến Destination 1", - "zh-Hans": "直行并道，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/straight_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/straight_name.json deleted file mode 100644 index c570c7b5a7a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/straight_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "straight" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Geradeaus auffahren auf Way Name", - "en": "Merge straight onto Way Name", - "fr": "Rejoindre tout droit sur Way Name", - "nl": "Bij de splitsing rechtdoor naar Way Name", - "ru": "Слияние полосы прямо на Way Name", - "sv": "Körfältsbyte åt rakt fram in på Way Name", - "vi": "Nhập sang thẳng vào Way Name", - "zh-Hans": "直行并道，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/uturn_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/uturn_default.json deleted file mode 100644 index a1787aa36c4..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/uturn_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "uturn" - }, - "name": "" - }, - "instructions": { - "de": "180°-Wendung", - "en": "Make a U-turn", - "fr": "Fair demi-tour", - "nl": "Keer om", - "ru": "Сделайте разворот", - "sv": "Gör en U-sväng", - "vi": "Quẹo ngược lại", - "zh-Hans": "调头" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/uturn_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/uturn_destination.json deleted file mode 100644 index 10944f02dc8..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/uturn_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "uturn" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "180°-Wendung Richtung Destination 1", - "en": "Make a U-turn towards Destination 1", - "fr": "Fair demi-tour en direction de Destination 1", - "nl": "Keer om richting Destination 1", - "ru": "Сделайте разворот в направлении Destination 1", - "sv": "Gör en U-sväng mot Destination 1", - "vi": "Quẹo ngược lại đến Destination 1", - "zh-Hans": "调头，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/uturn_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/uturn_name.json deleted file mode 100644 index 0c8ed93ebad..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/merge/uturn_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "merge", - "modifier": "uturn" - }, - "name": "Way Name" - }, - "instructions": { - "de": "180°-Wendung auf Way Name", - "en": "Make a U-turn onto Way Name", - "fr": "Fair demi-tour sur Way Name", - "nl": "Keer om naar Way Name", - "ru": "Сделайте разворот на Way Name", - "sv": "Gör en U-sväng in på Way Name", - "vi": "Quẹo ngược lại Way Name", - "zh-Hans": "调头，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/driving_turn_left.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/driving_turn_left.json deleted file mode 100644 index 46806596fb2..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/driving_turn_left.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "left" - }, - "mode": "driving", - "name": "Way Name" - }, - "instructions": { - "de": "Links abbiegen auf Way Name", - "en": "Turn left onto Way Name", - "fr": "Tourner à gauche sur Way Name", - "nl": "Ga linksaf naar Way Name", - "ru": "Поверните налево на Way Name", - "sv": "Sväng vänster in på Way Name", - "vi": "Quẹo trái vào Way Name", - "zh-Hans": "左转，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_fork_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_fork_left_default.json deleted file mode 100644 index 6545fa8560c..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_fork_left_default.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "left" - }, - "mode": "ferry", - "name": "" - }, - "instructions": { - "de": "Fähre nehmen", - "en": "Take the ferry", - "fr": "Prendre le ferry", - "nl": "Neem het veer", - "ru": "Возьмите паром", - "sv": "Ta färjan", - "vi": "Lên phà", - "zh-Hans": "乘坐轮渡" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_fork_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_fork_left_destination.json deleted file mode 100644 index f6daf788084..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_fork_left_destination.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "left" - }, - "mode": "ferry", - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Fähre nehmen Richtung Destination 1", - "en": "Take the ferry towards Destination 1", - "fr": "Prendre le ferry en direction de Destination 1", - "nl": "Neem het veer naar Destination 1", - "ru": "Возьмите паром в направлении Destination 1", - "sv": "Ta färjan mot Destination 1", - "vi": "Lên phà đi Destination 1", - "zh-Hans": "乘坐开往Destination 1的轮渡" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_fork_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_fork_left_name.json deleted file mode 100644 index ff7bf4a8734..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_fork_left_name.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "fork", - "modifier": "left" - }, - "mode": "ferry", - "name": "Way Name" - }, - "instructions": { - "de": "Fähre nehmen Way Name", - "en": "Take the ferry Way Name", - "fr": "Prendre le ferry Way Name", - "nl": "Neem het veer Way Name", - "ru": "Возьмите паром Way Name", - "sv": "Ta färjan på Way Name", - "vi": "Lên phà Way Name", - "zh-Hans": "乘坐Way Name轮渡" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_turn_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_turn_left_default.json deleted file mode 100644 index ff584942d61..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_turn_left_default.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "straight" - }, - "mode": "ferry", - "name": "" - }, - "instructions": { - "de": "Fähre nehmen", - "en": "Take the ferry", - "fr": "Prendre le ferry", - "nl": "Neem het veer", - "ru": "Возьмите паром", - "sv": "Ta färjan", - "vi": "Lên phà", - "zh-Hans": "乘坐轮渡" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_turn_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_turn_left_destination.json deleted file mode 100644 index 5d5b68dadad..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_turn_left_destination.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "straight" - }, - "mode": "ferry", - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Fähre nehmen Richtung Destination 1", - "en": "Take the ferry towards Destination 1", - "fr": "Prendre le ferry en direction de Destination 1", - "nl": "Neem het veer naar Destination 1", - "ru": "Возьмите паром в направлении Destination 1", - "sv": "Ta färjan mot Destination 1", - "vi": "Lên phà đi Destination 1", - "zh-Hans": "乘坐开往Destination 1的轮渡" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_turn_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_turn_left_name.json deleted file mode 100644 index 12aec3aa39b..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/modes/ferry_turn_left_name.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "continue", - "modifier": "straight" - }, - "mode": "ferry", - "name": "Way Name" - }, - "instructions": { - "de": "Fähre nehmen Way Name", - "en": "Take the ferry Way Name", - "fr": "Prendre le ferry Way Name", - "nl": "Neem het veer Way Name", - "ru": "Возьмите паром Way Name", - "sv": "Ta färjan på Way Name", - "vi": "Lên phà Way Name", - "zh-Hans": "乘坐Way Name轮渡" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/left_default.json deleted file mode 100644 index e9031dc97ab..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "left" - }, - "name": "" - }, - "instructions": { - "de": "Links weiterfahren", - "en": "Continue left", - "fr": "Continuer à gauche", - "nl": "Ga links", - "ru": "Поверните налево", - "sv": "Fortsätt vänster", - "vi": "Chạy tiếp bên trái", - "zh-Hans": "继续向左" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/left_destination.json deleted file mode 100644 index f7be4cc81db..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Links weiterfahren Richtung Destination 1", - "en": "Continue left towards Destination 1", - "fr": "Continuer à gauche en direction de Destination 1", - "nl": "Ga links richting Destination 1", - "ru": "Поверните налево и продолжайте движение в направлении Destination 1", - "sv": "Fortsätt vänster mot Destination 1", - "vi": "Chạy tiếp bên trái đến Destination 1", - "zh-Hans": "继续向左，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/left_name.json deleted file mode 100644 index 4ec34bc157c..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Links weiterfahren auf Way Name", - "en": "Continue left onto Way Name", - "fr": "Continuer à gauche sur Way Name", - "nl": "Ga links naar Way Name", - "ru": "Поверните налево на Way Name", - "sv": "Fortsätt vänster på Way Name", - "vi": "Chạy tiếp bên trái trên Way Name", - "zh-Hans": "继续向左，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/right_default.json deleted file mode 100644 index 3573abdd70a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "right" - }, - "name": "" - }, - "instructions": { - "de": "Rechts weiterfahren", - "en": "Continue right", - "fr": "Continuer à droite", - "nl": "Ga rechts", - "ru": "Поверните направо", - "sv": "Fortsätt höger", - "vi": "Chạy tiếp bên phải", - "zh-Hans": "继续向右" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/right_destination.json deleted file mode 100644 index 88d6df87fc8..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rechts weiterfahren Richtung Destination 1", - "en": "Continue right towards Destination 1", - "fr": "Continuer à droite en direction de Destination 1", - "nl": "Ga rechts richting Destination 1", - "ru": "Поверните направо и продолжайте движение в направлении Destination 1", - "sv": "Fortsätt höger mot Destination 1", - "vi": "Chạy tiếp bên phải đến Destination 1", - "zh-Hans": "继续向右，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/right_name.json deleted file mode 100644 index c8f05584755..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rechts weiterfahren auf Way Name", - "en": "Continue right onto Way Name", - "fr": "Continuer à droite sur Way Name", - "nl": "Ga rechts naar Way Name", - "ru": "Поверните направо на Way Name", - "sv": "Fortsätt höger på Way Name", - "vi": "Chạy tiếp bên phải trên Way Name", - "zh-Hans": "继续向右，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_left_default.json deleted file mode 100644 index e558bcd199a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "sharp left" - }, - "name": "" - }, - "instructions": { - "de": "Scharf links", - "en": "Take a sharp left", - "fr": "Prendre à gauche", - "nl": "Linksaf", - "ru": "Поверните резко налево", - "sv": "Gör en skarp vänstersväng", - "vi": "Quẹo gắt bên trái", - "zh-Hans": "继续向左" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_left_destination.json deleted file mode 100644 index b7f5e100f91..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "sharp left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf links Richtung Destination 1", - "en": "Take a sharp left towards Destination 1", - "fr": "Prendre à gauche en direction de Destination 1", - "nl": "Linksaf richting Destination 1", - "ru": "Поверните резко налево и продолжайте движение в направлении Destination 1", - "sv": "Gör en skarp vänstersväng mot Destination 1", - "vi": "Quẹo gắt bên trái đến Destination 1", - "zh-Hans": "继续向左，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_left_name.json deleted file mode 100644 index ebc6f0f8e72..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "sharp left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf links auf Way Name", - "en": "Take a sharp left onto Way Name", - "fr": "Prendre à gauche sur Way Name", - "nl": "Linksaf naar Way Name", - "ru": "Поверните резко налево на Way Name", - "sv": "Gör en skarp vänstersväng in på Way Name", - "vi": "Quẹo gắt bên trái vào Way Name", - "zh-Hans": "继续向左，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_right_default.json deleted file mode 100644 index 35951216f66..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "sharp right" - }, - "name": "" - }, - "instructions": { - "de": "Scharf rechts", - "en": "Take a sharp right", - "fr": "Prendre à droite", - "nl": "Rechtsaf", - "ru": "Поверните резко направо", - "sv": "Gör en skarp högersväng", - "vi": "Quẹo gắt bên phải", - "zh-Hans": "继续向右" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_right_destination.json deleted file mode 100644 index a20e9319cda..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "sharp right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf rechts Richtung Destination 1", - "en": "Take a sharp right towards Destination 1", - "fr": "Prendre à droite en direction de Destination 1", - "nl": "Rechtsaf richting Destination 1", - "ru": "Поверните резко направо и продолжайте движение в направлении Destination 1", - "sv": "Gör en skarp högersväng mot Destination 1", - "vi": "Quẹo gắt bên phải đến Destination 1", - "zh-Hans": "继续向右，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_right_name.json deleted file mode 100644 index dc1ef6d26b1..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/sharp_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "sharp right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf rechts auf Way Name", - "en": "Take a sharp right onto Way Name", - "fr": "Prendre à droite sur Way Name", - "nl": "Rechtsaf naar Way Name", - "ru": "Поверните резко направо на Way Name", - "sv": "Gör en skarp högersväng in på Way Name", - "vi": "Quẹo gắt bên phải vào Way Name", - "zh-Hans": "继续向右，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_left_default.json deleted file mode 100644 index aeec151ca65..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "slight left" - }, - "name": "" - }, - "instructions": { - "de": "Leicht links weiter", - "en": "Continue slightly left", - "fr": "Continuer légèrement à gauche", - "nl": "Links aanhouden", - "ru": "Плавный поворот налево", - "sv": "Fortsätt med lätt vänstersväng", - "vi": "Nghiêng về bên trái", - "zh-Hans": "继续向左" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_left_destination.json deleted file mode 100644 index 83b59b33f75..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "slight left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Leicht links weiter Richtung Destination 1", - "en": "Continue slightly left towards Destination 1", - "fr": "Continuer légèrement à gauche en direction de Destination 1", - "nl": "Links aanhouden richting Destination 1", - "ru": "Плавный поворот налево в направлении Destination 1", - "sv": "Fortsätt med lätt vänstersväng mot Destination 1", - "vi": "Nghiêng về bên trái đến Destination 1", - "zh-Hans": "继续向左，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_left_name.json deleted file mode 100644 index 2975fb8331f..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "slight left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Leicht links weiter auf Way Name", - "en": "Continue slightly left onto Way Name", - "fr": "Continuer légèrement à gauche sur Way Name", - "nl": "Links aanhouden naar Way Name", - "ru": "Плавный поворот налево на Way Name", - "sv": "Fortsätt med lätt vänstersväng in på Way Name", - "vi": "Nghiêng về bên trái vào Way Name", - "zh-Hans": "继续向左，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_right_default.json deleted file mode 100644 index 3c410d910b1..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "slight right" - }, - "name": "" - }, - "instructions": { - "de": "Leicht rechts weiter", - "en": "Continue slightly right", - "fr": "Continuer légèrement à droite", - "nl": "Rechts aanhouden", - "ru": "Плавный поворот направо", - "sv": "Fortsätt med lätt högersväng", - "vi": "Nghiêng về bên phải", - "zh-Hans": "继续向右" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_right_destination.json deleted file mode 100644 index 7e8b249acc7..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "slight right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Leicht rechts weiter Richtung Destination 1", - "en": "Continue slightly right towards Destination 1", - "fr": "Continuer légèrement à droite en direction de Destination 1", - "nl": "Rechts aanhouden richting Destination 1", - "ru": "Плавный поворот направо в направлении Destination 1", - "sv": "Fortsätt med lätt högersväng mot Destination 1", - "vi": "Nghiêng về bên phải đến Destination 1", - "zh-Hans": "继续向右，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_right_name.json deleted file mode 100644 index 5edd57762b7..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/slight_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "slight right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Leicht rechts weiter auf Way Name", - "en": "Continue slightly right onto Way Name", - "fr": "Continuer légèrement à droite sur Way Name", - "nl": "Rechts aanhouden naar Way Name", - "ru": "Плавный поворот направо на Way Name", - "sv": "Fortsätt med lätt högersväng in på Way Name", - "vi": "Nghiêng về bên phải vào Way Name", - "zh-Hans": "继续向右，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/straight_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/straight_default.json deleted file mode 100644 index 1779ecbed9e..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/straight_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "straight" - }, - "name": "" - }, - "instructions": { - "de": "Geradeaus weiterfahren", - "en": "Continue straight", - "fr": "Continuer tout droit", - "nl": "Ga rechtdoor", - "ru": "Поверните прямо", - "sv": "Fortsätt rakt fram", - "vi": "Chạy tiếp bên thẳng", - "zh-Hans": "继续直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/straight_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/straight_destination.json deleted file mode 100644 index 35bf8e0ca8a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/straight_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "straight" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Geradeaus weiterfahren Richtung Destination 1", - "en": "Continue straight towards Destination 1", - "fr": "Continuer tout droit en direction de Destination 1", - "nl": "Ga rechtdoor richting Destination 1", - "ru": "Поверните прямо и продолжайте движение в направлении Destination 1", - "sv": "Fortsätt rakt fram mot Destination 1", - "vi": "Chạy tiếp bên thẳng đến Destination 1", - "zh-Hans": "继续直行，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/straight_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/straight_name.json deleted file mode 100644 index 2105dc216f3..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/straight_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "straight" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Geradeaus weiterfahren auf Way Name", - "en": "Continue straight onto Way Name", - "fr": "Continuer tout droit sur Way Name", - "nl": "Ga rechtdoor naar Way Name", - "ru": "Поверните прямо на Way Name", - "sv": "Fortsätt rakt fram på Way Name", - "vi": "Chạy tiếp bên thẳng trên Way Name", - "zh-Hans": "继续直行，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/uturn_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/uturn_default.json deleted file mode 100644 index bc1c5719563..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/uturn_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "uturn" - }, - "name": "" - }, - "instructions": { - "de": "180°-Wendung", - "en": "Make a U-turn", - "fr": "Fair demi-tour", - "nl": "Keer om", - "ru": "Сделайте разворот", - "sv": "Gör en U-sväng", - "vi": "Quẹo ngược lại", - "zh-Hans": "调头" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/uturn_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/uturn_destination.json deleted file mode 100644 index eb0ff817da0..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/uturn_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "uturn" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "180°-Wendung Richtung Destination 1", - "en": "Make a U-turn towards Destination 1", - "fr": "Fair demi-tour en direction de Destination 1", - "nl": "Keer om richting Destination 1", - "ru": "Сделайте разворот и продолжайте движение в направлении Destination 1", - "sv": "Gör en U-sväng mot Destination 1", - "vi": "Quẹo ngược lại đến Destination 1", - "zh-Hans": "调头，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/uturn_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/uturn_name.json deleted file mode 100644 index 7a0b16d9f47..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/new_name/uturn_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "new name", - "modifier": "uturn" - }, - "name": "Way Name" - }, - "instructions": { - "de": "180°-Wendung auf Way Name", - "en": "Make a U-turn onto Way Name", - "fr": "Fair demi-tour sur Way Name", - "nl": "Keer om naar Way Name", - "ru": "Сделайте разворот на Way Name", - "sv": "Gör en U-sväng in på Way Name", - "vi": "Quẹo ngược lại Way Name", - "zh-Hans": "调头，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/left_default.json deleted file mode 100644 index 7f8e8a69144..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "left" - }, - "name": "" - }, - "instructions": { - "de": "Links weiterfahren", - "en": "Continue left", - "fr": "Continuer à gauche", - "nl": "Ga links", - "ru": "Продолжайте движение налево", - "sv": "Fortsätt vänster", - "vi": "Chạy tiếp bên trái", - "zh-Hans": "继续向左" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/left_destination.json deleted file mode 100644 index f23ee8d90b4..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Links weiterfahren Richtung Destination 1", - "en": "Continue left towards Destination 1", - "fr": "Continuer à gauche en direction de Destination 1", - "nl": "Ga links richting Destination 1", - "ru": "Продолжайте движение налево в направлении Destination 1", - "sv": "Fortsätt vänster mot Destination 1", - "vi": "Chạy tiếp bên trái đến Destination 1", - "zh-Hans": "继续向左，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/left_name.json deleted file mode 100644 index aba2f54bdb6..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Links weiterfahren auf Way Name", - "en": "Continue left onto Way Name", - "fr": "Continuer à gauche sur Way Name", - "nl": "Ga links naar Way Name", - "ru": "Продолжайте движение налево по Way Name", - "sv": "Fortsätt vänster på Way Name", - "vi": "Chạy tiếp bên trái trên Way Name", - "zh-Hans": "继续向左，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/right_default.json deleted file mode 100644 index 69286b00b6d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "right" - }, - "name": "" - }, - "instructions": { - "de": "Rechts weiterfahren", - "en": "Continue right", - "fr": "Continuer à droite", - "nl": "Ga rechts", - "ru": "Продолжайте движение направо", - "sv": "Fortsätt höger", - "vi": "Chạy tiếp bên phải", - "zh-Hans": "继续向右" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/right_destination.json deleted file mode 100644 index c2581c67129..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rechts weiterfahren Richtung Destination 1", - "en": "Continue right towards Destination 1", - "fr": "Continuer à droite en direction de Destination 1", - "nl": "Ga rechts richting Destination 1", - "ru": "Продолжайте движение направо в направлении Destination 1", - "sv": "Fortsätt höger mot Destination 1", - "vi": "Chạy tiếp bên phải đến Destination 1", - "zh-Hans": "继续向右，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/right_name.json deleted file mode 100644 index ce4171aaeb0..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rechts weiterfahren auf Way Name", - "en": "Continue right onto Way Name", - "fr": "Continuer à droite sur Way Name", - "nl": "Ga rechts naar Way Name", - "ru": "Продолжайте движение направо по Way Name", - "sv": "Fortsätt höger på Way Name", - "vi": "Chạy tiếp bên phải trên Way Name", - "zh-Hans": "继续向右，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_left_default.json deleted file mode 100644 index 957f51f9560..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "sharp left" - }, - "name": "" - }, - "instructions": { - "de": "Scharf links weiterfahren", - "en": "Continue sharp left", - "fr": "Continuer franchement à gauche", - "nl": "Ga linksaf", - "ru": "Продолжайте движение резко налево", - "sv": "Fortsätt skarp vänster", - "vi": "Chạy tiếp bên trái gắt", - "zh-Hans": "继续向左" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_left_destination.json deleted file mode 100644 index 4145c7a89fe..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "sharp left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf links weiterfahren Richtung Destination 1", - "en": "Continue sharp left towards Destination 1", - "fr": "Continuer franchement à gauche en direction de Destination 1", - "nl": "Ga linksaf richting Destination 1", - "ru": "Продолжайте движение резко налево в направлении Destination 1", - "sv": "Fortsätt skarp vänster mot Destination 1", - "vi": "Chạy tiếp bên trái gắt đến Destination 1", - "zh-Hans": "继续向左，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_left_name.json deleted file mode 100644 index 69260e6d775..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "sharp left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf links weiterfahren auf Way Name", - "en": "Continue sharp left onto Way Name", - "fr": "Continuer franchement à gauche sur Way Name", - "nl": "Ga linksaf naar Way Name", - "ru": "Продолжайте движение резко налево по Way Name", - "sv": "Fortsätt skarp vänster på Way Name", - "vi": "Chạy tiếp bên trái gắt trên Way Name", - "zh-Hans": "继续向左，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_right_default.json deleted file mode 100644 index 073da206a72..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "sharp right" - }, - "name": "" - }, - "instructions": { - "de": "Scharf rechts weiterfahren", - "en": "Continue sharp right", - "fr": "Continuer franchement à droite", - "nl": "Ga rechtsaf", - "ru": "Продолжайте движение резко направо", - "sv": "Fortsätt skarp höger", - "vi": "Chạy tiếp bên phải gắt", - "zh-Hans": "继续向右" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_right_destination.json deleted file mode 100644 index 3eeddc73773..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "sharp right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf rechts weiterfahren Richtung Destination 1", - "en": "Continue sharp right towards Destination 1", - "fr": "Continuer franchement à droite en direction de Destination 1", - "nl": "Ga rechtsaf richting Destination 1", - "ru": "Продолжайте движение резко направо в направлении Destination 1", - "sv": "Fortsätt skarp höger mot Destination 1", - "vi": "Chạy tiếp bên phải gắt đến Destination 1", - "zh-Hans": "继续向右，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_right_name.json deleted file mode 100644 index eed8156d0d8..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/sharp_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "sharp right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf rechts weiterfahren auf Way Name", - "en": "Continue sharp right onto Way Name", - "fr": "Continuer franchement à droite sur Way Name", - "nl": "Ga rechtsaf naar Way Name", - "ru": "Продолжайте движение резко направо по Way Name", - "sv": "Fortsätt skarp höger på Way Name", - "vi": "Chạy tiếp bên phải gắt trên Way Name", - "zh-Hans": "继续向右，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_left_default.json deleted file mode 100644 index d746eb2b0b0..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "slight left" - }, - "name": "" - }, - "instructions": { - "de": "Leicht links weiterfahren", - "en": "Continue slight left", - "fr": "Continuer légèrement à gauche", - "nl": "Ga links", - "ru": "Продолжайте движение плавно налево", - "sv": "Fortsätt lätt vänster", - "vi": "Chạy tiếp bên trái nghiêng", - "zh-Hans": "继续向左" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_left_destination.json deleted file mode 100644 index ea9bd027251..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "slight left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Leicht links weiterfahren Richtung Destination 1", - "en": "Continue slight left towards Destination 1", - "fr": "Continuer légèrement à gauche en direction de Destination 1", - "nl": "Ga links richting Destination 1", - "ru": "Продолжайте движение плавно налево в направлении Destination 1", - "sv": "Fortsätt lätt vänster mot Destination 1", - "vi": "Chạy tiếp bên trái nghiêng đến Destination 1", - "zh-Hans": "继续向左，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_left_name.json deleted file mode 100644 index 6496530c0e7..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "slight left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Leicht links weiterfahren auf Way Name", - "en": "Continue slight left onto Way Name", - "fr": "Continuer légèrement à gauche sur Way Name", - "nl": "Ga links naar Way Name", - "ru": "Продолжайте движение плавно налево по Way Name", - "sv": "Fortsätt lätt vänster på Way Name", - "vi": "Chạy tiếp bên trái nghiêng trên Way Name", - "zh-Hans": "继续向左，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_right_default.json deleted file mode 100644 index 98bdb17fa45..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "slight right" - }, - "name": "" - }, - "instructions": { - "de": "Leicht rechts weiterfahren", - "en": "Continue slight right", - "fr": "Continuer légèrement à droite", - "nl": "Ga rechts", - "ru": "Продолжайте движение плавно направо", - "sv": "Fortsätt lätt höger", - "vi": "Chạy tiếp bên phải nghiêng", - "zh-Hans": "继续向右" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_right_destination.json deleted file mode 100644 index d5af2a4eeac..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "slight right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Leicht rechts weiterfahren Richtung Destination 1", - "en": "Continue slight right towards Destination 1", - "fr": "Continuer légèrement à droite en direction de Destination 1", - "nl": "Ga rechts richting Destination 1", - "ru": "Продолжайте движение плавно направо в направлении Destination 1", - "sv": "Fortsätt lätt höger mot Destination 1", - "vi": "Chạy tiếp bên phải nghiêng đến Destination 1", - "zh-Hans": "继续向右，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_right_name.json deleted file mode 100644 index 1d819c1cdbd..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/slight_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "slight right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Leicht rechts weiterfahren auf Way Name", - "en": "Continue slight right onto Way Name", - "fr": "Continuer légèrement à droite sur Way Name", - "nl": "Ga rechts naar Way Name", - "ru": "Продолжайте движение плавно направо по Way Name", - "sv": "Fortsätt lätt höger på Way Name", - "vi": "Chạy tiếp bên phải nghiêng trên Way Name", - "zh-Hans": "继续向右，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/straight_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/straight_default.json deleted file mode 100644 index 2e9abf9da89..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/straight_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "straight" - }, - "name": "" - }, - "instructions": { - "de": "Geradeaus weiterfahren", - "en": "Continue straight", - "fr": "Continuer tout droit", - "nl": "Ga rechtdoor", - "ru": "Продолжайте движение прямо", - "sv": "Fortsätt rakt fram", - "vi": "Chạy tiếp bên thẳng", - "zh-Hans": "继续直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/straight_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/straight_destination.json deleted file mode 100644 index b2d4da528db..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/straight_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "straight" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Geradeaus weiterfahren Richtung Destination 1", - "en": "Continue straight towards Destination 1", - "fr": "Continuer tout droit en direction de Destination 1", - "nl": "Ga rechtdoor richting Destination 1", - "ru": "Продолжайте движение прямо в направлении Destination 1", - "sv": "Fortsätt rakt fram mot Destination 1", - "vi": "Chạy tiếp bên thẳng đến Destination 1", - "zh-Hans": "继续直行，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/straight_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/straight_name.json deleted file mode 100644 index 03b10e6d5c2..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/straight_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "straight" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Geradeaus weiterfahren auf Way Name", - "en": "Continue straight onto Way Name", - "fr": "Continuer tout droit sur Way Name", - "nl": "Ga rechtdoor naar Way Name", - "ru": "Продолжайте движение прямо по Way Name", - "sv": "Fortsätt rakt fram på Way Name", - "vi": "Chạy tiếp bên thẳng trên Way Name", - "zh-Hans": "继续直行，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/uturn_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/uturn_default.json deleted file mode 100644 index f2bb0a477ab..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/uturn_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "uturn" - }, - "name": "" - }, - "instructions": { - "de": "180°-Wendung", - "en": "Make a U-turn", - "fr": "Fair demi-tour", - "nl": "Keer om", - "ru": "Сделайте разворот", - "sv": "Gör en U-sväng", - "vi": "Quẹo ngược lại", - "zh-Hans": "调头" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/uturn_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/uturn_destination.json deleted file mode 100644 index 211dc54c3ad..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/uturn_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "uturn" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "180°-Wendung Richtung Destination 1", - "en": "Make a U-turn towards Destination 1", - "fr": "Fair demi-tour en direction de Destination 1", - "nl": "Keer om richting Destination 1", - "ru": "Сделайте разворот и продолжайте движение в направлении Destination 1", - "sv": "Gör en U-sväng mot Destination 1", - "vi": "Quẹo ngược lại đến Destination 1", - "zh-Hans": "调头，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/uturn_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/uturn_name.json deleted file mode 100644 index b3de1e55708..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/notification/uturn_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "notification", - "modifier": "uturn" - }, - "name": "Way Name" - }, - "instructions": { - "de": "180°-Wendung auf Way Name", - "en": "Make a U-turn onto Way Name", - "fr": "Fair demi-tour sur Way Name", - "nl": "Keer om naar Way Name", - "ru": "Сделайте разворот на Way Name", - "sv": "Gör en U-sväng in på Way Name", - "vi": "Quẹo ngược lại Way Name", - "zh-Hans": "调头，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/left_default.json deleted file mode 100644 index 87c7ced51e4..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "left" - }, - "name": "" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen", - "en": "Take the ramp on the left", - "fr": "Prendre la sortie à gauche", - "nl": "Neem de afrit links", - "ru": "Используйте съезд слева", - "sv": "Ta avfartsrampen till vänster", - "vi": "Đi đường nhánh bên trái", - "zh-Hans": "通过左边的匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/left_destination.json deleted file mode 100644 index bc3fd17a828..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen Richtung Destination 1", - "en": "Take the ramp on the left towards Destination 1", - "fr": "Prendre la sortie à gauche en direction de Destination 1", - "nl": "Neem de afrit links richting Destination 1", - "ru": "Используйте съезд слева в направлении Destination 1", - "sv": "Ta avfartsrampen till vänster mot Destination 1", - "vi": "Đi đường nhánh bên trái đến Destination 1", - "zh-Hans": "通过左边的匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/left_name.json deleted file mode 100644 index 3faeb7d75a1..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen auf Way Name", - "en": "Take the ramp on the left onto Way Name", - "fr": "Prendre la sortie à gauche sur Way Name", - "nl": "Neem de afrit links naar Way Name", - "ru": "Используйте съезд слева на Way Name", - "sv": "Ta avfartsrampen till vänster in på Way Name", - "vi": "Đi đường nhánh Way Name bên trái", - "zh-Hans": "通过左边的匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/right_default.json deleted file mode 100644 index fe02d5123bc..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "right" - }, - "name": "" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen", - "en": "Take the ramp on the right", - "fr": "Prendre la sortie à droite", - "nl": "Neem de afrit rechts", - "ru": "Используйте съезд справа", - "sv": "Ta avfartsrampen till höger", - "vi": "Đi đường nhánh bên phải", - "zh-Hans": "通过右边的匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/right_destination.json deleted file mode 100644 index 6827e7f0dca..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen Richtung Destination 1", - "en": "Take the ramp on the right towards Destination 1", - "fr": "Prendre la sortie à droite en direction de Destination 1", - "nl": "Neem de afrit rechts richting Destination 1", - "ru": "Используйте съезд справа в направлении Destination 1", - "sv": "Ta avfartsrampen till höger mot Destination 1", - "vi": "Đi đường nhánh bên phải đến Destination 1", - "zh-Hans": "通过右边的匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/right_name.json deleted file mode 100644 index bb8b890b6ea..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen auf Way Name", - "en": "Take the ramp on the right onto Way Name", - "fr": "Prendre la sortie à droite sur Way Name", - "nl": "Neem de afrit rechts naar Way Name", - "ru": "Используйте съезд справа на Way Name", - "sv": "Ta avfartsrampen till höger in på Way Name", - "vi": "Đi đường nhánh Way Name bên phải", - "zh-Hans": "通过右边的匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_left_default.json deleted file mode 100644 index 309a09386c8..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "sharp left" - }, - "name": "" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen", - "en": "Take the ramp on the left", - "fr": "Prendre la sortie à gauche", - "nl": "Neem de afrit links", - "ru": "Используйте съезд слева", - "sv": "Ta avfartsrampen till vänster", - "vi": "Đi đường nhánh bên trái", - "zh-Hans": "上匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_left_destination.json deleted file mode 100644 index 9e6c425e003..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "sharp left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen Richtung Destination 1", - "en": "Take the ramp on the left towards Destination 1", - "fr": "Prendre la sortie à gauche en direction de Destination 1", - "nl": "Neem de afrit links richting Destination 1", - "ru": "Используйте съезд слева в направлении Destination 1", - "sv": "Ta avfartsrampen till vänster mot Destination 1", - "vi": "Đi đường nhánh bên trái đến Destination 1", - "zh-Hans": "通过匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_left_name.json deleted file mode 100644 index 7d9bc69f1ad..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "sharp left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen auf Way Name", - "en": "Take the ramp on the left onto Way Name", - "fr": "Prendre la sortie à gauche sur Way Name", - "nl": "Neem de afrit links naar Way Name", - "ru": "Используйте съезд слева на Way Name", - "sv": "Ta avfartsrampen till vänster in på Way Name", - "vi": "Đi đường nhánh Way Name bên trái", - "zh-Hans": "通过匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_right_default.json deleted file mode 100644 index d611d584c52..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "sharp right" - }, - "name": "" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen", - "en": "Take the ramp on the right", - "fr": "Prendre la sortie à droite", - "nl": "Neem de afrit rechts", - "ru": "Используйте съезд справа", - "sv": "Ta avfartsrampen till höger", - "vi": "Đi đường nhánh bên phải", - "zh-Hans": "上匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_right_destination.json deleted file mode 100644 index 905a422e7e1..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "sharp right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen Richtung Destination 1", - "en": "Take the ramp on the right towards Destination 1", - "fr": "Prendre la sortie à droite en direction de Destination 1", - "nl": "Neem de afrit rechts richting Destination 1", - "ru": "Используйте съезд справа в направлении Destination 1", - "sv": "Ta avfartsrampen till höger mot Destination 1", - "vi": "Đi đường nhánh bên phải đến Destination 1", - "zh-Hans": "通过匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_right_name.json deleted file mode 100644 index da5a9565aa2..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/sharp_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "sharp right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen auf Way Name", - "en": "Take the ramp on the right onto Way Name", - "fr": "Prendre la sortie à droite sur Way Name", - "nl": "Neem de afrit rechts naar Way Name", - "ru": "Используйте съезд справа на Way Name", - "sv": "Ta avfartsrampen till höger in på Way Name", - "vi": "Đi đường nhánh Way Name bên phải", - "zh-Hans": "通过匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_left_default.json deleted file mode 100644 index 75bfda7cf5f..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "slight left" - }, - "name": "" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen", - "en": "Take the ramp on the left", - "fr": "Prendre la sortie à gauche", - "nl": "Neem de afrit links", - "ru": "Используйте съезд слева", - "sv": "Ta avfartsrampen till vänster", - "vi": "Đi đường nhánh bên trái", - "zh-Hans": "上匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_left_destination.json deleted file mode 100644 index 9c46088643b..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "slight left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen Richtung Destination 1", - "en": "Take the ramp on the left towards Destination 1", - "fr": "Prendre la sortie à gauche en direction de Destination 1", - "nl": "Neem de afrit links richting Destination 1", - "ru": "Используйте съезд слева в направлении Destination 1", - "sv": "Ta avfartsrampen till vänster mot Destination 1", - "vi": "Đi đường nhánh bên trái đến Destination 1", - "zh-Hans": "通过匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_left_name.json deleted file mode 100644 index b632a7f4433..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "slight left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen auf Way Name", - "en": "Take the ramp on the left onto Way Name", - "fr": "Prendre la sortie à gauche sur Way Name", - "nl": "Neem de afrit links naar Way Name", - "ru": "Используйте съезд слева на Way Name", - "sv": "Ta avfartsrampen till vänster in på Way Name", - "vi": "Đi đường nhánh Way Name bên trái", - "zh-Hans": "通过匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_right_default.json deleted file mode 100644 index fc8393c2a83..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "slight right" - }, - "name": "" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen", - "en": "Take the ramp on the right", - "fr": "Prendre la sortie à droite", - "nl": "Neem de afrit rechts", - "ru": "Используйте съезд справа", - "sv": "Ta avfartsrampen till höger", - "vi": "Đi đường nhánh bên phải", - "zh-Hans": "上匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_right_destination.json deleted file mode 100644 index 4c57cc12425..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "slight right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen Richtung Destination 1", - "en": "Take the ramp on the right towards Destination 1", - "fr": "Prendre la sortie à droite en direction de Destination 1", - "nl": "Neem de afrit rechts richting Destination 1", - "ru": "Используйте съезд справа в направлении Destination 1", - "sv": "Ta avfartsrampen till höger mot Destination 1", - "vi": "Đi đường nhánh bên phải đến Destination 1", - "zh-Hans": "通过匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_right_name.json deleted file mode 100644 index 2a58a1a5212..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/slight_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "slight right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen auf Way Name", - "en": "Take the ramp on the right onto Way Name", - "fr": "Prendre la sortie à droite sur Way Name", - "nl": "Neem de afrit rechts naar Way Name", - "ru": "Используйте съезд справа на Way Name", - "sv": "Ta avfartsrampen till höger in på Way Name", - "vi": "Đi đường nhánh Way Name bên phải", - "zh-Hans": "通过匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/straight_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/straight_default.json deleted file mode 100644 index 219e97a3a28..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/straight_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "straight" - }, - "name": "" - }, - "instructions": { - "de": "Rampe nehmen", - "en": "Take the ramp", - "fr": "Prendre la sortie", - "nl": "Neem de afrit", - "ru": "Используйте съезд", - "sv": "Ta avfartrampen", - "vi": "Đi đường nhánh", - "zh-Hans": "上匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/straight_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/straight_destination.json deleted file mode 100644 index 362f6323a9a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/straight_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "straight" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe nehmen Richtung Destination 1", - "en": "Take the ramp towards Destination 1", - "fr": "Prendre la sortie en direction de Destination 1", - "nl": "Neem de afrit richting Destination 1", - "ru": "Используйте съезд в направлении Destination 1", - "sv": "Ta avfartsrampen mot Destination 1", - "vi": "Đi đường nhánh đến Destination 1", - "zh-Hans": "通过匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/straight_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/straight_name.json deleted file mode 100644 index d0ea539cde3..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/straight_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "straight" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe nehmen auf Way Name", - "en": "Take the ramp onto Way Name", - "fr": "Prendre la sortie sur Way Name", - "nl": "Neem de afrit naar Way Name", - "ru": "Используйте съезд на Way Name", - "sv": "Ta avfartsrampen in på Way Name", - "vi": "Đi đường nhánh Way Name", - "zh-Hans": "通过匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/uturn_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/uturn_default.json deleted file mode 100644 index 7e93998d7cf..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/uturn_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "uturn" - }, - "name": "" - }, - "instructions": { - "de": "Rampe nehmen", - "en": "Take the ramp", - "fr": "Prendre la sortie", - "nl": "Neem de afrit", - "ru": "Используйте съезд", - "sv": "Ta avfartrampen", - "vi": "Đi đường nhánh", - "zh-Hans": "上匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/uturn_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/uturn_destination.json deleted file mode 100644 index 7722fe1237d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/uturn_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "uturn" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe nehmen Richtung Destination 1", - "en": "Take the ramp towards Destination 1", - "fr": "Prendre la sortie en direction de Destination 1", - "nl": "Neem de afrit richting Destination 1", - "ru": "Используйте съезд в направлении Destination 1", - "sv": "Ta avfartsrampen mot Destination 1", - "vi": "Đi đường nhánh đến Destination 1", - "zh-Hans": "通过匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/uturn_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/uturn_name.json deleted file mode 100644 index 76480f15dcf..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/off_ramp/uturn_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "off ramp", - "modifier": "uturn" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe nehmen auf Way Name", - "en": "Take the ramp onto Way Name", - "fr": "Prendre la sortie sur Way Name", - "nl": "Neem de afrit naar Way Name", - "ru": "Используйте съезд на Way Name", - "sv": "Ta avfartsrampen in på Way Name", - "vi": "Đi đường nhánh Way Name", - "zh-Hans": "通过匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/left_default.json deleted file mode 100644 index f4c6189b4e5..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "left" - }, - "name": "" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen", - "en": "Take the ramp on the left", - "fr": "Prendre la sortie à gauche", - "nl": "Neem de oprit links", - "ru": "Используйте въезд на автомагистраль слева", - "sv": "Ta påfartsrampen till vänster", - "vi": "Đi đường nhánh bên trái", - "zh-Hans": "通过左边的匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/left_destination.json deleted file mode 100644 index 70181a2e776..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen Richtung Destination 1", - "en": "Take the ramp on the left towards Destination 1", - "fr": "Prendre la sortie à gauche en direction de Destination 1", - "nl": "Neem de oprit links richting Destination 1", - "ru": "Используйте въезд на автомагистраль слева и продолжайте движение в направлении Destination 1", - "sv": "Ta påfartsrampen till vänster mot Destination 1", - "vi": "Đi đường nhánh bên trái đến Destination 1", - "zh-Hans": "通过左边的匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/left_name.json deleted file mode 100644 index 4add4b4f036..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen auf Way Name", - "en": "Take the ramp on the left onto Way Name", - "fr": "Prendre la sortie à gauche sur Way Name", - "nl": "Neem de oprit links naar Way Name", - "ru": "Используйте въезд на Way Name слева", - "sv": "Ta påfartsrampen till vänster in på Way Name", - "vi": "Đi đường nhánh Way Name bên trái", - "zh-Hans": "通过左边的匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/right_default.json deleted file mode 100644 index b52bd23d81c..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "right" - }, - "name": "" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen", - "en": "Take the ramp on the right", - "fr": "Prendre la sortie à droite", - "nl": "Neem de oprit rechts", - "ru": "Используйте въезд на автомагистраль справа", - "sv": "Ta påfartsrampen till höger", - "vi": "Đi đường nhánh bên phải", - "zh-Hans": "通过右边的匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/right_destination.json deleted file mode 100644 index 33bc0324686..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen Richtung Destination 1", - "en": "Take the ramp on the right towards Destination 1", - "fr": "Prendre la sortie à droite en direction de Destination 1", - "nl": "Neem de oprit rechts richting Destination 1", - "ru": "Используйте въезд на автомагистраль справа и продолжайте движение в направлении Destination 1", - "sv": "Ta påfartsrampen till höger mot Destination 1", - "vi": "Đi đường nhánh bên phải đến Destination 1", - "zh-Hans": "通过右边的匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/right_name.json deleted file mode 100644 index da4ac2ff1d1..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen auf Way Name", - "en": "Take the ramp on the right onto Way Name", - "fr": "Prendre la sortie à droite sur Way Name", - "nl": "Neem de oprit rechts naar Way Name", - "ru": "Используйте въезд на Way Name справа", - "sv": "Ta påfartsrampen till höger in på Way Name", - "vi": "Đi đường nhánh Way Name bên phải", - "zh-Hans": "通过右边的匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_left_default.json deleted file mode 100644 index 024c4f630ca..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "sharp left" - }, - "name": "" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen", - "en": "Take the ramp on the left", - "fr": "Prendre la sortie à gauche", - "nl": "Neem de oprit links", - "ru": "Используйте въезд на автомагистраль слева", - "sv": "Ta påfartsrampen till vänster", - "vi": "Đi đường nhánh bên trái", - "zh-Hans": "通过匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_left_destination.json deleted file mode 100644 index 563eac6afb1..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "sharp left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen Richtung Destination 1", - "en": "Take the ramp on the left towards Destination 1", - "fr": "Prendre la sortie à gauche en direction de Destination 1", - "nl": "Neem de oprit links richting Destination 1", - "ru": "Используйте въезд на автомагистраль слева и продолжайте движение в направлении Destination 1", - "sv": "Ta påfartsrampen till vänster mot Destination 1", - "vi": "Đi đường nhánh bên trái đến Destination 1", - "zh-Hans": "通过匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_left_name.json deleted file mode 100644 index 1508ff2b82a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "sharp left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen auf Way Name", - "en": "Take the ramp on the left onto Way Name", - "fr": "Prendre la sortie à gauche sur Way Name", - "nl": "Neem de oprit links naar Way Name", - "ru": "Используйте въезд на Way Name слева", - "sv": "Ta påfartsrampen till vänster in på Way Name", - "vi": "Đi đường nhánh Way Name bên trái", - "zh-Hans": "通过匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_right_default.json deleted file mode 100644 index c0253f47327..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "sharp right" - }, - "name": "" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen", - "en": "Take the ramp on the right", - "fr": "Prendre la sortie à droite", - "nl": "Neem de oprit rechts", - "ru": "Используйте въезд на автомагистраль справа", - "sv": "Ta påfartsrampen till höger", - "vi": "Đi đường nhánh bên phải", - "zh-Hans": "通过匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_right_destination.json deleted file mode 100644 index 9bc7cda7e18..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "sharp right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen Richtung Destination 1", - "en": "Take the ramp on the right towards Destination 1", - "fr": "Prendre la sortie à droite en direction de Destination 1", - "nl": "Neem de oprit rechts richting Destination 1", - "ru": "Используйте въезд на автомагистраль справа и продолжайте движение в направлении Destination 1", - "sv": "Ta påfartsrampen till höger mot Destination 1", - "vi": "Đi đường nhánh bên phải đến Destination 1", - "zh-Hans": "通过匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_right_name.json deleted file mode 100644 index 7572cee6b77..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/sharp_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "sharp right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen auf Way Name", - "en": "Take the ramp on the right onto Way Name", - "fr": "Prendre la sortie à droite sur Way Name", - "nl": "Neem de oprit rechts naar Way Name", - "ru": "Используйте въезд на Way Name справа", - "sv": "Ta påfartsrampen till höger in på Way Name", - "vi": "Đi đường nhánh Way Name bên phải", - "zh-Hans": "通过匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_left_default.json deleted file mode 100644 index c36958b8794..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "slight left" - }, - "name": "" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen", - "en": "Take the ramp on the left", - "fr": "Prendre la sortie à gauche", - "nl": "Neem de oprit links", - "ru": "Используйте въезд на автомагистраль слева", - "sv": "Ta påfartsrampen till vänster", - "vi": "Đi đường nhánh bên trái", - "zh-Hans": "通过匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_left_destination.json deleted file mode 100644 index df9865a265a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "slight left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen Richtung Destination 1", - "en": "Take the ramp on the left towards Destination 1", - "fr": "Prendre la sortie à gauche en direction de Destination 1", - "nl": "Neem de oprit links richting Destination 1", - "ru": "Используйте въезд на автомагистраль слева и продолжайте движение в направлении Destination 1", - "sv": "Ta påfartsrampen till vänster mot Destination 1", - "vi": "Đi đường nhánh bên trái đến Destination 1", - "zh-Hans": "通过匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_left_name.json deleted file mode 100644 index 6b4cd9624c7..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "slight left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe auf der linken Seite nehmen auf Way Name", - "en": "Take the ramp on the left onto Way Name", - "fr": "Prendre la sortie à gauche sur Way Name", - "nl": "Neem de oprit links naar Way Name", - "ru": "Используйте въезд на Way Name слева", - "sv": "Ta påfartsrampen till vänster in på Way Name", - "vi": "Đi đường nhánh Way Name bên trái", - "zh-Hans": "通过匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_right_default.json deleted file mode 100644 index 3db491c7e0a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "slight right" - }, - "name": "" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen", - "en": "Take the ramp on the right", - "fr": "Prendre la sortie à droite", - "nl": "Neem de oprit rechts", - "ru": "Используйте въезд на автомагистраль справа", - "sv": "Ta påfartsrampen till höger", - "vi": "Đi đường nhánh bên phải", - "zh-Hans": "通过匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_right_destination.json deleted file mode 100644 index 55e21159364..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "slight right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen Richtung Destination 1", - "en": "Take the ramp on the right towards Destination 1", - "fr": "Prendre la sortie à droite en direction de Destination 1", - "nl": "Neem de oprit rechts richting Destination 1", - "ru": "Используйте въезд на автомагистраль справа и продолжайте движение в направлении Destination 1", - "sv": "Ta påfartsrampen till höger mot Destination 1", - "vi": "Đi đường nhánh bên phải đến Destination 1", - "zh-Hans": "通过匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_right_name.json deleted file mode 100644 index bd95f91806d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/slight_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "slight right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe auf der rechten Seite nehmen auf Way Name", - "en": "Take the ramp on the right onto Way Name", - "fr": "Prendre la sortie à droite sur Way Name", - "nl": "Neem de oprit rechts naar Way Name", - "ru": "Используйте въезд на Way Name справа", - "sv": "Ta påfartsrampen till höger in på Way Name", - "vi": "Đi đường nhánh Way Name bên phải", - "zh-Hans": "通过匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/straight_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/straight_default.json deleted file mode 100644 index 8e2717970f8..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/straight_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "straight" - }, - "name": "" - }, - "instructions": { - "de": "Rampe nehmen", - "en": "Take the ramp", - "fr": "Prendre la sortie", - "nl": "Neem de oprit", - "ru": "Используйте въезд на автомагистраль", - "sv": "Ta påfartsrampen", - "vi": "Đi đường nhánh", - "zh-Hans": "通过匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/straight_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/straight_destination.json deleted file mode 100644 index ea637d30f33..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/straight_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "straight" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe nehmen Richtung Destination 1", - "en": "Take the ramp towards Destination 1", - "fr": "Prendre la sortie en direction de Destination 1", - "nl": "Neem de oprit richting Destination 1", - "ru": "Используйте въезд на автомагистраль и продолжайте движение в направлении Destination 1", - "sv": "Ta påfartsrampen mot Destination 1", - "vi": "Đi đường nhánh đến Destination 1", - "zh-Hans": "通过匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/straight_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/straight_name.json deleted file mode 100644 index 07484be6f59..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/straight_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "straight" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe nehmen auf Way Name", - "en": "Take the ramp onto Way Name", - "fr": "Prendre la sortie sur Way Name", - "nl": "Neem de oprit naar Way Name", - "ru": "Используйте въезд на Way Name", - "sv": "Ta påfartsrampen in på Way Name", - "vi": "Đi đường nhánh Way Name", - "zh-Hans": "通过匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/uturn_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/uturn_default.json deleted file mode 100644 index 593a3eb39fa..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/uturn_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "uturn" - }, - "name": "" - }, - "instructions": { - "de": "Rampe nehmen", - "en": "Take the ramp", - "fr": "Prendre la sortie", - "nl": "Neem de oprit", - "ru": "Используйте въезд на автомагистраль", - "sv": "Ta påfartsrampen", - "vi": "Đi đường nhánh", - "zh-Hans": "通过匝道" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/uturn_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/uturn_destination.json deleted file mode 100644 index 98b28bd59c4..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/uturn_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "uturn" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rampe nehmen Richtung Destination 1", - "en": "Take the ramp towards Destination 1", - "fr": "Prendre la sortie en direction de Destination 1", - "nl": "Neem de oprit richting Destination 1", - "ru": "Используйте въезд на автомагистраль и продолжайте движение в направлении Destination 1", - "sv": "Ta påfartsrampen mot Destination 1", - "vi": "Đi đường nhánh đến Destination 1", - "zh-Hans": "通过匝道前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/uturn_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/uturn_name.json deleted file mode 100644 index 50d4b3cce8d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/on_ramp/uturn_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "on ramp", - "modifier": "uturn" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rampe nehmen auf Way Name", - "en": "Take the ramp onto Way Name", - "fr": "Prendre la sortie sur Way Name", - "nl": "Neem de oprit naar Way Name", - "ru": "Используйте въезд на Way Name", - "sv": "Ta påfartsrampen in på Way Name", - "vi": "Đi đường nhánh Way Name", - "zh-Hans": "通过匝道驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/invalid_type.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/other/invalid_type.json deleted file mode 100644 index 88e111335d2..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/invalid_type.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "deliberatly_unknown_type", - "modifier": "left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Links abbiegen auf Way Name", - "en": "Turn left onto Way Name", - "fr": "Tourner à gauche sur Way Name", - "nl": "Ga linksaf naar Way Name", - "ru": "Поверните налево на Way Name", - "sv": "Sväng vänster in på Way Name", - "vi": "Quẹo trái vào Way Name", - "zh-Hans": "左转，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref.json deleted file mode 100644 index a8f7d314e4d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "left" - }, - "name": "", - "ref": "Ref1;Ref2" - }, - "instructions": { - "de": "Links abbiegen auf Ref1", - "en": "Turn left onto Ref1", - "fr": "Tourner à gauche sur Ref1", - "nl": "Ga linksaf naar Ref1", - "ru": "Поверните налево на Ref1", - "sv": "Sväng vänster in på Ref1", - "vi": "Quẹo trái vào Ref1", - "zh-Hans": "左转，上Ref1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_destinations.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_destinations.json deleted file mode 100644 index 82be367bd8f..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_destinations.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "left" - }, - "name": "Way Name", - "ref": "Ref1;Ref2", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Links abbiegen Richtung Destination 1", - "en": "Turn left towards Destination 1", - "fr": "Tourner à gauche en direction de Destination 1", - "nl": "Ga linksaf richting Destination 1", - "ru": "Поверните налево в направлении Destination 1", - "sv": "Sväng vänster mot Destination 1", - "vi": "Quẹo trái đến Destination 1", - "zh-Hans": "左转，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_mapbox_hack_1.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_mapbox_hack_1.json deleted file mode 100644 index f7d45fb1c69..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_mapbox_hack_1.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "left" - }, - "name": "Way Name (Ref1 (Another+Way \\ (Ref1.1)))", - "ref": "Ref1 (Another+Way \\ (Ref1.1))" - }, - "instructions": { - "de": "Links abbiegen auf Way Name (Ref1 (Another+Way \\ (Ref1.1)))", - "en": "Turn left onto Way Name (Ref1 (Another+Way \\ (Ref1.1)))", - "fr": "Tourner à gauche sur Way Name (Ref1 (Another+Way \\ (Ref1.1)))", - "nl": "Ga linksaf naar Way Name (Ref1 (Another+Way \\ (Ref1.1)))", - "ru": "Поверните налево на Way Name (Ref1 (Another+Way \\ (Ref1.1)))", - "sv": "Sväng vänster in på Way Name (Ref1 (Another+Way \\ (Ref1.1)))", - "vi": "Quẹo trái vào Way Name (Ref1 (Another+Way \\ (Ref1.1)))", - "zh-Hans": "左转，上Way Name (Ref1 (Another+Way \\ (Ref1.1)))" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_mapbox_hack_2.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_mapbox_hack_2.json deleted file mode 100644 index 6311cd524e2..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_mapbox_hack_2.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "left" - }, - "name": "Way Name (Ref0;Ref1 (Another Way (Ref1.1));Ref2)", - "ref": "Ref0;Ref1 (Another Way (Ref1.1));Ref2" - }, - "instructions": { - "de": "Links abbiegen auf Way Name (Ref0)", - "en": "Turn left onto Way Name (Ref0)", - "fr": "Tourner à gauche sur Way Name (Ref0)", - "nl": "Ga linksaf naar Way Name (Ref0)", - "ru": "Поверните налево на Way Name (Ref0)", - "sv": "Sväng vänster in på Way Name (Ref0)", - "vi": "Quẹo trái vào Way Name (Ref0)", - "zh-Hans": "左转，上Way Name (Ref0)" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_mapbox_hack_3.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_mapbox_hack_3.json deleted file mode 100644 index e87b2d19022..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_mapbox_hack_3.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "left" - }, - "name": "Ref0;Ref1 (Another Way (Ref1.1));Ref2", - "ref": "Ref0;Ref1 (Another Way (Ref1.1));Ref2" - }, - "instructions": { - "de": "Links abbiegen auf Ref0", - "en": "Turn left onto Ref0", - "fr": "Tourner à gauche sur Ref0", - "nl": "Ga linksaf naar Ref0", - "ru": "Поверните налево на Ref0", - "sv": "Sväng vänster in på Ref0", - "vi": "Quẹo trái vào Ref0", - "zh-Hans": "左转，上Ref0" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_name.json deleted file mode 100644 index e9b60595f2d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/other/way_name_ref_name.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "left" - }, - "name": "Way Name", - "ref": "Ref1;Ref2" - }, - "instructions": { - "de": "Links abbiegen auf Way Name (Ref1)", - "en": "Turn left onto Way Name (Ref1)", - "fr": "Tourner à gauche sur Way Name (Ref1)", - "nl": "Ga linksaf naar Way Name (Ref1)", - "ru": "Поверните налево на Way Name (Ref1)", - "sv": "Sväng vänster in på Way Name (Ref1)", - "vi": "Quẹo trái vào Way Name (Ref1)", - "zh-Hans": "左转，上Way Name (Ref1)" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/default_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/default_default.json deleted file mode 100644 index a5ba6c17b55..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/default_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary" - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren", - "en": "Enter the rotary", - "fr": "Entrer dans le rond-point", - "nl": "Ga het knooppunt op", - "ru": "Въезд на кольцевую развязку", - "sv": "Kör in i rondellen", - "vi": "Đi vào bùng binh", - "zh-Hans": "进入环岛" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/default_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/default_destination.json deleted file mode 100644 index 23cec3da8f9..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/default_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und Richtung Destination 1 verlassen", - "en": "Enter the rotary and exit towards Destination 1", - "fr": "Entrer dans le rond-point et sortir en direction de Destination 1", - "nl": "Verlaat het knooppunt richting Destination 1", - "ru": "На кольцевой развязке используйте съезд в направлении Destination 1", - "sv": "Kör in i rondellen och ta av mot Destination 1", - "vi": "Vào bùng binh và ra để đi Destination 1", - "zh-Hans": "通过环岛前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/default_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/default_name.json deleted file mode 100644 index ad0e6d89a7f..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/default_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary" - }, - "name": "Way Name" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und auf Way Name verlassen", - "en": "Enter the rotary and exit onto Way Name", - "fr": "Entrer dans le rond-point et sortir par Way Name", - "nl": "Verlaat het knooppunt naar Way Name", - "ru": "На кольцевой развязке используйте съезд на Way Name", - "sv": "Kör in i rondellen och ta av mot Way Name", - "vi": "Đi vào bùng binh và ra tại Way Name", - "zh-Hans": "通过环岛后驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_10.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_10.json deleted file mode 100644 index 53a000fa8ef..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_10.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 10 - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und zehnte Ausfahrt nehmen", - "en": "Enter the rotary and take the 10th exit", - "fr": "Entrer dans le rond-point et prendre la dixième sortie", - "nl": "Ga het knooppunt op en neem afslag tiende", - "ru": "На кольцевой развязке используйте десятый съезд", - "sv": "Kör in i rondellen och ta avfart 10:e", - "vi": "Đi vào bùng binh và ra tại đường thứ 10", - "zh-Hans": "进入环岛并从第十出口驶出" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_11.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_11.json deleted file mode 100644 index 7cb6b8610ad..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_11.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 11 - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und Ausfahrt nehmen", - "en": "Enter the rotary and take the exit", - "fr": "Entrer dans le rond-point et prendre la sortie", - "nl": "Ga het knooppunt op en neem afslag ", - "ru": "На кольцевой развязке используйте съезд", - "sv": "Kör in i rondellen och ta avfart ", - "vi": "Đi vào bùng binh và ra tại đường ", - "zh-Hans": "进入环岛并从出口驶出" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_1_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_1_default.json deleted file mode 100644 index 326e419ae80..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_1_default.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 1 - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und erste Ausfahrt nehmen", - "en": "Enter the rotary and take the 1st exit", - "fr": "Entrer dans le rond-point et prendre la première sortie", - "nl": "Ga het knooppunt op en neem afslag eerste", - "ru": "На кольцевой развязке используйте первый съезд", - "sv": "Kör in i rondellen och ta avfart 1:a", - "vi": "Đi vào bùng binh và ra tại đường đầu tiên", - "zh-Hans": "进入环岛并从第一出口驶出" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_1_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_1_destination.json deleted file mode 100644 index b043e090b7f..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_1_destination.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 1 - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und erste Ausfahrt nehmen Richtung Destination 1", - "en": "Enter the rotary and take the 1st exit towards Destination 1", - "fr": "Entrer dans le rond-point et prendre la première sortie en direction de Destination 1", - "nl": "Ga het knooppunt op en neem afslag eerste richting Destination 1", - "ru": "На кольцевой развязке используйте первый съезд в направлении Destination 1", - "sv": "Kör in i rondellen och ta avfart 1:a mot Destination 1", - "vi": "Đi vào bùng binh và ra tại đường đầu tiên đến Destination 1", - "zh-Hans": "进入环岛后从第一出口驶出前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_1_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_1_name.json deleted file mode 100644 index 72b733ba81d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_1_name.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 1 - }, - "name": "Way Name" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und erste Ausfahrt nehmen auf Way Name", - "en": "Enter the rotary and take the 1st exit onto Way Name", - "fr": "Entrer dans le rond-point et prendre la première sortie sur Way Name", - "nl": "Ga het knooppunt op en neem afslag eerste naar Way Name", - "ru": "На кольцевой развязке используйте первый съезд на Way Name", - "sv": "Kör in i rondellen och ta avfart 1:a mot Way Name", - "vi": "Đi vào bùng binh và ra tại đường đầu tiên tức Way Name", - "zh-Hans": "进入环岛后从第一出口驶出进入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_2.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_2.json deleted file mode 100644 index 0188d5b812c..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_2.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 2 - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und zweite Ausfahrt nehmen", - "en": "Enter the rotary and take the 2nd exit", - "fr": "Entrer dans le rond-point et prendre la seconde sortie", - "nl": "Ga het knooppunt op en neem afslag tweede", - "ru": "На кольцевой развязке используйте второй съезд", - "sv": "Kör in i rondellen och ta avfart 2:a", - "vi": "Đi vào bùng binh và ra tại đường thứ 2", - "zh-Hans": "进入环岛并从第二出口驶出" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_3.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_3.json deleted file mode 100644 index 45ed5386cf9..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_3.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 3 - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und dritte Ausfahrt nehmen", - "en": "Enter the rotary and take the 3rd exit", - "fr": "Entrer dans le rond-point et prendre la troisième sortie", - "nl": "Ga het knooppunt op en neem afslag derde", - "ru": "На кольцевой развязке используйте третий съезд", - "sv": "Kör in i rondellen och ta avfart 3:e", - "vi": "Đi vào bùng binh và ra tại đường thứ 3", - "zh-Hans": "进入环岛并从第三出口驶出" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_4.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_4.json deleted file mode 100644 index f64527975c2..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_4.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 4 - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und vierte Ausfahrt nehmen", - "en": "Enter the rotary and take the 4th exit", - "fr": "Entrer dans le rond-point et prendre la quatrième sortie", - "nl": "Ga het knooppunt op en neem afslag vierde", - "ru": "На кольцевой развязке используйте четвёртый съезд", - "sv": "Kör in i rondellen och ta avfart 4:e", - "vi": "Đi vào bùng binh và ra tại đường thứ 4", - "zh-Hans": "进入环岛并从第四出口驶出" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_5.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_5.json deleted file mode 100644 index 5b0d002a8f7..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_5.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 5 - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und fünfte Ausfahrt nehmen", - "en": "Enter the rotary and take the 5th exit", - "fr": "Entrer dans le rond-point et prendre la cinquième sortie", - "nl": "Ga het knooppunt op en neem afslag vijfde", - "ru": "На кольцевой развязке используйте пятый съезд", - "sv": "Kör in i rondellen och ta avfart 5:e", - "vi": "Đi vào bùng binh và ra tại đường thứ 5", - "zh-Hans": "进入环岛并从第五出口驶出" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_6.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_6.json deleted file mode 100644 index 46d38ba6de1..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_6.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 6 - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und sechste Ausfahrt nehmen", - "en": "Enter the rotary and take the 6th exit", - "fr": "Entrer dans le rond-point et prendre la sixième sortie", - "nl": "Ga het knooppunt op en neem afslag zesde", - "ru": "На кольцевой развязке используйте шестой съезд", - "sv": "Kör in i rondellen och ta avfart 6:e", - "vi": "Đi vào bùng binh và ra tại đường thú 6", - "zh-Hans": "进入环岛并从第六出口驶出" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_7.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_7.json deleted file mode 100644 index 10660c929a4..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_7.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 7 - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und siebente Ausfahrt nehmen", - "en": "Enter the rotary and take the 7th exit", - "fr": "Entrer dans le rond-point et prendre la setpième sortie", - "nl": "Ga het knooppunt op en neem afslag zevende", - "ru": "На кольцевой развязке используйте седьмой съезд", - "sv": "Kör in i rondellen och ta avfart 7:e", - "vi": "Đi vào bùng binh và ra tại đường thứ 7", - "zh-Hans": "进入环岛并从第七出口驶出" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_8.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_8.json deleted file mode 100644 index b11392a5bcf..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_8.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 8 - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und achte Ausfahrt nehmen", - "en": "Enter the rotary and take the 8th exit", - "fr": "Entrer dans le rond-point et prendre la huitième sortie", - "nl": "Ga het knooppunt op en neem afslag achtste", - "ru": "На кольцевой развязке используйте восьмой съезд", - "sv": "Kör in i rondellen och ta avfart 8:e", - "vi": "Đi vào bùng binh và ra tại đường thứ 8", - "zh-Hans": "进入环岛并从第八出口驶出" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_9.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_9.json deleted file mode 100644 index 2138c53eade..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/exit_9.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 9 - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und neunte Ausfahrt nehmen", - "en": "Enter the rotary and take the 9th exit", - "fr": "Entrer dans le rond-point et prendre la neuvième sortie", - "nl": "Ga het knooppunt op en neem afslag negende", - "ru": "На кольцевой развязке используйте девятый съезд", - "sv": "Kör in i rondellen och ta avfart 9:e", - "vi": "Đi vào bùng binh và ra tại đường thứ 9", - "zh-Hans": "进入环岛并从第九出口驶出" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_default.json deleted file mode 100644 index 464e3e9815b..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_default.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary" - }, - "name": "", - "rotary_name": "Rotary Name" - }, - "instructions": { - "de": "In Rotary Name fahren", - "en": "Enter Rotary Name", - "fr": "Entrer dans le rond-point Rotary Name", - "nl": "Ga het knooppunt Rotary Name op", - "ru": "Въезд на площадь Rotary Name с круговым движением", - "sv": "Kör in i Rotary Name", - "vi": "Đi vào Rotary Name", - "zh-Hans": "进入Rotary Name环岛" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_destination.json deleted file mode 100644 index 615820edfb7..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_destination.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary" - }, - "name": "Way Name", - "rotary_name": "Rotary Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "In Rotary Name fahren und Richtung Destination 1 verlassen", - "en": "Enter Rotary Name and exit towards Destination 1", - "fr": "Entrer dans le rond-point Rotary Name et sortir en direction de Destination 1", - "nl": "Verlaat het knooppunt Rotary Name richting Destination 1", - "ru": "На площади Rotary Name с круговым движением используйте съезд в направлении Destination 1", - "sv": "Kör in i Rotary Name och ta av mot Destination 1", - "vi": "Đi và Rotary Name và ra để đi Destination 1", - "zh-Hans": "通过Rotary Name环岛后前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_exit_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_exit_default.json deleted file mode 100644 index a6eff80be92..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_exit_default.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 2 - }, - "name": "", - "rotary_name": "Rotary Name" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und zweite Ausfahrt nehmen", - "en": "Enter Rotary Name and take the 2nd exit", - "fr": "Entrer dans le rond-point Rotary Name et prendre la seconde sortie", - "nl": "Ga het knooppunt Rotary Name op en neem afslag tweede", - "ru": "На площади Rotary Name с круговым движением используйте второй съезд", - "sv": "Kör in i Rotary Name och ta avfart 2:a", - "vi": "Đi vào Rotary Name và ra tại đường thứ 2", - "zh-Hans": "进入Rotary Name环岛后从第二出口驶出" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_exit_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_exit_destination.json deleted file mode 100644 index 8184bba5dcd..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_exit_destination.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 2 - }, - "name": "Way Name", - "rotary_name": "Rotary Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und zweite Ausfahrt nehmen Richtung Destination 1", - "en": "Enter Rotary Name and take the 2nd exit towards Destination 1", - "fr": "Entrer dans le rond-point Rotary Name et prendre la seconde sortie en direction de Destination 1", - "nl": "Ga het knooppunt Rotary Name op en neem afslag tweede richting Destination 1", - "ru": "На площади Rotary Name с круговым движением используйте второй съезд в направлении Destination 1", - "sv": "Kör in i Rotary Name och ta avfart 2:a mot Destination 1", - "vi": "Đi vào Rotary Name và ra tại đường thứ 2 đến Destination 1", - "zh-Hans": "进入Rotary Name环岛后从第二出口驶出前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_exit_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_exit_name.json deleted file mode 100644 index c95c676463d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_exit_name.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary", - "exit": 2 - }, - "name": "Way Name", - "rotary_name": "Rotary Name" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und zweite Ausfahrt nehmen auf Way Name", - "en": "Enter Rotary Name and take the 2nd exit onto Way Name", - "fr": "Entrer dans le rond-point Rotary Name et prendre la seconde sortie sur Way Name", - "nl": "Ga het knooppunt Rotary Name op en neem afslag tweede naar Way Name", - "ru": "На площади Rotary Name с круговым движением используйте второй съезд на Way Name", - "sv": "Kör in i Rotary Name och ta avfart 2:a mot Way Name", - "vi": "Đi vào Rotary Name và ra tại đường thứ 2 tức Way Name", - "zh-Hans": "进入Rotary Name环岛后从第二出口驶出进入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_name.json deleted file mode 100644 index 99c7cc69834..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/rotary/name_name.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "rotary" - }, - "name": "Way Name", - "rotary_name": "Rotary Name" - }, - "instructions": { - "de": "In Rotary Name fahren und auf Way Name verlassen", - "en": "Enter Rotary Name and exit onto Way Name", - "fr": "Entrer dans le rond-point Rotary Name et sortir par Way Name", - "nl": "Verlaat het knooppunt Rotary Name naar Way Name", - "ru": "На площади Rotary Name с круговым движением используйте съезд на Way Name", - "sv": "Kör in i Rotary Name och ta av mot Way Name", - "vi": "Đi vào Rotary Name và ra tại Way Name", - "zh-Hans": "通过Rotary Name环岛后驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/default_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/default_default.json deleted file mode 100644 index 36bae3fba9a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/default_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "roundabout" - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren", - "en": "Enter the roundabout", - "fr": "Entrer dans le rond-point", - "nl": "Ga de rotonde op", - "ru": "Въезд на круговой перекрёсток", - "sv": "Kör in i rondellen", - "vi": "Đi vào vòng xuyến", - "zh-Hans": "进入环岛" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/default_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/default_destination.json deleted file mode 100644 index 105ea1ed398..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/default_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "roundabout" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und Richtung Destination 1 verlassen", - "en": "Enter the roundabout and exit towards Destination 1", - "fr": "Entrer dans le rond-point et sortir en direction de Destination 1", - "nl": "Verlaat de rotonde richting Destination 1", - "ru": "На круговом перекрёстке используйте съезд в направлении Destination 1", - "sv": "Kör in i rondellen och ta av mot Destination 1", - "vi": "Đi vào vòng xuyến và ra để đi Destination 1", - "zh-Hans": "通过环岛后前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/default_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/default_name.json deleted file mode 100644 index 4934233b83f..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/default_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "roundabout" - }, - "name": "Way Name" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und auf Way Name verlassen", - "en": "Enter the roundabout and exit onto Way Name", - "fr": "Entrer dans le rond-point et sortir par Way Name", - "nl": "Verlaat de rotonde naar Way Name", - "ru": "На круговом перекрёстке используйте съезд на Way Name", - "sv": "Kör in i rondellen och ta av mot Way Name", - "vi": "Đi vào vòng xuyến và ra tại Way Name", - "zh-Hans": "通过环岛后驶入Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/exit_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/exit_default.json deleted file mode 100644 index fb2c2cfb4a6..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/exit_default.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "roundabout", - "exit": 1 - }, - "name": "" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und erste Ausfahrt nehmen", - "en": "Enter the roundabout and take the 1st exit", - "fr": "Entrer dans le rond-point et prendre la première sortie", - "nl": "Ga de rotonde op en neem afslag eerste", - "ru": "На круговом перекрёстке используйте первый съезд", - "sv": "Kör in i rondellen och ta avfart 1:a", - "vi": "Đi vào vòng xuyến và ra tại đường đầu tiên", - "zh-Hans": "进入环岛后从第一出口驶出" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/exit_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/exit_destination.json deleted file mode 100644 index 7ec02809dba..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/exit_destination.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "roundabout", - "exit": 1 - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und erste Ausfahrt nehmen Richtung Destination 1", - "en": "Enter the roundabout and take the 1st exit towards Destination 1", - "fr": "Entrer dans le rond-point et prendre la première sortie en direction de Destination 1", - "nl": "Ga de rotonde op en neem afslag eerste richting Destination 1", - "ru": "На круговом перекрёстке используйте первый съезд в направлении Destination 1", - "sv": "Kör in i rondellen och ta avfart 1:a mot Destination 1", - "vi": "Đi vào vòng xuyến và ra tại đường đầu tiên đến Destination 1", - "zh-Hans": "进入环岛后从第一出口驶出前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/exit_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/exit_name.json deleted file mode 100644 index dac1003f61f..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout/exit_name.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "left", - "type": "roundabout", - "exit": 1 - }, - "name": "Way Name" - }, - "instructions": { - "de": "In den Kreisverkehr fahren und erste Ausfahrt nehmen auf Way Name", - "en": "Enter the roundabout and take the 1st exit onto Way Name", - "fr": "Entrer dans le rond-point et prendre la première sortie sur Way Name", - "nl": "Ga de rotonde op en neem afslag eerste naar Way Name", - "ru": "На круговом перекрёстке используйте первый съезд на Way Name", - "sv": "Kör in i rondellen och ta avfart 1:a mot Way Name", - "vi": "Đi vào vòng xuyến và ra tại đường đầu tiên tức Way Name", - "zh-Hans": "进入环岛后从第一出口驶出前往Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/left_default.json deleted file mode 100644 index d50b76da3bb..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "left" - }, - "name": "" - }, - "instructions": { - "de": "Am Kreisverkehr links", - "en": "At the roundabout turn left", - "fr": "Au rond-point, tourner à gauche", - "nl": "Ga links op de rotonde", - "ru": "На круговом перекрёстке поверните налево", - "sv": "Vid rondellen sväng vänster", - "vi": "Quẹo trái tại vòng xuyến", - "zh-Hans": "在环岛左转" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/left_destination.json deleted file mode 100644 index 2b5ae9b1b9c..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Am Kreisverkehr links Richtung Destination 1", - "en": "At the roundabout turn left towards Destination 1", - "fr": "Au rond-point, tourner à gauche en direction de Destination 1", - "nl": "Ga links op de rotonde richting Destination 1", - "ru": "На круговом перекрёстке поверните налево в направлении Destination 1", - "sv": "Vid rondellen sväng vänster mot Destination 1", - "vi": "Quẹo trái tại vòng xuyến để đi Destination 1", - "zh-Hans": "在环岛左转，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/left_name.json deleted file mode 100644 index 48d8a97eced..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Am Kreisverkehr links auf Way Name", - "en": "At the roundabout turn left onto Way Name", - "fr": "Au rond-point, tourner à gauche sur Way Name", - "nl": "Ga links op de rotonde naar Way Name", - "ru": "На круговом перекрёстке поверните налево на Way Name", - "sv": "Vid rondellen sväng vänster in på Way Name", - "vi": "Quẹo trái tại vòng xuyến để vào Way Name", - "zh-Hans": "在环岛左转，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/right_default.json deleted file mode 100644 index 968fe733b4c..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "right" - }, - "name": "" - }, - "instructions": { - "de": "Am Kreisverkehr rechts", - "en": "At the roundabout turn right", - "fr": "Au rond-point, tourner à droite", - "nl": "Ga rechts op de rotonde", - "ru": "На круговом перекрёстке поверните направо", - "sv": "Vid rondellen sväng höger", - "vi": "Quẹo phải tại vòng xuyến", - "zh-Hans": "在环岛右转" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/right_destination.json deleted file mode 100644 index 2334189b424..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Am Kreisverkehr rechts Richtung Destination 1", - "en": "At the roundabout turn right towards Destination 1", - "fr": "Au rond-point, tourner à droite en direction de Destination 1", - "nl": "Ga rechts op de rotonde richting Destination 1", - "ru": "На круговом перекрёстке поверните направо в направлении Destination 1", - "sv": "Vid rondellen sväng höger mot Destination 1", - "vi": "Quẹo phải tại vòng xuyến để đi Destination 1", - "zh-Hans": "在环岛右转，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/right_name.json deleted file mode 100644 index 29cf1e1c4d7..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Am Kreisverkehr rechts auf Way Name", - "en": "At the roundabout turn right onto Way Name", - "fr": "Au rond-point, tourner à droite sur Way Name", - "nl": "Ga rechts op de rotonde naar Way Name", - "ru": "На круговом перекрёстке поверните направо на Way Name", - "sv": "Vid rondellen sväng höger in på Way Name", - "vi": "Quẹo phải ti vòng xuyến để vào Way Name", - "zh-Hans": "在环岛右转，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_left_default.json deleted file mode 100644 index 47350c93e97..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "sharp left" - }, - "name": "" - }, - "instructions": { - "de": "Am Kreisverkehr scharf links", - "en": "At the roundabout make a sharp left", - "fr": "Au rond-point, tourner franchement à gauche", - "nl": "Ga linksaf op de rotonde", - "ru": "На круговом перекрёстке резко налево", - "sv": "Vid rondellen sväng skarp vänster", - "vi": "Đi bên trái gắt tại vòng xuyến", - "zh-Hans": "在环岛向左行驶" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_left_destination.json deleted file mode 100644 index 318095ecda0..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "sharp left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Am Kreisverkehr scharf links Richtung Destination 1", - "en": "At the roundabout make a sharp left towards Destination 1", - "fr": "Au rond-point, tourner franchement à gauche en direction de Destination 1", - "nl": "Ga linksaf op de rotonde richting Destination 1", - "ru": "На круговом перекрёстке резко налево в направлении Destination 1", - "sv": "Vid rondellen sväng skarp vänster mot Destination 1", - "vi": "Đi bên trái gắt tại vòng xuyến để đi Destination 1", - "zh-Hans": "在环岛向左行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_left_name.json deleted file mode 100644 index c7f669965bf..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "sharp left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Am Kreisverkehr scharf links auf Way Name", - "en": "At the roundabout make a sharp left onto Way Name", - "fr": "Au rond-point, tourner franchement à gauche sur Way Name", - "nl": "Ga linksaf op de rotonde naar Way Name", - "ru": "На круговом перекрёстке резко налево на Way Name", - "sv": "Vid rondellen sväng skarp vänster in på Way Name", - "vi": "Đi bên trái gắt tại vòng xuyến để vào Way Name", - "zh-Hans": "在环岛向左行驶，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_right_default.json deleted file mode 100644 index d792f36d5ab..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "sharp right" - }, - "name": "" - }, - "instructions": { - "de": "Am Kreisverkehr scharf rechts", - "en": "At the roundabout make a sharp right", - "fr": "Au rond-point, tourner franchement à droite", - "nl": "Ga rechtsaf op de rotonde", - "ru": "На круговом перекрёстке резко направо", - "sv": "Vid rondellen sväng skarp höger", - "vi": "Đi bên phải gắt tại vòng xuyến", - "zh-Hans": "在环岛向右行驶" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_right_destination.json deleted file mode 100644 index 6ad4c22effd..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "sharp right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Am Kreisverkehr scharf rechts Richtung Destination 1", - "en": "At the roundabout make a sharp right towards Destination 1", - "fr": "Au rond-point, tourner franchement à droite en direction de Destination 1", - "nl": "Ga rechtsaf op de rotonde richting Destination 1", - "ru": "На круговом перекрёстке резко направо в направлении Destination 1", - "sv": "Vid rondellen sväng skarp höger mot Destination 1", - "vi": "Đi bên phải gắt tại vòng xuyến để đi Destination 1", - "zh-Hans": "在环岛向右行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_right_name.json deleted file mode 100644 index 230bf31d751..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/sharp_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "sharp right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Am Kreisverkehr scharf rechts auf Way Name", - "en": "At the roundabout make a sharp right onto Way Name", - "fr": "Au rond-point, tourner franchement à droite sur Way Name", - "nl": "Ga rechtsaf op de rotonde naar Way Name", - "ru": "На круговом перекрёстке резко направо на Way Name", - "sv": "Vid rondellen sväng skarp höger in på Way Name", - "vi": "Đi bên phải gắt tại vòng xuyến để vào Way Name", - "zh-Hans": "在环岛向右行驶，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_left_default.json deleted file mode 100644 index 8b98a4173ac..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "slight left" - }, - "name": "" - }, - "instructions": { - "de": "Am Kreisverkehr leicht links", - "en": "At the roundabout make a slight left", - "fr": "Au rond-point, tourner légèrement à gauche", - "nl": "Ga links op de rotonde", - "ru": "На круговом перекрёстке плавно налево", - "sv": "Vid rondellen sväng lätt vänster", - "vi": "Đi bên trái nghiêng tại vòng xuyến", - "zh-Hans": "在环岛向左行驶" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_left_destination.json deleted file mode 100644 index ea1c612529a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "slight left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Am Kreisverkehr leicht links Richtung Destination 1", - "en": "At the roundabout make a slight left towards Destination 1", - "fr": "Au rond-point, tourner légèrement à gauche en direction de Destination 1", - "nl": "Ga links op de rotonde richting Destination 1", - "ru": "На круговом перекрёстке плавно налево в направлении Destination 1", - "sv": "Vid rondellen sväng lätt vänster mot Destination 1", - "vi": "Đi bên trái nghiêng tại vòng xuyến để đi Destination 1", - "zh-Hans": "在环岛向左行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_left_name.json deleted file mode 100644 index 1264d2bb935..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "slight left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Am Kreisverkehr leicht links auf Way Name", - "en": "At the roundabout make a slight left onto Way Name", - "fr": "Au rond-point, tourner légèrement à gauche sur Way Name", - "nl": "Ga links op de rotonde naar Way Name", - "ru": "На круговом перекрёстке плавно налево на Way Name", - "sv": "Vid rondellen sväng lätt vänster in på Way Name", - "vi": "Đi bên trái nghiêng tại vòng xuyến để vào Way Name", - "zh-Hans": "在环岛向左行驶，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_right_default.json deleted file mode 100644 index 3921341d029..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "slight right" - }, - "name": "" - }, - "instructions": { - "de": "Am Kreisverkehr leicht rechts", - "en": "At the roundabout make a slight right", - "fr": "Au rond-point, tourner légèrement à droite", - "nl": "Ga rechts op de rotonde", - "ru": "На круговом перекрёстке плавно направо", - "sv": "Vid rondellen sväng lätt höger", - "vi": "Đi bên phải nghiêng tại vòng xuyến", - "zh-Hans": "在环岛向右行驶" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_right_destination.json deleted file mode 100644 index a3b304cb40d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "slight right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Am Kreisverkehr leicht rechts Richtung Destination 1", - "en": "At the roundabout make a slight right towards Destination 1", - "fr": "Au rond-point, tourner légèrement à droite en direction de Destination 1", - "nl": "Ga rechts op de rotonde richting Destination 1", - "ru": "На круговом перекрёстке плавно направо в направлении Destination 1", - "sv": "Vid rondellen sväng lätt höger mot Destination 1", - "vi": "Đi bên phải nghiêng tại vòng xuyến để đi Destination 1", - "zh-Hans": "在环岛向右行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_right_name.json deleted file mode 100644 index ab4b7ffd0f3..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/slight_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "slight right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Am Kreisverkehr leicht rechts auf Way Name", - "en": "At the roundabout make a slight right onto Way Name", - "fr": "Au rond-point, tourner légèrement à droite sur Way Name", - "nl": "Ga rechts op de rotonde naar Way Name", - "ru": "На круговом перекрёстке плавно направо на Way Name", - "sv": "Vid rondellen sväng lätt höger in på Way Name", - "vi": "Đi bên phải nghiêng tại vòng xuyến để vào Way Name", - "zh-Hans": "在环岛向右行驶，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/straight_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/straight_default.json deleted file mode 100644 index e32233b61c2..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/straight_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "straight" - }, - "name": "" - }, - "instructions": { - "de": "Am Kreisverkehr geradeaus weiterfahren", - "en": "At the roundabout continue straight", - "fr": "Au rond-point, continuer tout droit", - "nl": "Rechtdoor op de rotonde", - "ru": "На круговом перекрёстке продолжайте движение прямо", - "sv": "Vid rondellen fortsätt rakt fram", - "vi": "Chạy thẳng tại vòng xuyến", - "zh-Hans": "在环岛继续直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/straight_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/straight_destination.json deleted file mode 100644 index 8534ac55f00..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/straight_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "straight" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Am Kreisverkehr geradeaus weiterfahren Richtung Destination 1", - "en": "At the roundabout continue straight towards Destination 1", - "fr": "Au rond-point, continuer tout droit en direction de Destination 1", - "nl": "Rechtdoor op de rotonde richting Destination 1", - "ru": "На круговом перекрёстке продолжайте движение в направлении Destination 1", - "sv": "Vid rondellen fortsätt rakt fram mot Destination 1", - "vi": "Chạy thẳng tại vòng xuyến để đi Destination 1", - "zh-Hans": "在环岛继续直行，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/straight_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/straight_name.json deleted file mode 100644 index 33f6a6d44b0..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/straight_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "straight" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Am Kreisverkehr geradeaus weiterfahren auf Way Name", - "en": "At the roundabout continue straight onto Way Name", - "fr": "Au rond-point, continuer tout droit sur Way Name", - "nl": "Rechtdoor op de rotonde naar Way Name", - "ru": "На круговом перекрёстке продолжайте движение прямо по Way Name", - "sv": "Vid rondellen fortsätt rakt fram in på Way Name", - "vi": "Chạy thẳng tại vòng xuyến để chạy tiếp trên Way Name", - "zh-Hans": "在环岛继续直行，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/uturn_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/uturn_default.json deleted file mode 100644 index 194363cbfcc..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/uturn_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "uturn" - }, - "name": "" - }, - "instructions": { - "de": "Am Kreisverkehr 180°-Wendung", - "en": "At the roundabout make a U-turn", - "fr": "Au rond-point, tourner demi-tour", - "nl": "Ga omkeren op de rotonde", - "ru": "На круговом перекрёстке разворот", - "sv": "Vid rondellen sväng U-sväng", - "vi": "Đi bên ngược tại vòng xuyến", - "zh-Hans": "在环岛调头行驶" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/uturn_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/uturn_destination.json deleted file mode 100644 index 91f6ec6ec28..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/uturn_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "uturn" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Am Kreisverkehr 180°-Wendung Richtung Destination 1", - "en": "At the roundabout make a U-turn towards Destination 1", - "fr": "Au rond-point, tourner demi-tour en direction de Destination 1", - "nl": "Ga omkeren op de rotonde richting Destination 1", - "ru": "На круговом перекрёстке разворот в направлении Destination 1", - "sv": "Vid rondellen sväng U-sväng mot Destination 1", - "vi": "Đi bên ngược tại vòng xuyến để đi Destination 1", - "zh-Hans": "在环岛调头行驶，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/uturn_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/uturn_name.json deleted file mode 100644 index bbcb9ee60c6..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/roundabout_turn/uturn_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "roundabout turn", - "modifier": "uturn" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Am Kreisverkehr 180°-Wendung auf Way Name", - "en": "At the roundabout make a U-turn onto Way Name", - "fr": "Au rond-point, tourner demi-tour sur Way Name", - "nl": "Ga omkeren op de rotonde naar Way Name", - "ru": "На круговом перекрёстке разворот на Way Name", - "sv": "Vid rondellen sväng U-sväng in på Way Name", - "vi": "Đi bên ngược tại vòng xuyến để vào Way Name", - "zh-Hans": "在环岛调头行驶，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/left_default.json deleted file mode 100644 index efe6f946afd..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "left" - }, - "name": "" - }, - "instructions": { - "de": "Links abbiegen", - "en": "Turn left", - "fr": "Tourner à gauche", - "nl": "Ga linksaf", - "ru": "Поверните налево", - "sv": "Sväng vänster", - "vi": "Quẹo trái", - "zh-Hans": "左转" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/left_destination.json deleted file mode 100644 index 6608e22a260..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Links abbiegen Richtung Destination 1", - "en": "Turn left towards Destination 1", - "fr": "Tourner à gauche en direction de Destination 1", - "nl": "Ga linksaf richting Destination 1", - "ru": "Поверните налево в направлении Destination 1", - "sv": "Sväng vänster mot Destination 1", - "vi": "Quẹo trái đến Destination 1", - "zh-Hans": "左转，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/left_name.json deleted file mode 100644 index 89a2a9b8b99..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Links abbiegen auf Way Name", - "en": "Turn left onto Way Name", - "fr": "Tourner à gauche sur Way Name", - "nl": "Ga linksaf naar Way Name", - "ru": "Поверните налево на Way Name", - "sv": "Sväng vänster in på Way Name", - "vi": "Quẹo trái vào Way Name", - "zh-Hans": "左转，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/right_default.json deleted file mode 100644 index 77b22d7aaeb..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "right" - }, - "name": "" - }, - "instructions": { - "de": "Rechts abbiegen", - "en": "Turn right", - "fr": "Tourner à droite", - "nl": "Ga rechtsaf", - "ru": "Поверните направо", - "sv": "Sväng höger", - "vi": "Quẹo phải", - "zh-Hans": "右转" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/right_destination.json deleted file mode 100644 index 2362de2ec2d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Rechts abbiegen Richtung Destination 1", - "en": "Turn right towards Destination 1", - "fr": "Tourner à droite en direction de Destination 1", - "nl": "Ga rechtsaf richting Destination 1", - "ru": "Поверните направо в направлении Destination 1", - "sv": "Sväng höger mot Destination 1", - "vi": "Quẹo phải đến Destination 1", - "zh-Hans": "右转，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/right_name.json deleted file mode 100644 index a841f2b1a48..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Rechts abbiegen auf Way Name", - "en": "Turn right onto Way Name", - "fr": "Tourner à droite sur Way Name", - "nl": "Ga rechtsaf naar Way Name", - "ru": "Поверните направо на Way Name", - "sv": "Sväng höger in på Way Name", - "vi": "Quẹo phải vào Way Name", - "zh-Hans": "右转，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_left_default.json deleted file mode 100644 index fec8166a844..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "sharp left" - }, - "name": "" - }, - "instructions": { - "de": "Scharf links abbiegen", - "en": "Make a sharp left", - "fr": "Tourner franchement à gauche", - "nl": "Ga linksaf", - "ru": "Поверните резко налево", - "sv": "Sväng åt skarp vänster", - "vi": "Quẹo trái gắt", - "zh-Hans": "向左转弯" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_left_destination.json deleted file mode 100644 index 35cbce5e8ac..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "sharp left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf links abbiegen Richtung Destination 1", - "en": "Make a sharp left towards Destination 1", - "fr": "Tourner franchement à gauche en direction de Destination 1", - "nl": "Ga linksaf richting Destination 1", - "ru": "Поверните резко налево в направлении Destination 1", - "sv": "Sväng åt skarp vänster mot Destination 1", - "vi": "Quẹo trái gắt đến Destination 1", - "zh-Hans": "向左转弯，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_left_name.json deleted file mode 100644 index e1b132b9d2a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "sharp left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf links abbiegen auf Way Name", - "en": "Make a sharp left onto Way Name", - "fr": "Tourner franchement à gauche sur Way Name", - "nl": "Ga linksaf naar Way Name", - "ru": "Поверните резко налево на Way Name", - "sv": "Sväng åt skarp vänster in på Way Name", - "vi": "Quẹo trái gắt vào Way Name", - "zh-Hans": "向左转弯，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_right_default.json deleted file mode 100644 index 6307b33e464..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "sharp right" - }, - "name": "" - }, - "instructions": { - "de": "Scharf rechts abbiegen", - "en": "Make a sharp right", - "fr": "Tourner franchement à droite", - "nl": "Ga rechtsaf", - "ru": "Поверните резко направо", - "sv": "Sväng åt skarp höger", - "vi": "Quẹo phải gắt", - "zh-Hans": "向右转弯" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_right_destination.json deleted file mode 100644 index 82bb5613db3..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "sharp right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Scharf rechts abbiegen Richtung Destination 1", - "en": "Make a sharp right towards Destination 1", - "fr": "Tourner franchement à droite en direction de Destination 1", - "nl": "Ga rechtsaf richting Destination 1", - "ru": "Поверните резко направо в направлении Destination 1", - "sv": "Sväng åt skarp höger mot Destination 1", - "vi": "Quẹo phải gắt đến Destination 1", - "zh-Hans": "向右转弯，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_right_name.json deleted file mode 100644 index 474e11bc2dc..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/sharp_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "sharp right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Scharf rechts abbiegen auf Way Name", - "en": "Make a sharp right onto Way Name", - "fr": "Tourner franchement à droite sur Way Name", - "nl": "Ga rechtsaf naar Way Name", - "ru": "Поверните резко направо на Way Name", - "sv": "Sväng åt skarp höger in på Way Name", - "vi": "Quẹo phải gắt vào Way Name", - "zh-Hans": "向右转弯，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_left_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_left_default.json deleted file mode 100644 index 9fd642f46ff..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_left_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "slight left" - }, - "name": "" - }, - "instructions": { - "de": "Leicht links abbiegen", - "en": "Make a slight left", - "fr": "Tourner légèrement à gauche", - "nl": "Ga links", - "ru": "Поверните плавно налево", - "sv": "Sväng åt lätt vänster", - "vi": "Quẹo trái nghiêng", - "zh-Hans": "向左转弯" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_left_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_left_destination.json deleted file mode 100644 index c6c4d71f077..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_left_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "slight left" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Leicht links abbiegen Richtung Destination 1", - "en": "Make a slight left towards Destination 1", - "fr": "Tourner légèrement à gauche en direction de Destination 1", - "nl": "Ga links richting Destination 1", - "ru": "Поверните плавно налево в направлении Destination 1", - "sv": "Sväng åt lätt vänster mot Destination 1", - "vi": "Quẹo trái nghiêng đến Destination 1", - "zh-Hans": "向左转弯，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_left_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_left_name.json deleted file mode 100644 index ecb05913bf9..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_left_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "slight left" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Leicht links abbiegen auf Way Name", - "en": "Make a slight left onto Way Name", - "fr": "Tourner légèrement à gauche sur Way Name", - "nl": "Ga links naar Way Name", - "ru": "Поверните плавно налево на Way Name", - "sv": "Sväng åt lätt vänster in på Way Name", - "vi": "Quẹo trái nghiêng vào Way Name", - "zh-Hans": "向左转弯，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_right_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_right_default.json deleted file mode 100644 index 2da951997b8..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_right_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "slight right" - }, - "name": "" - }, - "instructions": { - "de": "Leicht rechts abbiegen", - "en": "Make a slight right", - "fr": "Tourner légèrement à droite", - "nl": "Ga rechts", - "ru": "Поверните плавно направо", - "sv": "Sväng åt lätt höger", - "vi": "Quẹo phải nghiêng", - "zh-Hans": "向右转弯" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_right_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_right_destination.json deleted file mode 100644 index e5598c1b3e6..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_right_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "slight right" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Leicht rechts abbiegen Richtung Destination 1", - "en": "Make a slight right towards Destination 1", - "fr": "Tourner légèrement à droite en direction de Destination 1", - "nl": "Ga rechts richting Destination 1", - "ru": "Поверните плавно направо в направлении Destination 1", - "sv": "Sväng åt lätt höger mot Destination 1", - "vi": "Quẹo phải nghiêng đến Destination 1", - "zh-Hans": "向右转弯，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_right_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_right_name.json deleted file mode 100644 index 297ebbbbe22..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/slight_right_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "slight right" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Leicht rechts abbiegen auf Way Name", - "en": "Make a slight right onto Way Name", - "fr": "Tourner légèrement à droite sur Way Name", - "nl": "Ga rechts naar Way Name", - "ru": "Поверните плавно направо на Way Name", - "sv": "Sväng åt lätt höger in på Way Name", - "vi": "Quẹo phải nghiêng vào Way Name", - "zh-Hans": "向右转弯，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/straight_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/straight_default.json deleted file mode 100644 index c34d06930f0..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/straight_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "straight" - }, - "name": "" - }, - "instructions": { - "de": "Geradeaus weiterfahren", - "en": "Go straight", - "fr": "Aller tout droit", - "nl": "Ga rechtdoor", - "ru": "Продолжайте движение прямо", - "sv": "Kör rakt fram", - "vi": "Chạy thẳng", - "zh-Hans": "直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/straight_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/straight_destination.json deleted file mode 100644 index 672527c29be..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/straight_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "straight" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "Geradeaus weiterfahren Richtung Destination 1", - "en": "Go straight towards Destination 1", - "fr": "Aller tout droit en direction de Destination 1", - "nl": "Ga rechtdoor richting Destination 1", - "ru": "Продолжайте движение прямо в направлении Destination 1", - "sv": "Kör rakt fram mot Destination 1", - "vi": "Chạy thẳng đến Destination 1", - "zh-Hans": "直行，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/straight_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/straight_name.json deleted file mode 100644 index f730b5eb576..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/straight_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "straight" - }, - "name": "Way Name" - }, - "instructions": { - "de": "Geradeaus weiterfahren auf Way Name", - "en": "Go straight onto Way Name", - "fr": "Aller tout droit sur Way Name", - "nl": "Ga rechtdoor naar Way Name", - "ru": "Продолжайте движение прямо по Way Name", - "sv": "Kör rakt fram in på Way Name", - "vi": "Chạy thẳng vào Way Name", - "zh-Hans": "直行，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/uturn_default.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/uturn_default.json deleted file mode 100644 index b0c99596135..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/uturn_default.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "uturn" - }, - "name": "" - }, - "instructions": { - "de": "180°-Wendung abbiegen", - "en": "Make a U-turn", - "fr": "Tourner demi-tour", - "nl": "Ga omkeren", - "ru": "Поверните разворот", - "sv": "Sväng åt U-sväng", - "vi": "Quẹo ngược", - "zh-Hans": "调头转弯" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/uturn_destination.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/uturn_destination.json deleted file mode 100644 index eaebfee67ce..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/uturn_destination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "uturn" - }, - "name": "Way Name", - "destinations": "Destination 1,Destination 2" - }, - "instructions": { - "de": "180°-Wendung abbiegen Richtung Destination 1", - "en": "Make a U-turn towards Destination 1", - "fr": "Tourner demi-tour en direction de Destination 1", - "nl": "Ga omkeren richting Destination 1", - "ru": "Поверните разворот в направлении Destination 1", - "sv": "Sväng åt U-sväng mot Destination 1", - "vi": "Quẹo ngược đến Destination 1", - "zh-Hans": "调头转弯，前往Destination 1" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/uturn_name.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/uturn_name.json deleted file mode 100644 index 9e7044bcb98..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/turn/uturn_name.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "step": { - "maneuver": { - "type": "turn", - "modifier": "uturn" - }, - "name": "Way Name" - }, - "instructions": { - "de": "180°-Wendung abbiegen auf Way Name", - "en": "Make a U-turn onto Way Name", - "fr": "Tourner demi-tour sur Way Name", - "nl": "Ga omkeren naar Way Name", - "ru": "Поверните разворот на Way Name", - "sv": "Sväng åt U-sväng in på Way Name", - "vi": "Quẹo ngược vào Way Name", - "zh-Hans": "调头转弯，上Way Name" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/o.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/o.json deleted file mode 100644 index c95a91b9953..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/o.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "straight", - "type": "use lane" - }, - "intersections": [ - { - "location": [ - 13.39677, - 52.54366 - ], - "in": 1, - "out": 2, - "bearings": [ - 10, - 20 - ], - "entry": [ - true, - false - ], - "lanes": [ - { - "indications": [ - "straight" - ], - "valid": true - } - ] - } - ], - "name": "" - }, - "instructions": { - "de": "Geradeaus weiterfahren", - "en": "Continue straight", - "fr": "Continuer tout droit", - "nl": "Rechtdoor", - "ru": "Продолжайте движение прямо", - "sv": "Fortsätt rakt fram", - "vi": "Chạy thẳng", - "zh-Hans": "继续直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/ooo.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/ooo.json deleted file mode 100644 index 108e19b9407..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/ooo.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "straight", - "type": "use lane" - }, - "intersections": [ - { - "location": [ - 13.39677, - 52.54366 - ], - "in": 1, - "out": 2, - "bearings": [ - 10, - 20 - ], - "entry": [ - true, - false - ], - "lanes": [ - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": true - } - ] - } - ], - "name": "" - }, - "instructions": { - "de": "Geradeaus weiterfahren", - "en": "Continue straight", - "fr": "Continuer tout droit", - "nl": "Rechtdoor", - "ru": "Продолжайте движение прямо", - "sv": "Fortsätt rakt fram", - "vi": "Chạy thẳng", - "zh-Hans": "继续直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/oooxxo.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/oooxxo.json deleted file mode 100644 index c0d81fbfe9d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/oooxxo.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "straight", - "type": "use lane" - }, - "intersections": [ - { - "location": [ - 13.39677, - 52.54366 - ], - "in": 1, - "out": 2, - "bearings": [ - 10, - 20 - ], - "entry": [ - true, - false - ], - "lanes": [ - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": true - } - ] - } - ], - "name": "" - }, - "instructions": { - "de": "Rechts oder links halten", - "en": "Keep left or right", - "fr": "Rester à gauche ou à droite", - "nl": "Links of rechts blijven", - "ru": "Держите левой или правой стороны", - "sv": "Håll till vänster eller höger", - "vi": "Đi bên trái hay bên phải", - "zh-Hans": "保持在道路两侧直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/oox.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/oox.json deleted file mode 100644 index 3e3bb5aa48a..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/oox.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "straight", - "type": "use lane" - }, - "intersections": [ - { - "location": [ - 13.39677, - 52.54366 - ], - "in": 1, - "out": 2, - "bearings": [ - 10, - 20 - ], - "entry": [ - true, - false - ], - "lanes": [ - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": false - } - ] - } - ], - "name": "" - }, - "instructions": { - "de": "Links halten", - "en": "Keep left", - "fr": "Serrer à gauche", - "nl": "Links aanhouden", - "ru": "Держитесь левой стороны", - "sv": "Håll till vänster", - "vi": "Đi bên trái", - "zh-Hans": "靠左直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/ooxx.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/ooxx.json deleted file mode 100644 index 1627bacb8c0..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/ooxx.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "straight", - "type": "use lane" - }, - "intersections": [ - { - "location": [ - 13.39677, - 52.54366 - ], - "in": 1, - "out": 2, - "bearings": [ - 10, - 20 - ], - "entry": [ - true, - false - ], - "lanes": [ - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": false - } - ] - } - ], - "name": "" - }, - "instructions": { - "de": "Links halten", - "en": "Keep left", - "fr": "Serrer à gauche", - "nl": "Links aanhouden", - "ru": "Держитесь левой стороны", - "sv": "Håll till vänster", - "vi": "Đi bên trái", - "zh-Hans": "靠左直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/oxo.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/oxo.json deleted file mode 100644 index d5f38e7137d..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/oxo.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "straight", - "type": "use lane" - }, - "intersections": [ - { - "location": [ - 13.39677, - 52.54366 - ], - "in": 1, - "out": 2, - "bearings": [ - 10, - 20 - ], - "entry": [ - true, - false - ], - "lanes": [ - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": true - } - ] - } - ], - "name": "" - }, - "instructions": { - "de": "Rechts oder links halten", - "en": "Keep left or right", - "fr": "Rester à gauche ou à droite", - "nl": "Links of rechts blijven", - "ru": "Держите левой или правой стороны", - "sv": "Håll till vänster eller höger", - "vi": "Đi bên trái hay bên phải", - "zh-Hans": "保持在道路两侧直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xoo.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xoo.json deleted file mode 100644 index d97eedb320b..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xoo.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "straight", - "type": "use lane" - }, - "intersections": [ - { - "location": [ - 13.39677, - 52.54366 - ], - "in": 1, - "out": 2, - "bearings": [ - 10, - 20 - ], - "entry": [ - true, - false - ], - "lanes": [ - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": true - } - ] - } - ], - "name": "" - }, - "instructions": { - "de": "Rechts halten", - "en": "Keep right", - "fr": "Serrer à droite", - "nl": "Rechts aanhouden", - "ru": "Держитесь правой стороны", - "sv": "Håll till höger", - "vi": "Đi bên phải", - "zh-Hans": "靠右直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xox.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xox.json deleted file mode 100644 index 8b1b54d6320..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xox.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "straight", - "type": "use lane" - }, - "intersections": [ - { - "location": [ - 13.39677, - 52.54366 - ], - "in": 1, - "out": 2, - "bearings": [ - 10, - 20 - ], - "entry": [ - true, - false - ], - "lanes": [ - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": false - } - ] - } - ], - "name": "" - }, - "instructions": { - "de": "Mittlere Spur nutzen", - "en": "Keep in the middle", - "fr": "Rester au milieu", - "nl": "In het midden blijven", - "ru": "Держитесь середины", - "sv": "Håll till mitten", - "vi": "Đi vào giữa", - "zh-Hans": "保持在道路中间直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xxoo.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xxoo.json deleted file mode 100644 index 7775651f79b..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xxoo.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "straight", - "type": "use lane" - }, - "intersections": [ - { - "location": [ - 13.39677, - 52.54366 - ], - "in": 1, - "out": 2, - "bearings": [ - 10, - 20 - ], - "entry": [ - true, - false - ], - "lanes": [ - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": true - } - ] - } - ], - "name": "" - }, - "instructions": { - "de": "Rechts halten", - "en": "Keep right", - "fr": "Serrer à droite", - "nl": "Rechts aanhouden", - "ru": "Держитесь правой стороны", - "sv": "Håll till höger", - "vi": "Đi bên phải", - "zh-Hans": "靠右直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xxooxx.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xxooxx.json deleted file mode 100644 index e98d5825111..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xxooxx.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "straight", - "type": "use lane" - }, - "intersections": [ - { - "location": [ - 13.39677, - 52.54366 - ], - "in": 1, - "out": 2, - "bearings": [ - 10, - 20 - ], - "entry": [ - true, - false - ], - "lanes": [ - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": false - } - ] - } - ], - "name": "" - }, - "instructions": { - "de": "Mittlere Spur nutzen", - "en": "Keep in the middle", - "fr": "Rester au milieu", - "nl": "In het midden blijven", - "ru": "Держитесь середины", - "sv": "Håll till mitten", - "vi": "Đi vào giữa", - "zh-Hans": "保持在道路中间直行" - } -} diff --git a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xxoxo.json b/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xxoxo.json deleted file mode 100644 index 6b3fcd0253b..00000000000 --- a/navigation/libandroid-navigation/src/test/res/osrm/v5/use_lane/xxoxo.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "step": { - "maneuver": { - "modifier": "straight", - "type": "use lane" - }, - "intersections": [ - { - "location": [ - 13.39677, - 52.54366 - ], - "in": 1, - "out": 2, - "bearings": [ - 10, - 20 - ], - "entry": [ - true, - false - ], - "lanes": [ - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": true - }, - { - "indications": [ - "straight" - ], - "valid": false - }, - { - "indications": [ - "straight" - ], - "valid": true - } - ] - } - ], - "name": "" - }, - "instructions": { - "de": "Geradeaus weiterfahren", - "en": "Continue straight", - "fr": "Continuer tout droit", - "nl": "Rechtdoor", - "ru": "Продолжайте движение прямо", - "sv": "Fortsätt rakt fram", - "vi": "Chạy thẳng", - "zh-Hans": "继续直行" - } -} From b95ecb7adb7a0ea21df4294f57bdc0f042f872fa Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Fri, 29 Sep 2017 18:43:41 -0400 Subject: [PATCH 5/5] Resolves several code issues (#287) * removed unnecessary throw decleration * reversed operators for easier readability * cleaned up some additional classes * resolved unexpected token in route milestone * added back maneuver constants --- .../navigation/v5/milestone/Milestone.java | 24 +++--- .../navigation/v5/milestone/Operation.java | 12 ++- .../v5/milestone/RouteMilestone.java | 9 +-- .../navigation/v5/milestone/Trigger.java | 4 + .../v5/navigation/NavigationConstants.java | 74 +++++++++++++++++-- .../v5/navigation/NavigationHelper.java | 21 ++++-- 6 files changed, 110 insertions(+), 34 deletions(-) diff --git a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Milestone.java b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Milestone.java index 6693af52188..5ccb2d63fb6 100644 --- a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Milestone.java +++ b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Milestone.java @@ -19,8 +19,8 @@ public Milestone(Builder builder) { } /** - * Milestone specific identifier as an {@code int} value, useful for deciphering which milestone invoked - * {@link MilestoneEventListener#onMilestoneEvent(RouteProgress, String, int)}. + * Milestone specific identifier as an {@code int} value, useful for deciphering which milestone + * invoked {@link MilestoneEventListener#onMilestoneEvent(RouteProgress, String, int)}. * * @return {@code int} representing the identifier * @since 0.4.0 @@ -31,7 +31,7 @@ public int getIdentifier() { /** * Milestone specific {@link Instruction}, which can be used to build a {@link String} - * instruction specified by the superclass + * instruction specified by the superclass. * * @return {@link Instruction} to be used to build the {@link String} passed to * {@link MilestoneEventListener#onMilestoneEvent(RouteProgress, String, int)} @@ -46,13 +46,14 @@ public Instruction getInstruction() { * {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation} object * (recommended) or validated directly inside your activity. * - * @param previousRouteProgress last locations generated {@link RouteProgress} object used to determine certain - * {@link TriggerProperty}s + * @param previousRouteProgress last locations generated {@link RouteProgress} object used to + * determine certain {@link TriggerProperty}s * @param routeProgress used to determine certain {@link TriggerProperty}s * @return true if the milestone trigger's valid, else false * @since 0.4.0 */ - public abstract boolean isOccurring(RouteProgress previousRouteProgress, RouteProgress routeProgress); + public abstract boolean isOccurring(RouteProgress previousRouteProgress, + RouteProgress routeProgress); /** * Build a new {@link Milestone} @@ -68,8 +69,8 @@ public Builder() { } /** - * Milestone specific identifier as an {@code int} value, useful for deciphering which milestone invoked - * {@link MilestoneEventListener#onMilestoneEvent(RouteProgress, String, int)}. + * Milestone specific identifier as an {@code int} value, useful for deciphering which milestone + * invoked {@link MilestoneEventListener#onMilestoneEvent(RouteProgress, String, int)}. * * @return {@code int} representing the identifier * @since 0.4.0 @@ -79,8 +80,8 @@ public int getIdentifier() { } /** - * Milestone specific identifier as an {@code int} value, useful for deciphering which milestone invoked - * {@link MilestoneEventListener#onMilestoneEvent(RouteProgress, String, int)}. + * Milestone specific identifier as an {@code int} value, useful for deciphering which milestone + * invoked {@link MilestoneEventListener#onMilestoneEvent(RouteProgress, String, int)}. * * @param identifier an {@code int} used to identify this milestone instance * @return this builder @@ -126,7 +127,6 @@ public Builder setInstruction(Instruction instruction) { * @throws NavigationException if an invalid value has been set on the milestone * @since 0.4.0 */ - public abstract Milestone build() throws NavigationException; + public abstract Milestone build(); } - } diff --git a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Operation.java b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Operation.java index 563ca742135..545befc4612 100644 --- a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Operation.java +++ b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Operation.java @@ -7,12 +7,16 @@ */ class Operation { + private Operation() { + // Private constructor to prevent initialization of class. + } + static boolean greaterThan(Number[] valueOne, Number valueTwo) { if (valueOne.length > 1) { if (valueTwo.equals(TriggerProperty.TRUE)) { return valueOne[0].doubleValue() > valueOne[1].doubleValue(); } else { - return !(valueOne[0].doubleValue() > valueOne[1].doubleValue()); + return valueOne[0].doubleValue() <= valueOne[1].doubleValue(); } } return valueOne[0].doubleValue() > valueTwo.doubleValue(); @@ -23,7 +27,7 @@ static boolean lessThan(Number[] valueOne, Number valueTwo) { if (valueTwo.equals(TriggerProperty.TRUE)) { return valueOne[0].doubleValue() < valueOne[1].doubleValue(); } else { - return !(valueOne[0].doubleValue() < valueOne[1].doubleValue()); + return valueOne[0].doubleValue() >= valueOne[1].doubleValue(); } } return valueOne[0].doubleValue() < valueTwo.doubleValue(); @@ -56,7 +60,7 @@ static boolean greaterThanEqual(Number[] valueOne, Number valueTwo) { if (valueTwo.equals(TriggerProperty.TRUE)) { return valueOne[0].doubleValue() >= valueOne[1].doubleValue(); } else { - return !(valueOne[0].doubleValue() >= valueOne[1].doubleValue()); + return valueOne[0].doubleValue() < valueOne[1].doubleValue(); } } return valueOne[0].doubleValue() >= valueTwo.doubleValue(); @@ -67,7 +71,7 @@ static boolean lessThanEqual(Number[] valueOne, Number valueTwo) { if (valueTwo.equals(TriggerProperty.TRUE)) { return valueOne[0].doubleValue() <= valueOne[1].doubleValue(); } else { - return !(valueOne[0].doubleValue() <= valueOne[1].doubleValue()); + return valueOne[0].doubleValue() > valueOne[1].doubleValue(); } } return valueOne[0].doubleValue() <= valueTwo.doubleValue(); diff --git a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/RouteMilestone.java b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/RouteMilestone.java index f24dd3d9ae1..cb9d9e723cc 100644 --- a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/RouteMilestone.java +++ b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/RouteMilestone.java @@ -1,17 +1,16 @@ package com.mapbox.services.android.navigation.v5.milestone; -import com.mapbox.services.android.navigation.v5.exception.NavigationException; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; /** - * Using a Route Milestone will result in {@link MilestoneEventListener#onMilestoneEvent(RouteProgress, String, int)} - * being invoked only once during a navigation session. + * Using a Route Milestone will result in + * {@link MilestoneEventListener#onMilestoneEvent(RouteProgress, String, int)} being invoked only + * once during a navigation session. * * @since 0.4.0 */ public class RouteMilestone extends Milestone { - private Builder builder; private boolean called; @@ -56,7 +55,7 @@ Trigger.Statement getTrigger() { } @Override - public RouteMilestone build() throws NavigationException { + public RouteMilestone build() { return new RouteMilestone(this); } } diff --git a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Trigger.java b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Trigger.java index 4aa8552eea2..b53b0219816 100644 --- a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Trigger.java +++ b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Trigger.java @@ -11,6 +11,10 @@ */ public class Trigger { + private Trigger() { + // Empty private constructor to prevent users creating an instance of this class. + } + /** * Base Trigger statement. Subclassed to provide concrete statements. * diff --git a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationConstants.java b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationConstants.java index 6b3ccdf021e..299224918de 100644 --- a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationConstants.java +++ b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationConstants.java @@ -7,58 +7,118 @@ */ public class NavigationConstants { + private NavigationConstants() { + // Empty private constructor to prevent users creating an instance of this class. + } + + /** + * Identifier value for the default departure milestone event. If additional milestones are added, + * avoid using the 1-5 integer values as identifiers. + * + * @since 0.4.0 + */ public static final int DEPARTURE_MILESTONE = 1; + + /** + * Identifier value for the default new step milestone event. If additional milestones are added, + * avoid using the 1-5 integer values as identifiers. + * + * @since 0.4.0 + */ public static final int NEW_STEP_MILESTONE = 2; + + /** + * Identifier value for the default imminent milestone event. If additional milestones are added, + * avoid using the 1-5 integer values as identifiers. + * + * @since 0.4.0 + */ public static final int IMMINENT_MILESTONE = 3; + + /** + * Identifier value for the default urgent milestone event. If additional milestones are added, + * avoid using the 1-5 integer values as identifiers. + * + * @since 0.4.0 + */ public static final int URGENT_MILESTONE = 4; + + /** + * Identifier value for the default arrival milestone event. If additional milestones are added, + * avoid using the 1-5 integer values as identifiers. + * + * @since 0.4.0 + */ public static final int ARRIVAL_MILESTONE = 5; /** * Random integer value used for identifying the navigation notification. + * + * @since 0.5.0 */ static final int NAVIGATION_NOTIFICATION_ID = 5678; /** - * Threshold user must be in within to count as completing a step. One of two heuristics used to know when a user - * completes a step, see `RouteControllerManeuverZoneRadius`. The users `heading` and the `finalHeading` are - * compared. If this number is within `RouteControllerMaximumAllowedDegreeOffsetForTurnCompletion`, the user has + * Threshold user must be within to count as completing a step. One of two heuristics used to know + * when a user completes a step, see {@link #MANEUVER_ZONE_RADIUS}. The users heading and the + * finalHeading are compared. If this number is within this defined constant, the user has * completed the step. + * + * @since 0.1.0 */ static final int MAXIMUM_ALLOWED_DEGREE_OFFSET_FOR_TURN_COMPLETION = 30; /** - * Radius in meters the user must enter to count as completing a step. One of two heuristics used to know when a user - * completes a step, see `RouteControllerMaximumAllowedDegreeOffsetForTurnCompletion`. + * Radius in meters the user must enter to count as completing a step. One of two heuristics used + * to know when a user completes a step, see + * {@link #MAXIMUM_ALLOWED_DEGREE_OFFSET_FOR_TURN_COMPLETION}. + * + * @since 0.1.0 */ static final int MANEUVER_ZONE_RADIUS = 40; /** * Maximum number of meters the user can travel away from step before the * {@link OffRouteListener}'s called. + * + * @since 0.2.0 */ static final double MAXIMUM_DISTANCE_BEFORE_OFF_ROUTE = 20; /** * Seconds used before a reroute occurs. + * + * @since 0.2.0 */ static final int SECONDS_BEFORE_REROUTE = 3; /** * Accepted deviation excluding horizontal accuracy before the user is considered to be off route. + * + * @since 0.1.0 */ static final double USER_LOCATION_SNAPPING_DISTANCE = 10; /** - * When calculating whether or not the user is on the route, we look where the user will be given their speed and - * this variable. + * When calculating whether or not the user is on the route, we look where the user will be given + * their speed and this variable. + * + * @since 0.2.0 */ static final double DEAD_RECKONING_TIME_INTERVAL = 1.0; /** * Maximum angle the user puck will be rotated when snapping the user's course to the route line. + * + * @since 0.3.0 */ static final int MAX_MANIPULATED_COURSE_ANGLE = 25; + /** + * Meter radius which the user must be inside for an arrival milestone to be triggered and + * navigation to end. + * + */ static final double METERS_REMAINING_TILL_ARRIVAL = 40; // Bundle variable keys diff --git a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelper.java b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelper.java index f0ba15750a3..846bb7cb94f 100644 --- a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelper.java +++ b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelper.java @@ -28,6 +28,10 @@ */ class NavigationHelper { + private NavigationHelper() { + // Empty private constructor to prevent users creating an instance of this class. + } + /** * Takes in a raw location, converts it to a point, and snaps it to the closest point along the * route. This is isolated as separate logic from the snap logic provided because we will always @@ -121,7 +125,8 @@ static double routeDistanceRemaining(double legDistanceRemaining, int legIndex, * @return boolean true if the user location matches (using a tolerance) the final heading * @since 0.2.0 */ - static boolean bearingMatchesManeuverFinalHeading(Location userLocation, RouteProgress routeProgress, + static boolean bearingMatchesManeuverFinalHeading(Location userLocation, + RouteProgress routeProgress, double maxTurnCompletionOffset) { if (routeProgress.currentLegProgress().upComingStep() == null) { return false; @@ -129,7 +134,8 @@ static boolean bearingMatchesManeuverFinalHeading(Location userLocation, RoutePr // Bearings need to be normalized so when the bearingAfter is 359 and the user heading is 1, we // count this as within the MAXIMUM_ALLOWED_DEGREE_OFFSET_FOR_TURN_COMPLETION. - double finalHeading = routeProgress.currentLegProgress().upComingStep().getManeuver().getBearingAfter(); + double finalHeading = routeProgress.currentLegProgress().upComingStep().getManeuver() + .getBearingAfter(); double finalHeadingNormalized = MathUtils.wrap(finalHeading, 0, 360); double userHeadingNormalized = MathUtils.wrap(userLocation.getBearing(), 0, 360); return MathUtils.differenceBetweenAngles(finalHeadingNormalized, userHeadingNormalized) @@ -150,10 +156,12 @@ static boolean bearingMatchesManeuverFinalHeading(Location userLocation, RoutePr * @param previousIndices used for adjusting the indices * @return a {@link NavigationIndices} object which contains the new leg and step indices */ - static NavigationIndices increaseIndex(RouteProgress routeProgress, NavigationIndices previousIndices) { + static NavigationIndices increaseIndex(RouteProgress routeProgress, + NavigationIndices previousIndices) { // Check if we are in the last step in the current routeLeg and iterate it if needed. if (previousIndices.stepIndex() - >= routeProgress.directionsRoute().getLegs().get(routeProgress.legIndex()).getSteps().size() - 2 + >= routeProgress.directionsRoute().getLegs().get(routeProgress.legIndex()) + .getSteps().size() - 2 && previousIndices.legIndex() < routeProgress.directionsRoute().getLegs().size() - 1) { return NavigationIndices.create((previousIndices.legIndex() + 1), 0); } @@ -161,7 +169,8 @@ static NavigationIndices increaseIndex(RouteProgress routeProgress, NavigationIn } static List checkMilestones(RouteProgress previousRouteProgress, - RouteProgress routeProgress, MapboxNavigation mapboxNavigation) { + RouteProgress routeProgress, + MapboxNavigation mapboxNavigation) { List milestones = new ArrayList<>(); for (Milestone milestone : mapboxNavigation.getMilestones()) { if (milestone.isOccurring(previousRouteProgress, routeProgress)) { @@ -192,6 +201,6 @@ static Position nextManeuverPosition(int stepIndex, List steps, List (stepIndex + 1)) { return steps.get(stepIndex + 1).getManeuver().asPosition(); } - return coords.size() >= 1 ? coords.get(coords.size() - 1) : coords.get(coords.size()); + return !coords.isEmpty() ? coords.get(coords.size() - 1) : coords.get(coords.size()); } }