- * Set to true when
- * 1. user clicks on the my location button
- * 2. first location during a recording
- * Set to false when
- * 1. showing a marker
- * 2. user manually zooms/pans
- * 3. after zooming to the current location
- *
- * The last one is to support the use case of zooming only once. After zoom, - * set it to false. E.g., only zoom to the first location during a recording. - */ - private boolean zoomToCurrentLocation; - private OnLocationChangedListener onLocationChangedListener; // Current track @@ -181,9 +164,8 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData public void onLocationChanged(Location location) { myTracksLocationManager.close(); keepCurrentLocationVisible = true; - zoomToCurrentLocation = true; setCurrentLocation(location); - updateCurrentLocation(); + updateCurrentLocation(true); } }); } @@ -199,9 +181,12 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData if (savedInstanceState != null) { keepCurrentLocationVisible = savedInstanceState.getBoolean( KEEP_CURRENT_LOCATION_VISIBLE_KEY, false); - zoomToCurrentLocation = savedInstanceState.getBoolean(ZOOM_TO_CURRENT_LOCATION_KEY, false); - Location location = (Location) savedInstanceState.getParcelable(CURRENT_LOCATION_KEY); - setCurrentLocation(location); + if (keepCurrentLocationVisible) { + Location location = (Location) savedInstanceState.getParcelable(CURRENT_LOCATION_KEY); + if (location != null) { + setCurrentLocation(location); + } + } } /* @@ -259,8 +244,7 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData public void onCameraChange(CameraPosition cameraPosition) { if (isResumed() && keepCurrentLocationVisible && currentLocation != null && !isLocationVisible(currentLocation)) { - keepCurrentLocationVisible = false; - zoomToCurrentLocation = false; + keepCurrentLocationVisible = false; } } }); @@ -296,12 +280,22 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData // setWarningMessage depends on resumeTrackDataHub being invoked beforehand setWarningMessage(isGpsProviderEnabled); - updateCurrentLocation(); + + if (markerId == -1L && isInTrackingMode()) { + updateCurrentLocation(true); + } else { + if (googleMap != null) { + googleMap.moveCamera( + CameraUpdateFactory.newLatLngZoom(getDefaultLatLng(), googleMap.getMinZoomLevel())); + } + } } @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); + + outState.putBoolean(KEEP_CURRENT_LOCATION_VISIBLE_KEY, keepCurrentLocationVisible); if (currentLocation != null) { /* * currentLocation is a MyTracksLocation object, which cannot be @@ -310,8 +304,6 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData */ outState.putParcelable(CURRENT_LOCATION_KEY, new Location(currentLocation)); } - outState.putBoolean(KEEP_CURRENT_LOCATION_VISIBLE_KEY, keepCurrentLocationVisible); - outState.putBoolean(ZOOM_TO_CURRENT_LOCATION_KEY, zoomToCurrentLocation); } @Override @@ -384,14 +376,11 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData public void onSelectedTrackChanged(final Track track) { if (isResumed()) { currentTrack = track; - boolean hasTrack = track != null; - if (hasTrack) { - mapOverlay.setShowEndMarker(!isSelectedTrackRecording()); - if (markerId != -1L) { - // Show the marker - showMarker(markerId); - } else { - // Show the track + mapOverlay.setShowEndMarker(!isSelectedTrackRecording()); + if (markerId != -1L) { + showMarker(markerId); + } else { + if (!isInTrackingMode()) { showTrack(); } } @@ -447,12 +436,13 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData if (hasStartMarker) { reloadPaths = false; } - if (!isSelectedTrackRecording() || isSelectedTrackPaused()) { - lastTrackPoint = null; - } - if (lastTrackPoint != null) { - setCurrentLocation(lastTrackPoint); - updateCurrentLocation(); + + if (lastTrackPoint != null && isSelectedTrackRecording()) { + boolean firstLocation = setCurrentLocation(lastTrackPoint); + if (firstLocation) { + keepCurrentLocationVisible = true; + } + updateCurrentLocation(firstLocation); setWarningMessage(true); } } @@ -542,32 +532,28 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData return trackDataHub != null && trackDataHub.isSelectedTrackRecording(); } - /** - * Returns true if the selected track is paused. Needs to be synchronized - * because trackDataHub can be accessed by multiple threads. - */ - private synchronized boolean isSelectedTrackPaused() { - return trackDataHub != null && trackDataHub.isSelectedTrackPaused(); - } - /** * Sets the current location. * * @param location the location + * @return true if this is the first location */ - private void setCurrentLocation(Location location) { - // If recording, zoom to the first location - if (isSelectedTrackRecording() && currentLocation == null && location != null) { - keepCurrentLocationVisible = true; - zoomToCurrentLocation = true; + private boolean setCurrentLocation(Location location) { + boolean firstLocation = false; + if (currentLocation == null && location != null) { + firstLocation = true; } currentLocation = location; + return firstLocation; } /** - * Updates the current location and zoom to it if necessary. + * Updates the current location. + * + * @param forceZoom true to force zoom to the current location regardless of + * the keepCurrentLocationVisible policy */ - private void updateCurrentLocation() { + private void updateCurrentLocation(final boolean forceZoom) { getActivity().runOnUiThread(new Runnable() { public void run() { if (!isResumed() || googleMap == null || onLocationChangedListener == null @@ -575,11 +561,9 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData return; } onLocationChangedListener.onLocationChanged(currentLocation); - if (zoomToCurrentLocation - || (keepCurrentLocationVisible && !isLocationVisible(currentLocation))) { + if (forceZoom || (keepCurrentLocationVisible && !isLocationVisible(currentLocation))) { LatLng latLng = new LatLng(currentLocation.getLatitude(), currentLocation.getLongitude()); googleMap.animateCamera(CameraUpdateFactory.newLatLngZoom(latLng, DEFAULT_ZOOM_LEVEL)); - zoomToCurrentLocation = false; } }; }); @@ -649,7 +633,6 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData Location location = waypoint.getLocation(); LatLng latLng = new LatLng(location.getLatitude(), location.getLongitude()); keepCurrentLocationVisible = false; - zoomToCurrentLocation = false; CameraUpdate cameraUpdate = CameraUpdateFactory.newLatLngZoom(latLng, DEFAULT_ZOOM_LEVEL); googleMap.moveCamera(cameraUpdate); } @@ -662,16 +645,20 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData */ private LatLng getDefaultLatLng() { MyTracksProviderUtils myTracksProviderUtils = MyTracksProviderUtils.Factory.get(getActivity()); - Track track = myTracksProviderUtils.getLastTrack(); - if (track != null) { - Location location = myTracksProviderUtils.getLastValidTrackPoint(track.getId()); - if (location != null) { - return new LatLng(location.getLatitude(), location.getLongitude()); - } + Location location = myTracksProviderUtils.getLastValidTrackPoint(); + if (location != null) { + return new LatLng(location.getLatitude(), location.getLongitude()); } return new LatLng(DEFAULT_LATITUDE, DEFAULT_LONGITUDE); } + /** + * Returns true if in tracking mode. + */ + private boolean isInTrackingMode() { + return keepCurrentLocationVisible && currentLocation != null && isSelectedTrackRecording(); + } + /** * Returns true if the location is visible. Needs to run on the UI thread. * diff --git a/MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java b/MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java index 032fc7422..794e4b036 100644 --- a/MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java +++ b/MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java @@ -252,6 +252,12 @@ public interface MyTracksProviderUtils { */ public Location getLastValidTrackPoint(long trackId); + + /** + * Gets the last valid location. + */ + public Location getLastValidTrackPoint(); + /** * Creates a location cursor. The caller owns the returned cursor and is * responsible for closing it. diff --git a/MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java b/MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java index f8053f24b..ebc1c0597 100644 --- a/MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java +++ b/MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java @@ -816,6 +816,14 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils { return findTrackPointBy(selection, selectionArgs); } + @Override + public Location getLastValidTrackPoint() { + String selection = TrackPointsColumns._ID + "=(select max(" + TrackPointsColumns._ID + ") from " + + TrackPointsColumns.TABLE_NAME + " WHERE " + TrackPointsColumns.LATITUDE + "<=" + + MAX_LATITUDE + ")"; + return findTrackPointBy(selection, null); + } + @Override public Cursor getTrackPointCursor( long trackId, long startTrackPointId, int maxLocations, boolean descending) {