Merge pull request #40 from TheTransitClock/tc_issue_38

Fix #38. Extra add prediction left in during merge now removed.
TheTransitClock · Jan 30, 2018 · cb369a9 · cb369a9
2 parents 9b161a9 + fc673f5
commit cb369a9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/transitclock/src/main/java/org/transitclock/core/PredictionGeneratorDefaultImpl.java b/transitclock/src/main/java/org/transitclock/core/PredictionGeneratorDefaultImpl.java
@@ -476,7 +476,7 @@ public List<IpcPrediction> generate(VehicleState vehicleState) {
 			if (!lastStopOfNonSchedBasedTrip
 					&& predictionForStop.getPredictionTime() > now) {
 
-				newPredictions.add(predictionForStop);
+
 				logger.info("Generated prediction {} based on avlreport {}.", predictionForStop, avlReport);
 
 

diff --git a/transitclockWebapp/src/main/webapp/map/map.jsp b/transitclockWebapp/src/main/webapp/map/map.jsp
@@ -45,7 +45,7 @@
 
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 
-  <title>Transitime Map</title>
+  <title>TheTransitClock Map</title>
 </head>
 
 <body>

diff --git a/transitclockWebapp/src/main/webapp/maps/index.jsp b/transitclockWebapp/src/main/webapp/maps/index.jsp
@@ -21,10 +21,10 @@ if (agencyId == null || agencyId.isEmpty()) {
 <div id="mainDiv">
 <div id="title">Real-time Maps for <%= WebAgency.getCachedWebAgency(agencyId).getAgencyName() %></div>
 <ul class="choicesList">
-  <li><a href="../maps/map.jsp?a=<%= agencyId %>"
+  <li><a href="../maps/map.jsp?verbose=true&a=<%= agencyId %>"
     title="Real-time map for selected route">
       Map for Selected Route</a></li>
-  <li><a href="../maps/map.jsp?a=<%= agencyId %>&showUnassignedVehicles=true"
+  <li><a href="../maps/map.jsp?verbose=true&a=<%= agencyId %>&showUnassignedVehicles=true"
     title="Real-time map for selected route but also shows vehicles not currently assigned to a route">
       Map Including Unassigned Vehicles</a></li>
   <li><a href="../maps/schAdhMap.jsp?a=<%= agencyId %>"