Requires GPS location to insert a marker except for

the track statistics marker.

MyTracks/src/com/google/android/apps/mytracks/MarkerEditActivity.java

@@ -160,6 +160,7 @@ public class MarkerEditActivity extends AbstractMyTracksActivity {
   private void addMarker() {
     WaypointCreationRequest waypointCreationRequest = new WaypointCreationRequest(
         WaypointType.WAYPOINT,
+        false,
         waypointName.getText().toString(),
         waypointMarkerType.getText().toString(),
         waypointDescription.getText().toString(),

MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java

@@ -346,7 +346,7 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
     if (event.getAction() == MotionEvent.ACTION_DOWN) {
       if (TrackRecordingServiceConnectionUtils.isRecording(this, trackRecordingServiceConnection)) {
         TrackRecordingServiceConnectionUtils.addMarker(
-            this, trackRecordingServiceConnection, WaypointCreationRequest.DEFAULT_STATISTICS);
+            this, trackRecordingServiceConnection, WaypointCreationRequest.DEFAULT_WAYPOINT);
         return true;
       }
     }

MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java

@@ -30,6 +30,7 @@ import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.TracksColumns;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.content.WaypointCreationRequest;
+import com.google.android.apps.mytracks.content.WaypointCreationRequest.WaypointType;
 import com.google.android.apps.mytracks.content.WaypointsColumns;
 import com.google.android.apps.mytracks.services.sensors.SensorManager;
 import com.google.android.apps.mytracks.services.sensors.SensorManagerFactory;
@@ -589,7 +590,7 @@ public class TrackRecordingService extends Service {
     statsBuilder.setMinRecordingDistance(minRecordingDistance);
     waypointStatsBuilder = new TripStatisticsBuilder(startTime);
     waypointStatsBuilder.setMinRecordingDistance(minRecordingDistance);
-    currentWaypointId = insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS);
+    currentWaypointId = insertWaypoint(WaypointCreationRequest.DEFAULT_START_TRACK);
     length = 0;
     showNotification();
     registerLocationListener();
@@ -916,37 +917,33 @@ public class TrackRecordingService extends Service {
 
   public long insertWaypoint(WaypointCreationRequest request) {
     if (!isRecording()) {
-      throw new IllegalStateException(
-          "Unable to insert waypoint marker while not recording!");
+      throw new IllegalStateException("Unable to insert marker while not recording!");
     }
-    if (request == null) {
-      request = WaypointCreationRequest.DEFAULT_WAYPOINT;
-    }
-    Waypoint wpt = new Waypoint();
-    switch (request.getType()) {
-      case WAYPOINT:
-        buildWaypointMarker(wpt, request);
-        break;
-      case STATISTICS:
-        buildStatisticsMarker(wpt, request);
-        break;
-    }
-    wpt.setTrackId(recordingTrackId);
-    wpt.setLength(length);
-    if (lastLocation == null
-        || statsBuilder == null || statsBuilder.getStatistics() == null) {
-      // A null location is ok, and expected on track start.
-      // Make it an impossible location.
-      Location l = new Location("");
-      l.setLatitude(100);
-      l.setLongitude(180);
-      wpt.setLocation(l);
+    Waypoint waypoint = new Waypoint();
+    if (request.getType() == WaypointType.WAYPOINT) {
+      buildWaypointMarker(waypoint, request);
     } else {
-      wpt.setLocation(lastLocation);
-      wpt.setDuration(lastLocation.getTime()
-          - statsBuilder.getStatistics().getStartTime());
+      buildStatisticsMarker(waypoint, request);
     }
-    Uri uri = providerUtils.insertWaypoint(wpt);
+    waypoint.setTrackId(recordingTrackId);
+    waypoint.setLength(length);
+    if (lastLocation == null || statsBuilder == null || statsBuilder.getStatistics() == null) {
+      if (!request.isTrackStatistics()) {
+        return -1L;
+      }
+      /*
+       * For track statistics, a null location is OK. Make it an impossible
+       * location.
+       */
+      Location location = new Location("");
+      location.setLatitude(100);
+      location.setLongitude(180);
+      waypoint.setLocation(location);
+    } else {
+      waypoint.setLocation(lastLocation);
+      waypoint.setDuration(lastLocation.getTime() - statsBuilder.getStatistics().getStartTime());
+    }
+    Uri uri = providerUtils.insertWaypoint(waypoint);
     return Long.parseLong(uri.getLastPathSegment());
   }