Added get_route api function & aidl get_position

OsmAnd-api/src/net/osmand/aidlapi/IOsmAndAidlInterface.aidl

@@ -1,6 +1,7 @@
 package net.osmand.aidlapi;
 
 import net.osmand.aidlapi.map.ALatLon;
+import net.osmand.aidlapi.map.APosition;
 import net.osmand.aidlapi.map.SetMapLocationParams;
 
 import net.osmand.aidlapi.favorite.group.AFavoriteGroup;
@@ -841,4 +842,22 @@ interface IOsmAndAidlInterface {
     boolean executeQuickAction(in QuickActionParams params);
 
     boolean getQuickActionsInfo(out List<QuickActionInfoParams> quickActions);
+
+    /**
+     * Method to get position of various objects
+     *
+     * @params positionType (int) - type of position to get
+     */
+    boolean getPosition(in int positionType, out APosition position);
+
+    /**
+     * Method to get index of the current route segment
+     */
+    int getCurrentRouteSegmentIndex();
+
+    /**
+     * Method to get creation time of current route
+     *
+     */
+    long getRouteCreationTime();
 }

OsmAnd-api/src/net/osmand/aidlapi/map/APosition.aidl

@@ -0,0 +1,3 @@
+package net.osmand.aidlapi.map;
+
+parcelable APosition;

OsmAnd-api/src/net/osmand/aidlapi/map/APosition.java

@@ -0,0 +1,138 @@
+package net.osmand.aidlapi.map;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class APosition implements Parcelable {
+
+	public double getLatitude() {
+		return latitude;
+	}
+
+	public void setLatitude(double latitude) {
+		this.latitude = latitude;
+	}
+
+	public double getLongitude() {
+		return longitude;
+	}
+
+	public void setLongitude(double longitude) {
+		this.longitude = longitude;
+	}
+
+	public double getAltitude() {
+		return altitude;
+	}
+
+	public void setAltitude(double altitude) {
+		this.altitude = altitude;
+	}
+
+	public double getSpeed() {
+		return speed;
+	}
+
+	public void setSpeed(double speed) {
+		this.speed = speed;
+	}
+
+	public double getBearing() {
+		return bearing;
+	}
+
+	public void setBearing(double bearing) {
+		this.bearing = bearing;
+	}
+
+	private double latitude;
+	private double longitude;
+	private double altitude;
+	private double speed;
+	private double bearing;
+
+	public APosition(double latitude, double longitude, double altitude, double speed, double bearing) {
+		this.latitude = latitude;
+		this.longitude = longitude;
+		this.altitude = altitude;
+		this.speed = speed;
+		this.bearing = bearing;
+	}
+
+	public APosition(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<APosition> CREATOR = new
+			Creator<APosition>() {
+				public APosition createFromParcel(Parcel in) {
+					return new APosition(in);
+				}
+
+				public APosition[] newArray(int size) {
+					return new APosition[size];
+				}
+			};
+
+	public APosition() {
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		int temp;
+		temp = (int)Math.floor(latitude * 10000);
+		result = prime * result + temp;
+		temp = (int)Math.floor(longitude * 10000);
+		result = prime * result + temp;
+		temp = (int)Math.floor(altitude * 10000);
+		result = prime * result + temp;
+		temp = (int)Math.floor(speed * 10000);
+		result = prime * result + temp;
+		temp = (int)Math.floor(bearing * 10000);
+		result = prime * result + temp;
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+
+		APosition other = (APosition) obj;
+		return Math.abs(latitude - other.latitude) < 0.00001
+				&& Math.abs(longitude - other.longitude) < 0.00001
+				&& Math.abs(altitude - other.altitude) < 1
+				&& Math.abs(speed - other.speed) < 1;
+	}
+
+	@Override
+	public String toString() {
+		return "Lat " + ((float)latitude) + " Lon " + ((float)longitude) + " Alt " + ((float)altitude);
+	}
+
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeDouble(latitude);
+		out.writeDouble(longitude);
+		out.writeDouble(altitude);
+		out.writeDouble(speed);
+		out.writeDouble(bearing);
+	}
+
+	public void readFromParcel(Parcel in) {
+		latitude = in.readDouble();
+		longitude = in.readDouble();
+		altitude = in.readDouble();
+		speed = in.readDouble();
+		bearing = in.readDouble();
+	}
+
+	public int describeContents() {
+		return 0;
+	}
+}

OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl

@@ -1,6 +1,7 @@
 package net.osmand.aidl;
 
 import net.osmand.aidl.map.ALatLon;
+import net.osmand.aidl.map.APosition;
 import net.osmand.aidl.map.SetMapLocationParams;
 
 import net.osmand.aidl.favorite.group.AFavoriteGroup;
@@ -856,4 +857,23 @@ interface IOsmAndAidlInterface {
     boolean executeQuickAction(in QuickActionParams params);
 
     boolean getQuickActionsInfo(out List<QuickActionInfoParams> quickActions);
+
+    /**
+     * Method to get position of various objects
+     *
+     * @params positionType (int) - type of position to get
+     */
+    boolean getPosition(in int positionType, out APosition position);
+
+    /**
+     * Method to get index of current route segment
+     *
+     */
+    int getCurrentRouteSegmentIndex();
+
+    /**
+     * Method to get creation time current route
+     *
+     */
+    long getRouteCreationTime();
 }

OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java

@@ -29,10 +29,12 @@
 import net.osmand.GPXUtilities.GPXFile;
 import net.osmand.GPXUtilities.GPXTrackAnalysis;
 import net.osmand.IndexConstants;
+import net.osmand.Location;
 import net.osmand.PlatformUtil;
 import net.osmand.aidl.gpx.AGpxFile;
 import net.osmand.aidl.gpx.AGpxFileDetails;
 import net.osmand.aidl.gpx.ASelectedGpxFile;
+import net.osmand.aidl.map.APosition;
 import net.osmand.aidl.navigation.ADirectionInfo;
 import net.osmand.aidl.navigation.OnVoiceNavigationParams;
 import net.osmand.aidl.quickaction.QuickActionInfoParams;
@@ -1003,6 +1005,32 @@ boolean removeAllActiveMapMarkers() {
 		return true;
 	}
 
+	public APosition getPosition(int positionType) {
+		switch (positionType) {
+			case 0: {
+				RoutingHelper rh = app.getRoutingHelper();
+				Location location = rh.getLastFixedLocation();
+				return new APosition(
+						location.getLatitude(),
+						location.getLongitude(),
+						location.getAltitude(),
+						location.getSpeed(),
+						location.getBearing()
+				);
+			}
+		}
+		return null;
+	}
+
+	public int getCurrentRouteSegmentIndex() {
+		RoutingHelper rh = app.getRoutingHelper();
+		return rh.getRoute().getCurrentRoute();
+	}
+
+	public long getRouteCreationTime(){
+		RoutingHelper rh = app.getRoutingHelper();
+		return rh.getRoute().getCreationTime();
+	}
 
 	boolean updateMapMarker(String prevName, LatLon prevLatLon, String newName, LatLon newLatLon, boolean ignoreCoordinates) {
 		LatLon latLon = new LatLon(prevLatLon.getLatitude(), prevLatLon.getLongitude());

OsmAnd/src/net/osmand/aidl/OsmandAidlService.java

@@ -45,6 +45,7 @@
 import net.osmand.aidl.gpx.StartGpxRecordingParams;
 import net.osmand.aidl.gpx.StopGpxRecordingParams;
 import net.osmand.aidl.map.ALatLon;
+import net.osmand.aidl.map.APosition;
 import net.osmand.aidl.map.SetMapLocationParams;
 import net.osmand.aidl.maplayer.AddMapLayerParams;
 import net.osmand.aidl.maplayer.RemoveMapLayerParams;
@@ -1278,6 +1279,51 @@ public boolean removeAllActiveMapMarkers(RemoveMapMarkersParams params) {
 			}
 		}
 
+		@Override
+		public boolean getPosition(int positionType, APosition position) {
+			try {
+				OsmandAidlApi api = getApi("getPosition");
+				if (api != null) {
+					APosition p = api.getPosition(positionType);
+					position.setLatitude(p.getLatitude());
+					position.setLongitude(p.getLongitude());
+					position.setAltitude(p.getAltitude());
+					position.setSpeed(p.getSpeed());
+					position.setBearing(p.getBearing());
+					return true;
+				}
+			} catch (Exception e) {
+				handleException(e);
+			}
+			return false;
+		}
+
+		@Override
+		public int getCurrentRouteSegmentIndex() {
+			try {
+				OsmandAidlApi api = getApi("getCurrentRouteSegmentIndex");
+				if (api != null) {
+					return api.getCurrentRouteSegmentIndex();
+				}
+			} catch (Exception e) {
+				handleException(e);
+			}
+			return -1;
+		}
+
+		@Override
+		public long getRouteCreationTime() {
+			try {
+				OsmandAidlApi api = getApi("getRouteCreationTime");
+				if (api != null) {
+					return api.getRouteCreationTime();
+				}
+			} catch (Exception e) {
+				handleException(e);
+			}
+			return -1;
+		}
+
 		@Override
 		public boolean getGpxColor(GpxColorParams params) {
 			try {

OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java

@@ -15,6 +15,7 @@
 import net.osmand.aidl.OsmandAidlApi.GpxBitmapCreatedCallback;
 import net.osmand.aidl.OsmandAidlApi.OsmandAppInitCallback;
 import net.osmand.aidl.OsmandAidlApi.SearchCompleteCallback;
+import net.osmand.aidlapi.map.APosition;
 import net.osmand.aidlapi.IOsmAndAidlCallback;
 import net.osmand.aidlapi.IOsmAndAidlInterface;
 import net.osmand.aidlapi.calculateroute.CalculateRouteParams;
@@ -87,6 +88,7 @@
 import net.osmand.aidlapi.search.SearchResult;
 import net.osmand.aidlapi.tiles.ASqliteDbFile;
 import net.osmand.data.LatLon;
+import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.settings.backend.OsmAndAppCustomization;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.util.Algorithms;
@@ -1227,6 +1229,51 @@ public boolean removeAllActiveMapMarkers(RemoveMapMarkersParams params) {
 			}
 		}
 
+		@Override
+		public boolean getPosition(int positionType, APosition position) {
+			try {
+				OsmandAidlApi api = getApi("getPosition");
+				if (api != null) {
+					net.osmand.aidl.map.APosition p = api.getPosition(positionType);
+					position.setLatitude(p.getLatitude());
+					position.setLongitude(p.getLongitude());
+					position.setAltitude(p.getAltitude());
+					position.setSpeed(p.getSpeed());
+					position.setBearing(p.getBearing());
+					return true;
+				}
+			} catch (Exception e) {
+				handleException(e);
+			}
+			return false;
+		}
+
+		@Override
+		public int getCurrentRouteSegmentIndex() {
+			try {
+				OsmandAidlApi api = getApi("getCurrentRouteSegmentIndex");
+				if (api != null) {
+					return api.getCurrentRouteSegmentIndex();
+				}
+			} catch (Exception e) {
+				handleException(e);
+			}
+			return -1;
+		}
+
+		@Override
+		public long getRouteCreationTime() {
+			try {
+				OsmandAidlApi api = getApi("getRouteCreationTime");
+				if (api != null) {
+					return api.getRouteCreationTime();
+				}
+			} catch (Exception e) {
+				handleException(e);
+			}
+			return -1;
+		}
+
 		@Override
 		public boolean importProfile(ProfileSettingsParams params) {
 			try {

OsmAnd/src/net/osmand/aidl/map/APosition.aidl

@@ -0,0 +1,3 @@
+package net.osmand.aidl.map;
+
+parcelable APosition;