Gmap pending fixes

pom.xml

@@ -10,7 +10,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jackson.version>2.13.5</jackson.version>
-        <awsjavasdk.version>1.11.728</awsjavasdk.version>
+        <awsjavasdk.version>1.12.261</awsjavasdk.version>
     </properties>
     <repositories>
         <!--  used for importing java projects from github -->
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>2.15.1</version>
         </dependency>
 
         <!-- Use for better object state checking. -->
@@ -136,13 +136,13 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
+            <version>2.0.17</version>
         </dependency>
 
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>1.5.18</version>
         </dependency>
 
         <!-- Required to construct URI (UriBuilder) -->

src/main/java/org/opentripplanner/middleware/models/MonitoredTrip.java

@@ -521,10 +521,12 @@ public TripUsers(MobilityProfileLite primary, RelatedUser companion, List<Relate
     }
 
     /**
-     * Trip created by primary user.
+     * Determines whether this trip was created by primary user.
+     * The primary user is either be the user denoted with userId if there are no companions (there can be observers),
+     * or the user denoted with the `primary` field if that field is populated.
      */
     public boolean ownedByPrimary() {
-        return primary != null && userId.equalsIgnoreCase(primary.userId);
+        return primary == null || userId.equalsIgnoreCase(primary.userId);
     }
 
     /**

src/main/java/org/opentripplanner/middleware/triptracker/ManageLegTraversal.java

@@ -8,6 +8,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.opentripplanner.middleware.triptracker.TravelerLocator.MIN_TRANSIT_VEHICLE_SPEED;
 import static org.opentripplanner.middleware.triptracker.TravelerLocator.getAllLegPositions;
 import static org.opentripplanner.middleware.triptracker.TravelerLocator.getLegGeoPoints;
 import static org.opentripplanner.middleware.utils.ConfigUtils.getConfigPropertyAsInt;
@@ -62,10 +63,10 @@ private static boolean canUseLeg(Leg leg) {
      * match, return this leg, if not simply return the leg that is nearest to the current position.
      */
     @Nullable
-    public static Leg getExpectedLeg(Coordinates position, Itinerary itinerary) {
+    public static Leg getExpectedLeg(Coordinates position, int speed, Itinerary itinerary) {
         if (canUseTripLegs(itinerary)) {
             Leg leg = getContainingLeg(position, itinerary);
-            return (leg != null) ? leg : getNearestLeg(position, itinerary);
+            return (leg != null) ? leg : getNearestLeg(position, speed, itinerary);
         }
         return null;
     }
@@ -92,9 +93,12 @@ public static Leg getNextLeg(Leg expectedLeg, Itinerary itinerary) {
      * identical. In this scenario it would be possible for the current position to be attributed to the exit leg,
      * therefore missing the instruction at the end of the cul-de-sac.
      */
-    private static Leg getNearestLeg(Coordinates position, Itinerary itinerary) {
-        double shortestDistance = Double.MAX_VALUE;
+    private static Leg getNearestLeg(Coordinates position, int speed, Itinerary itinerary) {
+        Leg nearestTransitLeg = null;
         Leg nearestLeg = null;
+
+        double shortestDistance = Double.MAX_VALUE;
+        double shortestTransitDistance = Double.MAX_VALUE;
         for (int i = 0; i < itinerary.legs.size(); i++) {
             Leg leg = itinerary.legs.get(i);
             for (Coordinates positionOnLeg : getAllLegPositions(leg)) {
@@ -103,8 +107,16 @@ private static Leg getNearestLeg(Coordinates position, Itinerary itinerary) {
                     nearestLeg = leg;
                     shortestDistance = distance;
                 }
+                if (Boolean.TRUE.equals(leg.transitLeg) && distance < shortestTransitDistance) {
+                    nearestTransitLeg = leg;
+                    shortestTransitDistance = distance;
+                }
             }
         }
+
+        if (speed >= MIN_TRANSIT_VEHICLE_SPEED && nearestTransitLeg != null) {
+            return nearestTransitLeg;
+        }
         return nearestLeg;
     }
 
@@ -121,6 +133,7 @@ private static Leg getContainingLeg(Coordinates position, Itinerary itinerary) {
                 }
             }
         }
+
         return null;
     }
 

src/main/java/org/opentripplanner/middleware/triptracker/ManageTripTracking.java

@@ -13,6 +13,7 @@
 import org.opentripplanner.middleware.otp.response.Itinerary;
 import org.opentripplanner.middleware.otp.response.Leg;
 import org.opentripplanner.middleware.otp.response.OtpResponse;
+import org.opentripplanner.middleware.otp.response.Step;
 import org.opentripplanner.middleware.otp.response.TripPlan;
 import org.opentripplanner.middleware.persistence.Persistence;
 import org.opentripplanner.middleware.triptracker.instruction.OnTrackInstruction;
@@ -27,6 +28,8 @@
 import org.opentripplanner.middleware.utils.Coordinates;
 import org.opentripplanner.middleware.utils.DateTimeUtils;
 import org.opentripplanner.middleware.utils.NotificationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import spark.Request;
 
 import java.time.LocalDate;
@@ -48,6 +51,7 @@
 import static org.opentripplanner.middleware.utils.JsonUtils.logMessageAndHalt;
 
 public class ManageTripTracking {
+    private static final Logger LOG = LoggerFactory.getLogger(ManageTripTracking.class);
 
     public static Supplier<OtpResponse> otpResponseProviderOverride = null;
     private static OtpGraphQLVariables rerouteVariables = null;
@@ -138,6 +142,11 @@ private static TrackingResponse doUpdateTracking(
                 tripStatus = TripStatus.getTimingStatus(travelerPosition);
             }
 
+            if (isEndOfRoutingInstruction(instruction)) {
+                // Deem trip completed if issuing a "destination in vicinity" instruction.
+                tripStatus = TripStatus.COMPLETED;
+            }
+
             // Perform interactions such as triggering traffic signals when approaching segments so configured.
             // It is assumed to be ok to repeatedly perform the interaction.
             if (instruction instanceof SelfLegInstruction && instruction.distance <= TRIP_INSTRUCTION_UPCOMING_RADIUS) {
@@ -160,6 +169,20 @@ private static TrackingResponse doUpdateTracking(
         return null;
     }
 
+    /**
+     * Detect if the instruction is an end-of-routing instruction
+     * (to give a 'completed' status to the trip, for instance).
+     */
+    private static boolean isEndOfRoutingInstruction(TripInstruction instruction) {
+        if (instruction instanceof OnTrackInstruction) {
+            Step step = ((OnTrackInstruction) instruction).getLegStep();
+            if (step != null) {
+                return step.isEndOfRouting();
+            }
+        }
+        return false;
+    }
+
     /**
      * Detect if we are deeming a traveler deviated while giving out a non-deviated instruction
      * (to prevent, for instance, being offered rerouting while near a bus stop).
@@ -186,17 +209,37 @@ public static TrackingResponse updateTracking(Request request) {
     public static TrackingResponse startOrUpdateTracking(Request request) {
         TripTrackingData tripData = TripTrackingData.fromRequestTripId(request);
         if (tripData != null) {
+            logTracking(request, "track/updatetracking");
+            // write device info to last location reported location
+            if (tripData.locations != null && !tripData.locations.isEmpty()) {
+                var lastLocation = tripData.locations.get(tripData.locations.size() - 1);
+                lastLocation.device_id = request.headers("device_id");
+                lastLocation.app_platform = request.headers("app_platform");
+                lastLocation.app_version = request.headers("app_version");
+            }
+
             return doUpdateTracking(request, tripData, tripData.journey == null);
         }
         return null;
     }
 
+    public static void logTracking(Request request, String operation) {
+        LOG.info(
+            "{} called by device {} running {} app version {}",
+            operation,
+            request.headers("device_id"),
+            request.headers("app_platform"),
+            request.headers("app_version")
+        );
+    }
+
     /**
      * End tracking by saving the end condition and date.
      */
     public static EndTrackingResponse endTracking(Request request) {
         TripTrackingData tripData = TripTrackingData.fromRequestJourneyId(request);
         if (tripData != null) {
+            logTracking(request, "endtracking");
             return completeJourney(tripData, false);
         }
         return null;
@@ -211,6 +254,7 @@ public static EndTrackingResponse forciblyEndTracking(Request request) {
         TripTrackingData tripData = TripTrackingData.fromRequestTripId(request);
         if (tripData != null) {
             if (tripData.journey != null) {
+                logTracking(request, "forciblyendtracking");
                 return completeJourney(tripData, true);
             } else {
                 logMessageAndHalt(request, HttpStatus.BAD_REQUEST_400, "Journey for provided trip id does not exist!");

src/main/java/org/opentripplanner/middleware/triptracker/TrackingLocation.java

@@ -18,6 +18,15 @@ public class TrackingLocation {
 
     public Date timestamp;
 
+    /** ID of the device that reported the location - For troubleshooting only. */
+    public String device_id;
+
+    /** The OS of the device that reported the location - For troubleshooting only. */
+    public String app_platform;
+
+    /** App version of the device that reported the location - For troubleshooting only. */
+    public String app_version;
+
     /** Deviation or on-time status computed for this location. */
     public TripStatus tripStatus;