diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2015-10-18 20:06:17 +0200 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2015-10-22 15:15:23 +1100 |
commit | cc8986d60f8a0051fb77f7e8ae77a5a35d5ce00a (patch) | |
tree | af2c24edd87f56d3ae6762759903f3062d01157c /android | |
parent | 7f08c22aedf3aecab928d5ce6b99ac03ee060faf (diff) | |
download | qtlocation-mapboxgl-cc8986d60f8a0051fb77f7e8ae77a5a35d5ce00a.tar.gz |
[android] - #2666 removed compass sensor data for milestone 2.1.0
Diffstat (limited to 'android')
-rw-r--r-- | android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java | 91 | ||||
-rw-r--r-- | android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java | 9 |
2 files changed, 1 insertions, 99 deletions
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java index 1105adb514..e1d0723581 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java @@ -16,30 +16,7 @@ import com.mapbox.mapboxsdk.R; import java.lang.ref.WeakReference; -final class CompassView extends ImageView implements SensorEventListener { - - private CompassDelegate mCompassDelegate; - - // Sensor model - private SensorManager mSensorManager; - private Sensor mSensorAccelerometer; - private Sensor mSensorMagneticField; - - // Sensor data - private boolean mSensorValid; - private float[] mValuesAccelerometer = new float[3]; - private float[] mValuesMagneticField = new float[3]; - private float[] mMatrixR = new float[9]; - private float[] mMatrixI = new float[9]; - private float[] mMatrixValues = new float[3]; - - // Location data - private GeomagneticField mGeomagneticField; - private Location mGpsLocation; - - // Compass date - private float mCompassBearing; - private boolean mCompassValid; +final class CompassView extends ImageView { public CompassView(Context context) { super(context); @@ -57,11 +34,6 @@ final class CompassView extends ImageView implements SensorEventListener { } private void initialize(Context context) { - // Sensor initialisation - mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE); - mSensorAccelerometer = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER); - mSensorMagneticField = mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); - // View configuration setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.compass)); setContentDescription(getResources().getString(R.string.compassContentDescription)); @@ -78,67 +50,6 @@ final class CompassView extends ImageView implements SensorEventListener { setVisibility(enabled ? View.VISIBLE : View.INVISIBLE); } - public boolean isValid() { - return mCompassValid; - } - - public float getBearing() { - return mCompassBearing; - } - - public void registerListeners(CompassDelegate compassDelegate) { - mSensorManager.registerListener(this, mSensorAccelerometer, SensorManager.SENSOR_DELAY_UI); - mSensorManager.registerListener(this, mSensorMagneticField, SensorManager.SENSOR_DELAY_UI); - mCompassDelegate = compassDelegate; - } - - public void unRegisterListeners() { - mCompassDelegate = null; - mSensorManager.unregisterListener(this, mSensorMagneticField); - mSensorManager.unregisterListener(this, mSensorAccelerometer); - } - - @Override - public void onSensorChanged(SensorEvent event) { - switch (event.sensor.getType()) { - case Sensor.TYPE_ACCELEROMETER: - System.arraycopy(event.values, 0, mValuesAccelerometer, 0, 3); - break; - case Sensor.TYPE_MAGNETIC_FIELD: - System.arraycopy(event.values, 0, mValuesMagneticField, 0, 3); - break; - } - - mSensorValid = SensorManager.getRotationMatrix(mMatrixR, mMatrixI, - mValuesAccelerometer, - mValuesMagneticField); - - if (mSensorValid && mCompassDelegate != null) { - SensorManager.getOrientation(mMatrixR, mMatrixValues); - mGpsLocation = mCompassDelegate.getLocation(); - if (mGpsLocation != null) { - mGeomagneticField = new GeomagneticField( - (float) mGpsLocation.getLatitude(), - (float) mGpsLocation.getLongitude(), - (float) mGpsLocation.getAltitude(), - System.currentTimeMillis()); - mCompassBearing = (float) Math.toDegrees(mMatrixValues[0]) + mGeomagneticField.getDeclination(); - mCompassValid = true; - } - } - } - - @Override - public void onAccuracyChanged(Sensor sensor, int accuracy) { - // TODO: ignore unreliable stuff - } - - public interface CompassDelegate { - - Location getLocation(); - - } - public static class CompassClickListener implements View.OnClickListener { private WeakReference<MapView> mMapView; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java index 0f99223108..0b10993819 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java @@ -2979,11 +2979,9 @@ public final class MapView extends FrameLayout { updateLocation(LocationServices.FusedLocationApi.getLastLocation()); mLocationListener = new MyLocationListener(); LocationServices.FusedLocationApi.requestLocationUpdates(mLocationRequest, mLocationListener); - mCompassView.registerListeners(new CompassDelegate()); } } else { if (mLocationClient.isConnected()) { - mCompassView.unRegisterListeners(); LocationServices.FusedLocationApi.removeLocationUpdates(mLocationListener); mLocationListener = null; mLocationClient.disconnect(); @@ -3112,13 +3110,6 @@ public final class MapView extends FrameLayout { } } - private class CompassDelegate implements CompassView.CompassDelegate { - @Override - public Location getLocation() { - return mGpsLocation; - } - } - // // Logo // |