Skip to content

Commit ba76b49

Browse files
authored
[WIP] Standalone Mapbox Navigation SDK for Android (#439)
* remove code and tests for navigation * remove navigation activities from the test app * remove navigation targets * remove NavigationService from Manifest * remove osrm text instructions translations
1 parent b2ac0cb commit ba76b49

366 files changed

Lines changed: 0 additions & 15574 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ dex-count:
6565
cd mapbox; ./gradlew countDebugDexMethods
6666
cd mapbox; ./gradlew countReleaseDexMethods
6767

68-
navigation-fixtures:
69-
# Navigation: Taylor street to Page street
70-
curl "https://api.mapbox.com/directions/v5/mapbox/driving/-122.413165,37.795042;-122.433378,37.7727?geometries=polyline6&overview=full&steps=true&access_token=$(MAPBOX_ACCESS_TOKEN)" \
71-
-o mapbox/libandroid-services/src/test/resources/navigation.json
72-
7368
directions-matrix-fixtures:
7469
# request a symmetric 3x3 matrix for cars
7570
curl "https://api.mapbox.com/directions-matrix/v1/mapbox/driving/-122.42,37.78;-122.45,37.91;-122.48,37.73?access_token=$(MAPBOX_ACCESS_TOKEN)" \
@@ -126,9 +121,3 @@ distance-fixtures:
126121
curl -X POST --header "Content-Type:application/json" -d @mapbox/libjava-services/src/test/fixtures/distance_coordinates.json \
127122
"https://api.mapbox.com/distances/v1/mapbox/driving?access_token=$(MAPBOX_ACCESS_TOKEN)" \
128123
-o mapbox/libjava-services/src/test/fixtures/distance_v1.json
129-
130-
libosrm:
131-
rm -rf mapbox/libjava-services/src/main/resources/translations mapbox/libjava-services/src/test/fixtures/osrm/v5
132-
mkdir -p mapbox/libjava-services/src/main/resources/translations mapbox/libjava-services/src/test/fixtures/osrm/v5
133-
cp -R ../osrm-text-instructions/languages/translations/* mapbox/libjava-services/src/main/resources/translations
134-
cp -R ../osrm-text-instructions/test/fixtures/v5/* mapbox/libjava-services/src/test/fixtures/osrm/v5

mapbox/app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@
4141
android:name="android.support.PARENT_ACTIVITY"
4242
android:value=".MainActivity"/>
4343
</activity>
44-
<activity
45-
android:name=".directions.RouteUtilsV5Activity"
46-
android:label="@string/title_route_utils_v5">
47-
<meta-data
48-
android:name="android.support.PARENT_ACTIVITY"
49-
android:value=".MainActivity"/>
50-
</activity>
5144
<activity
5245
android:name=".geocoding.GeocodingReverseActivity"
5346
android:label="@string/title_reverse_geocoding">
@@ -134,34 +127,13 @@
134127
android:name="android.support.PARENT_ACTIVITY"
135128
android:value=".MainActivity"/>
136129
</activity>
137-
<activity
138-
android:name=".nav.OffRouteDetectionActivity"
139-
android:label="@string/title_off_route_detection">
140-
<meta-data
141-
android:name="android.support.PARENT_ACTIVITY"
142-
android:value=".MainActivity"/>
143-
</activity>
144130
<activity
145131
android:name=".connectivity.ConnectivityActivity"
146132
android:label="@string/title_connectivity">
147133
<meta-data
148134
android:name="android.support.PARENT_ACTIVITY"
149135
android:value=".MainActivity"/>
150136
</activity>
151-
<activity
152-
android:name=".nav.SnapToRouteActivity"
153-
android:label="@string/title_snap_to_route">
154-
<meta-data
155-
android:name="android.support.PARENT_ACTIVITY"
156-
android:value=".MainActivity"/>
157-
</activity>
158-
<activity
159-
android:name=".nav.NavigationActivity"
160-
android:label="@string/title_navigation">
161-
<meta-data
162-
android:name="android.support.PARENT_ACTIVITY"
163-
android:value=".MainActivity"/>
164-
</activity>
165137

166138
<!--
167139
Service to asynchronously fetch a location address using a Geocoder. Setting the

mapbox/app/src/main/java/com/mapbox/services/android/testapp/MainActivity.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,14 @@
1313
import android.widget.TextView;
1414
import android.widget.Toast;
1515

16-
import com.mapbox.services.android.BuildConfig;
1716
import com.mapbox.services.android.telemetry.permissions.PermissionsListener;
1817
import com.mapbox.services.android.telemetry.permissions.PermissionsManager;
1918
import com.mapbox.services.android.testapp.connectivity.ConnectivityActivity;
2019
import com.mapbox.services.android.testapp.directions.DirectionsV5Activity;
21-
import com.mapbox.services.android.testapp.directions.RouteUtilsV5Activity;
2220
import com.mapbox.services.android.testapp.geocoding.GeocodingReverseActivity;
2321
import com.mapbox.services.android.testapp.geocoding.GeocodingServiceActivity;
2422
import com.mapbox.services.android.testapp.geocoding.GeocodingWidgetActivity;
2523
import com.mapbox.services.android.testapp.location.LocationEngineActivity;
26-
import com.mapbox.services.android.testapp.nav.NavigationActivity;
27-
import com.mapbox.services.android.testapp.nav.OffRouteDetectionActivity;
28-
import com.mapbox.services.android.testapp.nav.SnapToRouteActivity;
2924
import com.mapbox.services.android.testapp.staticimage.StaticImageActivity;
3025
import com.mapbox.services.android.testapp.turf.TurfBearingActivity;
3126
import com.mapbox.services.android.testapp.turf.TurfDestinationActivity;
@@ -67,11 +62,6 @@ protected void onCreate(Bundle savedInstanceState) {
6762
getString(R.string.description_directions_v5),
6863
DirectionsV5Activity.class
6964
),
70-
new SampleItem(
71-
getString(R.string.title_route_utils_v5),
72-
getString(R.string.description_route_utils),
73-
RouteUtilsV5Activity.class
74-
),
7565
new SampleItem(
7666
getString(R.string.title_reverse_geocoding),
7767
getString(R.string.description_reverse_geocoding),
@@ -132,25 +122,10 @@ protected void onCreate(Bundle savedInstanceState) {
132122
getString(R.string.description_turf_midpoint),
133123
TurfMidpointActivity.class
134124
),
135-
new SampleItem(
136-
getString(R.string.title_off_route_detection),
137-
getString(R.string.description_off_route_detection),
138-
OffRouteDetectionActivity.class
139-
),
140125
new SampleItem(
141126
getString(R.string.title_connectivity),
142127
getString(R.string.description_connectivity),
143128
ConnectivityActivity.class
144-
),
145-
new SampleItem(
146-
getString(R.string.title_snap_to_route),
147-
getString(R.string.description_snap_to_route),
148-
SnapToRouteActivity.class
149-
),
150-
new SampleItem(
151-
getString(R.string.title_navigation),
152-
getString(R.string.description_navigation),
153-
NavigationActivity.class
154129
)
155130
));
156131

0 commit comments

Comments
 (0)