Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NavigationMapRoute 2.0 #1387

Merged
merged 3 commits into from
Dec 20, 2018
Merged

NavigationMapRoute 2.0 #1387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e9b714
Refactor NavigationMapRoute
danesfeder Oct 3, 2018
b2cacfb
Add / update lifecycle methods for NavigationMapRoute
danesfeder Dec 4, 2018
b4d4db7
Remove GeoJson sources onDestroy
danesfeder Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
169 changes: 92 additions & 77 deletions ...services/android/navigation/testapp/activity/navigationui/NavigationMapRouteActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package com.mapbox.services.android.navigation.testapp.activity.navigationui;

import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.TextView;
import android.widget.ProgressBar;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.mapbox.api.directions.v5.DirectionsAdapterFactory;
import com.mapbox.api.directions.v5.DirectionsCriteria;
import com.mapbox.api.directions.v5.MapboxDirections;
import com.mapbox.api.directions.v5.models.DirectionsResponse;
import com.mapbox.api.directions.v5.models.DirectionsRoute;
import com.mapbox.geojson.Point;
Expand All @@ -19,16 +21,16 @@
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
import com.mapbox.mapboxsdk.constants.Style;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.location.LocationComponent;
import com.mapbox.mapboxsdk.location.modes.CameraMode;
import com.mapbox.mapboxsdk.location.modes.RenderMode;
import com.mapbox.mapboxsdk.maps.MapView;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
import com.mapbox.services.android.navigation.testapp.R;
import com.mapbox.services.android.navigation.ui.v5.route.NavigationMapRoute;
import com.mapbox.services.android.navigation.ui.v5.route.OnRouteSelectionChangeListener;
import com.mapbox.services.android.navigation.v5.navigation.NavigationRoute;

import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;

import butterknife.BindView;
Expand All @@ -40,22 +42,23 @@
import timber.log.Timber;

public class NavigationMapRouteActivity extends AppCompatActivity implements OnMapReadyCallback,
MapboxMap.OnMapLongClickListener, Callback<DirectionsResponse>, OnRouteSelectionChangeListener {
MapboxMap.OnMapLongClickListener, Callback<DirectionsResponse> {

private static final String DIRECTIONS_RESPONSE = "directions-route.json";
private static final int ONE_HUNDRED_MILLISECONDS = 100;

@BindView(R.id.mapView)
MapView mapView;
@BindView(R.id.primaryRouteIndexTextView)
TextView primaryRouteIndexTextView;
@BindView(R.id.routeLoadingProgressBar)
ProgressBar routeLoading;
@BindView(R.id.fabRemoveRoute)
FloatingActionButton fabRemoveRoute;

private MapboxMap mapboxMap;
private NavigationMapRoute navigationMapRoute;
private StyleCycle styleCycle = new StyleCycle();

private Marker originMarker;
private Marker destinationMarker;
private List<DirectionsRoute> routes = new ArrayList<>();

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand All @@ -69,77 +72,46 @@ protected void onCreate(Bundle savedInstanceState) {
}

@OnClick(R.id.fabStyles)
public void onStyleFabClick(View view) {
public void onStyleFabClick() {
if (mapboxMap != null) {
mapboxMap.setStyleUrl(styleCycle.getNextStyle());
}
}

@Override
public void onNewPrimaryRouteSelected(DirectionsRoute directionsRoute) {
primaryRouteIndexTextView.setText(String.valueOf(routes.indexOf(directionsRoute)));
@OnClick(R.id.fabRemoveRoute)
public void onRemoveRouteClick(View fabRemoveRoute) {
removeRouteAndMarkers();
fabRemoveRoute.setVisibility(View.INVISIBLE);
}

@Override
public void onMapReady(MapboxMap mapboxMap) {
this.mapboxMap = mapboxMap;
navigationMapRoute = new NavigationMapRoute(null, mapView, mapboxMap,
"admin-3-4-boundaries-bg");
Gson gson = new GsonBuilder().registerTypeAdapterFactory(DirectionsAdapterFactory.create())
.create();
DirectionsResponse response = gson.fromJson(loadJsonFromAsset(DIRECTIONS_RESPONSE),
DirectionsResponse.class);
navigationMapRoute.addRoute(response.routes().get(0));
initializeLocationComponent(mapboxMap);
navigationMapRoute = new NavigationMapRoute(null, mapView, mapboxMap);
mapboxMap.addOnMapLongClickListener(this);
navigationMapRoute.setOnRouteSelectionChangeListener(this);
Snackbar.make(mapView, "Long press to select route", Snackbar.LENGTH_SHORT).show();
}

@Override
public void onMapLongClick(@NonNull LatLng point) {
if (originMarker == null) {
originMarker = mapboxMap.addMarker(new MarkerOptions().position(point));
} else if (destinationMarker == null) {
destinationMarker = mapboxMap.addMarker(new MarkerOptions().position(point));
Point originPoint = Point.fromLngLat(
originMarker.getPosition().getLongitude(), originMarker.getPosition().getLatitude());
Point destinationPoint = Point.fromLngLat(
destinationMarker.getPosition().getLongitude(), destinationMarker.getPosition().getLatitude());
requestDirectionsRoute(originPoint, destinationPoint);
mapboxMap.removeMarker(originMarker);
mapboxMap.removeMarker(destinationMarker);
} else {
originMarker = null;
destinationMarker = null;
navigationMapRoute.removeRoute();
}
}

public void requestDirectionsRoute(Point origin, Point destination) {
MapboxDirections directions = MapboxDirections.builder()
.origin(origin)
.destination(destination)
.accessToken(Mapbox.getAccessToken())
.profile(DirectionsCriteria.PROFILE_DRIVING_TRAFFIC)
.overview(DirectionsCriteria.OVERVIEW_FULL)
.annotations(DirectionsCriteria.ANNOTATION_CONGESTION)
.alternatives(true)
.steps(true)
.build();

directions.enqueueCall(this);
handleClicked(point);
}

@Override
public void onResponse(Call<DirectionsResponse> call, Response<DirectionsResponse> response) {
if (response.body() != null && !response.body().routes().isEmpty()) {
public void onResponse(@NonNull Call<DirectionsResponse> call, @NonNull Response<DirectionsResponse> response) {
if (response.isSuccessful()
&& response.body() != null
&& !response.body().routes().isEmpty()) {
List<DirectionsRoute> routes = response.body().routes();
this.routes = routes;
navigationMapRoute.addRoutes(routes);
routeLoading.setVisibility(View.INVISIBLE);
fabRemoveRoute.setVisibility(View.VISIBLE);
}
}

@Override
public void onFailure(Call<DirectionsResponse> call, Throwable throwable) {
public void onFailure(@NonNull Call<DirectionsResponse> call, @NonNull Throwable throwable) {
Timber.e(throwable);
}

Expand All @@ -153,12 +125,18 @@ public void onResume() {
protected void onStart() {
super.onStart();
mapView.onStart();
if (navigationMapRoute != null) {
navigationMapRoute.onStart();
}
}

@Override
protected void onStop() {
super.onStop();
mapView.onStop();
if (navigationMapRoute != null) {
navigationMapRoute.onStop();
}
}

@Override
Expand All @@ -185,25 +163,62 @@ protected void onSaveInstanceState(Bundle outState) {
mapView.onSaveInstanceState(outState);
}

public NavigationMapRoute getNavigationMapRoute() {
return navigationMapRoute;
@SuppressWarnings("MissingPermission")
private void initializeLocationComponent(MapboxMap mapboxMap) {
LocationComponent locationComponent = mapboxMap.getLocationComponent();
locationComponent.activateLocationComponent(this);
locationComponent.setLocationComponentEnabled(true);
locationComponent.setRenderMode(RenderMode.COMPASS);
locationComponent.setCameraMode(CameraMode.TRACKING);
locationComponent.zoomWhileTracking(10d);
}

private String loadJsonFromAsset(String filename) {
// Using this method to load in GeoJSON files from the assets folder.

try {
InputStream is = getAssets().open(filename);
int size = is.available();
byte[] buffer = new byte[size];
is.read(buffer);
is.close();
return new String(buffer, "UTF-8");
private void handleClicked(@NonNull LatLng point) {
vibrate();
if (originMarker == null) {
originMarker = mapboxMap.addMarker(new MarkerOptions().position(point));
Snackbar.make(mapView, "Origin selected", Snackbar.LENGTH_SHORT).show();
} else if (destinationMarker == null) {
destinationMarker = mapboxMap.addMarker(new MarkerOptions().position(point));
Point originPoint = Point.fromLngLat(
originMarker.getPosition().getLongitude(), originMarker.getPosition().getLatitude());
Point destinationPoint = Point.fromLngLat(
destinationMarker.getPosition().getLongitude(), destinationMarker.getPosition().getLatitude());
Snackbar.make(mapView, "Destination selected", Snackbar.LENGTH_SHORT).show();
findRoute(originPoint, destinationPoint);
routeLoading.setVisibility(View.VISIBLE);
}
}

} catch (IOException ex) {
ex.printStackTrace();
return null;
@SuppressLint("MissingPermission")
private void vibrate() {
Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
if (vibrator == null) {
return;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
vibrator.vibrate(VibrationEffect.createOneShot(ONE_HUNDRED_MILLISECONDS, VibrationEffect.DEFAULT_AMPLITUDE));
} else {
vibrator.vibrate(ONE_HUNDRED_MILLISECONDS);
}
}

private void removeRouteAndMarkers() {
mapboxMap.removeMarker(originMarker);
originMarker = null;
mapboxMap.removeMarker(destinationMarker);
destinationMarker = null;
navigationMapRoute.removeRoute();
}

public void findRoute(Point origin, Point destination) {
NavigationRoute.builder(this)
.accessToken(Mapbox.getAccessToken())
.origin(origin)
.destination(destination)
.alternatives(true)
.build()
.getRoute(this);
}

private static class StyleCycle {
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/com/mapbox/services/android/navigation/testapp/example/ui/ExampleActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ class ExampleActivity : HistoryActivity(), ExampleView {
}

override fun showAlternativeRoutes(alternativesVisible: Boolean) {
map?.showAlternativeRoutes(false)
map?.showAlternativeRoutes(alternativesVisible)
}

override fun updateLocationRenderMode(renderMode: Int) {
Expand Down
63 changes: 39 additions & 24 deletions app/src/main/res/layout/activity_navigation_map_route.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,48 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".activity.navigationui.NavigationMapRouteActivity">

<com.mapbox.mapboxsdk.maps.MapView
android:id="@+id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="40.7448"
app:mapbox_cameraTargetLng="-73.9861"
app:mapbox_cameraZoom="12"
app:mapbox_uiAttribution="false"/>
<com.mapbox.mapboxsdk.maps.MapView
android:id="@+id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraZoom="12"/>

<TextView
android:id="@+id/primaryRouteIndexTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|start"
android:background="@android:color/transparent"/>
<ProgressBar
android:id="@+id/routeLoadingProgressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="invisible"/>

<android.support.design.widget.FloatingActionButton
android:id="@+id/fabStyles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/ic_layers"
android:tint="@android:color/white"
app:backgroundTint="@color/colorAccent"/>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|center"
android:clipToPadding="false"
android:paddingBottom="16dp"
app:layout_anchor="@id/fabStyles"
app:layout_anchorGravity="top|center">

<android.support.design.widget.FloatingActionButton
android:id="@+id/fabRemoveRoute"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"
app:backgroundTint="@color/red"
app:srcCompat="@drawable/ic_cancel"/>

</FrameLayout>

<android.support.design.widget.FloatingActionButton
android:id="@+id/fabStyles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:tint="@android:color/white"
app:backgroundTint="@color/colorAccent"
app:srcCompat="@drawable/ic_layers"/>

</android.support.design.widget.CoordinatorLayout>
Loading