Merge pull request #134 from vsperez/tc_issue_131

Fixes Bad request.
TheTransitClock · May 14, 2019 · 3eac868 · 3eac868
2 parents ce19a28 + 2194b1d
commit 3eac868
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/transitclock/src/main/java/org/transitclock/ipc/data/IpcRoute.java b/transitclock/src/main/java/org/transitclock/ipc/data/IpcRoute.java
@@ -222,7 +222,7 @@ private static IpcDirectionsForRoute createStops(Route dbRoute,
 				if (stopId != null) {
 					isUiStop = false;
 					for (TripPattern tripPattern : uiTripPatterns) {
-						if(tripPattern.getDirectionId().compareTo(currentDirectionId)==0)
+						if((tripPattern.getDirectionId()==null && currentDirectionId==null)  || tripPattern.getDirectionId().compareTo(currentDirectionId)==0)
 							currentTripPattern=tripPattern;
 						if (tripPattern.isStopAtOrAfterStop(stopId, currentStopId)) {
 							isUiStop = true;
@@ -233,7 +233,7 @@ private static IpcDirectionsForRoute createStops(Route dbRoute,
 				else
 				{
 					for (TripPattern tripPattern : uiTripPatterns) {
-						if(tripPattern.getDirectionId().compareTo(currentDirectionId)==0)
+						if((tripPattern.getDirectionId()==null && currentDirectionId==null) || tripPattern.getDirectionId().compareTo(currentDirectionId)==0)
 							currentTripPattern=tripPattern;
 					}
 				}

diff --git a/transitclockWebapp/src/main/webapp/synoptic/index.jsp b/transitclockWebapp/src/main/webapp/synoptic/index.jsp
@@ -291,6 +291,8 @@ function routeConfigCallback(routeDetail, status)
 			var stop=routeDetail.routes[0].direction[i].stop[j];
 			distanceOverPath+=stop.pathLength;
 			var projectionStop=distanceOverPath/routeLenght;
+			if(stop.direction==undefined)
+				stop.direction="0";
 			var directionStop=(stop.direction==routeDetail.routes[0].direction[i].id=="0")?0:1;
 			stops.push({id: stop.id, identifier: stop.name,projection:projectionStop,direction:directionStop,distance:distanceOverPath});
 		}