Vehicles locations

src/debug/res/values/constants.xml

@@ -10,6 +10,8 @@
     <string name="schedule_provider">org.mtransit.android.debug.provider.SCHEDULE_PROVIDER</string>
     <!-- org.mtransit.android.debug.provider.SCHEDULE_PROVIDER_TARGET (do not fix to avoid breaking change) -->
     <string name="schedule_provider_target">org.mtransit.android.debug.providerSCHEDULE_PROVIDER_TARGET</string>
+    <string name="vehicle_location_provider">org.mtransit.android.debug.provider.VEHICLE_LOCATION_PROVIDER</string>
+    <string name="vehicle_location_provider_target">org.mtransit.android.debug.provider.VEHICLE_LOCATION_PROVIDER_TARGET</string>
     <string name="service_update_provider">org.mtransit.android.debug.provider.SERVICE_UPDATE_PROVIDER</string>
     <string name="service_update_provider_target">org.mtransit.android.debug.provider.SERVICE_UPDATE_PROVIDER_TARGET</string>
     <string name="news_provider">org.mtransit.android.debug.provider.NEWS_PROVIDER</string>

src/main/java/org/mtransit/android/commons/PreferenceUtils.java

@@ -94,10 +94,9 @@ public static String getPREFS_LCL_AGENCY_TYPE_TAB_AGENCY(int typeId) {
 	}
 
 	private static final String PREFS_LCL_AGENCY_LAST_OPENED = "pAgencyLastOpened";
-	public static final long PREFS_LCL_AGENCY_LAST_OPENED_DEFAULT = -1L;
 
 	@NonNull
-	public static String getPREFS_LCL_AGENCY_LAST_OPENED_DEFAULT(String authority) {
+	public static String getPREFS_LCL_AGENCY_LAST_OPENED_DEFAULT(@NonNull String authority) {
 		return PREFS_LCL_AGENCY_LAST_OPENED + authority;
 	}
 

src/main/java/org/mtransit/android/commons/data/Direction.java

@@ -22,7 +22,7 @@
 import java.util.Comparator;
 
 @SuppressWarnings("WeakerAccess")
-public class Direction {
+public class Direction implements Targetable {
 
 	private static final String LOG_TAG = Direction.class.getSimpleName();
 
@@ -41,26 +41,32 @@ public class Direction {
 	public static final int HEADSIGN_TYPE_STOP_ID = 3;
 	public static final int HEADSIGN_TYPE_NO_PICKUP = 4;
 
+	@NonNull
+	private final String authority;
 	private final long id;
 	@HeadSignType
 	private final int headsignType;
 	@NonNull
 	private final String headsignValue;
 	private final long routeId;
 
-	public Direction(long id,
-					 @HeadSignType int headsignType,
-					 @NonNull String headsignValue,
-					 long routeId) {
+	public Direction(
+			@NonNull String authority,
+			long id,
+			@HeadSignType int headsignType,
+			@NonNull String headsignValue,
+			long routeId) {
+		this.authority = authority;
 		this.id = id;
 		this.headsignType = headsignType;
 		this.headsignValue = headsignValue;
 		this.routeId = routeId;
 	}
 
 	@NonNull
-	public static Direction fromCursor(@NonNull Cursor c) {
+	public static Direction fromCursor(@NonNull Cursor c, @NonNull String authority) {
 		return new Direction(
+				authority,
 				CursorExtKt.getLong(c, GTFSProviderContract.DirectionColumns.T_DIRECTION_K_ID),
 				CursorExtKt.getInt(c, GTFSProviderContract.DirectionColumns.T_DIRECTION_K_HEADSIGN_TYPE),
 				CursorExtKt.getString(c, GTFSProviderContract.DirectionColumns.T_DIRECTION_K_HEADSIGN_VALUE),
@@ -72,7 +78,8 @@ public static Direction fromCursor(@NonNull Cursor c) {
 	@Override
 	public String toString() {
 		return Direction.class.getSimpleName() + "{" +
-				"id=" + id +
+				"authority='" + authority + '\'' +
+				", id=" + id +
 				", headsignType=" + headsignType +
 				", headsignValue='" + headsignValue + '\'' +
 				", routeId=" + routeId +
@@ -100,9 +107,10 @@ public static JSONObject toJSON(@NonNull Direction direction) {
 	}
 
 	@NonNull
-	public static Direction fromJSON(@NonNull JSONObject jDirection) throws JSONException {
+	public static Direction fromJSON(@NonNull JSONObject jDirection, @NonNull String authority) throws JSONException {
 		try {
 			return new Direction(
+					authority,
 					jDirection.getLong(JSON_ID),
 					jDirection.getInt(JSON_HEADSIGN_TYPE),
 					jDirection.getString(JSON_HEADSIGN_VALUE),
@@ -220,8 +228,14 @@ public static boolean isSameHeadsign(@Nullable String stringHeadsign1, @Nullable
 	}
 
 	@NonNull
-	public String getUUID(@NonNull String authority) {
-		return POI.POIUtils.getUUID(authority, this.routeId, this.id);
+	public String getAuthority() {
+		return this.authority;
+	}
+
+	@NonNull
+	@Override
+	public String getUUID() {
+		return POI.POIUtils.getUUID(this.authority, this.routeId, this.id);
 	}
 
 	public long getId() {

src/main/java/org/mtransit/android/commons/data/POI.java

@@ -17,7 +17,7 @@
 
 import java.lang.annotation.Retention;
 
-public interface POI extends MTLog.Loggable {
+public interface POI extends Targetable, MTLog.Loggable {
 
 	@Retention(SOURCE)
 	@IntDef({ITEM_VIEW_TYPE_ROUTE_DIRECTION_STOP, ITEM_VIEW_TYPE_BASIC_POI, ITEM_VIEW_TYPE_MODULE, ITEM_VIEW_TYPE_TEXT_MESSAGE, ITEM_VIEW_TYPE_PLACE})
@@ -71,9 +71,6 @@ public interface POI extends MTLog.Loggable {
 
 	boolean hasLocation();
 
-	@NonNull
-	String getUUID();
-
 	@NonNull
 	String getAuthority();
 

src/main/java/org/mtransit/android/commons/data/Route.java

@@ -25,7 +25,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class Route implements MTLog.Loggable {
+public class Route implements Targetable, MTLog.Loggable {
 
 	private static final String LOG_TAG = Route.class.getSimpleName();
 
@@ -210,6 +210,7 @@ public long getId() {
 	private String uuid = null;
 
 	@NonNull
+	@Override
 	public String getUUID() {
 		if (this.uuid == null) {
 			this.uuid = POI.POIUtils.getUUID(this.authority, this.id);
@@ -221,6 +222,7 @@ public void resetUUID() {
 		this.uuid = null;
 	}
 
+	@SuppressWarnings("unused") // main app only
 	@NonNull
 	public Collection<String> getAllUUIDs() {
 		return Arrays.asList(

src/main/java/org/mtransit/android/commons/data/RouteDirection.java

@@ -16,7 +16,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-public class RouteDirection implements MTLog.Loggable {
+public class RouteDirection implements Targetable, MTLog.Loggable {
 
 	private static final String LOG_TAG = RouteDirection.class.getSimpleName();
 
@@ -40,10 +40,12 @@ public RouteDirection(
 	}
 
 	@NonNull
+	@Override
 	public String getUUID() {
-		return direction.getUUID(getAuthority());
+		return direction.getUUID();
 	}
 
+	@SuppressWarnings("unused") // main app only
 	@NonNull
 	public Collection<String> getAllUUIDs() {
 		return Arrays.asList(
@@ -109,7 +111,7 @@ public static RouteDirection fromJSON(@NonNull JSONObject json, @NonNull String
 		try {
 			return new RouteDirection(
 					Route.fromJSON(json.getJSONObject(JSON_ROUTE), authority),
-					Direction.fromJSON(json.getJSONObject(JSON_DIRECTION))
+					Direction.fromJSON(json.getJSONObject(JSON_DIRECTION), authority)
 			);
 		} catch (JSONException jsone) {
 			MTLog.w(LOG_TAG, jsone, "Error while parsing JSON '%s'!", json);
@@ -153,6 +155,7 @@ public static RouteDirection fromCursorStatic(@NonNull Cursor c, @NonNull String
 						CursorExtKt.optInt(c, GTFSProviderContract.RouteDirectionColumns.T_ROUTE_K_TYPE, GTFSCommons.DEFAULT_ROUTE_TYPE)
 				),
 				new Direction(
+						authority,
 						CursorExtKt.getLong(c, GTFSProviderContract.RouteDirectionColumns.T_DIRECTION_K_ID),
 						CursorExtKt.getInt(c, GTFSProviderContract.RouteDirectionColumns.T_DIRECTION_K_HEADSIGN_TYPE),
 						CursorExtKt.getString(c, GTFSProviderContract.RouteDirectionColumns.T_DIRECTION_K_HEADSIGN_VALUE),

src/main/java/org/mtransit/android/commons/data/RouteDirectionStop.java

@@ -56,11 +56,12 @@ public RouteDirectionStop(
 	}
 
 	public RouteDirectionStop(
-							  @DataSourceType int dataSourceTypeId,
-							  @NonNull Route route,
-							  @NonNull Direction direction,
-							  @NonNull Stop stop,
-							  boolean noPickup) {
+			@DataSourceType int dataSourceTypeId,
+			@NonNull Route route,
+			@NonNull Direction direction,
+			@NonNull Stop stop,
+			boolean noPickup
+	) {
 		super(route.getAuthority(), -1, dataSourceTypeId, POI.ITEM_VIEW_TYPE_ROUTE_DIRECTION_STOP, POI.ITEM_STATUS_TYPE_SCHEDULE, POI.ITEM_ACTION_TYPE_ROUTE_DIRECTION_STOP);
 		this.route = route;
 		this.direction = direction;
@@ -82,11 +83,16 @@ public int getId() {
 	@Override
 	public String getUUID() {
 		if (this.uuid == null) {
-			this.uuid = POI.POIUtils.getUUID(getAuthority(), getRoute().getId(), getDirection().getId(), getStop().getId());
+			this.uuid = makeUUID(getAuthority(), getRoute().getId(), getDirection().getId(), getStop().getId());
 		}
 		return this.uuid;
 	}
 
+	@NonNull
+	public static String makeUUID(@NonNull String authority, long routeId, long directionId, int stopId) {
+		return POI.POIUtils.getUUID(authority, routeId, directionId, stopId);
+	}
+
 	@Override
 	public void resetUUID() {
 		this.uuid = null;
@@ -201,7 +207,7 @@ public static RouteDirectionStop fromJSONStatic(@NonNull JSONObject json) {
 			final RouteDirectionStop rds = new RouteDirectionStop( //
 					DefaultPOI.getDSTypeIdFromJSON(json),//
 					Route.fromJSON(json.getJSONObject(JSON_ROUTE), authority), //
-					Direction.fromJSON(json.getJSONObject(JSON_DIRECTION)), //
+					Direction.fromJSON(json.getJSONObject(JSON_DIRECTION), authority), //
 					Stop.fromJSON(json.getJSONObject(JSON_STOP)), //
 					json.getBoolean(JSON_NO_PICKUP) //
 			);
@@ -261,6 +267,7 @@ public static RouteDirectionStop fromCursorStatic(@NonNull Cursor c, @NonNull St
 						CursorExtKt.optInt(c, GTFSProviderContract.RouteDirectionStopColumns.T_ROUTE_K_TYPE, GTFSCommons.DEFAULT_ROUTE_TYPE)
 				),
 				new Direction(
+						authority,
 						CursorExtKt.getLong(c, GTFSProviderContract.RouteDirectionStopColumns.T_DIRECTION_K_ID),
 						CursorExtKt.getInt(c, GTFSProviderContract.RouteDirectionStopColumns.T_DIRECTION_K_HEADSIGN_TYPE),
 						CursorExtKt.getString(c, GTFSProviderContract.RouteDirectionStopColumns.T_DIRECTION_K_HEADSIGN_VALUE),
@@ -308,9 +315,10 @@ public Direction getDirection() {
 
 	@NonNull
 	public String getRouteDirectionUUID() {
-		return direction.getUUID(getAuthority());
+		return direction.getUUID();
 	}
 
+	@SuppressWarnings("unused") // main app only
 	@NonNull
 	public Collection<String> getRouteDirectionAllUUIDs() {
 		return Arrays.asList(

src/main/java/org/mtransit/android/commons/data/ServiceUpdateKtx.kt

@@ -24,13 +24,13 @@ fun Iterable<ServiceUpdate>?.isSeverityWarningInfo(): Pair<Boolean, Boolean> {
 fun Iterable<ServiceUpdate>.distinctByOriginalId() =
     this.distinctBy { it.originalId ?: it.id } // keep 1st occurrence from sorted list (in *Manager)
 
-fun ServiceUpdateProviderContract.makeServiceUpdateNoneList(targetUUID: String, sourceId: String): ArrayList<ServiceUpdate> =
+fun ServiceUpdateProviderContract.makeServiceUpdateNoneList(targetable: Targetable, sourceId: String): ArrayList<ServiceUpdate> =
     ArrayList<ServiceUpdate>().apply {
-        add(makeServiceUpdateNone(targetUUID, sourceId))
+        add(makeServiceUpdateNone(targetable.uuid, sourceId))
     }
 
-fun ServiceUpdateProviderContract.makeServiceUpdateNone(targetUUID: String, sourceId: String): ServiceUpdate {
-    return ServiceUpdate(
+fun ServiceUpdateProviderContract.makeServiceUpdateNone(targetUUID: String, sourceId: String) =
+    ServiceUpdate(
         null,
         targetUUID,
         TimeUtils.currentTimeMillis(),
@@ -43,4 +43,3 @@ fun ServiceUpdateProviderContract.makeServiceUpdateNone(targetUUID: String, sour
         null,
         getServiceUpdateLanguage(),
     )
-}

src/main/java/org/mtransit/android/commons/data/Targetable.kt

@@ -0,0 +1,8 @@
+package org.mtransit.android.commons.data
+
+interface Targetable {
+
+    val uUID: String
+    val uuid: String get() = this.uUID
+
+}