Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 0 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,6 @@ dex-count:
cd mapbox; ./gradlew countDebugDexMethods
cd mapbox; ./gradlew countReleaseDexMethods

navigation-fixtures:
# Navigation: Taylor street to Page street
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)" \
-o mapbox/libandroid-services/src/test/resources/navigation.json

directions-matrix-fixtures:
# request a symmetric 3x3 matrix for cars
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)" \
Expand Down Expand Up @@ -126,9 +121,3 @@ distance-fixtures:
curl -X POST --header "Content-Type:application/json" -d @mapbox/libjava-services/src/test/fixtures/distance_coordinates.json \
"https://api.mapbox.com/distances/v1/mapbox/driving?access_token=$(MAPBOX_ACCESS_TOKEN)" \
-o mapbox/libjava-services/src/test/fixtures/distance_v1.json

libosrm:
rm -rf mapbox/libjava-services/src/main/resources/translations mapbox/libjava-services/src/test/fixtures/osrm/v5
mkdir -p mapbox/libjava-services/src/main/resources/translations mapbox/libjava-services/src/test/fixtures/osrm/v5
cp -R ../osrm-text-instructions/languages/translations/* mapbox/libjava-services/src/main/resources/translations
cp -R ../osrm-text-instructions/test/fixtures/v5/* mapbox/libjava-services/src/test/fixtures/osrm/v5
28 changes: 0 additions & 28 deletions mapbox/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,6 @@
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity"/>
</activity>
<activity
android:name=".directions.RouteUtilsV5Activity"
android:label="@string/title_route_utils_v5">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity"/>
</activity>
<activity
android:name=".geocoding.GeocodingReverseActivity"
android:label="@string/title_reverse_geocoding">
Expand Down Expand Up @@ -134,34 +127,13 @@
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity"/>
</activity>
<activity
android:name=".nav.OffRouteDetectionActivity"
android:label="@string/title_off_route_detection">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity"/>
</activity>
<activity
android:name=".connectivity.ConnectivityActivity"
android:label="@string/title_connectivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity"/>
</activity>
<activity
android:name=".nav.SnapToRouteActivity"
android:label="@string/title_snap_to_route">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity"/>
</activity>
<activity
android:name=".nav.NavigationActivity"
android:label="@string/title_navigation">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity"/>
</activity>

<!--
Service to asynchronously fetch a location address using a Geocoder. Setting the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,14 @@
import android.widget.TextView;
import android.widget.Toast;

import com.mapbox.services.android.BuildConfig;
import com.mapbox.services.android.telemetry.permissions.PermissionsListener;
import com.mapbox.services.android.telemetry.permissions.PermissionsManager;
import com.mapbox.services.android.testapp.connectivity.ConnectivityActivity;
import com.mapbox.services.android.testapp.directions.DirectionsV5Activity;
import com.mapbox.services.android.testapp.directions.RouteUtilsV5Activity;
import com.mapbox.services.android.testapp.geocoding.GeocodingReverseActivity;
import com.mapbox.services.android.testapp.geocoding.GeocodingServiceActivity;
import com.mapbox.services.android.testapp.geocoding.GeocodingWidgetActivity;
import com.mapbox.services.android.testapp.location.LocationEngineActivity;
import com.mapbox.services.android.testapp.nav.NavigationActivity;
import com.mapbox.services.android.testapp.nav.OffRouteDetectionActivity;
import com.mapbox.services.android.testapp.nav.SnapToRouteActivity;
import com.mapbox.services.android.testapp.staticimage.StaticImageActivity;
import com.mapbox.services.android.testapp.turf.TurfBearingActivity;
import com.mapbox.services.android.testapp.turf.TurfDestinationActivity;
Expand Down Expand Up @@ -67,11 +62,6 @@ protected void onCreate(Bundle savedInstanceState) {
getString(R.string.description_directions_v5),
DirectionsV5Activity.class
),
new SampleItem(
getString(R.string.title_route_utils_v5),
getString(R.string.description_route_utils),
RouteUtilsV5Activity.class
),
new SampleItem(
getString(R.string.title_reverse_geocoding),
getString(R.string.description_reverse_geocoding),
Expand Down Expand Up @@ -132,25 +122,10 @@ protected void onCreate(Bundle savedInstanceState) {
getString(R.string.description_turf_midpoint),
TurfMidpointActivity.class
),
new SampleItem(
getString(R.string.title_off_route_detection),
getString(R.string.description_off_route_detection),
OffRouteDetectionActivity.class
),
new SampleItem(
getString(R.string.title_connectivity),
getString(R.string.description_connectivity),
ConnectivityActivity.class
),
new SampleItem(
getString(R.string.title_snap_to_route),
getString(R.string.description_snap_to_route),
SnapToRouteActivity.class
),
new SampleItem(
getString(R.string.title_navigation),
getString(R.string.description_navigation),
NavigationActivity.class
)
));

Expand Down
Loading