Merge pull request #699 from mbm-OR/bugfix/Fix-Web-HUD-Force-labels

Bug fix for https://bugs.launchpad.net/or/+bug/1987453. Web: HUD/Force Information, some labels not visible.

Author: mbm-OR

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

@@ -1,4 +1,4 @@
-// COPYRIGHT 2011, 2012, 2013 by the Open Rails project.
+// COPYRIGHT 2011, 2012, 2013 by the Open Rails project.
 //
 // This file is part of Open Rails.
 //
@@ -1038,6 +1038,7 @@ void TextPageBrakeInfo(TableData table)
 
         void TextPageForceInfo(TableData table)
         {
+            TableSetLabelValueColumns(table, 0, 2);
             TextPageHeading(table, Viewer.Catalog.GetString("FORCE INFORMATION"));
 
             var train = Viewer.PlayerLocomotive.Train;

Source/RunActivity/Viewer3D/WebServices/Web/HUD/index.js

@@ -85,6 +85,7 @@ function ApiHeadUpDisplay() {
 						DebugColSpanTo3 = ['Render process','Updater process','Loader process','Sound process','Total process'],
 						DebugWidthTofix = ['primitives','Camera'],
 					// Force information
+						ForceColSpanTo15 = ['Wind Speed'],
 						ForceColSpanTo4 = ['(Simple adhesion model)','Dynamic brake'],
 						ForceColSpanTo3 = ['Axle out force','Loco Adhesion','Wagon Adhesion'],
 					// Brake information
@@ -135,6 +136,9 @@ function ApiHeadUpDisplay() {
 								Str += "<td class='td_nowrap' >" + obj.extraTable.values[next] + "</td>";
 							}
 							// Force info requires colspan into first col
+							else if (obj.extraTable.values[next].includes(ForceColSpanTo15)) {
+								Str += "<td colspan='15' >" + obj.extraTable.values[next] + "</td>";
+							}
 							else if (ForceColSpanTo4.indexOf(obj.extraTable.values[next]) !== -1 || obj.extraTable.values[next].indexOf('===') !== -1){ // Locomotive info
 								Str += "<td colspan='4' >" + obj.extraTable.values[next] + "</td>";
 							}