From 643fc3c2e9465123611cc5f166f2dabe4d5fad14 Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Thu, 1 Jul 2021 22:36:47 +0200
Subject: [PATCH 01/14] Improving translations, adding OSM with configuration,
 some mysql error fix

---
 .../org/transitclock/i18n/text.properties     |  39 +-
 .../org/transitclock/i18n/text_pl.properties  |  45 ++-
 .../src/main/webapp/map/javascript/avlMap.js  |   2 +-
 .../src/main/webapp/map/map.jsp               |   3 +-
 .../src/main/webapp/map/testMap.html          |   3 +-
 .../src/main/webapp/reports/avlMap.jsp        |   2 +-
 .../reports/javascript/avlMapJavascript.jsp   | 366 ++++++++++++++++++
 .../src/main/webapp/reports/lastAvlReport.jsp |   2 +-
 .../main/webapp/reports/params/vehicle.jsp    |   2 +-
 .../reports/predAccuracyIntervalsChart.jsp    |  18 +-
 .../webapp/reports/predAccuracyRangeChart.jsp |  30 +-
 .../webapp/reports/schAdhByRouteChart.jsp     |  42 +-
 .../main/webapp/reports/schAdhByStopChart.jsp |  43 +-
 .../main/webapp/reports/schAdhByTimeChart.jsp |  34 +-
 .../main/webapp/reports/schAdhByTimeData.jsp  |   2 +-
 .../reports/scheduleHorizStopsReport.jsp      |   5 +-
 16 files changed, 552 insertions(+), 86 deletions(-)
 create mode 100644 transitclockWebapp/src/main/webapp/reports/javascript/avlMapJavascript.jsp

diff --git a/transitclockWebapp/src/main/resources/org/transitclock/i18n/text.properties b/transitclockWebapp/src/main/resources/org/transitclock/i18n/text.properties
index 9b5aaea3e..36e62dc32 100644
--- a/transitclockWebapp/src/main/resources/org/transitclock/i18n/text.properties
+++ b/transitclockWebapp/src/main/resources/org/transitclock/i18n/text.properties
@@ -200,4 +200,41 @@ div.Adh = Adh:
 div.Headsign = Headsign
 div.Start = Start:
 div.End = End:
-div.Service = Service:
\ No newline at end of file
+div.Service = Service:
+PredictionAccuracyRangeFor = Prediction Accuracy Range for
+PredictionAccuracyRangeForRoute = route 
+Predictions = predictions
+PlurarDaySuffix = s
+DayGenitive = day
+Days = days
+NoDataForParameters = No data for requested parameters. Hit back button to try other parameters.
+PredictionsWithinRange = % of Predictions Within Range
+PredictionLengthInMinutes = Prediction Length (minutes)
+Error = Error
+EarlierThanPredicted_MoreThan = Earlier than predicted (more than
+SecsEarly_ = secs early)
+WithinBounds_ = Within Bounds (
+SecsEarlyTo = secs early to
+SecsLate_ = secs late)
+LaterThanPredicted_MoreThan = Later than predicted (more than
+PredictionAccuracySecs = Prediction Accuracy (secs) (positive means vehicle later than predicted)
+EarlierThanPredicted = Earlier than predicted
+SecsEarly = secs early
+WithinBounds = Within Bounds
+SecsLate = secs late
+LaterThanPredicted = Later than predicted
+Points = points
+TooLate = Too Late
+AllVehicles = All Vehicles
+AssigmentId = Assigment ID
+MinEarlyTo = min early to
+To = to
+Stops = stops
+StopsBig = Stops
+ScheduleAdherenceFor = Schedule Adherence for
+EarlyLate = Early/Late
+StopsUnderEq4ForVehiclesThatAre = stops for vehicles that are
+StopsOver4ForVehiclesThatAre = stops for vehicles that are
+NumberOfStopsPerTimeInterval = Number of stops per time interval
+MinutesVehicleLateNOrEarlyPositive = Minutes vehicle late (negative) or early (positive)
+Undefined = undefined
\ No newline at end of file
diff --git a/transitclockWebapp/src/main/resources/org/transitclock/i18n/text_pl.properties b/transitclockWebapp/src/main/resources/org/transitclock/i18n/text_pl.properties
index 47f897370..feb4b60c6 100644
--- a/transitclockWebapp/src/main/resources/org/transitclock/i18n/text_pl.properties
+++ b/transitclockWebapp/src/main/resources/org/transitclock/i18n/text_pl.properties
@@ -65,8 +65,8 @@ div.veh = Pojazdy
 div.roude = Szczeg\u00f3\u0142y trasy
 div.rou = Trasy
 div.spfpbla = Wybierz parametry dla przeiwdywania lokacji API
-div.lat = D\u0142ugo\u015b\u0107 geograficzna:
-div.lon = Szeroko\u015b\u0107 geograficzna:
+div.lat = D\u0142ugo\u015b\u0107 geograficzna
+div.lon = Szeroko\u015b\u0107 geograficzna
 div.md = Maksymalny dystans:
 div.mdf = metry ( domy\u015blnie 1500m )
 div.np = Prognoza numer\u00f3w:
@@ -140,7 +140,7 @@ div.spdavld = Wybierz parametry by wy\u015bwietli\u0107 dane AVL na mapie wed\u0
 div.spdavlbv = Wybierz parametry by wy\u015bwietli\u0107 dane AVL na mapie wed\u0142ug pojazdu
 div.lgpsr = Ostatnie raporty GPS przez ostatnie 24 godziny
 div.spfsr = Wybierz parametry dla raportu rozk\u0142adu
-div.lgps = Last GPS
+div.lgps = Data ostatniego odczytu
 div.selectroute = Wybierz lini\u0119
 div.droute = Linia
 div.dstop = Przystanek
@@ -200,4 +200,41 @@ div.Adh = Odch.:
 div.Headsign = Kierunek
 div.Start = Start:
 div.End = Koniec:
-div.Service = Kalendarz:
\ No newline at end of file
+div.Service = Kalendarz:
+PredictionAccuracyRangeFor = Wykres zakresu dok\u0142adno\u015Bci prognozy dla linii
+PredictionAccuracyRangeForRoute = 
+Predictions = prognozy
+DayGenitive = dnia
+Days = dni
+NoDataForParameters = Brak danych dla wybranych parametrów. Cofnij i wybierz inne parametry.
+PredictionsWithinRange = % prognoz w zakresie
+PredictionLengthInMinutes = D\u0142ugo\u015B\u0107 prognozy (w minutach)
+Error = B\u0142\u0105d
+EarlierThanPredicted_MoreThan = Wcze\u015Bniej ni\u017C prognozowano(>
+SecsEarly_ = sekund wcze\u015Bniej)
+WithinBounds_ = W zakresie (od
+SecsEarlyTo = sekund wcze\u015Bniej do
+SecsLate_ = sekund pó\u017Aniej)
+LaterThanPredicted_MoreThan = Pó\u017Aniej ni\u017C prognozowano (>
+PredictionAccuracySecs = Dok\u0142adno\u015B\u0107 prognozy (sek) (warto\u015B\u0107 pozytywna oznacza pojazd pó\u017Aniej ni\u017C prognozowano)
+EarlierThanPredicted = Wcze\u015Bniej ni\u017C prognozowano
+SecsEarly = sekund wcze\u015Bniej
+WithinBounds = W zakresie
+SecsLate = sekund pó\u017Aniej
+LaterThanPredicted = Pó\u017Aniej ni\u017C prognozowano
+Points = punktów
+TooLate = Za pó\u017Ano
+AllVehicles = Wszystkie pojazdy
+TimeProc = Czas proces.
+AssigmentId = Assigment ID
+MinEarlyTo = min wcze\u015Bniej do
+To = do
+Stops = przystanków
+StopsBig = Przystanki
+ScheduleAdherenceFor = Przestrzeganie rozk\u0142adu dla
+EarlyLate = Wcze\u015Bniej/Pó\u017Aniej
+StopsUnderEq4ForVehiclesThatAre = przystanki dla pojazdów, które s\u0105 od
+StopsOver4ForVehiclesThatAre = przystanków dla pojazdów, które s\u0105 od
+NumberOfStopsPerTimeInterval = Liczba przystanków na interwa\u0142 czasowy
+MinutesVehicleLateNOrEarlyPositive = Minut pojazd pó\u017Aniej (negatywna) lub wcze\u015Bniej (pozytywna)
+Undefined = nieokre\u015Blony
\ No newline at end of file
diff --git a/transitclockWebapp/src/main/webapp/map/javascript/avlMap.js b/transitclockWebapp/src/main/webapp/map/javascript/avlMap.js
index 8e68439fd..616c5e8d8 100644
--- a/transitclockWebapp/src/main/webapp/map/javascript/avlMap.js
+++ b/transitclockWebapp/src/main/webapp/map/javascript/avlMap.js
@@ -40,7 +40,7 @@ function drawAvlMarker(avl) {
 	
   	// Create popup with detailed info
 	
-	var labels = ["Vehicle", "GPS Time", "Time Proc", "Lat/Lon", "Speed", "Heading", "Assignment ID"],
+	var labels = ["Vehicles", "GPS Time", "Time Proc", "Lat/Lon", "Speed", "Heading", "Assignment ID"],
 		keys = ["vehicleId", "time", "timeProcessed", "latlon", "niceSpeed", "heading", "assignmentId"];
 	
 	// populate missing keys
diff --git a/transitclockWebapp/src/main/webapp/map/map.jsp b/transitclockWebapp/src/main/webapp/map/map.jsp
index ef0fb955a..e6cd317c4 100644
--- a/transitclockWebapp/src/main/webapp/map/map.jsp
+++ b/transitclockWebapp/src/main/webapp/map/map.jsp
@@ -800,9 +800,10 @@ if (!agencyId)
 	alert("You must specify agency in URL using a=agencyId parameter");
  
 // Create the map with a scale and specify which map tiles to use
+var mapTileUrl = <%=System.getProperty("transitclock.mapTileUrl")%>
 var map = L.map('map');
 L.control.scale({metric: false}).addTo(map);
-L.tileLayer('http://api.tiles.mapbox.com/v4/transitime.j1g5bb0j/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoidHJhbnNpdGltZSIsImEiOiJiYnNWMnBvIn0.5qdbXMUT1-d90cv1PAIWOQ', {
+L.tileLayer(mapTileUrl, {
 	// Specifying a shorter version of attribution. Original really too long.
     //attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',
     attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> &amp; <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',
diff --git a/transitclockWebapp/src/main/webapp/map/testMap.html b/transitclockWebapp/src/main/webapp/map/testMap.html
index 4d062764c..b5c8a2487 100644
--- a/transitclockWebapp/src/main/webapp/map/testMap.html
+++ b/transitclockWebapp/src/main/webapp/map/testMap.html
@@ -48,9 +48,10 @@
   
   <script>
   //Create the map with a scale and specify which map tiles to use
+  var mapTileUrl = <%=System.getProperty("transitclock.mapTileUrl")%>
   var map = L.map('map');
   L.control.scale({metric: false}).addTo(map);
-  L.tileLayer('http://api.tiles.mapbox.com/v4/transitime.j1g5bb0j/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoidHJhbnNpdGltZSIsImEiOiJiYnNWMnBvIn0.5qdbXMUT1-d90cv1PAIWOQ', {
+  L.tileLayer(mapTileUrl, {
   	// Specifying a shorter version of attribution. Original really too long.
       //attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',
       attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> &amp; <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',
diff --git a/transitclockWebapp/src/main/webapp/reports/avlMap.jsp b/transitclockWebapp/src/main/webapp/reports/avlMap.jsp
index 6d121c5fd..78b26ce6b 100644
--- a/transitclockWebapp/src/main/webapp/reports/avlMap.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/avlMap.jsp
@@ -60,6 +60,6 @@
 var request = {<%= WebUtils.getAjaxDataString(request) %>},
 	contextPath = "<%= request.getContextPath() %>";
 </script>
-<script src="<%= request.getContextPath() %>/map/javascript/avlMap.js"></script>
+<jsp:include page="javascript/avlMapJavascript.jsp" />
 </html>
 
diff --git a/transitclockWebapp/src/main/webapp/reports/javascript/avlMapJavascript.jsp b/transitclockWebapp/src/main/webapp/reports/javascript/avlMapJavascript.jsp
new file mode 100644
index 000000000..c9f6ecddb
--- /dev/null
+++ b/transitclockWebapp/src/main/webapp/reports/javascript/avlMapJavascript.jsp
@@ -0,0 +1,366 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<c:set var="language" value="" scope="session" />
+<fmt:setLocale value="${not empty param.language ? param.language : not empty language ? language : pageContext.request.locale}" />
+<fmt:requestEncoding value = "UTF-8" />
+<fmt:setBundle basename="org.transitclock.i18n.text" />
+    
+<script>
+$("#route").attr("style", "width: 200px");
+
+/* For drawing the route and stops */
+var routeOptions = {
+	color: '#00ee00',
+	weight: 4,
+	opacity: 0.4,
+	lineJoin: 'round',
+	clickable: false
+};
+				
+ var stopOptions = {
+    color: '#006600',
+    opacity: 0.4,
+    radius: 4,
+    weight: 2,
+    fillColor: '#006600',
+    fillOpacity: 0.3,
+};
+
+var routePolylineOptions = {clickable: false, color: "#00f", opacity: 0.5, weight: 4};
+
+var stopPopupOptions = {closeButton: false};
+
+function drawAvlMarker(avl) {
+	var latLng = L.latLng(avl.lat, avl.lon);
+	  
+	// Create the marker. Use a divIcon so that can have tooltips
+  	var tooltip = avl.time.substring(avl.time.indexOf(' ') + 1);  
+  	var avlMarker = L.rotatedMarker(avl, {
+          icon: L.divIcon({
+        	  className: 'avlMarker_',
+        	  html: "<div class='avlTriangle' />",
+        	  iconSize: [7,7]
+          }),
+          angle: avl.heading,
+          title: tooltip
+      }).addTo(vehicleGroup); 
+	
+  	// Create popup with detailed info
+	
+	var labels = ["<fmt:message key='div.Vehicle' />", "<fmt:message key='div.dgpstime' />", "<fmt:message key='TimeProc' />", "Lat/Lon", 
+		"<fmt:message key='div.dspeed' />", "<fmt:message key='div.dheading' />", "<fmt:message key='AssigmentId' />"],
+		keys = ["vehicleId", "time", "timeProcessed", "latlon", "niceSpeed", "heading", "assignmentId"];
+	
+	// populate missing keys
+	avl.latlon = avl.lat + ", " + avl.lon
+	avl.niceSpeed =  Math.round(parseFloat(avl.speed) * 10)/10 + " kph";
+	
+	var content = $("<table />").attr("class", "popupTable");
+	
+	for (var i = 0; i < labels.length; i++) {
+		var label = $("<td />").attr("class", "popupTableLabel").text(labels[i] + ": ");
+		var value = $("<td />").text(avl[keys[i]]);
+		content.append( $("<tr />").append(label, value) )
+	}
+		
+	avlMarker.bindPopup(content[0]);
+  	
+	return avlMarker;
+}
+  
+/* Called when receiving the AVL data via AJAX call */
+function processAvlCallback(jsonData) {
+	 
+	/* Save avl data */ 
+	
+    // List of all the latLngs
+    var latLngs = [];
+
+    // So can draw separate polyline per vehicle
+    var previousVehicleId = "";
+    var latLngsForVehicle = [];
+    
+    // reset list of vehicles
+    var vehicles = [];
+    
+    // For each AVL report...
+    var vehicle;
+    for (var i=0; i<jsonData.data.length; ++i) {
+    	var avl = jsonData.data[i];
+    	
+    	// If getting data for new vehicle then need to draw out polyline 
+    	// for the old vehicle
+		if (avl.vehicleId != previousVehicleId) {		    
+	    	// Create a line connecting the AVL locations as long as there are 
+	    	// at least 2 AVL reports for the vehicle
+	    	if (latLngsForVehicle.length >= 2)
+	    		L.polyline(latLngsForVehicle, routePolylineOptions).addTo(map); //.bringToBack();
+	    	latLngsForVehicle = [];
+	    	vehicle = {id: avl.vehicleId, data: []}
+	    	vehicles.push(vehicle);
+		} 
+		
+    	// parse date string -> number
+    	avl.timestamp = Date.parse(avl.time.replace(/-/g, '/').slice(0,-2))
+    	
+		vehicle.data.push(avl)
+		previousVehicleId = avl.vehicleId;
+		
+		var latLng = drawAvlMarker(avl).getLatLng();
+
+		latLngsForVehicle.push(latLng);
+		latLngs.push(latLng);
+    }
+    
+    // Draw polyline for the last vehicle in the AVL data
+    if (latLngsForVehicle.length >= 2)
+    	L.polyline(latLngsForVehicle, routePolylineOptions).addTo(vehicleGroup); //.bringToBack();
+    
+    // If actually read AVL data...
+    if (latLngs.length > 0) {
+    	// To make all AVL reports fit in bounds of map.
+    	map.fitBounds(latLngs);
+  	} else {
+		alert("No AVL data for the criteria specified.")
+  	}
+	return vehicles;
+}
+
+  
+/**
+ * Reads in route data obtained via AJAX and draws route and stops on map.
+ */
+function routeConfigCallback(data, status) {
+	// Draw the paths for the route
+	
+	var route = data.routes[0];
+	
+	for (var i=0; i<route.shape.length; ++i) {
+		var shape = route.shape[i];
+		L.polyline(shape.loc, routeOptions).addTo(routeGroup);
+	}
+	  
+  	// Draw stops for the route. 
+  	for (var i=0; i<route.direction.length; ++i) {
+  		var direction = route.direction[i];
+  		for (var j=0; j<direction.stop.length; ++j) {
+  			var stop = direction.stop[j];
+  			
+  			// Create the stop Marker
+  			var stopMarker = L.circleMarker([stop.lat,stop.lon], stopOptions).addTo(routeGroup);
+  					
+  			// Create popup for stop marker
+  
+  			var content = $("<table />").attr("class", "popupTable");
+  			var labels = ["Stop ID", "Name"], keys = ["id", "name"];
+  			for (var i = 0; i < labels.length; i++) {
+  				var label = $("<td />").attr("class", "popupTableLabel").text(labels[i] + ": ");
+  				var value = $("<td />").text(stop[keys[i]]);
+  				content.append( $("<tr />").append(label, value) );
+  			}
+  			
+  			stopMarker.bindPopup(content[0]);
+  		}
+   	 }
+}
+  
+// Data in vehicles will be available as CSV when you click the `export' link.
+// CSV should be the AVL CSV format used elsewhere in Transitime.
+// org.transitclock.avl.AvlCsvWriter writes the following header:
+// vehicleId,time,justTime,latitude,longitude,speed,heading,assignmentId,assignmentType
+// org.transitclock.avl.AvlCsvRecord has required keys vehicleId, time, latitude, longitude
+// all others optional
+function createExport(vehicles) {
+	
+	var data = vehicles[0].data
+  	
+  	// set keys
+	var keys = ["vehicleId", "time", "latitude", "longitude", "speed", "heading", "assignmentId"]
+	// CSV key => JS object key
+	function mapKey(k) {
+		var o = {"latitude": "lat", "longitude": "lon"}
+		return o[k] || k;
+	}
+	
+  	// write header
+  	var text = keys[0];
+  	for (var i = 1; i < keys.length; i++)
+  		text += "," + keys[i]
+  	text += '\n'
+  	
+  	// write rows
+  	for (var i = 0; i < data.length; i++) {
+  		text += data[i][keys[0]]
+  		for (var j = 1; j < keys.length; j++) {
+  			var k = mapKey(keys[j])
+  			text += "," + data[i][k]
+  		}
+  		text += "\n";
+  	}
+  	
+  	var blob = new Blob([text], { type: 'text/plain' }); // change to text/csv for download prompt
+  	$("#exportData")[0].href = window.URL.createObjectURL(blob);
+ }
+ 
+//Add a new layer for only route/bus markers, so that it can be refreshed
+//when selections change without having to redraw tiles.
+var map = L.map('map');
+var mapTileUrl = <%=System.getProperty("transitclock.mapTileUrl")%>
+L.control.scale({metric: false}).addTo(map);
+L.tileLayer(mapTileUrl, {
+ attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> &amp; <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',
+ maxZoom: 19
+}).addTo(map);
+
+//fit map to agency boundaries.
+$.getJSON(apiUrlPrefix + "/command/agencyGroup", function(agencies) {
+	var e = agencies.agency[0].extent;
+	map.fitBounds([[e.minLat, e.minLon], [e.maxLat, e.maxLon]]);
+})
+.fail(function(request, status, error) {
+  alert(error + '. ' + request.responseText);
+});
+
+
+var vehicleGroup = L.layerGroup().addTo(map);
+var routeGroup = L.layerGroup().addTo(map);
+var animationGroup = L.layerGroup().addTo(map);
+
+//Set the CLIP_PADDING to a higher value so that when user pans on map
+//the route path doesn't need to be redrawn. Note: leaflet documentation
+//says that this could decrease drawing performance. But hey, it looks
+//better.
+L.Path.CLIP_PADDING = 0.8;0
+
+if (request.v || request.r) {
+	// Request exists; set all the controls to match the values in the request.
+	$("#vehicle").val(request.v).trigger("change");
+	$("#beginDate").val(request.beginDate).trigger("change");
+	$("#numDays").val(parseInt(request.numDays)).trigger("change");
+	$("#beginTime").val(request.beginTime).trigger("change");
+	$("#endTime").val(request.endTime).trigger("change");
+	$("#route").val(request.r).trigger("change");
+	
+	//draw vehicles if there is already request information
+	if (request.v) {
+		drawAvlData();
+	}
+	if (request.r && request.r != "")
+		drawRoute(request.r);
+	
+}
+else {
+	// no request
+	// set beginDate and endDate to defaults
+	request.beginDate = $("#beginDate").val()
+	request.numDays = $("#numDays").val()
+}
+
+// draw route data when dropdown is selected
+$("#route").change(function(evt) { drawRoute(evt.target.value) });
+
+// draw AVL data when submit button is clicked
+$("#submit").on("click", function() {
+	/* Set request object to match new values */
+	request.v = $("#vehicle").val();
+	request.beginDate = $("#beginDate").val();
+	request.numDays = $("#numDays").val();
+	request.beginTime = $("#beginTime").val();
+	request.endTime = $("#endTime").val();
+	request.r = $("#route").val();
+
+	// Clear existing layer and draw new objects on map.
+	drawAvlData();	
+});
+
+
+//Get the AVL data via AJAX and call processAvlCallback to draw it
+function drawAvlData() {
+	$.ajax({
+	  	// The page being requested
+	    url: contextPath + "/reports/avlJsonData.jsp",
+		// Pass in query string parameters to page being requested
+		data: request,
+		// Needed so that parameters passed properly to page being requested
+		traditional: true,
+	    dataType:"json",
+	    async: true,
+	    // When successful process JSON data
+	    success: function(resp) {
+	    	vehicleGroup.clearLayers();
+	    	var vehicles = processAvlCallback(resp);
+	    	// connect export to link to csv creation.
+	    	createExport(vehicles);
+	    	if (vehicles.length)
+	    		prepareAnimation(vehicles[0].data); // only animate first vehicle returned.
+	    },
+	    // When there is an AJAX problem alert the user
+	    error: function(request, status, error) {
+	      alert(error + '. ' + request.responseText);
+	    },
+	});
+}
+
+function drawRoute(route) {
+	routeGroup.clearLayers();
+	if (route != "") {
+		var url = apiUrlPrefix + "/command/routesDetails?r=" + route;
+		$.getJSON(url, routeConfigCallback);
+	}
+}
+
+/* Animation controls */
+
+var busIcon =  L.icon({
+    iconUrl:  contextPath + "/reports/images/bus.png", 
+    iconSize: [25,25]
+});
+var animate = avlAnimation(animationGroup, busIcon, $("#playbackTime")[0]);
+
+var playButton = contextPath + "/reports/images/playback/media-playback-start.svg",
+	pauseButton = contextPath + "/reports/images/playback/media-playback-pause.svg";
+
+animate.onEnd(function() {
+	$("#playbackPlay").attr("src", playButton);
+})
+
+// Given a list of AVL positions, initialize the animation object.
+function prepareAnimation(avlData) {
+
+	// Make sure animation controls are in their initial state.
+	$("#playbackPlay").attr("src", playButton);
+	$("#playbackRate").text("1X");
+	
+	animate(avlData);
+
+}
+
+$("#playbackNext").on("click", animate.next);
+
+$("#playbackPrev").on("click", animate.prev);
+
+$("#playbackPlay").on("click", function() {
+	
+	if (!animate.paused()) {
+		animate.pause();
+		$("#playbackPlay").attr("src", playButton);
+	}
+	else { // need to start it
+		animate.start();
+		$("#playbackPlay").attr("src", pauseButton);
+	}
+	
+});
+
+$("#playbackFF").on("click", function() {
+	var rate = animate.rate()*2;
+	animate.rate(rate);
+	$("#playbackRate").text(rate + "X");
+});
+
+$("#playbackRew").on("click", function() {
+	var rate = animate.rate()/2;
+	animate.rate(rate);
+	$("#playbackRate").text(rate + "X");
+});
+</script>
diff --git a/transitclockWebapp/src/main/webapp/reports/lastAvlReport.jsp b/transitclockWebapp/src/main/webapp/reports/lastAvlReport.jsp
index f6e00434c..faeec31b7 100644
--- a/transitclockWebapp/src/main/webapp/reports/lastAvlReport.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/lastAvlReport.jsp
@@ -56,7 +56,7 @@ $( document ).ready(function() {
 <%@include file="/template/header.jsp" %>
 <div id="title"><fmt:message key="div.lgpsr" /></div>
 <table id="dataTable">
-  <tr><th><fmt:message key="div.Vehicle" /></th><th><fmt:message key="div.lgps" /></th></tr>
+  <tr><th><fmt:message key="div.Vehicle" /></th><th><fmt:message key="div.lgps" /></th><th><fmt:message key="div.lat" /></th><th><fmt:message key="div.lon" /></th></tr>
   </table>
 </body>
 </html>
\ No newline at end of file
diff --git a/transitclockWebapp/src/main/webapp/reports/params/vehicle.jsp b/transitclockWebapp/src/main/webapp/reports/params/vehicle.jsp
index a36365b2f..8a966b96d 100644
--- a/transitclockWebapp/src/main/webapp/reports/params/vehicle.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/params/vehicle.jsp
@@ -22,7 +22,7 @@
 $.getJSON(apiUrlPrefix + "/command/vehicleIds", 
  		function(vehicles) {
 	        // Generate list of routes for the selector
-	 		var selectorData = [{id: '', text: 'All Vehicles'}];
+	 		var selectorData = [{id: '', text: '<fmt:message key="AllVehicles" />'}];
 	 		for (var i in vehicles.ids) {
 	 			var id = vehicles.ids[i];
 	 			selectorData.push({id: id, text: id})
diff --git a/transitclockWebapp/src/main/webapp/reports/predAccuracyIntervalsChart.jsp b/transitclockWebapp/src/main/webapp/reports/predAccuracyIntervalsChart.jsp
index 62e44937d..cb22e882a 100644
--- a/transitclockWebapp/src/main/webapp/reports/predAccuracyIntervalsChart.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/predAccuracyIntervalsChart.jsp
@@ -2,10 +2,13 @@
     pageEncoding="UTF-8"%>
 
 <%@ page import="org.transitclock.utils.web.WebUtils" %>
+<%@page import="java.util.ResourceBundle" %>
+<%@page import="java.util.Locale" %>
 <%@page import="org.transitclock.db.webstructs.WebAgency"%>
 
 <%     
 // Determine all the parameters from the query string
+ResourceBundle labels = ResourceBundle.getBundle("org.transitclock.i18n.text", request.getLocale());
 
 // Determine agency using "a" param
 String agencyId = request.getParameter("a");
@@ -15,7 +18,7 @@ String agencyId = request.getParameter("a");
 String routeIds[] = request.getParameterValues("r");
 String titleRoutes = "";
 if (routeIds != null && !routeIds[0].isEmpty()) {
-    titleRoutes += ", route ";
+    titleRoutes += ", " + labels.getString("PredictionAccuracyRangeForRoute");
     if (routeIds.length > 1) 
         titleRoutes += "s";
     titleRoutes += routeIds[0];
@@ -27,7 +30,10 @@ if (routeIds != null && !routeIds[0].isEmpty()) {
 
 String sourceParam = request.getParameter("source");
 String source = (sourceParam != null && !sourceParam.isEmpty()) ? 
-	", " + sourceParam + " predictions" : ""; 
+		request.getLocale().toString() == "pl_PL" ? 
+				", " + labels.getString("Predictions") + " " + sourceParam 
+				: ", " + sourceParam + " " + labels.getString("Predictions") 
+			: "";  
 String beginDate = request.getParameter("beginDate");
 String numDays = request.getParameter("numDays");
 String beginTime = request.getParameter("beginTime");
@@ -37,7 +43,7 @@ String chartTitle = "Prediction Accuracy for "
 	+ WebAgency.getCachedWebAgency(agencyId).getAgencyName()   
 	+ titleRoutes 
 	+ source 
-	+ ", " + beginDate + " for " + numDays + " day" + (Integer.parseInt(numDays) > 1 ? "s" : "");
+	+ ", " + beginDate + " " + labels.getString("div.for") + " " + numDays + " " + (Integer.parseInt(numDays) > 1 ? labels.getString("Days") : labels.getString("DayGenitive"));
 
 if ((beginTime != null && !beginTime.isEmpty()) || (endTime != null && !endTime.isEmpty())) {
 	chartTitle += ", " + beginTime + " to " + endTime;
@@ -124,7 +130,7 @@ if ((beginTime != null && !beginTime.isEmpty()) || (endTime != null && !endTime.
         // When there is an AJAX problem alert the user
         error: function(request, status, error) {
         	console.log(request.responseText)
-        	var msg = $("<p>").html("<br>No data for requested parameters. Hit back button to try other parameters.")
+        	var msg = $("<p>").html("<br><fmt:message key='NoDataForParameters' />")
      		$("#errorMessage").append(msg);
 			$("#errorMessage").fadeIn("slow");
           },
@@ -155,7 +161,7 @@ if ((beginTime != null && !beginTime.isEmpty()) || (endTime != null && !endTime.
             	// Make chart a bit graay so that it stands out
             	backgroundColor: '#f2f2f2'},
             hAxis: {
-            	title: 'Prediction Length (minutes)',
+            	title: '<fmt:message key="PredictionLengthInMinutes" />',
             	// So that last column is labeled
             	maxValue: 15,
             	// Want a gridline for every minute, not just the default of 5 gridlines
@@ -163,7 +169,7 @@ if ((beginTime != null && !beginTime.isEmpty()) || (endTime != null && !endTime.
        	        // Nice to show a faint line for every 30 seconds as well
             	minorGridlines: {count: 1}
        	    },
-            vAxis: {title: 'Prediction Accuracy (secs) (postive means vehicle later than predicted)',
+            vAxis: {title: '<fmt:message key="PredictionAccuracySecs" />',
             	// Try to show accuracy on a consistent vertical axis and 
             	// divide into minutes. This unfortunately won't work well
             	// if values are greater than 300 because then chart will
diff --git a/transitclockWebapp/src/main/webapp/reports/predAccuracyRangeChart.jsp b/transitclockWebapp/src/main/webapp/reports/predAccuracyRangeChart.jsp
index cf0a97c52..9c94aa61f 100644
--- a/transitclockWebapp/src/main/webapp/reports/predAccuracyRangeChart.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/predAccuracyRangeChart.jsp
@@ -1,9 +1,12 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
 <%@ page import="org.transitclock.utils.web.WebUtils" %>
+<%@page import="java.util.ResourceBundle" %>
+<%@page import="java.util.Locale" %>
 <%@page import="org.transitclock.db.webstructs.WebAgency"%>
 <%     
 // Determine all the parameters from the query string
+ResourceBundle labels = ResourceBundle.getBundle("org.transitclock.i18n.text", request.getLocale());
 
 // Determine agency using "a" param
 String agencyId = request.getParameter("a");
@@ -13,7 +16,7 @@ String agencyId = request.getParameter("a");
 String routeIds[] = request.getParameterValues("r");
 String titleRoutes = "";
 if (routeIds != null && !routeIds[0].isEmpty()) {
-    titleRoutes += ", route ";
+    titleRoutes += ", " + labels.getString("PredictionAccuracyRangeForRoute");
     if (routeIds.length > 1) 
         titleRoutes += "s";
     titleRoutes += routeIds[0];
@@ -25,18 +28,21 @@ if (routeIds != null && !routeIds[0].isEmpty()) {
 
 String sourceParam = request.getParameter("source");
 String source = (sourceParam != null && !sourceParam.isEmpty()) ? 
-	", " + sourceParam + " predictions" : ""; 
+	request.getLocale().toString() == "pl_PL" ? 
+			", " + labels.getString("Predictions") + " " + sourceParam 
+			: ", " + sourceParam + " " + labels.getString("Predictions") 
+		: ""; 
 String beginDate = request.getParameter("beginDate");
 String numDays = request.getParameter("numDays");
 if (numDays == null) numDays = "1";
 String beginTime = request.getParameter("beginTime");
 String endTime = request.getParameter("endTime");
 
-String chartTitle = "Prediction Accuracy Range for " 
+String chartTitle = labels.getString("PredictionAccuracyRangeFor") + " " 
     + WebAgency.getCachedWebAgency(agencyId).getAgencyName()   
 	+ titleRoutes 
 	+ source 
-	+ ", " + beginDate + " for " + numDays + " day" + (Integer.parseInt(numDays) > 1 ? "s" : "");
+	+ ", " + beginDate + " " + labels.getString("div.for") + " " + numDays + " " + (Integer.parseInt(numDays) > 1 ? labels.getString("Days") : labels.getString("DayGenitive"));
 	
 if ((beginTime != null && !beginTime.isEmpty()) || (endTime != null && !endTime.isEmpty())) {
 	chartTitle += ", " + beginTime + " to " + endTime;
@@ -129,7 +135,7 @@ function getDataTable() {
      // When there is an AJAX problem alert the user
      error: function(request, status, error) {
         console.log(request.responseText)
-        var msg = $("<p>").html("<br>No data for requested parameters. Hit back button to try other parameters.")
+        var msg = $("<p>").html("<br><fmt:message key='NoDataForParameters' />")
      	$("#errorMessage").append(msg);
         $("#errorMessage").fadeIn("slow");
        },
@@ -152,7 +158,7 @@ function drawChart() {
 	            	// Make chart a bit graay so that it stands out
 	            	backgroundColor: '#f2f2f2'},
 	         hAxis: {
-	            	title: 'Prediction Length (minutes)',
+	            	title: '<fmt:message key="PredictionLengthInMinutes" />',
 	            	// So that last column is labeled
 	            	maxValue: 15,
 	            	// Want a gridline for every minute, not just the default of 5 gridlines
@@ -161,7 +167,7 @@ function drawChart() {
 	            	minorGridlines: {count: 1}
 	       	    },
 	         vAxis: {
-	        	 title: '% of Predictions Within Range',
+	        	 title: '<fmt:message key="PredictionsWithinRange" />',
 	        	 maxValue: 100,
 	        	 // Specify ticks so that when column adds up to just over 100% the horizontal
 	        	 // part of chart not increased to 120% to accomodate it.
@@ -187,10 +193,10 @@ function parseSummary(data) {
 		results.push(d);
 	});
 	document.getElementById('summary').innerHTML = "Schedule Adherence over " + results[0] + " arrival and departures<br/>"
-	+ "Early: <b>" + results[1]
-	+ "</b>% OnTime: <b>" + results[2] 
-	+ "</b>% Late: <b>" + results[3] + "</b>%";
-	
+	+ "<fmt:message key='div.cearly' />" + ": <b>" + results[1] 
+	+ "</b>% <fmt:message key='div.contime' />: <b>" + results[2] 
+	+ "</b>% <fmt:message key='div.clate' />: <b>" + results[3] + "</b>%";
+
 }
 
 function formatQueryParams() {
@@ -201,7 +207,7 @@ function showSummary() {
 	$("#summary").show();
 	$.get("data/summaryScheduleAdherence.jsp?"+formatQueryParams(), parseSummary)
 	.fail(function() {
-		document.getElementById('summary').innerHTML ="Error!";
+		document.getElementById('summary').innerHTML ="<fmt:message key='div.error' />";
 	});
 }
 
diff --git a/transitclockWebapp/src/main/webapp/reports/schAdhByRouteChart.jsp b/transitclockWebapp/src/main/webapp/reports/schAdhByRouteChart.jsp
index 2e54b2e92..cf82e2fcf 100644
--- a/transitclockWebapp/src/main/webapp/reports/schAdhByRouteChart.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/schAdhByRouteChart.jsp
@@ -1,6 +1,8 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
 <%@ page import="org.transitclock.utils.web.WebUtils" %>
+<%@page import="java.util.ResourceBundle" %>
+<%@page import="java.util.Locale" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
@@ -50,11 +52,12 @@
   <%@include file="/template/header.jsp" %>
   
 <%
-  String dateRange = request.getParameter("beginDate") + " (+" + request.getParameter("numDays") + " days)";
-  String allowableEarly = request.getParameter("allowableEarly");;
-  String allowableLate = request.getParameter("allowableLate");;
-  String chartSubtitle = allowableEarly + " min early to " 
-  	+ allowableLate + " min late<br>" + dateRange;
+  ResourceBundle labels = ResourceBundle.getBundle("org.transitclock.i18n.text", request.getLocale());
+  String dateRange = request.getParameter("beginDate") + " (+" + request.getParameter("numDays") + " " + labels.getString("Days") + ")";
+  String allowableEarly = request.getParameter("allowableEarly");
+  String allowableLate = request.getParameter("allowableLate");
+  String chartSubtitle = allowableEarly + " " + labels.getString("MinEarlyTo") + " " 
+  	+ allowableLate + " " + labels.getString("div.minlate") + "<br>" + dateRange;
 
   String beginTime = request.getParameter("beginTime");
   String endTime = request.getParameter("endTime");
@@ -63,11 +66,10 @@
 		  beginTime = "00:00"; // default value
 	  if (endTime.isEmpty())
 		  endTime = "24:00";   // default value
-      chartSubtitle += ", " + beginTime + " to " + endTime;
+      chartSubtitle += ", " + beginTime + " " + labels.getString("To") + " "  + endTime;
   }  
 %>
-
-  <div id="title">Schedule Adherence by Route</div>
+  <div id="title"><fmt:message key="div.scheduleroutr" /></div>
   <div id="subtitle"><%= chartSubtitle %></div>
   <div id="chart_div"></div>
   <div id="loading"></div>
@@ -136,10 +138,10 @@ var globalNumberOfRoutes;
   function createDataTableAndDrawChart(jsonData) {
 	  // Initialize dataArray with the column info
 	  var dataArray = [[
-	                  'Route', 
-	                  'Late',    {role: 'style'}, { role: 'tooltip'}, { role: 'annotation'},
-	                  'On Time', {role: 'style'}, { role: 'tooltip'}, { role: 'annotation'},
-	                  'Early',   {role: 'style'}, { role: 'tooltip'}, { role: 'annotation'}
+	                  '<fmt:message key="div.droute" />', 
+	                  '<fmt:message key="div.clate" />',    {role: 'style'}, { role: 'tooltip'}, { role: 'annotation'},
+	                  '<fmt:message key="div.contime" />', {role: 'style'}, { role: 'tooltip'}, { role: 'annotation'},
+	                  '<fmt:message key="div.cearly" />',   {role: 'style'}, { role: 'tooltip'}, { role: 'annotation'}
 	                  ]];
 	  
 	  // Add data for each route to the dataArray
@@ -155,15 +157,15 @@ var globalNumberOfRoutes;
 		             route.name, 
 		             latePercent, 
 		             	'opacity: 1.0', 
-		             	'Late: ' + route.late + ' out of ' + route.total + ' stops', 
+		             	'<fmt:message key="div.clate" />' + ': ' + route.late + ' ' + '<fmt:message key="div.coutof" />' + ' ' + route.total + ' ' + '<fmt:message key="Stops" />', 
 		             	route.late > 0 ? latePercent.toFixed(1) + '%' : '',
 		             ontimePercent, 
 		             	'opacity: 1.0', 
-		             	'On time: ' + route.ontime + ' out of ' + route.total + ' stops', 
+		             	'<fmt:message key="div.contime" />' + ': ' + route.ontime + ' ' + '<fmt:message key="div.coutof" />' + ' ' + route.total + ' ' + '<fmt:message key="Stops" />', 
 	             	 	route.ontime > 0 ? ontimePercent.toFixed(1) + '%' : '',
 			         earlyPercent, 
 		             	'opacity: 1.0', 
-		             	'Early: ' + route.early + ' out of ' + route.total + ' stops', 
+		             	'<fmt:message key="div.cearly" />' + ': ' + route.early + ' ' + '<fmt:message key="div.coutof" />' + ' ' + route.total + ' ' + '<fmt:message key="Stops" />', 
 		             	(route.early > 0) ? earlyPercent.toFixed(1) + '%' : ''
 		             ];
 		  dataArray.push(dataArrayForRoute);
@@ -180,18 +182,18 @@ var globalNumberOfRoutes;
 		  var ontimePercent = (100.0 * totalOntime / totalTotal); 
 		  var latePercent = (100.0 * totalLate / totalTotal); 
 		  var dataArrayForRoute = [
-		     		 'Combined',
+		     		 '<fmt:message key="div.ccombined" />',
 		     		 latePercent, 
 		     		 	'opacity: 1.0', 
-		     		 	'Late: ' + totalLate + ' out of ' + totalTotal + ' stops', 
+		     		 	'<fmt:message key="div.clate" />' + ': ' + totalLate + ' ' + '<fmt:message key="div.coutof" />' + ' ' + totalTotal + ' ' + '<fmt:message key="Stops" />', 
 		     		 	latePercent.toFixed(1) + '%',
 			     	 ontimePercent, 
 			     	 	'opacity: 1.0', 
-			     	 	'On time: ' + totalOntime + ' out of ' + totalTotal + ' stops', 
+			     	 	'<fmt:message key="div.contime" />' + ': ' + totalOntime + ' ' + '<fmt:message key="div.coutof" />' + ' ' + totalTotal + ' ' + '<fmt:message key="Stops" />', 
 			     	 	ontimePercent.toFixed(1) + '%',
 		     		 earlyPercent, 
 		     		 	'opacity: 1.0', 
-		     		 	'Early: ' + totalEarly + ' out of ' + totalTotal + ' stops', 
+		     		 	'<fmt:message key="div.cearly" />' + ': ' + totalEarly + ' ' + '<fmt:message key="div.coutof" />' + ' ' + totalTotal + ' ' + '<fmt:message key="Stops" />', 
 		     		 	earlyPercent.toFixed(1) + '%'
 		     		 ];
 		  dataArray.push(dataArrayForRoute);		  
@@ -221,7 +223,7 @@ var globalNumberOfRoutes;
 	    // When there is an AJAX problem alert the user
 	    error: function(request, status, error) {
 	     	console.log(request.responseText)
-            var msg = $("<p>").html("<br>No data for requested parameters. Hit back button to try other parameters.")
+            var msg = $("<p>").html("<br><fmt:message key='NoDataForParameters' />")
             $("#errorMessage").append(msg);;
 	        $("#errorMessage").fadeIn("fast");
 	        $("#loading").fadeOut("slow");
diff --git a/transitclockWebapp/src/main/webapp/reports/schAdhByStopChart.jsp b/transitclockWebapp/src/main/webapp/reports/schAdhByStopChart.jsp
index 7438a7cdf..7b1a98d32 100644
--- a/transitclockWebapp/src/main/webapp/reports/schAdhByStopChart.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/schAdhByStopChart.jsp
@@ -1,6 +1,8 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
 <%@ page import="org.transitclock.utils.web.WebUtils" %>
+<%@page import="java.util.ResourceBundle" %>
+<%@page import="java.util.Locale" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
@@ -53,6 +55,7 @@
   <div id="subtitle"></div>
   <div class="chart_div" id="chart_direction_div_0"></div>
   <div class="chart_div" id="chart_direction_div_1"></div>
+  <div class="chart_div" id="chart_direction_div_undefined"></div>
   <div id="loading"></div>
   <div id="errorMessage"></div>
 </body>
@@ -66,9 +69,10 @@
 	  var vertSpaceForChart = (numberOfStops + 1) * 22;
 	  var chartDivHeight = vertSpaceForTitleAndHAxis + vertSpaceForChart;
       $("#" + divId).height(chartDivHeight);
+      var directionTitle = (directionId == 0 || directionId == 1) ? '<fmt:message key="div.ddirection" />' + ': ' + directionId : '';
       
         var options = {
-          title: 'Direction: ' + directionId, 
+          title: directionTitle,
           titleTextStyle: {
         	 fontSize: 22,
         	 bold: false
@@ -123,11 +127,11 @@
   function createDataTableAndDrawChartForDirection(stopsData) {
 	  // Initialize dataArray with the column info
 	  var dataArray = [[
-	                  'Stop', 
-	                  'Late',    {role: 'style'}, { role: 'tooltip'}, { role: 'annotation'},
-	                  'On Time', {role: 'style'}, { role: 'tooltip'}, { role: 'annotation'},
-	                  'Early',   {role: 'style'}, { role: 'tooltip'}, { role: 'annotation'}
-	                  ]];
+          			  '<fmt:message key="div.dstop" />', 
+          			  '<fmt:message key="div.clate" />',    {role: 'style'}, { role: 'tooltip'}, { role: 'annotation'},
+          			  '<fmt:message key="div.contime" />', {role: 'style'}, { role: 'tooltip'}, { role: 'annotation'},
+          			  '<fmt:message key="div.cearly" />',   {role: 'style'}, { role: 'tooltip'}, { role: 'annotation'}
+          			  ]];
 	  
 	  // Add data for each route to the dataArray
 	  var totalEarly = 0;
@@ -142,15 +146,15 @@
 		             stop.stop_name + ' ', 
 		             latePercent, 
 		             	'opacity: 1.0', 
-		             	'Late: ' + stop.late + ' out of ' + stop.total + ' times', 
+		             	'<fmt:message key="div.clate" />' + ': ' + stop.late + ' ' + '<fmt:message key="div.coutof" />' + ' ' + stop.total + ' ' + '<fmt:message key="div.ctimes" />', 
 		             	stop.late > 0 ? latePercent.toFixed(1) + '%' : '',
 		             ontimePercent, 
 		             	'opacity: 1.0', 
-		             	'On time: ' + stop.ontime + ' out of ' + stop.total + ' times', 
+		             	'<fmt:message key="div.contime" />' + ': ' + stop.ontime + ' ' + '<fmt:message key="div.coutof" />' + ' ' + stop.total + ' ' + '<fmt:message key="div.ctimes" />', 
 		             	stop.ontime > 0 ? ontimePercent.toFixed(1) + '%' : '',
 			         earlyPercent, 
 		             	'opacity: 1.0', 
-		             	'Early: ' + stop.early + ' out of ' + stop.total + ' times', 
+		             	'<fmt:message key="div.cearly" />' + ': ' + stop.early + ' ' + '<fmt:message key="div.coutof" />' + ' ' + stop.total + ' ' + '<fmt:message key="div.ctimes" />', 
 		             	(stop.early > 0) ? earlyPercent.toFixed(1) + '%' : ''
 		             ];
 		  dataArray.push(dataArrayForStop);
@@ -169,15 +173,15 @@
 	     		 'Total: ',
 	     		 latePercent, 
 	     		 	'opacity: 1.0', 
-	     		 	'Late: ' + totalLate + ' out of ' + totalTotal + ' times', 
+	     		 	'<fmt:message key="div.clate" />' + ': ' + totalLate + ' ' + '<fmt:message key="div.coutof" />' + ' ' + totalTotal + ' ' + '<fmt:message key="div.ctimes" />', 
 	     		 	latePercent.toFixed(1) + '%',
 		     	 ontimePercent, 
 		     	 	'opacity: 1.0', 
-		     	 	'On time: ' + totalOntime + ' out of ' + totalTotal + ' times', 
+		     	 	'<fmt:message key="div.contime" />' + ': ' + totalOntime + ' ' + '<fmt:message key="div.coutof" />' + ' ' + totalTotal + ' ' + '<fmt:message key="div.ctimes" />', 
 		     	 	ontimePercent.toFixed(1) + '%',
 	     		 earlyPercent, 
 	     		 	'opacity: 1.0', 
-	     		 	'Early: ' + totalEarly + ' out of ' + totalTotal + ' times', 
+	     		 	'<fmt:message key="div.cearly" />' + ': ' + totalEarly + ' ' + '<fmt:message key="div.coutof" />' + ' ' + totalTotal + ' ' + '<fmt:message key="div.ctimes" />', 
 	     		 	earlyPercent.toFixed(1) + '%'
 	     		 ];
 	  dataArray.push(dataArrayForStop);		  
@@ -226,11 +230,12 @@
 	var routeName = routeData.routes[0].name;
 		
 	  <%
-	  String dateRange = request.getParameter("beginDate") + " (+" + request.getParameter("numDays") + " days)";
-	  String allowableEarly = request.getParameter("allowableEarly");;
-	  String allowableLate = request.getParameter("allowableLate");;
+	  ResourceBundle labels = ResourceBundle.getBundle("org.transitclock.i18n.text", request.getLocale());
+	  String dateRange = request.getParameter("beginDate") + " (+" + request.getParameter("numDays") + " " + labels.getString("Days") + ")";
+	  String allowableEarly = request.getParameter("allowableEarly");
+	  String allowableLate = request.getParameter("allowableLate");
 	  String chartParams = 
-	    allowableEarly + " min early to " + allowableLate + " min late</br>" 
+	    allowableEarly + " " + labels.getString("MinEarlyTo") + " " + allowableLate + " " + labels.getString("div.minlate") + "<br>"
 		+ dateRange;
 	  
 	  String beginTime = request.getParameter("beginTime");
@@ -240,11 +245,11 @@
 			  beginTime = "00:00"; // default value
 		  if (endTime.isEmpty())
 			  endTime = "24:00";   // default value
-		  chartParams += ", " + beginTime + " to " + endTime;
+		  chartParams += ", " + beginTime + " " + labels.getString("To") + " "  + endTime;
 	  }
 	%>
 	  
-	$("#title").html('Schedule Adherence for ' + routeName);
+	$("#title").html('<fmt:message key="ScheduleAdherenceFor" />' + ' ' + routeName);
 	$("#subtitle").html('<%= chartParams %>');
   }
   
@@ -266,7 +271,7 @@
 	    // When there is an AJAX problem alert the user
 	    error: function(request, status, error) {
 	     	console.log(request.responseText)
-            var msg = $("<p>").html("<br>No data for requested parameters. Hit back button to try other parameters.")
+            var msg = $("<p>").html("<br><fmt:message key='NoDataForParameters' />")
             $("#errorMessage").append(msg);
 	        $("#errorMessage").fadeIn("fast");
 	        $("#loading").fadeOut("slow");
diff --git a/transitclockWebapp/src/main/webapp/reports/schAdhByTimeChart.jsp b/transitclockWebapp/src/main/webapp/reports/schAdhByTimeChart.jsp
index 2bfbf8038..c8637f0cc 100644
--- a/transitclockWebapp/src/main/webapp/reports/schAdhByTimeChart.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/schAdhByTimeChart.jsp
@@ -1,6 +1,8 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
 <%@ page import="org.transitclock.utils.web.WebUtils" %>
+<%@page import="java.util.ResourceBundle" %>
+<%@page import="java.util.Locale" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
   <head>
@@ -50,11 +52,12 @@
     <%@include file="/template/header.jsp" %>
   
   <%
-  String dateRange = request.getParameter("beginDate") + " (+" + request.getParameter("numDays") + " days)";
-  String allowableEarly = request.getParameter("allowableEarly");;
-  String allowableLate = request.getParameter("allowableLate");;
-  String chartSubtitle = allowableEarly + " min early to " 
-    + allowableLate + " min late</br>" 
+  ResourceBundle labels = ResourceBundle.getBundle("org.transitclock.i18n.text", request.getLocale());
+  String dateRange = request.getParameter("beginDate") + " (+" + request.getParameter("numDays") + " " + labels.getString("Days") + ")";
+  String allowableEarly = request.getParameter("allowableEarly");
+  String allowableLate = request.getParameter("allowableLate");
+  String chartSubtitle = allowableEarly + " " + labels.getString("MinEarlyTo") + " "
+    + allowableLate  + " " + labels.getString("div.minlate") + "</br>" 
 	+ dateRange;
   
   String beginTime = request.getParameter("beginTime");
@@ -65,7 +68,7 @@
 		  beginTime = "00:00"; // default value
 	  if (endTime.isEmpty())
 		  endTime = "24:00";   // default value
-		  chartSubtitle += ", " + beginTime + " to " + endTime;
+		  chartSubtitle += ", " + beginTime + " " + labels.getString("To") + " "  + endTime;
   }  
 %>
     <div id="title"></div>
@@ -97,8 +100,8 @@ function drawChart() {
 function createDataTableAndDrawChart(jsonData) {
     // Initialize the data array with the header that describes the columns
 	var dataArray = [[
-		'Early/Late', 
-		'Stops', 
+		'<fmt:message key="EarlyLate" />', 
+		'<fmt:message key="StopsBig" />', 
 		{ role: 'style' }, 
 		{ role: 'annotation' }, 
 		{ role: 'tooltip' }
@@ -137,13 +140,14 @@ function createDataTableAndDrawChart(jsonData) {
     	
     	var annotation = bucket.counts_per_time_period;
     	
-    	var tooltip = bucket.counts_per_time_period + ' stops for vehicles that are ';
+    	var tooltip = (bucket.counts_per_time_period > 4) ? '<fmt:message key="StopsOver4ForVehiclesThatAre" />' + ' ' :  '<fmt:message key="StopsUnderEq4ForVehiclesThatAre" />' + ' ' ;
+    	tooltip = bucket.counts_per_time_period + ' ' + tooltip;
     	if (bucket.time_period < 0) {
     		// vehicle late
-    		tooltip += -(bucket.time_period+30) + 's to ' + (-bucket.time_period) + 's late. ';
+    		tooltip += -(bucket.time_period+30) + 's ' + '<fmt:message key="To" />' + ' ' + (-bucket.time_period) + ' ' + '<fmt:message key="SecsLate" />' + '. ';
     	} else {
     		// vehicle early
-    		tooltip += bucket.time_period + 's to ' + (bucket.time_period+30) + 's early. ';
+    		tooltip += bucket.time_period + 's ' + '<fmt:message key="To" />' + ' ' + (bucket.time_period+30) + ' ' + '<fmt:message key="SecsEarly" />' + '. ';
     	}
     	
     	var row = [timeFloor, counts, style, annotation, tooltip];
@@ -177,12 +181,12 @@ function createDataTableAndDrawChart(jsonData) {
           chartArea: {top:10, width: '86%', height: '90%'},
           vAxis: {
         	  minValue: 0,
-        	  title: "Number of stops per time interval",
+        	  title: '<fmt:message key="NumberOfStopsPerTimeInterval" />',
         	  textStyle: {fontSize: 12},
         	  },
           hAxis: { 
         	  ticks: ticks,
-        	  title: "Minutes vehicle late (negative) or early (positive)",
+        	  title: '<fmt:message key="MinutesVehicleLateNOrEarlyPositive" />',
         	  // The chart always draws the baseline at value 0 over the chart.
         	  // Since the baseline isn't true zero, since using bars and 
         	  // putting tick marks at the edges of the bars, don't want this
@@ -207,7 +211,7 @@ function createDataTableAndDrawChart(jsonData) {
 function determineChartTitle(routeData) {
 	var agencyName = routeData.agency;
 	var routeName = routeData.routes[0].name;
-	$("#title").html('Schedule Adherence for ' + routeName);
+	$("#title").html('<fmt:message key="ScheduleAdherenceFor" />' + ' ' + routeName);
 }
 
 function getDataAndDrawChart() {
@@ -227,7 +231,7 @@ function getDataAndDrawChart() {
 	    // When there is an AJAX problem alert the user
 	    error: function(request, status, error) {
 	     	console.log(request.responseText)
-            var msg = $("<p>").html("<br>No data for requested parameters. Hit back button to try other parameters.")
+            var msg = $("<p>").html("<br><fmt:message key='NoDataForParameters' />")
             $("#errorMessage").append(msg);
 	        $("#errorMessage").fadeIn("fast");
 	        $("#loading").fadeOut("slow");
diff --git a/transitclockWebapp/src/main/webapp/reports/schAdhByTimeData.jsp b/transitclockWebapp/src/main/webapp/reports/schAdhByTimeData.jsp
index 6df4acf15..4be765530 100644
--- a/transitclockWebapp/src/main/webapp/reports/schAdhByTimeData.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/schAdhByTimeData.jsp
@@ -44,7 +44,7 @@ int BUCKET_TIME = 30;
 String epochCommandPre = "EXTRACT (EPOCH FROM ";
 String epochCommandPost = ")";
 if (isMysql) {
-  epochCommandPre = "UNIX_TIMESTAMP";
+  epochCommandPre = "";
   epochCommandPost = "";
 }
 String sql =
diff --git a/transitclockWebapp/src/main/webapp/reports/scheduleHorizStopsReport.jsp b/transitclockWebapp/src/main/webapp/reports/scheduleHorizStopsReport.jsp
index b3f933635..a0cd15d4e 100644
--- a/transitclockWebapp/src/main/webapp/reports/scheduleHorizStopsReport.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/scheduleHorizStopsReport.jsp
@@ -44,11 +44,12 @@ if (agencyId == null || agencyId.isEmpty()) {
 	      // Go through all service classes and directions for route
     	  for (var i=0; i<jsonData.schedule.length; ++i) {
     		  var schedule = jsonData.schedule[i];
+    		  var directionText = (schedule.directionId === undefined) ? '<fmt:message key="Undefined" />' : schedule.directionId;
     		  
     		  // Create title for schedule
     		  $('body').append("<div id='scheduleTitle'>" 
-                      + '<fmt:message key="div.ddirection" /> ' + schedule.directionId 
-    				  + ", Service: " + schedule.serviceName
+                      + '<fmt:message key="div.ddirection" /> ' + directionText 
+    				  + ", " + '<fmt:message key="div.Service" />' + " " + schedule.serviceName
     				  + "</div>");
 
     		  var table = $("<table id='dataTable'></table>").appendTo('body')[0];

From da83dd0ad83cd87ee58736391e89ac03e22ed919 Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Thu, 1 Jul 2021 22:44:17 +0200
Subject: [PATCH 02/14] Improving translations, some mysql error fix

---
 .../transitclock/reports/AvlJsonQuery.java    | 14 ++++++++--
 .../reports/ChartJsonBuilder.java             |  2 +-
 .../reports/PredAccuracyRangeQuery.java       | 28 +++++++++++++------
 .../reports/PredictionAccuracyQuery.java      |  3 ++
 .../org/transitclock/reports/SqlUtils.java    | 13 +++++++--
 5 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java b/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java
index 38cb214d6..2ac0a7540 100644
--- a/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java
+++ b/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java
@@ -67,11 +67,18 @@ public static String getAvlJson(String agencyId, String vehicleId,
 				+ beginTime + "' AND '" + endTime + "' ";
 		}
 
-		String sql = "SELECT vehicleId, time, assignmentId, lat, lon, speed, "
+		/*String sql = "SELECT vehicleId, time, assignmentId, lat, lon, speed, "
 				+ "heading, timeProcessed, source "
 				+ "FROM avlreports "
-				+ "WHERE time BETWEEN " + " cast(? as timestamp)"
-				+ " AND " + "cast(? as timestamp)"  + " + INTERVAL '" + numdays + " day' "
+				+ "WHERE time BETWEEN " + " cast(? as datetime)"
+				+ " AND " + "cast(? as datetime)"  + " + INTERVAL '" + numdays + " day' "
+				+ timeSql;*/
+		
+		String sql = "SELECT vehicleId, time, assignmentId, lat, lon, speed, "
+				+ "heading, timeProcessed, source "
+				+ "FROM avlreports "
+				+ "WHERE time BETWEEN " + " cast(? as datetime)"
+				+ " AND " + "date_add(cast(? as datetime), INTERVAL " + numdays + " day) "
 				+ timeSql;
 
 
@@ -86,6 +93,7 @@ public static String getAvlJson(String agencyId, String vehicleId,
 		// to view too much data at once.
 
 		sql += "ORDER BY vehicleId, time LIMIT " + MAX_ROWS;
+		
 		String json=null;
 		try {
 			java.util.Date startdate = Time.parseDate(beginDate);						
diff --git a/transitclockWebapp/src/main/java/org/transitclock/reports/ChartJsonBuilder.java b/transitclockWebapp/src/main/java/org/transitclock/reports/ChartJsonBuilder.java
index 5ea0b8336..70898dffe 100644
--- a/transitclockWebapp/src/main/java/org/transitclock/reports/ChartJsonBuilder.java
+++ b/transitclockWebapp/src/main/java/org/transitclock/reports/ChartJsonBuilder.java
@@ -79,7 +79,7 @@ public void addRowElement(String value) {
 		 *            The value of the element to be added to the row
 		 */
 		public void addRowElement(double value) {
-			String rowElement = "{\"v\": " + StringUtils.oneDigitFormat(value)
+			String rowElement = "{\"v\": " + StringUtils.oneDigitFormat(value).replace(",", ".")
 					+ "}";
 			rowElementsList.add(rowElement);
 		}
diff --git a/transitclockWebapp/src/main/java/org/transitclock/reports/PredAccuracyRangeQuery.java b/transitclockWebapp/src/main/java/org/transitclock/reports/PredAccuracyRangeQuery.java
index 52303dd6b..a5c69f384 100644
--- a/transitclockWebapp/src/main/java/org/transitclock/reports/PredAccuracyRangeQuery.java
+++ b/transitclockWebapp/src/main/java/org/transitclock/reports/PredAccuracyRangeQuery.java
@@ -18,6 +18,8 @@
 package org.transitclock.reports;
 
 import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.List;
 
@@ -26,6 +28,8 @@
 import org.transitclock.reports.ChartJsonBuilder.RowBuilder;
 import org.transitclock.utils.StringUtils;
 import org.transitclock.utils.Time;
+import java.util.ResourceBundle;
+import java.util.Locale;
 
 /**
  * For generating the JSON data for a Google chart for showing percent of
@@ -38,6 +42,8 @@ public class PredAccuracyRangeQuery extends PredictionAccuracyQuery {
 
 	private static final Logger logger = LoggerFactory
 			.getLogger(PredAccuracyRangeQuery.class);
+	
+	ResourceBundle labels = ResourceBundle.getBundle("org.transitclock.i18n.text", Locale.getDefault());
 
 	/********************** Member Functions **************************/
 
@@ -85,15 +91,15 @@ private void addCols(ChartJsonBuilder builder, int maxEarlySec,
 		}
 
 		builder.addNumberColumn();
-		builder.addNumberColumn("Earlier than predicted (more than " + maxEarlySec + " secs early)");
+		builder.addNumberColumn(labels.getString("EarlierThanPredicted_MoreThan") + " " + maxEarlySec + " " + labels.getString("SecsEarly_"));
 		builder.addTooltipColumn();
-		builder.addNumberColumn("Within Bounds (" + maxEarlySec + " secs early to "
-				+ maxLateSec + " secs late)");
+		builder.addNumberColumn(labels.getString("WithinBounds_") + " " + maxEarlySec + " " + labels.getString("SecsEarlyTo") + " "
+				+ maxLateSec + " " + labels.getString("SecsLate_"));
 		builder.addTooltipColumn();
-		builder.addNumberColumn("Later than predicted (more than " + maxLateSec + " secs late)");
+		builder.addNumberColumn(labels.getString("LaterThanPredicted_MoreThan") + maxLateSec + " " + labels.getString("SecsLate_"));
 		builder.addTooltipColumn();
 	}
-
+	
 	/**
 	 * Adds the row definition in JSON string format so that chart the data
 	 * using Google charts. The row definition contains the actual data.
@@ -154,17 +160,21 @@ else if (accuracyInSecs < maxLateSec)
 				rowBuilder.addRowElement(predBucketSecs);
 
 				rowBuilder.addRowElement(tooEarlyPercentage);
-				rowBuilder.addRowElement("Earlier than predicted: " + tooEarly + " points, "
+				
+				
+				ResourceBundle labels = ResourceBundle.getBundle("org.transitclock.i18n.text", Locale.getDefault());
+
+				rowBuilder.addRowElement(labels.getString("EarlierThanPredicted") + ": " + tooEarly + " " + labels.getString("Points") + ", "
 						+ StringUtils.oneDigitFormat(tooEarlyPercentage) + "%");
 
 				rowBuilder.addRowElement(okPercentage);
-				rowBuilder.addRowElement("Within Bounds: " + ok + " points, "
+				rowBuilder.addRowElement(labels.getString("WithinBounds") + ": " + ok + " " + labels.getString("Points") + ", "
 						+ StringUtils.oneDigitFormat(okPercentage) + "%");
 
 				rowBuilder.addRowElement(tooLatePercentage);
-				rowBuilder.addRowElement("Too Late: " + tooLate + " points, "
+				rowBuilder.addRowElement(labels.getString("TooLate") + ": " + tooLate + " " + labels.getString("Points") + ", "
 				    + StringUtils.oneDigitFormat(tooLatePercentage) + "%");
-				rowBuilder.addRowElement("Later than predicted: " + tooLate + " points, "
+				rowBuilder.addRowElement(labels.getString("LaterThanPredicted") + ": " + tooLate + " " + labels.getString("Points") + ", "
 						+ StringUtils.oneDigitFormat(tooLatePercentage) + "%");
 			}
 		}
diff --git a/transitclockWebapp/src/main/java/org/transitclock/reports/PredictionAccuracyQuery.java b/transitclockWebapp/src/main/java/org/transitclock/reports/PredictionAccuracyQuery.java
index 6c9531b66..b8a033bb1 100644
--- a/transitclockWebapp/src/main/java/org/transitclock/reports/PredictionAccuracyQuery.java
+++ b/transitclockWebapp/src/main/java/org/transitclock/reports/PredictionAccuracyQuery.java
@@ -382,6 +382,9 @@ protected void doQuery(String beginDateStr, String numDaysStr,
 			// Set the parameters for the query
 			int i = 1;
 			statement.setTimestamp(i++, beginDate);
+			if ("mysql".equals(dbType)) {
+				statement.setTimestamp(i++, beginDate);
+			}
 			
 			if (beginTime != null) {
 			  if ("mysql".equals(dbType)) {
diff --git a/transitclockWebapp/src/main/java/org/transitclock/reports/SqlUtils.java b/transitclockWebapp/src/main/java/org/transitclock/reports/SqlUtils.java
index 38a17083e..4414ef88f 100644
--- a/transitclockWebapp/src/main/java/org/transitclock/reports/SqlUtils.java
+++ b/transitclockWebapp/src/main/java/org/transitclock/reports/SqlUtils.java
@@ -17,6 +17,7 @@
 package org.transitclock.reports;
 
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -215,8 +216,16 @@ public static String timeRangeClause(HttpServletRequest request,
 				numDays = maxNumDays;
 			String sql = null;
 			if (isMysql) {
-			  sql = " AND " + timeColumnName + " BETWEEN '" + beginDate
-	          + "' " + " AND DATE_ADD(STR_TO_DATE('" + beginDate + "', '%Y-%m-%d'), INTERVAL "
+				String reformattedBeginDate = beginDate;
+				SimpleDateFormat currentFormat = new SimpleDateFormat("MM-dd-yyyy");
+				SimpleDateFormat requiredFormat = new SimpleDateFormat("yyyy-MM-dd");
+				try {
+				    reformattedBeginDate = requiredFormat.format(currentFormat.parse(beginDate));
+				} catch (ParseException e) {
+				    e.printStackTrace();
+				}
+			  sql = " AND " + timeColumnName + " BETWEEN '" + reformattedBeginDate
+	          + "' " + " AND DATE_ADD(STR_TO_DATE('" + reformattedBeginDate + "', '%Y-%m-%d'), INTERVAL "
 	          + numDays + " day) " + timeSql + ' ';
 			} else {
 			sql =" AND " + timeColumnName + " BETWEEN '" + beginDate

From ff5d6e722c7ce86bfe17cf3cfcd5f078ceecdd99 Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Tue, 13 Jul 2021 07:15:43 +0200
Subject: [PATCH 03/14] Add vehicleName, vehicleSpeed[traccar], popup fix

---
 .../core/dataCache/VehicleDataCache.java      | 11 ++-
 .../custom/traccar/TraccarAVLModule.java      | 10 ++-
 .../transitclock/db/structs/AvlReport.java    | 60 +++++++++++++
 .../db/structs/VehicleConfig.java             | 51 ++++++++++-
 .../org/transitclock/ipc/data/IpcVehicle.java | 86 ++++++++++++++++++-
 .../ipc/data/IpcVehicleConfig.java            |  9 +-
 .../ddl_mysql_org_transitime_db_structs.sql   |  1 +
 .../ddl_oracle_org_transitime_db_structs.sql  |  3 +-
 ...ddl_postgres_org_transitime_db_structs.sql |  3 +-
 .../api/data/ApiVehicleConfig.java            |  6 +-
 .../api/data/ApiVehicleDetails.java           |  6 +-
 .../transitclock/reports/AvlJsonQuery.java    | 24 ++++--
 .../src/main/webapp/maps/map.jsp              | 12 ++-
 .../main/webapp/reports/lastAvlJsonData.jsp   | 10 ++-
 .../src/main/webapp/reports/lastAvlReport.jsp |  2 +-
 .../main/webapp/reports/params/vehicle.jsp    |  9 +-
 16 files changed, 269 insertions(+), 34 deletions(-)

diff --git a/transitclock/src/main/java/org/transitclock/core/dataCache/VehicleDataCache.java b/transitclock/src/main/java/org/transitclock/core/dataCache/VehicleDataCache.java
index 82814700f..f5c69dfc5 100644
--- a/transitclock/src/main/java/org/transitclock/core/dataCache/VehicleDataCache.java
+++ b/transitclock/src/main/java/org/transitclock/core/dataCache/VehicleDataCache.java
@@ -27,6 +27,7 @@
 
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
+import org.hibernate.Transaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.transitclock.applications.Core;
@@ -180,7 +181,8 @@ public void cacheVehicleConfig(AvlReport avlReport) {
 		
 		// If new vehicle...
 		String vehicleId = avlReport.getVehicleId();
-		VehicleConfig vehicleConfig = new VehicleConfig(vehicleId);
+		String vehicleName = avlReport.getVehicleName();
+		VehicleConfig vehicleConfig = new VehicleConfig(vehicleId, vehicleName);
 		VehicleConfig absent = vehicleConfigsMap.putIfAbsent(vehicleId, vehicleConfig);
 		if (absent == null) {
 			logger.info("Encountered new vehicle where vehicleId={} so "
@@ -188,6 +190,13 @@ public void cacheVehicleConfig(AvlReport avlReport) {
 					+ "VehicleConfig to database.", vehicleId);
 			// Write the vehicle to the database
 			Core.getInstance().getDbLogger().add(vehicleConfig);
+		} else if(!vehicleName.equals(absent.getName())){
+			Session session = 
+					HibernateUtils.getSession(AgencyConfig.getAgencyId());
+			Transaction tx = session.beginTransaction();
+			absent.setName(vehicleName);
+			VehicleConfig.updateVehicleConfig(absent, session);
+			tx.commit();
 		}
 	}
     
diff --git a/transitclock/src/main/java/org/transitclock/custom/traccar/TraccarAVLModule.java b/transitclock/src/main/java/org/transitclock/custom/traccar/TraccarAVLModule.java
index 0d938c9f3..ba4769802 100644
--- a/transitclock/src/main/java/org/transitclock/custom/traccar/TraccarAVLModule.java
+++ b/transitclock/src/main/java/org/transitclock/custom/traccar/TraccarAVLModule.java
@@ -27,6 +27,7 @@
 import org.transitclock.avl.PollUrlAvlModule;
 import org.transitclock.config.StringConfigValue;
 import org.transitclock.db.structs.AvlReport;
+import org.transitclock.db.structs.Location;
 import org.transitclock.db.structs.AvlReport.AssignmentType;
 import io.swagger.client.ApiClient;
 import io.swagger.client.api.DefaultApi;
@@ -91,18 +92,19 @@ protected void getAndProcessData() throws Exception {
 				Device device=findDeviceById(devices, result.getDeviceId());
 				
 				AvlReport avlReport = null;
+				
 				// If have device details use name.
-				if(device!=null && device.getName()!=null && !device.getName().isEmpty())
+				if(device!=null && device.getUniqueId()!=null && !device.getUniqueId().isEmpty())
 				{
-					 avlReport = new AvlReport(device.getName(),
+					 avlReport = new AvlReport(device.getUniqueId().toString(), device.getName(),
 							result.getDeviceTime().toDate().getTime(), result.getLatitude().doubleValue(),
-							result.getLongitude().doubleValue(), traccarSource.toString());
+							result.getLongitude().doubleValue(), result.getSpeed().floatValue(), result.getCourse().floatValue(), traccarSource.toString());
 				}
 				else
 				{
 					 avlReport = new AvlReport(result.getDeviceId().toString(),
 						result.getDeviceTime().toDate().getTime(), result.getLatitude().doubleValue(),
-						result.getLongitude().doubleValue(), traccarSource.toString());
+						result.getLongitude().doubleValue(), result.getSpeed().floatValue(), result.getCourse().floatValue(), traccarSource.toString());
 				}
 				if(avlReport!=null)
 					avlReportsReadIn.add(avlReport);
diff --git a/transitclock/src/main/java/org/transitclock/db/structs/AvlReport.java b/transitclock/src/main/java/org/transitclock/db/structs/AvlReport.java
index e89233c1d..48e848279 100644
--- a/transitclock/src/main/java/org/transitclock/db/structs/AvlReport.java
+++ b/transitclock/src/main/java/org/transitclock/db/structs/AvlReport.java
@@ -171,6 +171,7 @@ public enum AssignmentType {
 	@Column(length=HibernateUtils.DEFAULT_ID_SIZE)
 	String field1Value;
 	
+	private String vehicleName;
 	
 	// How long the AvlReport source field can be in db
 	private static final int SOURCE_LENGTH = 10;
@@ -212,6 +213,7 @@ protected AvlReport() {
 		passengerFullness = null;
 		field1Name = null;
 		field1Value = null;
+		vehicleName = null;
 	}
 	
 	/**
@@ -259,6 +261,54 @@ public AvlReport(String vehicleId, long time, double lat, double lon,
 		this.timeProcessed = null;
 	}
 	
+	/**
+	 * Constructor for an AvlReport object that is not yet being processed.
+	 * Since not yet being processed timeProcessed is set to null.
+	 * 
+	 * @param vehicleId
+	 *            ID of the vehicle
+	 * @param vehicleName
+	 *            Name of the vehicle
+	 * @param time
+	 *            Epoch time in msec of GPS report (not when processed)
+	 * @param lat
+	 *            Latitude in decimal degrees
+	 * @param lon
+	 *            Longitude in decimal degrees
+	 * @param speed
+	 *            Speed of vehicle in m/s. Should be set to Float.NaN if speed
+	 *            not available
+	 * @param heading
+	 *            Heading of vehicle in degrees clockwise from north. Should be
+	 *            set to Float.NaN if speed not available
+	 * @param source
+	 *            Text describing the source of the report
+	 */
+	public AvlReport(String vehicleId, String vehicleName, long time, double lat, double lon, 
+			float speed, float heading, String source) {
+		// Store the values
+		this.vehicleId = vehicleId;
+		this.time = new Date(time);
+		this.location = new Location(lat, lon);
+		// DB requires null instead of NaN
+		this.speed = Float.isNaN(speed) ? null : speed;
+		this.heading = Float.isNaN(heading) ? null : heading;
+		this.source = sized(source);
+		this.assignmentId = null;
+		this.assignmentType = AssignmentType.UNSET;
+		this.leadVehicleId = null;
+		this.driverId = null;
+		this.licensePlate = null;
+		this.passengerCount = null;
+		this.passengerFullness = null;
+		this.field1Name = null;
+		this.field1Value = null;
+		this.vehicleName = vehicleName;
+		
+		// Don't yet know when processed so set timeProcessed to null
+		this.timeProcessed = null;
+	}
+	
 	/**
 	 * Constructor for an AvlReport object that is not yet being processed.
 	 * Since not yet being processed timeProcessed is set to null.
@@ -1030,6 +1080,16 @@ public String getField1Name() {
 	public String getField1Value() {
 		return field1Value;
 	}
+	
+	
+
+	public String getVehicleName() {
+		return vehicleName;
+	}
+
+	public void setVehicleName(String vehicleName) {
+		this.vehicleName = vehicleName;
+	}
 
 	/**
 	 * Returns true if the AVL report is configured to indicate that it was
diff --git a/transitclock/src/main/java/org/transitclock/db/structs/VehicleConfig.java b/transitclock/src/main/java/org/transitclock/db/structs/VehicleConfig.java
index 8c80c2c8f..ee7c6609c 100644
--- a/transitclock/src/main/java/org/transitclock/db/structs/VehicleConfig.java
+++ b/transitclock/src/main/java/org/transitclock/db/structs/VehicleConfig.java
@@ -27,6 +27,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.Query;
 import org.hibernate.Session;
+import org.hibernate.Transaction;
 import org.hibernate.annotations.DynamicUpdate;
 import org.transitclock.db.hibernate.HibernateUtils;
 
@@ -44,6 +45,9 @@ public class VehicleConfig {
 	@Id
 	private final String id;
 	
+	@Column
+	private String name;
+	
 	// Same as vehicle type in GTFS
 	@Column
 	private final Integer type;
@@ -87,6 +91,26 @@ public VehicleConfig(String id) {
 		capacity = null;
 		crushCapacity = null;
 		nonPassengerVehicle = null;
+		name = null;
+	}
+	
+	/**
+	 * Constructor for when new vehicle encountered and automatically adding it
+	 * to the db.
+	 * 
+	 * @param id vehicle ID
+	 * @param name vehicle name
+	 *
+	 */
+	public VehicleConfig(String id, String name) {
+		this.id = id;
+		type = null;
+		description = null;
+		trackerId = null;
+		capacity = null;
+		crushCapacity = null;
+		nonPassengerVehicle = null;
+		this.name = name;
 	}
 
 	/**
@@ -101,6 +125,7 @@ private VehicleConfig() {
 		capacity = null;
 		crushCapacity = null;
 		nonPassengerVehicle = null;
+		name = null;
 	}
 
 	/**
@@ -118,10 +143,24 @@ public static List<VehicleConfig> getVehicleConfigs(Session session)
 		return query.list();
 	}
 	
+	/**
+	 * Reads List of VehicleConfig objects from database
+	 * 
+	 * @param VehicleConfig, session
+	 * @throws HibernateException
+	 */
+	public static void updateVehicleConfig(VehicleConfig vehicleConfig, Session session) 
+			throws HibernateException {
+		//Transaction tx = session.beginTransaction();
+		session.update(vehicleConfig);
+		//tx.commit();
+	}
+	
 	@Override
 	public String toString() {
 		return "VehicleConfig [" 
 				+ "id=" + id 
+				+ "name=" + name 
 				+ ", type=" + type 
 				+ ", description=" + description
 				+ ", trackerId=" + trackerId
@@ -192,5 +231,15 @@ public Integer getCrushCapacity() {
 	public Boolean isNonPassengerVehicle() {
 		return nonPassengerVehicle;
 	}
-	
+
+	/**
+	 * @return the vehicle name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 }
diff --git a/transitclock/src/main/java/org/transitclock/ipc/data/IpcVehicle.java b/transitclock/src/main/java/org/transitclock/ipc/data/IpcVehicle.java
index 422da6ca1..a9ea44dc3 100644
--- a/transitclock/src/main/java/org/transitclock/ipc/data/IpcVehicle.java
+++ b/transitclock/src/main/java/org/transitclock/ipc/data/IpcVehicle.java
@@ -52,6 +52,8 @@ public class IpcVehicle implements Serializable {
 	public boolean isAtStop() {
 		return isAtStop;
 	}
+	
+	private String vehicleName;
 
 	private final String blockId;
 	private final BlockAssignmentMethod blockAssignmentMethod;
@@ -96,6 +98,7 @@ public boolean isAtStop() {
 	 * @param vs
 	 */
 	public IpcVehicle(VehicleState vs) {
+		this.vehicleName = vs.getVehicleName();
 		this.blockAssignmentMethod = vs.getAssignmentMethod();
 		this.avl = new IpcAvl(vs.getAvlReport());
 		this.heading = vs.getHeading();
@@ -257,6 +260,74 @@ protected IpcVehicle(String blockId,
 		this.predictedLongitude = predictedLongitude;
 
 	}
+	
+	/**
+	 * Constructor used for when deserializing a proxy object. Declared
+	 * protected because only used internally by the proxy class but also for
+	 * sub class.
+	 * 
+	 * @param blockId
+	 * @param blockAssignmentMethod
+	 * @param avl
+	 * @param pathHeading
+	 * @param routeId
+	 * @param routeShortName
+	 * @param routeName
+	 * @param tripId
+	 * @param tripPatternId
+	 * @param directionId
+	 * @param headsign
+	 * @param predictable
+	 * @param schedBasedPred
+	 * @param realTimeSchdAdh
+	 * @param isDelayed
+	 * @param isLayover
+	 * @param layoverDepartureTime
+	 * @param nextStopId
+	 * @param nextStopName
+	 * @param vehicleType
+	 * @param freqStartTime
+	 */
+	protected IpcVehicle(String blockId, String vehicleName,
+			BlockAssignmentMethod blockAssignmentMethod, IpcAvl avl,
+			float heading, String routeId, String routeShortName,
+			String routeName, String tripId, String tripPatternId,
+			String directionId, String headsign, boolean predictable,
+			boolean schedBasedPred, TemporalDifference realTimeSchdAdh,
+			boolean isDelayed, boolean isLayover, long layoverDepartureTime,
+
+			String nextStopId, String nextStopName, String vehicleType, long freqStartTime, boolean isAtStop, IpcHoldingTime holdingTime, double predictedLatitude, double predictedLongitude) {
+
+		this.vehicleName = vehicleName;
+		this.blockId = blockId;
+		this.blockAssignmentMethod = blockAssignmentMethod;
+		this.avl = avl;
+		this.heading = heading;
+		this.routeId = routeId;
+		this.routeShortName = routeShortName;
+		this.routeName = routeName;
+		this.tripId = tripId;
+		this.tripPatternId = tripPatternId;
+		this.directionId = directionId;
+		this.headsign = headsign;
+		this.predictable = predictable;
+		this.schedBasedPred = schedBasedPred;
+		this.realTimeSchedAdh = realTimeSchdAdh;
+		this.isDelayed = isDelayed;
+		this.isLayover = isLayover;
+		this.layoverDepartureTime = layoverDepartureTime;
+		this.nextStopId = nextStopId;
+		this.nextStopName = nextStopName;
+		this.vehicleType = vehicleType;
+
+		this.freqStartTime = freqStartTime;
+		this.isAtStop = isAtStop;
+		this.holdingTime = holdingTime;
+
+		this.predictedLatitude = predictedLatitude;
+		this.predictedLongitude = predictedLongitude;
+
+	}
 
 	/*
 	 * SerializationProxy is used so that this class can be immutable and so
@@ -265,6 +336,7 @@ protected IpcVehicle(String blockId,
 	protected static class SerializationProxy implements Serializable {
 		// Exact copy of fields of IpcVehicle enclosing class object
 		protected String blockId;
+		protected String vehicleName;
 		protected BlockAssignmentMethod blockAssignmentMethod;
 		protected IpcAvl avl;
 		protected float heading;
@@ -300,6 +372,7 @@ protected static class SerializationProxy implements Serializable {
 		 * Only to be used within this class.
 		 */
 		protected SerializationProxy(IpcVehicle v) {
+			this.vehicleName = v.vehicleName;
 			this.blockId = v.blockId;
 			this.blockAssignmentMethod = v.blockAssignmentMethod;
 			this.avl = v.avl;
@@ -340,6 +413,7 @@ protected void writeObject(java.io.ObjectOutputStream stream)
 				throws IOException {
 		    stream.writeShort(currentSerializationVersion);
 		    
+		    stream.writeObject(vehicleName);
 			stream.writeObject(blockId);
 			stream.writeObject(blockAssignmentMethod);
 			stream.writeObject(avl);
@@ -388,6 +462,7 @@ protected void readObject(java.io.ObjectInputStream stream)
 
 			// serialization version is OK so read in object
 			blockId = (String) stream.readObject();
+			vehicleName = (String) stream.readObject();
 			blockAssignmentMethod = (BlockAssignmentMethod) stream.readObject();
 			avl = (IpcAvl) stream.readObject();
 			heading = stream.readFloat();
@@ -422,7 +497,7 @@ protected void readObject(java.io.ObjectInputStream stream)
 		 * object is converted to an enclosing class object.
 		 */
 		private Object readResolve() {
-			return new IpcVehicle(blockId, blockAssignmentMethod, avl, heading,
+			return new IpcVehicle(blockId, vehicleName, blockAssignmentMethod, avl, heading,
 					routeId, routeShortName, routeName, tripId, tripPatternId,
 					directionId, headsign, predictable, schedBasedPred,
 					realTimeSchdAdh, isDelayed, isLayover, layoverDepartureTime,
@@ -589,11 +664,20 @@ public String getNextStopName() {
 	public String getVehicleType() {
 		return vehicleType;		
 	}
+	
+	public String getVehicleName() {
+		return vehicleName;
+	}
+	
+	public void setVehicleName(String vehicleName) {
+		this.vehicleName = vehicleName;
+	}
 
 	@Override
 	public String toString() {
 		return "IpcVehicle [" 
 				+ "vehicleId=" + avl.getVehicleId() 
+				+ ", vehicleName=" + vehicleName
 				+ ", blockId=" + blockId 
 				+ ", blockAssignmentMethod=" + blockAssignmentMethod
 				+ ", routeId=" + routeId 
diff --git a/transitclock/src/main/java/org/transitclock/ipc/data/IpcVehicleConfig.java b/transitclock/src/main/java/org/transitclock/ipc/data/IpcVehicleConfig.java
index 5aca83639..1a67a50f0 100644
--- a/transitclock/src/main/java/org/transitclock/ipc/data/IpcVehicleConfig.java
+++ b/transitclock/src/main/java/org/transitclock/ipc/data/IpcVehicleConfig.java
@@ -35,7 +35,8 @@ public class IpcVehicleConfig implements Serializable {
 	private final Integer capacity;
 	private final Integer crushCapacity;
 	private final Boolean nonPassengerVehicle;
-
+	private final String name;
+	
 	private static final long serialVersionUID = 4172266751162647909L;
 	
 	/********************** Member Functions **************************/
@@ -47,6 +48,7 @@ public IpcVehicleConfig(VehicleConfig vc) {
 		this.capacity = vc.getCapacity();
 		this.crushCapacity = vc.getCrushCapacity();
 		this.nonPassengerVehicle = vc.isNonPassengerVehicle();
+		this.name = vc.getName();
 	}
 
 	public String getId() {
@@ -73,6 +75,10 @@ public Boolean isNonPassengerVehicle() {
 		return nonPassengerVehicle;
 	}
 
+	public String getName() {
+		return name;
+	}
+
 	@Override
 	public String toString() {
 		return "IpcVehicleConfig [" 
@@ -82,6 +88,7 @@ public String toString() {
 				+ ", capacity=" + capacity
 				+ ", crushCapacity=" + crushCapacity 
 				+ ", nonPassengerVehicle="	+ nonPassengerVehicle 
+				+ ", name=" + name
 				+ "]";
 	}
 }
diff --git a/transitclock/src/main/resources/ddl_mysql_org_transitime_db_structs.sql b/transitclock/src/main/resources/ddl_mysql_org_transitime_db_structs.sql
index 819223bd1..5e0325397 100644
--- a/transitclock/src/main/resources/ddl_mysql_org_transitime_db_structs.sql
+++ b/transitclock/src/main/resources/ddl_mysql_org_transitime_db_structs.sql
@@ -429,6 +429,7 @@
 
     create table VehicleConfigs (
         id varchar(60) not null,
+        name varchar(255),
         capacity integer,
         crushCapacity integer,
         description varchar(255),
diff --git a/transitclock/src/main/resources/ddl_oracle_org_transitime_db_structs.sql b/transitclock/src/main/resources/ddl_oracle_org_transitime_db_structs.sql
index 6f0c49cc4..cf7a776c5 100644
--- a/transitclock/src/main/resources/ddl_oracle_org_transitime_db_structs.sql
+++ b/transitclock/src/main/resources/ddl_oracle_org_transitime_db_structs.sql
@@ -262,7 +262,7 @@
         id varchar2(60 char) not null,
         configRev number(10,0) not null,
         color varchar2(10 char),
-        description varchar2(1024 char),
+        description varchar2(2048 char),
         maxLat double precision,
         maxLon double precision,
         minLat double precision,
@@ -429,6 +429,7 @@
 
     create table VehicleConfigs (
         id varchar2(60 char) not null,
+        name varchar2(255 char),
         capacity number(10,0),
         crushCapacity number(10,0),
         description varchar2(255 char),
diff --git a/transitclock/src/main/resources/ddl_postgres_org_transitime_db_structs.sql b/transitclock/src/main/resources/ddl_postgres_org_transitime_db_structs.sql
index 33cce163c..d3ecb2a29 100644
--- a/transitclock/src/main/resources/ddl_postgres_org_transitime_db_structs.sql
+++ b/transitclock/src/main/resources/ddl_postgres_org_transitime_db_structs.sql
@@ -262,7 +262,7 @@
         id varchar(60) not null,
         configRev int4 not null,
         color varchar(10),
-        description varchar(1024),
+        description varchar(2048),
         maxLat float8,
         maxLon float8,
         minLat float8,
@@ -429,6 +429,7 @@
 
     create table VehicleConfigs (
         id varchar(60) not null,
+        name varchar(255),
         capacity int4,
         crushCapacity int4,
         description varchar(255),
diff --git a/transitclockApi/src/main/java/org/transitclock/api/data/ApiVehicleConfig.java b/transitclockApi/src/main/java/org/transitclock/api/data/ApiVehicleConfig.java
index 6e75b8ee0..365ff6634 100644
--- a/transitclockApi/src/main/java/org/transitclock/api/data/ApiVehicleConfig.java
+++ b/transitclockApi/src/main/java/org/transitclock/api/data/ApiVehicleConfig.java
@@ -31,7 +31,7 @@
  */
 @XmlRootElement(name = "vehicleConfig")
 @XmlType(propOrder = { "id", "type", "description", "capacity",
-		"crushCapacity", "nonPassengerVehicle" })
+		"crushCapacity", "nonPassengerVehicle", "name" })
 public class ApiVehicleConfig {
 
 	@XmlAttribute
@@ -52,6 +52,9 @@ public class ApiVehicleConfig {
 	@XmlAttribute
 	private Boolean nonPassengerVehicle;
 	
+	@XmlAttribute
+	private String name;
+	
 	/********************** Member Functions **************************/
 
 	/**
@@ -68,6 +71,7 @@ public ApiVehicleConfig(IpcVehicleConfig vehicle) {
 		this.capacity = vehicle.getCapacity();
 		this.crushCapacity = vehicle.getCrushCapacity();
 		this.nonPassengerVehicle = vehicle.isNonPassengerVehicle();
+		this.name = vehicle.getName();
 	}
 
 }
diff --git a/transitclockApi/src/main/java/org/transitclock/api/data/ApiVehicleDetails.java b/transitclockApi/src/main/java/org/transitclock/api/data/ApiVehicleDetails.java
index 7ca1ed6be..425b8639c 100644
--- a/transitclockApi/src/main/java/org/transitclock/api/data/ApiVehicleDetails.java
+++ b/transitclockApi/src/main/java/org/transitclock/api/data/ApiVehicleDetails.java
@@ -39,7 +39,7 @@
  *
  */
 @XmlRootElement
-@XmlType(propOrder = { "id", "routeId", "routeShortName", "routeName", "headsign",
+@XmlType(propOrder = { "id", "vehicleName", "routeId", "routeShortName", "routeName", "headsign",
 		"directionId", "vehicleType", "uiType", "schedBasedPreds", "loc",
 		"scheduleAdherence", "scheduleAdherenceStr", "blockId",
 		"blockAssignmentMethod", "tripId", "tripPatternId", "isDelayed",
@@ -50,6 +50,9 @@ public class ApiVehicleDetails extends ApiVehicleAbstract {
 	@XmlAttribute
 	private String routeName;
 	
+	@XmlAttribute
+	private String vehicleName;
+	
 	// Note: needs to be Integer instead of an int because it can be null
 	// (for vehicles that are not predictable)
 	@XmlAttribute(name = "schAdh")
@@ -138,6 +141,7 @@ public ApiVehicleDetails(IpcVehicle vehicle, Time timeForAgency, UiMode... uiTyp
 		super(vehicle, uiType.length > 0 ? uiType[0] : UiMode.NORMAL);
 		
 		routeName = vehicle.getRouteName();
+		vehicleName = vehicle.getVehicleName();
 		scheduleAdherence = vehicle.getRealTimeSchedAdh() != null ? vehicle
 				.getRealTimeSchedAdh().getTemporalDifference() : null;
 		scheduleAdherenceStr = vehicle.getRealTimeSchedAdh() != null ? vehicle
diff --git a/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java b/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java
index 2ac0a7540..da606814f 100644
--- a/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java
+++ b/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java
@@ -18,6 +18,7 @@
 
 import java.text.ParseException;
 
+import org.transitclock.db.webstructs.WebAgency;
 import org.transitclock.utils.Time;
 
 /**
@@ -66,21 +67,26 @@ public static String getAvlJson(String agencyId, String vehicleId,
 			timeSql = " AND time(time) BETWEEN '" 
 				+ beginTime + "' AND '" + endTime + "' ";
 		}
-
-		/*String sql = "SELECT vehicleId, time, assignmentId, lat, lon, speed, "
-				+ "heading, timeProcessed, source "
-				+ "FROM avlreports "
-				+ "WHERE time BETWEEN " + " cast(? as datetime)"
-				+ " AND " + "cast(? as datetime)"  + " + INTERVAL '" + numdays + " day' "
-				+ timeSql;*/
 		
-		String sql = "SELECT vehicleId, time, assignmentId, lat, lon, speed, "
+		String sql = "";		
+		WebAgency agency = WebAgency.getCachedWebAgency(agencyId);
+		
+		if ("mysql".equals(agency.getDbType())) {
+			sql = "SELECT vehicleId, name, time, assignmentId, lat, lon, speed, "
 				+ "heading, timeProcessed, source "
 				+ "FROM avlreports "
+				+ "INNER JOIN vehicleconfigs ON vehicleconfigs.id = avlreports.vehicleId "
 				+ "WHERE time BETWEEN " + " cast(? as datetime)"
 				+ " AND " + "date_add(cast(? as datetime), INTERVAL " + numdays + " day) "
+				+ timeSql;;
+		} else {
+			sql = "SELECT vehicleId, time, assignmentId, lat, lon, speed, "
+				+ "heading, timeProcessed, source "
+				+ "FROM avlreports "
+				+ "WHERE time BETWEEN " + " cast(? as datetime)"
+				+ " AND " + "cast(? as datetime)"  + " + INTERVAL '" + numdays + " day' "
 				+ timeSql;
-
+		}
 
 		// If only want data for single vehicle then specify so in SQL
 		if (vehicleId != null && !vehicleId.isEmpty())
diff --git a/transitclockWebapp/src/main/webapp/maps/map.jsp b/transitclockWebapp/src/main/webapp/maps/map.jsp
index 0e7f3d46b..916d496e8 100644
--- a/transitclockWebapp/src/main/webapp/maps/map.jsp
+++ b/transitclockWebapp/src/main/webapp/maps/map.jsp
@@ -23,6 +23,8 @@
   <%@include file="/template/includes.jsp" %>
   <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
   <script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
+  <script type="text/javascript" src="//leaflet.github.io/Leaflet.label/leaflet.label.js"></script>
+  <link rel="stylesheet" href="//leaflet.github.io/Leaflet.label/leaflet.label.css" />
   <script src="javascript/leafletRotatedMarker.js"></script>
   <script src="javascript/mapUiOptions.js"></script>
   <script src="<%= request.getContextPath() %>/javascript/jquery-dateFormat.min.js"></script>
@@ -398,9 +400,9 @@ function getVehiclePopupContent(vehicleData) {
     	nextStopNameStr += "<br/><b><fmt:message key="div.dnextstop" /> Id:</b> " + vehicleData.nextStopId;
     var driver = vehicleData.driver ? 
     		"<br/><b><fmt:message key="div.ddriver" />:</b> " + vehicleData.driver : "";
-    var latLonHeadingStr = verbose ? "<br/><b>Lat:</b> " + vehicleData.loc.lat
+    var latLonHeadingStr = verbose ? "<br/><b><fmt:message key="div.dlat" />:</b> " + vehicleData.loc.lat
     			+ "<br/><b><fmt:message key="div.dlon" />:</b> " + vehicleData.loc.lon 
-    			+ "<br/><b><fmt:message key="div.Heading" />:</b> " + vehicleData.loc.heading 
+    			+ "<br/><b><fmt:message key="div.dheading" />:</b> " + vehicleData.loc.heading 
     			+ "<br/><b><fmt:message key="div.dspeed" />:</b> " + formatSpeed(vehicleData.loc.speed)
     			: "";
 	var gpsTimeStr = dateFormat(vehicleData.loc.time);
@@ -561,8 +563,10 @@ function createVehicleMarker(vehicleData) {
 	var vehicleMarker = L.marker(vehicleLoc,
 			getVehicleMarkerOptions(vehicleData))
 			.setIcon(getIconForVehicle(vehicleData))
+			.bindLabel(vehicleData.id, {noHide: true, className: "my-label", offset: [12, -14] })
 			.addTo(map);
 
+
 	// Add the background and the heading arrow markers to 
 	// vehicleIcon so they can all be updated when the vehicle moves.
 	vehicleMarker.background = vehicleBackground;
@@ -857,8 +861,8 @@ L.control.zoom({position: 'bottomleft'}).addTo(map);
 var mapTileUrl = '<%= WebConfigParams.getMapTileUrl() %>'; 
 L.tileLayer(mapTileUrl, {
 	// Specifying a shorter version of attribution. Original really too long.
-    //attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',
-    attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> &amp; <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery ©<%= WebConfigParams.getMapTileCopyright() %>',
+    //attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery ďż˝ <a href="http://mapbox.com">Mapbox</a>',
+    attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> &amp; <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery ďż˝<%= WebConfigParams.getMapTileCopyright() %>',
     maxZoom: 19
 }).addTo(map);
 
diff --git a/transitclockWebapp/src/main/webapp/reports/lastAvlJsonData.jsp b/transitclockWebapp/src/main/webapp/reports/lastAvlJsonData.jsp
index 0053a38d0..656a99df1 100644
--- a/transitclockWebapp/src/main/webapp/reports/lastAvlJsonData.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/lastAvlJsonData.jsp
@@ -11,21 +11,23 @@ String dbtype = agency.getDbType();
 String sql = null;
 if(dbtype.equals("mysql")){
 	sql = 
-	"SELECT a.vehicleId, maxTime, lat, lon "
+	"SELECT a.vehicleId, vC.name, maxTime, lat, lon "
 	+ "FROM " 
 	+ "(SELECT vehicleId, max(time) AS maxTime " 
 	+ "FROM AvlReports WHERE time > date_sub(now(), interval 1 day) "
 	+ "GROUP BY vehicleId) a "
-	+ "JOIN AvlReports b ON a.vehicleId=b.vehicleId AND a.maxTime = b.time";
+	+ "JOIN AvlReports b ON a.vehicleId=b.vehicleId AND a.maxTime = b.time "
+	+ "JOIN VehicleConfigs vC ON a.vehicleId=vC.id";
 }
 if(dbtype.equals("postgresql"))
 {
 	sql =
-					"select a.vehicleId as \"vehicleId\", a.maxTime as \"maxTime\", lat, lon from ( "
+					"select a.vehicleId as \"vehicleId\", vC.name as \"name\", a.maxTime as \"maxTime\", lat, lon from ( "
 					+ "SELECT vehicleId, max(time) AS maxTime " 
 					+ "FROM avlreports WHERE time > now() + '-24 hours' " 
 					+ "GROUP BY vehicleId) a "
-					+ "JOIN AvlReports b ON a.vehicleId=b.vehicleId AND a.maxTime = b.time";
+					+ "JOIN AvlReports b ON a.vehicleId=b.vehicleId AND a.maxTime = b.time "
+					+ "JOIN VehicleConfigs vC ON a.vehicleId=vC.id";
 }
 	
 	
diff --git a/transitclockWebapp/src/main/webapp/reports/lastAvlReport.jsp b/transitclockWebapp/src/main/webapp/reports/lastAvlReport.jsp
index faeec31b7..3152a4fd2 100644
--- a/transitclockWebapp/src/main/webapp/reports/lastAvlReport.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/lastAvlReport.jsp
@@ -30,7 +30,7 @@ function dataReadCallback(jsonData) {
 
 		// Insert row (after the header)
 		var row = table.insertRow(i+1);
-		row.insertCell(0).innerHTML = vehicleInfo.vehicleId;
+		row.insertCell(0).innerHTML = (vehicleInfo.name === undefined || vehicleInfo.name == '') ? vehicleInfo.vehicleId : vehicleInfo.name;
 		row.insertCell(1).innerHTML = vehicleInfo.maxTime;
 		row.insertCell(2).innerHTML = vehicleInfo.lat;
 		row.insertCell(3).innerHTML = vehicleInfo.lon;
diff --git a/transitclockWebapp/src/main/webapp/reports/params/vehicle.jsp b/transitclockWebapp/src/main/webapp/reports/params/vehicle.jsp
index 8a966b96d..8d985410f 100644
--- a/transitclockWebapp/src/main/webapp/reports/params/vehicle.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/params/vehicle.jsp
@@ -19,13 +19,14 @@
 
 <script>
 
-$.getJSON(apiUrlPrefix + "/command/vehicleIds", 
+$.getJSON(apiUrlPrefix + "/command/vehicleConfigs", 
  		function(vehicles) {
 	        // Generate list of routes for the selector
 	 		var selectorData = [{id: '', text: '<fmt:message key="AllVehicles" />'}];
-	 		for (var i in vehicles.ids) {
-	 			var id = vehicles.ids[i];
-	 			selectorData.push({id: id, text: id})
+	 		for (var i in vehicles.vehicleConfig) {
+	 			var id = vehicles.vehicleConfig[i].id;
+	 			var name = (vehicles.vehicleConfig[i].name === undefined || vehicles.vehicleConfig[i].name == '') ? vehicles.vehicleConfig[i].id : vehicles.vehicleConfig[i].name;
+	 			selectorData.push({id: id, text: name})
 	 		}
 	 		
 	 		// Configure the selector to be a select2 one that has

From a4e91bdfdf2203f908965bf85bce82e187b40895 Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Tue, 20 Jul 2021 04:47:20 +0200
Subject: [PATCH 04/14] temporary one-jar-boot path change

---
 transitclock/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/transitclock/pom.xml b/transitclock/pom.xml
index 37914354c..58a274f4b 100755
--- a/transitclock/pom.xml
+++ b/transitclock/pom.xml
@@ -51,6 +51,8 @@
 			<groupId>com.simontuffs</groupId>
 			<artifactId>one-jar-boot</artifactId>
 			<version>0.97.3</version>
+			<scope>system</scope>
+			<systemPath>/usr/local/transitclock/bin/one-jar-boot-0.97.jar</systemPath>
 		</dependency>
 
 		<!-- Database related, including c3p0 production quality connector. Note:

From 8d7f6861477b69f3ae5e3bea4b0b000160b26901 Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Tue, 20 Jul 2021 04:48:26 +0200
Subject: [PATCH 05/14] temporary one-jar-boot path change

---
 transitclock/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transitclock/pom.xml b/transitclock/pom.xml
index 58a274f4b..d6ad2d8b0 100755
--- a/transitclock/pom.xml
+++ b/transitclock/pom.xml
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>com.simontuffs</groupId>
 			<artifactId>one-jar-boot</artifactId>
-			<version>0.97.3</version>
+			<version>0.97</version>
 			<scope>system</scope>
 			<systemPath>/usr/local/transitclock/bin/one-jar-boot-0.97.jar</systemPath>
 		</dependency>

From 3e6b8ea18da1319f5113b71121b6d6378d4be613 Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Tue, 20 Jul 2021 05:46:26 +0200
Subject: [PATCH 06/14] add missing changes in VehicleState

---
 .../java/org/transitclock/core/VehicleState.java     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/transitclock/src/main/java/org/transitclock/core/VehicleState.java b/transitclock/src/main/java/org/transitclock/core/VehicleState.java
index f2dafca38..d6209f3b2 100644
--- a/transitclock/src/main/java/org/transitclock/core/VehicleState.java
+++ b/transitclock/src/main/java/org/transitclock/core/VehicleState.java
@@ -53,6 +53,7 @@
 public class VehicleState {
 
 	private final String vehicleId;
+	private String vehicleName;
 	private Block block;
 	private BlockAssignmentMethod assignmentMethod;
 	// Will be set to block ID (even if used trip to determine assignment) or route ID
@@ -132,6 +133,11 @@ public void incrementTripCounter() {
 	public VehicleState(String vehicleId) {
 		this.vehicleId = vehicleId;
 	}
+	
+	public VehicleState(String vehicleId, String vehicleName) {
+		this.vehicleId = vehicleId;
+		this.vehicleName = vehicleName;
+	}
 
 	/**
 	 * Sets the block assignment for vehicle. Also, this is how it is specified
@@ -747,6 +753,10 @@ public Date getAssignmentTime() {
 	public String getVehicleId() {
 		return vehicleId;
 	}
+	
+	public String getVehicleName() {
+		return vehicleId;
+	}
 
 	public boolean isPredictable() {
 		return predictable;
@@ -956,6 +966,7 @@ public float getHeading() {
 	public String toString() {
 		return "VehicleState ["
 				+ "vehicleId=" + vehicleId
+				+ "vehicleName=" + vehicleName
 				+ ", blockId=" + (block==null? null : block.getId())
 				+ ", assignmentId=" + assignmentId
 				+ ", assignmentMethod=" + assignmentMethod
@@ -976,6 +987,7 @@ public String toString() {
 	public String toStringVerbose() {
 		return "VehicleState ["
 				+ "vehicleId=" + vehicleId
+				+ "vehicleName=" + vehicleName
 				+ ", blockId=" + (block==null? null : block.getId())
 				+ ", assignmentId=" + assignmentId
 				+ ", assignmentMethod=" + assignmentMethod

From 2b1fab4d1b746bf066f100ed4b19d179ac88435a Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Tue, 20 Jul 2021 06:47:56 +0200
Subject: [PATCH 07/14] add fixes for avl query and null exception in vehicle
 name

---
 .../core/dataCache/VehicleDataCache.java      | 330 ++++++++----------
 .../transitclock/reports/AvlJsonQuery.java    |  15 +-
 2 files changed, 158 insertions(+), 187 deletions(-)

diff --git a/transitclock/src/main/java/org/transitclock/core/dataCache/VehicleDataCache.java b/transitclock/src/main/java/org/transitclock/core/dataCache/VehicleDataCache.java
index f5c69dfc5..b7e0c6d72 100644
--- a/transitclock/src/main/java/org/transitclock/core/dataCache/VehicleDataCache.java
+++ b/transitclock/src/main/java/org/transitclock/core/dataCache/VehicleDataCache.java
@@ -54,48 +54,43 @@
  */
 public class VehicleDataCache {
 
-    // Make this class available as a singleton
-    private static VehicleDataCache singleton = new VehicleDataCache();
-
-    // Keyed by vehicle ID
-    private Map<String, IpcVehicleComplete> vehiclesMap = 
-    		new ConcurrentHashMap<String, IpcVehicleComplete>();
-
-    // Keyed by route_short_name. Key is null for vehicles that have not
-    // been successfully associated with a route. For each route there is a 
-    // submap that is keyed by vehicle.
-    private Map<String, Map<String, IpcVehicleComplete>> vehiclesByRouteMap =
-    		new ConcurrentHashMapNullKeyOk<String, Map<String, IpcVehicleComplete>>();
-
-    // So can determine vehicles associated with a block ID. Keyed on
-    // block ID. Each block can have a list of vehicle IDs. Though rare
-    // there are situations where multiple vehicles might have the
-    // same assignment, such as for unscheduled assignments. 
-    private Map<String, List<String>> vehicleIdsByBlockMap =
-    		new ConcurrentHashMapNullKeyOk<String, List<String>>();
-    
-    // Keeps track of vehicle static config info. If new vehicle encountered
-    // in AVL feed then this map is updated and the new VehicleConfig is also
-    // written to the database. Using HashMap instead of ConcurrentHashMap
-    // since synchronizing puts anyways.
-    private ConcurrentHashMap<String, VehicleConfig> vehicleConfigsMap =
-    		new ConcurrentHashMap<String, VehicleConfig>();
-    
-    // So can quickly look up vehicle config using tracker ID
-    private Map<String, VehicleConfig> vehicleConfigByTrackerIdMap =
-    		new HashMap<String, VehicleConfig>();
-    
-    // So can determine how long since data was read from db
-    private long dbReadTime;
-    
-	// For filtering out info more than MAX_AGE since it means that the AVL info is
+	// Make this class available as a singleton
+	private static VehicleDataCache singleton = new VehicleDataCache();
+
+	// Keyed by vehicle ID
+	private Map<String, IpcVehicleComplete> vehiclesMap = new ConcurrentHashMap<String, IpcVehicleComplete>();
+
+	// Keyed by route_short_name. Key is null for vehicles that have not
+	// been successfully associated with a route. For each route there is a
+	// submap that is keyed by vehicle.
+	private Map<String, Map<String, IpcVehicleComplete>> vehiclesByRouteMap = new ConcurrentHashMapNullKeyOk<String, Map<String, IpcVehicleComplete>>();
+
+	// So can determine vehicles associated with a block ID. Keyed on
+	// block ID. Each block can have a list of vehicle IDs. Though rare
+	// there are situations where multiple vehicles might have the
+	// same assignment, such as for unscheduled assignments.
+	private Map<String, List<String>> vehicleIdsByBlockMap = new ConcurrentHashMapNullKeyOk<String, List<String>>();
+
+	// Keeps track of vehicle static config info. If new vehicle encountered
+	// in AVL feed then this map is updated and the new VehicleConfig is also
+	// written to the database. Using HashMap instead of ConcurrentHashMap
+	// since synchronizing puts anyways.
+	private ConcurrentHashMap<String, VehicleConfig> vehicleConfigsMap = new ConcurrentHashMap<String, VehicleConfig>();
+
+	// So can quickly look up vehicle config using tracker ID
+	private Map<String, VehicleConfig> vehicleConfigByTrackerIdMap = new HashMap<String, VehicleConfig>();
+
+	// So can determine how long since data was read from db
+	private long dbReadTime;
+
+	// For filtering out info more than MAX_AGE since it means that the AVL info
+	// is
 	// obsolete and shouldn't be displayed.
-    private static final int MAX_AGE_MSEC = 15 * Time.MS_PER_MIN;
-    
-    private static final Logger logger = LoggerFactory
-	    .getLogger(VehicleDataCache.class);
+	private static final int MAX_AGE_MSEC = 15 * Time.MS_PER_MIN;
 
-    /********************** Member Functions **************************/
+	private static final Logger logger = LoggerFactory.getLogger(VehicleDataCache.class);
+
+	/********************** Member Functions **************************/
 
 	/**
 	 * Gets the singleton instance of this class.
@@ -106,44 +101,40 @@ public static VehicleDataCache getInstance() {
 		return singleton;
 	}
 
-    /*
-     * Constructor declared private to enforce only access to this singleton
-     * class being getInstance()
-     */
-    private VehicleDataCache() {
-    }
-
-    /**
-     * Reads in vehicle config data from db. Unsynchronized since the
-     * calling methods are expected to sync.
-     */
-    private void readVehicleConfigFromDb() {
-		Session session = 
-				HibernateUtils.getSession(AgencyConfig.getAgencyId());
+	/*
+	 * Constructor declared private to enforce only access to this singleton
+	 * class being getInstance()
+	 */
+	private VehicleDataCache() {
+	}
+
+	/**
+	 * Reads in vehicle config data from db. Unsynchronized since the calling
+	 * methods are expected to sync.
+	 */
+	private void readVehicleConfigFromDb() {
+		Session session = HibernateUtils.getSession(AgencyConfig.getAgencyId());
 		try {
 			// Read VehicleConfig data from database
-			List<VehicleConfig> vehicleConfigs = 
-					VehicleConfig.getVehicleConfigs(session);
-			
+			List<VehicleConfig> vehicleConfigs = VehicleConfig.getVehicleConfigs(session);
+
 			// Convert list to the maps
 			for (VehicleConfig vehicleConfig : vehicleConfigs) {
 				vehicleConfigsMap.put(vehicleConfig.getId(), vehicleConfig);
-				vehicleConfigByTrackerIdMap.put(
-						vehicleConfig.getTrackerId(), vehicleConfig);
+				vehicleConfigByTrackerIdMap.put(vehicleConfig.getTrackerId(), vehicleConfig);
 				dbReadTime = System.currentTimeMillis();
 			}
 		} catch (HibernateException e) {
-			logger.error("Exception reading in VehicleConfig data. {}", 
-					e.getMessage(), e);
+			logger.error("Exception reading in VehicleConfig data. {}", e.getMessage(), e);
 		} finally {
 			// Always close the session
 			session.close();
 		}
-    }
-    
-    /**
-     * Reads in vehicle config data from db if haven't done so yet.
-     */
+	}
+
+	/**
+	 * Reads in vehicle config data from db if haven't done so yet.
+	 */
 	private void readVehicleConfigFromDbIfNeedTo() {
 		synchronized (vehicleConfigsMap) {
 			if (vehicleConfigsMap.isEmpty()) {
@@ -151,19 +142,19 @@ private void readVehicleConfigFromDbIfNeedTo() {
 			}
 		}
 	}
-    
+
 	/**
-	 * Reads in vehicle config data from db if more than 5 minutes since last
-	 * db read. Useful for when vehicle data has been updated in db.
+	 * Reads in vehicle config data from db if more than 5 minutes since last db
+	 * read. Useful for when vehicle data has been updated in db.
 	 */
 	private void readVehicleConfigFromDbIfOld() {
 		synchronized (vehicleConfigsMap) {
 			// Read db if more than 5 minutes since last read
 			if (System.currentTimeMillis() > dbReadTime + 5 * Time.MIN_IN_MSECS)
 				readVehicleConfigFromDb();
-		}		
+		}
 	}
-	
+
 	/**
 	 * To be called when vehicle encountered in AVL feed. Adds the vehicle to
 	 * the cache and stores in database if haven't done so yet.
@@ -175,31 +166,33 @@ public void cacheVehicleConfig(AvlReport avlReport) {
 		// part of the cache
 		if (avlReport.isForSchedBasedPreds())
 			return;
-		
+
 		// Make sure go initial data from database
 		readVehicleConfigFromDbIfNeedTo();
-		
+
 		// If new vehicle...
 		String vehicleId = avlReport.getVehicleId();
 		String vehicleName = avlReport.getVehicleName();
 		VehicleConfig vehicleConfig = new VehicleConfig(vehicleId, vehicleName);
 		VehicleConfig absent = vehicleConfigsMap.putIfAbsent(vehicleId, vehicleConfig);
 		if (absent == null) {
-			logger.info("Encountered new vehicle where vehicleId={} so "
-					+ "updating vehicle cache and writing the "
+			logger.info("Encountered new vehicle where vehicleId={} so " + "updating vehicle cache and writing the "
 					+ "VehicleConfig to database.", vehicleId);
 			// Write the vehicle to the database
 			Core.getInstance().getDbLogger().add(vehicleConfig);
-		} else if(!vehicleName.equals(absent.getName())){
-			Session session = 
-					HibernateUtils.getSession(AgencyConfig.getAgencyId());
-			Transaction tx = session.beginTransaction();
-			absent.setName(vehicleName);
-			VehicleConfig.updateVehicleConfig(absent, session);
-			tx.commit();
+		} else {
+			if (vehicleName != null) {
+				if (!vehicleName.equals(absent.getName())) {
+					Session session = HibernateUtils.getSession(AgencyConfig.getAgencyId());
+					Transaction tx = session.beginTransaction();
+					absent.setName(vehicleName);
+					VehicleConfig.updateVehicleConfig(absent, session);
+					tx.commit();
+				}
+			}
 		}
 	}
-    
+
 	/**
 	 * Returns the VehicleConfig for the specified trackerId. Useful for when
 	 * getting a GPS feed that has a tracker ID, like an IMEI or phone #,
@@ -215,9 +208,8 @@ public void cacheVehicleConfig(AvlReport avlReport) {
 	 *         configured.
 	 */
 	public VehicleConfig getVehicleConfigByTrackerId(String trackerId) {
-		VehicleConfig vehicleConfig =
-				vehicleConfigByTrackerIdMap.get(trackerId);
-		
+		VehicleConfig vehicleConfig = vehicleConfigByTrackerIdMap.get(trackerId);
+
 		// If specified trackerId not found then reread VehicleConfig data
 		// from db again to see if it has been updated.
 		if (vehicleConfig == null) {
@@ -226,67 +218,61 @@ public VehicleConfig getVehicleConfigByTrackerId(String trackerId) {
 		}
 		return vehicleConfig;
 	}
-	
+
 	/**
 	 * Returns an unmodifiable collection of the static vehicle configurations.
 	 * 
 	 * @return Unmodifiable collection of VehicleConfig objects
 	 */
-    public Collection<VehicleConfig> getVehicleConfigs() {
-    	readVehicleConfigFromDbIfNeedTo();
-    	return Collections.unmodifiableCollection(vehicleConfigsMap.values());
-    }
-    
+	public Collection<VehicleConfig> getVehicleConfigs() {
+		readVehicleConfigFromDbIfNeedTo();
+		return Collections.unmodifiableCollection(vehicleConfigsMap.values());
+	}
+
 	/**
-	 * Filters out vehicle info if last GPS report is too old. Doesn't
-	 * filter out vehicles at layovers though because for those won't
-	 * get another report for a long time. This includes schedule based
-	 * vehicles.
+	 * Filters out vehicle info if last GPS report is too old. Doesn't filter
+	 * out vehicles at layovers though because for those won't get another
+	 * report for a long time. This includes schedule based vehicles.
 	 * 
 	 * @param vehicles
 	 * @return
 	 */
-    private Collection<IpcVehicleComplete> filterOldAvlReports(
-    		Collection<IpcVehicleComplete> vehicles) {
-    	Collection<IpcVehicleComplete> filteredVehicles = 
-				new ArrayList<IpcVehicleComplete>(vehicles.size());
-    	
-    	long timeCutoff = Core.getInstance().getSystemTime() - MAX_AGE_MSEC;
-    	for (IpcVehicleComplete vehicle : vehicles) {
-    		if (vehicle.isLayover() 
-    				|| vehicle.getAvl().getTime() > timeCutoff) {
-    			filteredVehicles.add(vehicle);
-    		}
-    	}
-    	
-    	// Return only vehicles whose AVL report not too old.
-    	return filteredVehicles;
-    }
+	private Collection<IpcVehicleComplete> filterOldAvlReports(Collection<IpcVehicleComplete> vehicles) {
+		Collection<IpcVehicleComplete> filteredVehicles = new ArrayList<IpcVehicleComplete>(vehicles.size());
+
+		long timeCutoff = Core.getInstance().getSystemTime() - MAX_AGE_MSEC;
+		for (IpcVehicleComplete vehicle : vehicles) {
+			if (vehicle.isLayover() || vehicle.getAvl().getTime() > timeCutoff) {
+				filteredVehicles.add(vehicle);
+			}
+		}
+
+		// Return only vehicles whose AVL report not too old.
+		return filteredVehicles;
+	}
 
 	/**
 	 * This is intended to be used, when the vehicle maps are read, in order to
-	 * remove schedule based vehicles from a collection. 
+	 * remove schedule based vehicles from a collection.
 	 * 
 	 * @param vehicles
 	 *            collection of vehicles to investigate
 	 * @return filtered collection of vehicles
 	 */
-	private Collection<IpcVehicleComplete> filterSchedBasedVehicle(
-			Collection<IpcVehicleComplete> vehicles) {
-    	Collection<IpcVehicleComplete> filteredVehicles = 
-				new ArrayList<IpcVehicleComplete>(vehicles.size());
-
-    	for (IpcVehicleComplete vehicle : vehicles) {
-			// Return the vehicle info unless it is a schedule based vehicle 
-    		if (!vehicle.isForSchedBasedPred()) {
+	private Collection<IpcVehicleComplete> filterSchedBasedVehicle(Collection<IpcVehicleComplete> vehicles) {
+		Collection<IpcVehicleComplete> filteredVehicles = new ArrayList<IpcVehicleComplete>(vehicles.size());
+
+		for (IpcVehicleComplete vehicle : vehicles) {
+			// Return the vehicle info unless it is a schedule based vehicle
+			if (!vehicle.isForSchedBasedPred()) {
 				filteredVehicles.add(vehicle);
 			}
-    	}
-    	
-    	// Return results
-    	return filteredVehicles;
+		}
+
+		// Return results
+		return filteredVehicles;
 	}
-	
+
 	/**
 	 * Returns Collection of Vehicles currently associated with specified route.
 	 * Filters out info more than MAX_AGE_MSEC since it means that the info is
@@ -300,31 +286,26 @@ private Collection<IpcVehicleComplete> filterSchedBasedVehicle(
 	 * @return Collection of IpcExtVehicle for vehicles on route, or null if no
 	 *         vehicles for the route.
 	 */
-	public Collection<IpcVehicleComplete> getVehiclesForRoute(
-			String routeIdOrShortName) {
+	public Collection<IpcVehicleComplete> getVehiclesForRoute(String routeIdOrShortName) {
 		// Try getting vehicles using routeShortName
 		String routeShortName = routeIdOrShortName;
 		// If want vehicles not associated with route then need to use null
 		// as the route short name instead of an empty string.
 		if (routeShortName != null && routeShortName.isEmpty())
 			routeShortName = null;
-		Map<String, IpcVehicleComplete> vehicleMapForRoute = vehiclesByRouteMap
-				.get(routeShortName);
-		
+		Map<String, IpcVehicleComplete> vehicleMapForRoute = vehiclesByRouteMap.get(routeShortName);
+
 		// If couldn't get vehicles by route short name try using
 		// the route ID.
 		if (vehicleMapForRoute == null) {
-			Route route = Core.getInstance().getDbConfig()
-					.getRouteById(routeIdOrShortName);
+			Route route = Core.getInstance().getDbConfig().getRouteById(routeIdOrShortName);
 			if (route != null) {
-				vehicleMapForRoute = 
-						vehiclesByRouteMap.get(route.getShortName());
+				vehicleMapForRoute = vehiclesByRouteMap.get(route.getShortName());
 			}
 		}
 
 		if (vehicleMapForRoute != null)
-			return filterSchedBasedVehicle(
-					filterOldAvlReports(vehicleMapForRoute.values()));
+			return filterSchedBasedVehicle(filterOldAvlReports(vehicleMapForRoute.values()));
 		else
 			return null;
 	}
@@ -340,24 +321,22 @@ public Collection<IpcVehicleComplete> getVehiclesForRoute(
 	 * @return Collection of vehicles for the route. Empty collection if there
 	 *         are none.
 	 */
-	public Collection<IpcVehicleComplete> getVehiclesForRoute(
-			Collection<String> routeIdsOrShortNames) {
+	public Collection<IpcVehicleComplete> getVehiclesForRoute(Collection<String> routeIdsOrShortNames) {
 		// If there is just a single route specified then use a shortcut
 		if (routeIdsOrShortNames.size() == 1) {
 			String routeIdOrShortName = routeIdsOrShortNames.iterator().next();
 			return getVehiclesForRoute(routeIdOrShortName);
 		}
-		
+
 		Collection<IpcVehicleComplete> vehicles = new ArrayList<IpcVehicleComplete>();
 		for (String routeIdOrShortName : routeIdsOrShortNames) {
-			Collection<IpcVehicleComplete> vehiclesForRoute = 
-					getVehiclesForRoute(routeIdOrShortName);
+			Collection<IpcVehicleComplete> vehiclesForRoute = getVehiclesForRoute(routeIdOrShortName);
 			if (vehiclesForRoute != null)
 				vehicles.addAll(vehiclesForRoute);
 		}
 		return vehicles;
 	}
-      
+
 	/**
 	 * Returns collection of vehicles whose vehicleIds were specified using the
 	 * vehiclesIds parameter. No filtering of old vehicles is done since
@@ -374,7 +353,7 @@ public Collection<IpcVehicleComplete> getVehicles(Collection<String> vehicleIds)
 			if (vehicle != null)
 				vehicles.add(vehicle);
 		}
-		
+
 		// Return results but filter out schedule based vehicles if past
 		// trip start time
 		return vehicles;
@@ -403,7 +382,7 @@ public IpcVehicleComplete getVehicle(String vehicleId) {
 	public Collection<IpcVehicleComplete> getVehicles() {
 		return filterSchedBasedVehicle(vehiclesMap.values());
 	}
-	
+
 	/**
 	 * Returns all vehicles, even schedule based ones
 	 * 
@@ -434,12 +413,12 @@ public Collection<IpcVehicleComplete> getVehiclesIncludingSchedBasedOnes() {
 	public Collection<String> getVehiclesByBlockId(String blockId) {
 		List<String> vehicleIds = vehicleIdsByBlockMap.get(blockId);
 		if (vehicleIds != null)
-			// Return copy of collection 
+			// Return copy of collection
 			return new ArrayList<String>(vehicleIds);
 		else
 			return new ArrayList<String>(0);
 	}
-	
+
 	/**
 	 * Updates the vehiclesByBlockMap
 	 * 
@@ -449,88 +428,79 @@ public Collection<String> getVehiclesByBlockId(String blockId) {
 	 * @param vehicle
 	 *            For getting the current block ID for the vehicle.
 	 */
-	private void updateVehicleIdsByBlockMap(IpcVehicleComplete originalVehicle,
-			IpcVehicleComplete vehicle) {
-		// Handle old assignment		
+	private void updateVehicleIdsByBlockMap(IpcVehicleComplete originalVehicle, IpcVehicleComplete vehicle) {
+		// Handle old assignment
 		if (originalVehicle != null) {
-			// If block assignment is same as before don't need to update the 
+			// If block assignment is same as before don't need to update the
 			// block map
-			if (Objects.equals(originalVehicle.getBlockId(), 
-					vehicle.getBlockId()))
+			if (Objects.equals(originalVehicle.getBlockId(), vehicle.getBlockId()))
 				return;
-				
-			// Block assignment has changed for vehicle so remove the old one 
+
+			// Block assignment has changed for vehicle so remove the old one
 			// from the map
-			List<String> vehicleIdsForOldBlock = 
-					vehicleIdsByBlockMap.get(originalVehicle.getBlockId());
+			List<String> vehicleIdsForOldBlock = vehicleIdsByBlockMap.get(originalVehicle.getBlockId());
 			if (vehicleIdsForOldBlock != null)
 				vehicleIdsForOldBlock.remove(originalVehicle.getId());
 		}
-		
+
 		// Add the new block assignment to the map
-		List<String> vehiclesForNewBlock = 
-				vehicleIdsByBlockMap.get(vehicle.getBlockId());
+		List<String> vehiclesForNewBlock = vehicleIdsByBlockMap.get(vehicle.getBlockId());
 		if (vehiclesForNewBlock == null) {
 			vehiclesForNewBlock = new ArrayList<String>(1);
 			vehicleIdsByBlockMap.put(vehicle.getBlockId(), vehiclesForNewBlock);
 		}
 		vehiclesForNewBlock.add(vehicle.getId());
 	}
-	
+
 	/**
 	 * Updates vehiclesByRouteMap containing the vehicle info.
 	 * 
 	 * @param originalVehicle
 	 * @param vehicle
 	 */
-	private void updateVehiclesByRouteMap(IpcVehicleComplete originalVehicle, 
-			IpcVehicleComplete vehicle) {
+	private void updateVehiclesByRouteMap(IpcVehicleComplete originalVehicle, IpcVehicleComplete vehicle) {
 		// If the route has changed then remove the vehicle from the old map for
 		// that route. Watch out for getRouteShortName() sometimes being null
-		if (originalVehicle != null
-				&& originalVehicle.getRouteShortName() != 
-						vehicle.getRouteShortName()
-				&& (originalVehicle.getRouteShortName() == null 
-					|| !originalVehicle.getRouteShortName().equals(
-						vehicle.getRouteShortName()))) {
+		if (originalVehicle != null && originalVehicle.getRouteShortName() != vehicle.getRouteShortName()
+				&& (originalVehicle.getRouteShortName() == null
+						|| !originalVehicle.getRouteShortName().equals(vehicle.getRouteShortName()))) {
 			Map<String, IpcVehicleComplete> vehicleMapForRoute = vehiclesByRouteMap
 					.get(originalVehicle.getRouteShortName());
 			vehicleMapForRoute.remove(vehicle.getId());
 		}
 
 		// Add IpcExtVehicle to the vehiclesByRouteMap
-		Map<String, IpcVehicleComplete> vehicleMapForRoute = 
-				vehiclesByRouteMap.get(vehicle.getRouteShortName());
+		Map<String, IpcVehicleComplete> vehicleMapForRoute = vehiclesByRouteMap.get(vehicle.getRouteShortName());
 		if (vehicleMapForRoute == null) {
 			vehicleMapForRoute = new HashMap<String, IpcVehicleComplete>();
 			String routeMapKey = vehicle.getRouteShortName();
 			vehiclesByRouteMap.put(routeMapKey, vehicleMapForRoute);
 		}
-		vehicleMapForRoute.put(vehicle.getId(), vehicle);				
+		vehicleMapForRoute.put(vehicle.getId(), vehicle);
 	}
 
 	/**
 	 * Updates vehiclesMap. Usually will add the IpcExtVehicle to the
-	 * vehiclesMap. But there is a special case where a schedule based
-	 * vehicle is being made unpredictable. For this situation actually
-	 * need to remove the vehicle from the vehicles map so that it won't
-	 * show up requesting vehicles for the API. 
+	 * vehiclesMap. But there is a special case where a schedule based vehicle
+	 * is being made unpredictable. For this situation actually need to remove
+	 * the vehicle from the vehicles map so that it won't show up requesting
+	 * vehicles for the API.
 	 * 
 	 * @param vehicle
 	 */
 	private void updateVehiclesMap(IpcVehicleComplete vehicle) {
 		if (!vehicle.isForSchedBasedPred() || vehicle.isPredictable()) {
 			// Normal situation. Add vehicle to vehiclesMap
-			vehiclesMap.put(vehicle.getId(), vehicle);			
+			vehiclesMap.put(vehicle.getId(), vehicle);
 		} else {
-			// Special case where vehicle is schedule based and it is not 
+			// Special case where vehicle is schedule based and it is not
 			// predictable. This means that should get rid of the vehicle
 			// from the vehiclesMap since it was just a temporary fake
 			// vehicle.
 			vehiclesMap.remove(vehicle.getId());
 		}
 	}
-	
+
 	/**
 	 * Updates the maps containing the vehicle info. Should be called every time
 	 * vehicle state changes.
@@ -541,7 +511,7 @@ private void updateVehiclesMap(IpcVehicleComplete vehicle) {
 	public void updateVehicle(VehicleState vehicleState) {
 		IpcVehicleComplete vehicle = new IpcVehicleComplete(vehicleState);
 		IpcVehicleComplete originalVehicle = vehiclesMap.get(vehicle.getId());
-		
+
 		logger.debug("Adding to VehicleDataCache vehicle={}", vehicle);
 
 		updateVehiclesByRouteMap(originalVehicle, vehicle);
diff --git a/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java b/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java
index da606814f..fc6b08935 100644
--- a/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java
+++ b/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java
@@ -78,14 +78,15 @@ public static String getAvlJson(String agencyId, String vehicleId,
 				+ "INNER JOIN vehicleconfigs ON vehicleconfigs.id = avlreports.vehicleId "
 				+ "WHERE time BETWEEN " + " cast(? as datetime)"
 				+ " AND " + "date_add(cast(? as datetime), INTERVAL " + numdays + " day) "
-				+ timeSql;;
-		} else {
-			sql = "SELECT vehicleId, time, assignmentId, lat, lon, speed, "
-				+ "heading, timeProcessed, source "
-				+ "FROM avlreports "
-				+ "WHERE time BETWEEN " + " cast(? as datetime)"
-				+ " AND " + "cast(? as datetime)"  + " + INTERVAL '" + numdays + " day' "
 				+ timeSql;
+		} else {
+			sql = "SELECT vehicleId, name, time, assignmentId, lat, lon, speed, "
+					+ "heading, timeProcessed, source "
+					+ "FROM avlreports "
+					+ "INNER JOIN vehicleconfigs ON vehicleconfigs.id = avlreports.vehicleId "
+					+ "WHERE time BETWEEN " + " cast(? as timestamp)"
+					+ " AND " + "cast(? as timestamp)"  + " + INTERVAL '" + numdays + " day' "
+					+ timeSql;
 		}
 
 		// If only want data for single vehicle then specify so in SQL

From 48573cab32c7bb7aa13232f437ab6bcd23b22c6a Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Wed, 21 Jul 2021 18:38:12 +0200
Subject: [PATCH 08/14] fix pzn

---
 .../transitclock/core/dataCache/VehicleDataCache.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/transitclock/src/main/java/org/transitclock/core/dataCache/VehicleDataCache.java b/transitclock/src/main/java/org/transitclock/core/dataCache/VehicleDataCache.java
index b7e0c6d72..5c55a6b6f 100644
--- a/transitclock/src/main/java/org/transitclock/core/dataCache/VehicleDataCache.java
+++ b/transitclock/src/main/java/org/transitclock/core/dataCache/VehicleDataCache.java
@@ -185,9 +185,13 @@ public void cacheVehicleConfig(AvlReport avlReport) {
 				if (!vehicleName.equals(absent.getName())) {
 					Session session = HibernateUtils.getSession(AgencyConfig.getAgencyId());
 					Transaction tx = session.beginTransaction();
-					absent.setName(vehicleName);
-					VehicleConfig.updateVehicleConfig(absent, session);
-					tx.commit();
+					try {
+						absent.setName(vehicleName);
+						VehicleConfig.updateVehicleConfig(absent, session);
+						tx.commit();
+					} catch(Exception ex) {
+						tx.rollback();
+					}
 				}
 			}
 		}

From f2b4c78aec83068316a12b3ccaa648df0586addc Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Thu, 22 Jul 2021 01:44:22 +0200
Subject: [PATCH 09/14] vehicleconfig update workaround

---
 .../transitclock/db/hibernate/DbQueue.java    | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/transitclock/src/main/java/org/transitclock/db/hibernate/DbQueue.java b/transitclock/src/main/java/org/transitclock/db/hibernate/DbQueue.java
index 5e22afead..a09a1042e 100644
--- a/transitclock/src/main/java/org/transitclock/db/hibernate/DbQueue.java
+++ b/transitclock/src/main/java/org/transitclock/db/hibernate/DbQueue.java
@@ -14,6 +14,7 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
+import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.exception.GenericJDBCException;
 import org.hibernate.exception.JDBCConnectionException;
 import org.hibernate.exception.SQLGrammarException;
@@ -325,21 +326,24 @@ public void processBatchOfData() {
 						processSingleObject(o);
 						shouldKeepTrying = false;
 					} catch (HibernateException e2) {
-						// Need to know if it is a problem with the database not
-						// being accessible or if there is a problem with the SQL/data.
-						// If there is a problem accessibility of the database then
-						// want to keep trying writing the old data. But if it is
-						// a problem with the SQL/data then only want to try to write
-						// the good data from the batch a single time to make sure 
-						// all good data is written.
-						if (shouldKeepTryingBecauseConnectionException(e2)) {
-							shouldKeepTrying = true;
-							logger.error("Encountered database connection " +
-									"exception so will sleep for {} msec and " +
-									"will then try again.", TIME_BETWEEN_RETRIES);
-							Time.sleep(TIME_BETWEEN_RETRIES);
+						if(e instanceof ConstraintViolationException && e2 instanceof GenericJDBCException) {
+							shouldKeepTrying = false;
+						} else {
+							// Need to know if it is a problem with the database not
+							// being accessible or if there is a problem with the SQL/data.
+							// If there is a problem accessibility of the database then
+							// want to keep trying writing the old data. But if it is
+							// a problem with the SQL/data then only want to try to write
+							// the good data from the batch a single time to make sure 
+							// all good data is written.
+							if (shouldKeepTryingBecauseConnectionException(e2)) {
+								shouldKeepTrying = true;
+								logger.error("Encountered database connection " +
+										"exception so will sleep for {} msec and " +
+										"will then try again.", TIME_BETWEEN_RETRIES);
+								Time.sleep(TIME_BETWEEN_RETRIES);
+							}
 						}
-						
 						// Output message on what is going on
 						Throwable cause2 = HibernateUtils.getRootCause(e2);
 						logger.error(e2.getClass().getSimpleName() + " when individually writing object " +

From 9e50c1eab9f98dc0722cdae00e4be8c161cc3793 Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Fri, 23 Jul 2021 06:47:05 +0200
Subject: [PATCH 10/14] Add/Change labels, late / on time / early workaround

---
 .../org/transitclock/core/TemporalDifference.java  |  6 +++---
 .../org/transitclock/i18n/text_pl.properties       |  5 ++---
 transitclockWebapp/src/main/webapp/maps/map.jsp    |  8 +++++---
 .../src/main/webapp/maps/schAdhMap.jsp             | 14 +++++++++++---
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/transitclock/src/main/java/org/transitclock/core/TemporalDifference.java b/transitclock/src/main/java/org/transitclock/core/TemporalDifference.java
index 7aec02f96..1fd236bc3 100644
--- a/transitclock/src/main/java/org/transitclock/core/TemporalDifference.java
+++ b/transitclock/src/main/java/org/transitclock/core/TemporalDifference.java
@@ -238,11 +238,11 @@ public String toString() {
 		
 		// Add early/ontime/late info
 		if (temporalDifferenceMsec > 0)
-			str += " (early)";
+			str += " (wcześniej)";
 		else if (temporalDifferenceMsec == 0)
-			str += " (ontime)";
+			str += " (na czas)";
 		else
-			str += " (late)";
+			str += " (później)";
 		
 		// Return the results
 		return str;
diff --git a/transitclockWebapp/src/main/resources/org/transitclock/i18n/text_pl.properties b/transitclockWebapp/src/main/resources/org/transitclock/i18n/text_pl.properties
index feb4b60c6..726596a01 100644
--- a/transitclockWebapp/src/main/resources/org/transitclock/i18n/text_pl.properties
+++ b/transitclockWebapp/src/main/resources/org/transitclock/i18n/text_pl.properties
@@ -153,8 +153,8 @@ div.dlayover = Layover
 div.ddeparture = Odjazd
 div.dnextstop = Nast. Przystanek
 div.ddriver = Kierowca
-div.dlat = d\u0142. geogr
-div.dlon = szer. geogr
+div.dlat = D\u0142. geogr
+div.dlon = Szer. geogr
 div.dheading = Kierunek
 div.dspeed = Pr\u0119dko\u015b\u0107
 div.ddirection = Kierunek
@@ -170,7 +170,6 @@ div.drunapicall = Generuj Wywo\u0142anie API
 div.scfor = Rozk\u0142ad dla
 div.minearly = min wcze\u015bniej
 div.minearlyto = min wcze\u015bniej do
-div.minlate = min p\u00f3\u017aniej
 div.for = dla
 div.day = dzie\u0144
 div.clate = P\u00f3\u017aniej
diff --git a/transitclockWebapp/src/main/webapp/maps/map.jsp b/transitclockWebapp/src/main/webapp/maps/map.jsp
index 916d496e8..ad8a8f18e 100644
--- a/transitclockWebapp/src/main/webapp/maps/map.jsp
+++ b/transitclockWebapp/src/main/webapp/maps/map.jsp
@@ -409,8 +409,9 @@ function getVehiclePopupContent(vehicleData) {
     var directionStr = verbose ? "<br/><b><fmt:message key="div.ddirection" />:</b> " + vehicleData.direction : ""; 
     var tripPatternStr = verbose ? "<br/><b><fmt:message key="div.dtrippattern" />:</b> " + vehicleData.tripPattern : "";
     var startTimeStr = vehicleData.isScheduledService ? "" : "<br/><b><fmt:message key="div.dstarttime" />:</b> "+dateFormat(vehicleData.freqStartTime/1000);
-    var schAdhStr = vehicleData.isScheduledService ? "<br/><b><fmt:message key="div.dschadh" />:</b> " + vehicleData.schAdhStr : ""
-    var content = "<b><fmt:message key="div.Vehicle" />:</b> " + vehicleData.id 
+    var schAdhStr = vehicleData.isScheduledService ? "<br/><b><fmt:message key="div.dschadh" />:</b> " + vehicleData.schAdhStr : "";
+    var vehicleName = (vehicleData.vehicleName == '' || vehicleData.vehicleName == 'undefined') ? vehicleData.id : vehicleData.vehicleName;
+    var content = "<b><fmt:message key="div.Vehicle" />:</b> " + vehicleName
     	+ "<br/><b><fmt:message key="div.droute" />: </b> " + vehicleData.routeShortName
 		+ latLonHeadingStr
 		+ "<br/><b><fmt:message key="div.dgpstime" />:</b> " + gpsTimeStr
@@ -560,10 +561,11 @@ function createVehicleMarker(vehicleData) {
 	// Create the actual vehicle marker. This needs to be created
 	// last and on top since the popup callback for the vehicle is
 	// attached to this marker. Otherwise won't get click events.
+	var vehicleName = (vehicleData.vehicleName == '' || vehicleData.vehicleName == 'undefined') ? vehicleData.id : vehicleData.vehicleName;
 	var vehicleMarker = L.marker(vehicleLoc,
 			getVehicleMarkerOptions(vehicleData))
 			.setIcon(getIconForVehicle(vehicleData))
-			.bindLabel(vehicleData.id, {noHide: true, className: "my-label", offset: [12, -14] })
+			.bindLabel(vehicleName, {noHide: true, className: "my-label", offset: [12, -14] })
 			.addTo(map);
 
 
diff --git a/transitclockWebapp/src/main/webapp/maps/schAdhMap.jsp b/transitclockWebapp/src/main/webapp/maps/schAdhMap.jsp
index 83a72de48..73f78efd3 100644
--- a/transitclockWebapp/src/main/webapp/maps/schAdhMap.jsp
+++ b/transitclockWebapp/src/main/webapp/maps/schAdhMap.jsp
@@ -15,6 +15,8 @@
   
   <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
   <script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
+    <script type="text/javascript" src="//leaflet.github.io/Leaflet.label/leaflet.label.js"></script>
+  <link rel="stylesheet" href="//leaflet.github.io/Leaflet.label/leaflet.label.css" />
 
 <style>
 html, body, #map { 
@@ -45,6 +47,7 @@ var vehicleLayer;
  * schedule adherence.
  */
 function getVehiclePopupContent(vehicle) {
+	var vehicleName = (vehicle.vehicleName == '' || vehicle.vehicleName == 'undefined') ? vehicle.id : vehicle.vehicleName;
 	var content =
 		"<b><fmt:message key="div.Vehicle" />:</b> " + vehicle.id 
 		+ "<br/><b><fmt:message key="div.droute" />:</b> " + vehicle.routeName;
@@ -131,15 +134,20 @@ function getAndProcessSchAdhData() {
 					    fillOpacity: fillOpacity,
 					};
 					
+					var vehicleName = (vehicle.vehicleName == '' || vehicle.vehicleName == 'undefined') ? vehicle.id : vehicle.vehicleName;
+					if (vehicle.schAdhStr)
+						vehicleName += " " + vehicle.schAdhStr;
+					
 					// Create circle for vehicle showing schedule adherence
 					var vehicleMarker = 
 						L.circleMarker([vehicle.loc.lat, vehicle.loc.lon], 
-								vehicleMarkerOptions);
+								vehicleMarkerOptions).bindLabel(vehicleName, {noHide: true, className: "my-label", offset: [12, -14] });
 					newVehicleLayer.addLayer(vehicleMarker);
 					
 					// Store vehicle data obtained via AJAX with stopMarker so it can be used in popup
 					vehicleMarker.vehicle = vehicle;
 					
+					vehicleName = (vehicle.vehicleName == '' || vehicle.vehicleName == 'undefined') ? vehicle.id : vehicle.vehicleName;
 					// Create popup window for vehicle when clicked on
 					vehicleMarker.on('click', function(e) {
 						var content = getVehiclePopupContent(this.vehicle);
@@ -211,8 +219,8 @@ function createMap(mapTileUrl, mapTileCopyright) {
 	
 	L.tileLayer(mapTileUrl, {
 		// Specifying a shorter version of attribution. Original really too long.
-	    //attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',
-	    attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> &amp; <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery ©<%= WebConfigParams.getMapTileCopyright() %>',
+	    //attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery ďż˝ <a href="http://mapbox.com">Mapbox</a>',
+	    attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> &amp; <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery ďż˝<%= WebConfigParams.getMapTileCopyright() %>',
 	    maxZoom: 19
 	}).addTo(map);
 

From f1944d10744d58fc2f500336b23ec133bba49ead Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Fri, 23 Jul 2021 07:39:55 +0200
Subject: [PATCH 11/14] check undefined in vehicle name

---
 transitclockWebapp/src/main/webapp/maps/map.jsp       |  9 +++++++--
 transitclockWebapp/src/main/webapp/maps/schAdhMap.jsp | 10 +++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/transitclockWebapp/src/main/webapp/maps/map.jsp b/transitclockWebapp/src/main/webapp/maps/map.jsp
index ad8a8f18e..6f5220a45 100644
--- a/transitclockWebapp/src/main/webapp/maps/map.jsp
+++ b/transitclockWebapp/src/main/webapp/maps/map.jsp
@@ -410,7 +410,8 @@ function getVehiclePopupContent(vehicleData) {
     var tripPatternStr = verbose ? "<br/><b><fmt:message key="div.dtrippattern" />:</b> " + vehicleData.tripPattern : "";
     var startTimeStr = vehicleData.isScheduledService ? "" : "<br/><b><fmt:message key="div.dstarttime" />:</b> "+dateFormat(vehicleData.freqStartTime/1000);
     var schAdhStr = vehicleData.isScheduledService ? "<br/><b><fmt:message key="div.dschadh" />:</b> " + vehicleData.schAdhStr : "";
-    var vehicleName = (vehicleData.vehicleName == '' || vehicleData.vehicleName == 'undefined') ? vehicleData.id : vehicleData.vehicleName;
+    var vehicleName = (vehicleData.vehicleName == '' || vehicleData.vehicleName == 'undefined'  || 
+			vehicleData.vehicleName === undefined) ? vehicleData.id : vehicleData.vehicleName;
     var content = "<b><fmt:message key="div.Vehicle" />:</b> " + vehicleName
     	+ "<br/><b><fmt:message key="div.droute" />: </b> " + vehicleData.routeShortName
 		+ latLonHeadingStr
@@ -561,7 +562,11 @@ function createVehicleMarker(vehicleData) {
 	// Create the actual vehicle marker. This needs to be created
 	// last and on top since the popup callback for the vehicle is
 	// attached to this marker. Otherwise won't get click events.
-	var vehicleName = (vehicleData.vehicleName == '' || vehicleData.vehicleName == 'undefined') ? vehicleData.id : vehicleData.vehicleName;
+	var vehicleName = (vehicleData.vehicleName == '' || 
+			vehicleData.vehicleName == 'undefined' || 
+			vehicleData.vehicleName === undefined) ? vehicleData.id : vehicleData.vehicleName;
+	if (vehicleData.schAdhStr)
+		vehicleName += " " + vehicleData.schAdhStr;
 	var vehicleMarker = L.marker(vehicleLoc,
 			getVehicleMarkerOptions(vehicleData))
 			.setIcon(getIconForVehicle(vehicleData))
diff --git a/transitclockWebapp/src/main/webapp/maps/schAdhMap.jsp b/transitclockWebapp/src/main/webapp/maps/schAdhMap.jsp
index 73f78efd3..7dc1daf9c 100644
--- a/transitclockWebapp/src/main/webapp/maps/schAdhMap.jsp
+++ b/transitclockWebapp/src/main/webapp/maps/schAdhMap.jsp
@@ -47,7 +47,8 @@ var vehicleLayer;
  * schedule adherence.
  */
 function getVehiclePopupContent(vehicle) {
-	var vehicleName = (vehicle.vehicleName == '' || vehicle.vehicleName == 'undefined') ? vehicle.id : vehicle.vehicleName;
+	var vehicleName = (vehicle.vehicleName == '' || vehicle.vehicleName == 'undefined' || 
+			vehicle.vehicleName === undefined) ? vehicle.id : vehicle.vehicleName;
 	var content =
 		"<b><fmt:message key="div.Vehicle" />:</b> " + vehicle.id 
 		+ "<br/><b><fmt:message key="div.droute" />:</b> " + vehicle.routeName;
@@ -134,7 +135,9 @@ function getAndProcessSchAdhData() {
 					    fillOpacity: fillOpacity,
 					};
 					
-					var vehicleName = (vehicle.vehicleName == '' || vehicle.vehicleName == 'undefined') ? vehicle.id : vehicle.vehicleName;
+					var vehicleName = (vehicle.vehicleName == '' 
+							|| vehicle.vehicleName == 'undefined' 
+							|| vehicle.vehicleName === undefined) ? vehicle.id : vehicle.vehicleName;
 					if (vehicle.schAdhStr)
 						vehicleName += " " + vehicle.schAdhStr;
 					
@@ -147,7 +150,8 @@ function getAndProcessSchAdhData() {
 					// Store vehicle data obtained via AJAX with stopMarker so it can be used in popup
 					vehicleMarker.vehicle = vehicle;
 					
-					vehicleName = (vehicle.vehicleName == '' || vehicle.vehicleName == 'undefined') ? vehicle.id : vehicle.vehicleName;
+					vehicleName = (vehicle.vehicleName == '' || vehicle.vehicleName == 'undefined' || 
+							vehicle.vehicleName === undefined) ? vehicle.id : vehicle.vehicleName;
 					// Create popup window for vehicle when clicked on
 					vehicleMarker.on('click', function(e) {
 						var content = getVehiclePopupContent(this.vehicle);

From db0886016e7d74bf144b26c9d755e633142c5656 Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Fri, 23 Jul 2021 08:48:03 +0200
Subject: [PATCH 12/14] add vehicle name in api

---
 .../api/rootResources/TransitimeApi.java      | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/transitclockApi/src/main/java/org/transitclock/api/rootResources/TransitimeApi.java b/transitclockApi/src/main/java/org/transitclock/api/rootResources/TransitimeApi.java
index b7f11ef6e..61a5f2070 100644
--- a/transitclockApi/src/main/java/org/transitclock/api/rootResources/TransitimeApi.java
+++ b/transitclockApi/src/main/java/org/transitclock/api/rootResources/TransitimeApi.java
@@ -58,6 +58,7 @@
 import org.transitclock.api.data.ApiTripPatterns;
 import org.transitclock.api.data.ApiTripWithTravelTimes;
 import org.transitclock.api.data.ApiVehicleConfigs;
+import org.transitclock.api.data.ApiVehicleDetails;
 import org.transitclock.api.data.ApiVehicles;
 import org.transitclock.api.data.ApiVehiclesDetails;
 import org.transitclock.api.predsByLoc.PredsByLoc;
@@ -66,6 +67,7 @@
 import org.transitclock.core.TemporalDifference;
 import org.transitclock.db.structs.Agency;
 import org.transitclock.db.structs.Location;
+import org.transitclock.db.structs.VehicleConfig;
 import org.transitclock.ipc.data.IpcActiveBlock;
 import org.transitclock.ipc.data.IpcBlock;
 import org.transitclock.ipc.data.IpcCalendar;
@@ -328,11 +330,23 @@ public Response getVehiclesDetails(@BeanParam StandardParameters stdParameters,
 				vehicles = inter.get();
 			}
 
+			
 			// If the vehicles doesn't exist then throw exception such that
 			// Bad Request with an appropriate message is returned.
 			if (vehicles == null)
 				throw WebUtils.badRequestException("Invalid specifier for " + "vehicles");
 
+			
+			 for(IpcVehicle ipcVehicle : vehicles) {
+        		 for(IpcVehicleConfig iVC : inter.getVehicleConfigs()) {
+        			 if(iVC.getId().equals(ipcVehicle.getId())) {
+        				 ipcVehicle.setVehicleName(iVC.getName());
+         				 System.out.println(ipcVehicle.getVehicleName() + " " + iVC.getName());
+        				 break;
+        			 }
+        		 }        		 
+        	 }
+			 
 			// To determine how vehicles should be drawn in UI. If stop
 			// specified
 			// when getting vehicle info then only the vehicles being predicted
@@ -343,6 +357,8 @@ public Response getVehiclesDetails(@BeanParam StandardParameters stdParameters,
 			// Convert IpcVehiclesDetails to ApiVehiclesDetails
 			ApiVehiclesDetails apiVehiclesDetails = new ApiVehiclesDetails(vehicles, stdParameters.getAgencyId(),
 					uiTypesForVehicles,onlyAssigned);
+			
+			
 
 			// return ApiVehiclesDetails response
 			Response result = null;
@@ -1231,10 +1247,26 @@ public Response getActiveBlockByRouteNameWithVehicles(
           Collection<IpcActiveBlock> activeBlocks = vehiclesInterface
                   .getActiveBlocksAndVehiclesByRouteName(routeName,
                           allowableBeforeTimeSecs);
+          VehiclesInterface inter = stdParameters.getVehiclesInterface();
+			
+          
+          for(IpcActiveBlock ipcActiveBlocks : activeBlocks) {
+        	 for(IpcVehicle ipcVehicle : ipcActiveBlocks.getVehicles()) {
+        		 for(IpcVehicleConfig iVC : vehiclesInterface.getVehicleConfigs()) {
+        			 
+        			 if(iVC.getId().equals(ipcVehicle.getId())) {
+        				 ipcVehicle.setVehicleName(iVC.getName());
+        				 
+        				 break;
+        			 }
+        		 }        		 
+        	 }
+          }
 
           // Create and return ApiBlock response
           ApiActiveBlocksRoutes apiActiveBlocksRoutes = new ApiActiveBlocksRoutes(
                   activeBlocks, stdParameters.getAgencyId());
+          
           return stdParameters.createResponse(apiActiveBlocksRoutes);
       } catch (Exception e) {
           // If problem getting data then return a Bad Request

From 57d602ffbf7e6ace7386269ed7eb4ab8462be983 Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Thu, 9 Sep 2021 23:21:38 +0200
Subject: [PATCH 13/14] avl hours fixed

---
 .../java/org/transitclock/reports/AvlJsonQuery.java   | 11 ++++++++---
 transitclockWebapp/src/main/webapp/welcome/index.jsp  |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java b/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java
index fc6b08935..7ec10e3dd 100644
--- a/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java
+++ b/transitclockWebapp/src/main/java/org/transitclock/reports/AvlJsonQuery.java
@@ -54,6 +54,7 @@ public static String getAvlJson(String agencyId, String vehicleId,
 			String beginDate, String numdays, String beginTime, String endTime) {
 		//Determine the time portion of the SQL
 		String timeSql = "";
+		WebAgency agency = WebAgency.getCachedWebAgency(agencyId);
 		// If beginTime or endTime set but not both then use default values
 		if ((beginTime != null && !beginTime.isEmpty())
 				|| (endTime != null && !endTime.isEmpty())) {
@@ -64,12 +65,16 @@ public static String getAvlJson(String agencyId, String vehicleId,
 		}
 		if (beginTime != null && !beginTime.isEmpty() 
 				&& endTime != null && !endTime.isEmpty()) {
-			timeSql = " AND time(time) BETWEEN '" 
-				+ beginTime + "' AND '" + endTime + "' ";
+			if ("mysql".equals(agency.getDbType())) {
+				timeSql = " AND time(time) BETWEEN '" 
+						+ beginTime + "' AND '" + endTime + "' ";
+			} else {
+				timeSql = " AND cast('2000-01-01 01:12:00'::timestamp as time) BETWEEN '" 
+						+ beginTime + "' AND '" + endTime + "' ";
+			}
 		}
 		
 		String sql = "";		
-		WebAgency agency = WebAgency.getCachedWebAgency(agencyId);
 		
 		if ("mysql".equals(agency.getDbType())) {
 			sql = "SELECT vehicleId, name, time, assignmentId, lat, lon, speed, "
diff --git a/transitclockWebapp/src/main/webapp/welcome/index.jsp b/transitclockWebapp/src/main/webapp/welcome/index.jsp
index 08dfd964e..5b64885ab 100644
--- a/transitclockWebapp/src/main/webapp/welcome/index.jsp
+++ b/transitclockWebapp/src/main/webapp/welcome/index.jsp
@@ -60,7 +60,7 @@ for (WebAgency webAgency : webAgencies) {
 	  <td><div id=agencyName><%= webAgency.getAgencyName() %></div></td>
 	  <td><a href="<%= request.getContextPath() %>/maps/index.jsp?a=<%= webAgency.getAgencyId() %>" title="Real-time maps"><fmt:message key="div.maps" /></a></td>
 	  <td><a href="<%= request.getContextPath() %>/reports/index.jsp?a=<%= webAgency.getAgencyId() %>" title="Reports on historic information"><fmt:message key="div.reports" /></a></td>
-	  <td><a href="<%= request.getContextPath() %>/reports/apiCalls/index.jsp?a=<%= webAgency.getAgencyId() %>" title="API calls"><fmt:message key="div.api" /></a></td>
+	  <!--<td><a href="<%= request.getContextPath() %>/reports/apiCalls/index.jsp?a=<%= webAgency.getAgencyId() %>" title="API calls"><fmt:message key="div.api" /></a></td>-->
 	  <td><a href="<%= request.getContextPath() %>/status/index.jsp?a=<%= webAgency.getAgencyId() %>" title="Pages showing current status of system"><fmt:message key="div.status" /></a></td>
 	  <td><a href="<%= request.getContextPath() %>/synoptic/index.jsp?a=<%= webAgency.getAgencyId() %>" title="Real-time synoptic"><fmt:message key="div.synoptic" /></a></td>
 	  <td><a href="<%= request.getContextPath() %>/extensions/index.jsp?a=<%= webAgency.getAgencyId() %>" title="Page of links to extension to the system"><fmt:message key="div.extensions" /></a></td>

From 4c89905693fa1afa7f432f2b81e2fa1d24981d43 Mon Sep 17 00:00:00 2001
From: Hubert goEuropa <hubert.wachowski@goeuropa.eu>
Date: Tue, 26 Oct 2021 07:27:36 +0200
Subject: [PATCH 14/14] Fix translation, add osm link to bus position

---
 .../main/resources/org/transitclock/i18n/text.properties   | 3 ++-
 .../resources/org/transitclock/i18n/text_pl.properties     | 5 +++--
 transitclockWebapp/src/main/webapp/reports/index.jsp       | 2 +-
 .../src/main/webapp/reports/lastAvlReport.jsp              | 7 ++++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/transitclockWebapp/src/main/resources/org/transitclock/i18n/text.properties b/transitclockWebapp/src/main/resources/org/transitclock/i18n/text.properties
index 36e62dc32..41925695c 100644
--- a/transitclockWebapp/src/main/resources/org/transitclock/i18n/text.properties
+++ b/transitclockWebapp/src/main/resources/org/transitclock/i18n/text.properties
@@ -237,4 +237,5 @@ StopsUnderEq4ForVehiclesThatAre = stops for vehicles that are
 StopsOver4ForVehiclesThatAre = stops for vehicles that are
 NumberOfStopsPerTimeInterval = Number of stops per time interval
 MinutesVehicleLateNOrEarlyPositive = Minutes vehicle late (negative) or early (positive)
-Undefined = undefined
\ No newline at end of file
+Undefined = undefined
+PositionOnMap = Position on map
\ No newline at end of file
diff --git a/transitclockWebapp/src/main/resources/org/transitclock/i18n/text_pl.properties b/transitclockWebapp/src/main/resources/org/transitclock/i18n/text_pl.properties
index 726596a01..5f94a0d0a 100644
--- a/transitclockWebapp/src/main/resources/org/transitclock/i18n/text_pl.properties
+++ b/transitclockWebapp/src/main/resources/org/transitclock/i18n/text_pl.properties
@@ -21,7 +21,7 @@ div.avldata = Mapa danych AVL
 div.prediction = Wykres zakresu dok\u0142adno\u015bci prognozy
 div.PredictionAccuracyIntervalChart = Interwa\u0142owy wykres dok\u0142adno\u015bci prognozy
 div.predictionscatter = Wykres rozproszony dok\u0142adno\u015bci prognozy
-div.csv = Ostatni raport GPS wed\u0142ug pojazdu
+div.csv = Dok\u0142adno\u015B\u0107 prognoz w CSV
 div.scheduleroutr = Prognoza rozk\u0142adu wed\u0142ug trasy
 div.earlylate = Przestrzegania rozk\u0142adu jazdy wed\u0142ug wcze\u015bniej/p\u00f3\u017aniej ni\u017c rozk\u0142adowo
 div.schedulebystop = Prognoza rozk\u0142adu jazdy wed\u0142ug przystank\u00f3w
@@ -236,4 +236,5 @@ StopsUnderEq4ForVehiclesThatAre = przystanki dla pojazd
 StopsOver4ForVehiclesThatAre = przystanków dla pojazdów, które s\u0105 od
 NumberOfStopsPerTimeInterval = Liczba przystanków na interwa\u0142 czasowy
 MinutesVehicleLateNOrEarlyPositive = Minut pojazd pó\u017Aniej (negatywna) lub wcze\u015Bniej (pozytywna)
-Undefined = nieokre\u015Blony
\ No newline at end of file
+Undefined = nieokre\u015Blony
+PositionOnMap = Pozycja na mapie
\ No newline at end of file
diff --git a/transitclockWebapp/src/main/webapp/reports/index.jsp b/transitclockWebapp/src/main/webapp/reports/index.jsp
index 3278f186a..cda0def9f 100644
--- a/transitclockWebapp/src/main/webapp/reports/index.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/index.jsp
@@ -58,7 +58,7 @@ finding specific issues with predictions.">
      <fmt:message key="div.AVLDataInMapParametersPage" /></a></li>
   <li><a href="lastAvlReport.jsp?a=<%= agencyId %>"
     title="Displays the last time each vehicle reported its GPS position over the last 24 hours.">
-      <fmt:message key="div.csv" /></a></li>
+      <fmt:message key="div.lgpsr" /></a></li>
 </ul>
 
 <div id="subtitle"><fmt:message key="div.EventReports" /></div>
diff --git a/transitclockWebapp/src/main/webapp/reports/lastAvlReport.jsp b/transitclockWebapp/src/main/webapp/reports/lastAvlReport.jsp
index 3152a4fd2..a320c8052 100644
--- a/transitclockWebapp/src/main/webapp/reports/lastAvlReport.jsp
+++ b/transitclockWebapp/src/main/webapp/reports/lastAvlReport.jsp
@@ -24,16 +24,17 @@ if (agencyId == null || agencyId.isEmpty()) {
 /* Programatically create contents of table */
 function dataReadCallback(jsonData) {
 	var table = document.getElementById("dataTable");
-	
+		
 	for (var i=0; i<jsonData.data.length; ++i) {
 		var vehicleInfo = jsonData.data[i];
 
 		// Insert row (after the header)
-		var row = table.insertRow(i+1);
+		row = table.insertRow(i+1);
 		row.insertCell(0).innerHTML = (vehicleInfo.name === undefined || vehicleInfo.name == '') ? vehicleInfo.vehicleId : vehicleInfo.name;
 		row.insertCell(1).innerHTML = vehicleInfo.maxTime;
 		row.insertCell(2).innerHTML = vehicleInfo.lat;
 		row.insertCell(3).innerHTML = vehicleInfo.lon;
+		row.insertCell(4).innerHTML = '<a href="https://www.openstreetmap.org/?mlat=' + vehicleInfo.lat + '&mlon=' + vehicleInfo.lon + '&zoom=12">OtwĂłrz mapÄ™</a>';
 	}
 }
 
@@ -56,7 +57,7 @@ $( document ).ready(function() {
 <%@include file="/template/header.jsp" %>
 <div id="title"><fmt:message key="div.lgpsr" /></div>
 <table id="dataTable">
-  <tr><th><fmt:message key="div.Vehicle" /></th><th><fmt:message key="div.lgps" /></th><th><fmt:message key="div.lat" /></th><th><fmt:message key="div.lon" /></th></tr>
+  <tr><th><fmt:message key="div.Vehicle" /></th><th><fmt:message key="div.lgps" /></th><th><fmt:message key="div.lat" /></th><th><fmt:message key="div.lon" /><th><fmt:message key="PositionOnMap" /></th></tr>
   </table>
 </body>
 </html>
\ No newline at end of file