diff --git a/transitclock/src/main/java/org/transitclock/ipc/data/IpcRoute.java b/transitclock/src/main/java/org/transitclock/ipc/data/IpcRoute.java index d3d43bbee..49c77fedd 100644 --- 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 index bfae658a5..8eab07a62 100644 --- 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}); }