Merge pull request #103 from TheTransitClock/tc_issue_102

Set precedence of assignment correctly.
TheTransitClock · Aug 21, 2018 · da7905c · da7905c
2 parents bd5aa56 + afe7464
commit da7905c
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/...sitclock/src/main/java/org/transitclock/feed/gtfsRt/GtfsRtVehiclePositionsReaderBase.java b/...sitclock/src/main/java/org/transitclock/feed/gtfsRt/GtfsRtVehiclePositionsReaderBase.java
@@ -199,15 +199,18 @@ private void processMessage(FeedMessage message) {
 			if (vehicle.hasTrip()) {
 				TripDescriptor tripDescriptor = vehicle.getTrip();
 
+
+				if (tripDescriptor.hasRouteId()) {
+					avlReport.setAssignment(tripDescriptor.getRouteId(), 
+							AssignmentType.ROUTE_ID);
+				}
+
 				if (tripDescriptor.hasTripId()) {
 					avlReport.setAssignment(tripDescriptor.getTripId(), 
 							AssignmentType.TRIP_ID);
 				}
 
-				if (tripDescriptor.hasRouteId()) {
-					avlReport.setAssignment(tripDescriptor.getRouteId(), 
-							AssignmentType.ROUTE_ID);
-				}
+
 			}
 
 			logger.debug("Processed {}", avlReport);