tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] #4083 - rename locationservice

Browse Source
This commit is contained in:
Tobrun
2016-02-24 16:42:34 +01:00
committed by Brad Leege
parent 9a97a4d34f
commit 0e0b096945
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationListener.java
View File

@@ -8,7 +8,7 @@ import android.location.Location;
public interface LocationListener {
/**
* Callback method for receiving location updates from LocationService.
* Callback method for receiving location updates from LocationServices.
* @param location The new Location data
*/
void onLocationChanged(Location location);

18
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationService.java → platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java
View File

@@ -17,11 +17,11 @@ import com.mapzen.android.lost.api.LostApiClient;
import java.util.ArrayList;
import java.util.List;
public class LocationService implements com.mapzen.android.lost.api.LocationListener {
public class LocationServices implements com.mapzen.android.lost.api.LocationListener {
private static final String TAG = "LocationService";
private static final String TAG = "LocationServices";
private static LocationService instance;
private static LocationServices instance;
private Context context;
private LostApiClient locationClient;
@@ -32,9 +32,9 @@ public class LocationService implements com.mapzen.android.lost.api.LocationList
private boolean isGPSEnabled;
/**
* Private constructor for singleton LocationService
* Private constructor for singleton LocationServices
*/
private LocationService(Context context) {
private LocationServices(Context context) {
super();
this.context = context;
// Setup location services
@@ -43,14 +43,14 @@ public class LocationService implements com.mapzen.android.lost.api.LocationList
}
/**
* Primary (singleton) access method for LocationService
* Primary (singleton) access method for LocationServices
*
* @param context Context
* @return LocationService
* @return LocationServices
*/
public static LocationService getInstance(@NonNull final Context context) {
public static LocationServices getLocationServices(@NonNull final Context context) {
if (instance == null) {
instance = new LocationService(context.getApplicationContext());
instance = new LocationServices(context.getApplicationContext());
}
return instance;
}

14
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/UserLocationView.java
View File

@@ -32,7 +32,7 @@ import com.mapbox.mapboxsdk.constants.MyBearingTracking;
import com.mapbox.mapboxsdk.constants.MyLocationTracking;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.location.LocationListener;
import com.mapbox.mapboxsdk.location.LocationService;
import com.mapbox.mapboxsdk.location.LocationServices;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.maps.Projection;
@@ -365,11 +365,11 @@ public final class UserLocationView extends View {
*/
private void toggleGps(boolean enableGps) {
LocationService locationService = LocationService.getInstance(getContext());
LocationServices locationServices = LocationServices.getLocationServices(getContext());
if (enableGps) {
// Set an initial location if one available
Location lastLocation = locationService.getLastLocation();
Location lastLocation = locationServices.getLastLocation();
if (lastLocation != null) {
setLocation(lastLocation);
}
@@ -379,16 +379,16 @@ public final class UserLocationView extends View {
}
// Register for Location Updates
locationService.addLocationListener(mUserLocationListener);
locationServices.addLocationListener(mUserLocationListener);
} else {
// Disable location and user dot
setLocation(null);
// Deregister for Location Updates
locationService.removeLocationListener(mUserLocationListener);
locationServices.removeLocationListener(mUserLocationListener);
}
locationService.toggleGPS(enableGps);
locationServices.toggleGPS(enableGps);
}
public void setMyBearingTrackingMode(@MyBearingTracking.Mode int myBearingTrackingMode) {
@@ -503,7 +503,7 @@ public final class UserLocationView extends View {
/**
* Callback method for receiving location updates from LocationService.
* Callback method for receiving location updates from LocationServices.
*
* @param location The new Location data
*/

6
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
View File

@@ -24,7 +24,7 @@ import android.util.DisplayMetrics;
import android.util.Log;
import android.view.WindowManager;
import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.location.LocationService;
import com.mapbox.mapboxsdk.location.LocationServices;
import com.mapbox.mapboxsdk.utils.ApiAccess;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -183,8 +183,8 @@ public class MapboxEventManager {
context.startService(new Intent(context, TelemetryService.class));
// Make sure Ambient Mode is started at a minimum
if (LocationService.getInstance(context).isGPSEnabled()) {
LocationService.getInstance(context).toggleGPS(false);
if (LocationServices.getLocationServices(context).isGPSEnabled()) {
LocationServices.getLocationServices(context).toggleGPS(false);
}
// Manage Timer Flush