Address comments.

MyTracksLib/src/com/google/android/apps/mytracks/content/WaypointCreationRequest.aidl

@@ -1,2 +1,2 @@
 package com.google.android.apps.mytracks.content;
-parcelable WaypointType;
+parcelable WaypointCreationRequest;

MyTracksLib/src/com/google/android/apps/mytracks/content/WaypointCreationRequest.java

@@ -0,0 +1,106 @@
+/*
+ * Copyright 2010 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.android.apps.mytracks.content;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * A request for the service to create a waypoint at the current location.
+ *
+ * @author Sandor Dornbush
+ */
+public class WaypointCreationRequest implements Parcelable {
+
+  public static enum WaypointType {
+    MARKER,
+    STATISTICS;
+  }
+  
+  private WaypointType type;
+  private String name;
+  private String description;
+  private String icon;
+
+  public final static WaypointCreationRequest DEFAULT_MARKER =
+      new WaypointCreationRequest(WaypointType.MARKER);
+  public final static WaypointCreationRequest DEFAULT_STATISTICS =
+      new WaypointCreationRequest(WaypointType.STATISTICS);
+  
+  public WaypointCreationRequest(WaypointType type) {
+    this.type = type;
+  }
+
+  public static class Creator implements Parcelable.Creator<WaypointCreationRequest> {
+
+    public WaypointCreationRequest createFromParcel(Parcel source) {
+      int i = source.readInt();
+      if (i > WaypointType.values().length) {
+        throw new IllegalArgumentException("Could not find waypoint type: " + i);
+      }
+      WaypointCreationRequest request = new WaypointCreationRequest(WaypointType.values()[i]);
+      return request;
+    }
+
+    public WaypointCreationRequest[] newArray(int size) {
+      return new WaypointCreationRequest[size];
+    }
+  }
+
+  public static final Creator CREATOR = new Creator();
+  
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel parcel, int arg1) {
+    parcel.writeInt(type.ordinal());
+  }
+
+  public WaypointType getType() {
+    return type;
+  }
+
+  public void setType(WaypointType type) {
+    this.type = type;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public String getIcon() {
+    return icon;
+  }
+
+  public void setIcon(String icon) {
+    this.icon = icon;
+  }
+}

MyTracksLib/src/com/google/android/apps/mytracks/content/WaypointType.java

@@ -1,60 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.android.apps.mytracks.content;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-/**
- * An enumeration of the types of waypoints that can be created.
- *
- * @author Sandor Dornbush
- */
-public enum WaypointType implements Parcelable {
-
-  MARKER,
-  STATISTICS;
-  
-  public static class Creator implements Parcelable.Creator<WaypointType> {
-
-    public WaypointType createFromParcel(Parcel source) {
-      int i = source.readInt();
-      for (WaypointType type : WaypointType.values()) {
-        if (i == type.ordinal()) {
-          return type;
-        }
-      }
-      return null;
-    }
-
-    public WaypointType[] newArray(int size) {
-      return new WaypointType[size];
-    }
-  }
-
-  public static final Creator CREATOR = new Creator();
-  
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  @Override
-  public void writeToParcel(Parcel parcel, int arg1) {
-    parcel.writeInt(ordinal());
-  }
-
-}

MyTracksLib/src/com/google/android/apps/mytracks/services/ITrackRecordingService.aidl

@@ -15,7 +15,7 @@
  */
 package com.google.android.apps.mytracks.services;
 
-import com.google.android.apps.mytracks.content.WaypointType;
+import com.google.android.apps.mytracks.content.WaypointCreationRequest;
 
 /**
  * MyTracks service.
@@ -45,10 +45,10 @@ interface ITrackRecordingService {
   /**
    * Inserts a waypoint marker in the track being recorded.
    *
-   * @param type of the waypoint to insert
+   * @param request Details for the waypoint to be inserted.
    * @return the unique ID of the inserted marker
    */
-  long insertWaypoint(in WaypointType type);
+  long insertWaypoint(in WaypointCreationRequest request);
 
   /**
    * Inserts a location in the track being recorded.