[android] make location provider optional (#9488)
This commit is contained in:
@@ -106,7 +106,7 @@ public class MyLocationViewTest extends BaseActivityTest {
|
||||
mapboxMap.moveCamera(
|
||||
CameraUpdateFactory.newCameraPosition(
|
||||
new CameraPosition.Builder()
|
||||
.target(new LatLng(Mapbox.getLocationSource().getLastLocation()))
|
||||
.target(new LatLng(Mapbox.getLocationEngine().getLastLocation()))
|
||||
.build()
|
||||
)
|
||||
);
|
||||
|
||||
@@ -68,7 +68,7 @@ public class CustomLocationEngineActivity extends BaseLocationActivity {
|
||||
if (mapboxMap != null) {
|
||||
int itemId = item.getItemId();
|
||||
if (itemId == R.id.action_id_location_source_lost) {
|
||||
mapboxMap.setLocationSource(Mapbox.getLocationSource());
|
||||
mapboxMap.setLocationSource(Mapbox.getLocationEngine());
|
||||
return true;
|
||||
} else if (itemId == R.id.action_id_location_source_mock) {
|
||||
mapboxMap.setLocationSource(MockLocationEngine.getInstance());
|
||||
|
||||
@@ -5,8 +5,8 @@ import android.animation.TypeEvaluator;
|
||||
import android.animation.ValueAnimator;
|
||||
import android.location.Location;
|
||||
|
||||
import com.mapbox.services.android.telemetry.location.LocationEngine;
|
||||
import com.mapbox.services.android.telemetry.location.LocationEngineListener;
|
||||
import com.mapbox.services.android.core.location.LocationEngine;
|
||||
import com.mapbox.services.android.core.location.LocationEngineListener;
|
||||
|
||||
import timber.log.Timber;
|
||||
|
||||
@@ -87,6 +87,11 @@ public class MockLocationEngine extends LocationEngine {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Type obtainType() {
|
||||
return Type.MOCK;
|
||||
}
|
||||
|
||||
private static class LocationAnimator extends AnimatorListenerAdapter {
|
||||
|
||||
private static final long DURATION_ANIMATION = 10000;
|
||||
|
||||
@@ -16,19 +16,15 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
|
||||
import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
|
||||
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
|
||||
import com.mapbox.mapboxsdk.testapp.R;
|
||||
import com.mapzen.android.lost.api.LocationListener;
|
||||
import com.mapzen.android.lost.api.LocationRequest;
|
||||
import com.mapzen.android.lost.api.LocationServices;
|
||||
import com.mapzen.android.lost.api.LostApiClient;
|
||||
import com.mapbox.services.android.core.location.LocationEngineListener;
|
||||
|
||||
/**
|
||||
* Test activity showcasing how to change the MyLocationView drawable.
|
||||
*/
|
||||
public class MyLocationDrawableActivity extends BaseLocationActivity implements LocationListener {
|
||||
public class MyLocationDrawableActivity extends BaseLocationActivity implements LocationEngineListener {
|
||||
|
||||
private MapView mapView;
|
||||
private MapboxMap mapboxMap;
|
||||
private LostApiClient lostApiClient;
|
||||
|
||||
@Override
|
||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
@@ -66,15 +62,11 @@ public class MyLocationDrawableActivity extends BaseLocationActivity implements
|
||||
@Override
|
||||
protected void enableLocation(boolean enabled) {
|
||||
mapboxMap.setMyLocationEnabled(enabled);
|
||||
if (lostApiClient == null) {
|
||||
lostApiClient = new LostApiClient.Builder(this).build();
|
||||
lostApiClient.connect();
|
||||
LocationRequest request = LocationRequest.create()
|
||||
.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY)
|
||||
.setInterval(5000)
|
||||
.setSmallestDisplacement(10);
|
||||
LocationServices.FusedLocationApi.requestLocationUpdates(request, this);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onConnected() {
|
||||
// Nothing
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -104,10 +96,6 @@ public class MyLocationDrawableActivity extends BaseLocationActivity implements
|
||||
protected void onStop() {
|
||||
super.onStop();
|
||||
mapView.onStop();
|
||||
if (lostApiClient.isConnected()) {
|
||||
LocationServices.FusedLocationApi.removeLocationUpdates(this);
|
||||
lostApiClient.disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -14,6 +14,7 @@ import android.widget.ArrayAdapter;
|
||||
import android.widget.Spinner;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.mapbox.mapboxsdk.Mapbox;
|
||||
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
|
||||
import com.mapbox.mapboxsdk.constants.MyBearingTracking;
|
||||
import com.mapbox.mapboxsdk.constants.MyLocationTracking;
|
||||
@@ -24,10 +25,7 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
|
||||
import com.mapbox.mapboxsdk.maps.TrackingSettings;
|
||||
import com.mapbox.mapboxsdk.maps.UiSettings;
|
||||
import com.mapbox.mapboxsdk.testapp.R;
|
||||
import com.mapzen.android.lost.api.LocationListener;
|
||||
import com.mapzen.android.lost.api.LocationRequest;
|
||||
import com.mapzen.android.lost.api.LocationServices;
|
||||
import com.mapzen.android.lost.api.LostApiClient;
|
||||
import com.mapbox.services.android.core.location.LocationEngineListener;
|
||||
|
||||
import timber.log.Timber;
|
||||
|
||||
@@ -39,10 +37,7 @@ import timber.log.Timber;
|
||||
* </p>
|
||||
*/
|
||||
public class MyLocationTrackingModeActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener,
|
||||
OnMapReadyCallback, LocationListener {
|
||||
|
||||
// Testing for user defined LostApiClient
|
||||
private LostApiClient lostApiClient;
|
||||
OnMapReadyCallback, LocationEngineListener {
|
||||
|
||||
public static final int TRACKING_NONE_INDEX = 0;
|
||||
public static final int TRACKING_FOLLOW_INDEX = 1;
|
||||
@@ -75,18 +70,15 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
|
||||
@Override
|
||||
public void onMapReady(MapboxMap mapboxMap) {
|
||||
MyLocationTrackingModeActivity.this.mapboxMap = mapboxMap;
|
||||
lostApiClient = new LostApiClient.Builder(this).build();
|
||||
lostApiClient.connect();
|
||||
LocationRequest request = LocationRequest.create()
|
||||
.setPriority(LocationRequest.PRIORITY_LOW_POWER)
|
||||
.setInterval(5000)
|
||||
.setSmallestDisplacement(10);
|
||||
|
||||
Location location = LocationServices.FusedLocationApi.getLastLocation();
|
||||
if (location != null) {
|
||||
setInitialLocation(location, 15);
|
||||
}
|
||||
LocationServices.FusedLocationApi.requestLocationUpdates(request, this);
|
||||
mapboxMap.setMyLocationEnabled(true);
|
||||
Mapbox.getLocationEngine().addLocationEngineListener(this);
|
||||
Mapbox.getLocationEngine().requestLocationUpdates();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onConnected() {
|
||||
// Nothing
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -227,10 +219,8 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
|
||||
@Override
|
||||
protected void onStop() {
|
||||
super.onStop();
|
||||
if (lostApiClient.isConnected()) {
|
||||
LocationServices.FusedLocationApi.removeLocationUpdates(this);
|
||||
lostApiClient.disconnect();
|
||||
}
|
||||
Mapbox.getLocationEngine().removeLocationEngineListener(this);
|
||||
Mapbox.getLocationEngine().removeLocationUpdates();
|
||||
mapView.onStop();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user