Containers: changed wording from "occupancy" to "population" and extension from ".lso" to ".lsp"

Author: Csantucci

Source/Orts.Formats.Msts/ActivityFile.cs

@@ -399,7 +399,7 @@ public class Tr_Activity_Header {
         public int FuelWater = 100;		// percent
         public int FuelCoal = 100;		// percent
         public int FuelDiesel = 100;	// percent
-        public string LoadStationsOccupancyFile;
+        public string LoadStationsPopulationFile;
 
         public Tr_Activity_Header(STFReader stf) {
             stf.MustMatch("(");
@@ -423,7 +423,7 @@ public Tr_Activity_Header(STFReader stf) {
                 new STFReader.TokenProcessor("fuelwater", ()=>{ FuelWater = stf.ReadIntBlock(FuelWater); }),
                 new STFReader.TokenProcessor("fuelcoal", ()=>{ FuelCoal = stf.ReadIntBlock(FuelCoal); }),
                 new STFReader.TokenProcessor("fueldiesel", ()=>{ FuelDiesel = stf.ReadIntBlock(FuelDiesel); }),
-                new STFReader.TokenProcessor("ortsloadstationsoccupancy", ()=>{ LoadStationsOccupancyFile = stf.ReadStringBlock(null); }),
+                new STFReader.TokenProcessor("ortsloadstationspopulation", ()=>{ LoadStationsPopulationFile = stf.ReadStringBlock(null); }),
             });
         }
 

Source/Orts.Formats.OR/LoadStationsOccupancyFile.cs renamed to Source/Orts.Formats.OR/LoadStationsPopulationFile.cs

@@ -31,11 +31,11 @@ namespace Orts.Formats.OR
     /// class ORWeatherFile
     /// </summary>
 
-    public class LoadStationsOccupancyFile
+    public class LoadStationsPopulationFile
     {
-        public List<ContainerStationOccupancy> LoadStationsOccupancy = new List<ContainerStationOccupancy>();
+        public List<ContainerStationPopulation> LoadStationsPopulation = new List<ContainerStationPopulation>();
 
-        public LoadStationsOccupancyFile(string fileName)
+        public LoadStationsPopulationFile(string fileName)
         {
             JsonReader.ReadFile(fileName, TryParse);
         }
@@ -45,11 +45,11 @@ bool TryParse(JsonReader item)
             switch (item.Path)
             {
                 case "":
-                case "ContainerStationsOccupancy[]":
+                case "ContainerStationsPopulation[]":
                     // Ignore these items.
                     break;
-                case "ContainerStationsOccupancy[].":
-                    LoadStationsOccupancy.Add(new ContainerStationOccupancy(item));
+                case "ContainerStationsPopulation[].":
+                    LoadStationsPopulation.Add(new ContainerStationPopulation(item));
                     break;
                 default: return false;
             }
@@ -79,12 +79,12 @@ bool TryParse(JsonReader item)
         }
     }
 
-    public class ContainerStationOccupancy
+    public class ContainerStationPopulation
     {
         public LoadStationID LoadStatID;
         public List<LoadDataEntry> LoadData = new List<LoadDataEntry>();
 
-        public ContainerStationOccupancy(JsonReader json)
+        public ContainerStationPopulation(JsonReader json)
         {
             json.ReadBlock(TryParse);
         }

Source/Orts.Formats.OR/Orts.Formats.OR.csproj

@@ -63,7 +63,7 @@
     <Compile Include="DrawUtility.cs" />
     <Compile Include="ExtCarSpawnerFile.cs" />
     <Compile Include="GlobalItem.cs" />
-    <Compile Include="LoadStationsOccupancyFile.cs" />
+    <Compile Include="LoadStationsPopulationFile.cs" />
     <Compile Include="MSTSCoord.cs" />
     <Compile Include="MSTSData.cs" />
     <Compile Include="ClocksFile.cs" />

Source/Orts.Simulation/Simulation/Container.cs

@@ -436,7 +436,7 @@ public ContainerHandlingItem(Simulator simulator, WorldPosition shapePosition, F
             GrabberArmsParts = thisWorldObj.GrabberArmsParts;
             DelayTimer = new Timer(this);
             // preload containers if not at restore time
-            if (Simulator.LoadStationsOccupancyFile != null)
+            if (Simulator.LoadStationsPopulationFile != null)
                 PreloadContainerStation(thisWorldObj);
         }
 
@@ -507,13 +507,13 @@ public bool Refill()
         public void PreloadContainerStation(PickupObj thisWorldObj)
         {
             // Search if ContainerStation present in file
-            foreach (var loadStationOccupancy in Simulator.LoadStationsOccupancyFile.LoadStationsOccupancy)
+            foreach (var loadStationPopulation in Simulator.LoadStationsPopulationFile.LoadStationsPopulation)
             {
-                var tileX = int.Parse(loadStationOccupancy.LoadStatID.wfile.Substring(1, 7));
-                var tileZ = int.Parse(loadStationOccupancy.LoadStatID.wfile.Substring(8, 7));
-                if (tileX == Location.TileX && tileZ == Location.TileZ  && loadStationOccupancy.LoadStatID.UiD == thisWorldObj.UID)
+                var tileX = int.Parse(loadStationPopulation.LoadStatID.wfile.Substring(1, 7));
+                var tileZ = int.Parse(loadStationPopulation.LoadStatID.wfile.Substring(8, 7));
+                if (tileX == Location.TileX && tileZ == Location.TileZ  && loadStationPopulation.LoadStatID.UiD == thisWorldObj.UID)
                 {
-                    foreach (var loadDataEntry in (loadStationOccupancy as ContainerStationOccupancy).LoadData)
+                    foreach (var loadDataEntry in (loadStationPopulation as ContainerStationPopulation).LoadData)
                     {
                         string loadDataFolder = Simulator.BasePath + @"\trains\trainset\" + loadDataEntry.FolderName;
                         string loadFilePath = loadDataFolder + @"\" + loadDataEntry.FileName + ".loa";

Source/Orts.Simulation/Simulation/Simulator.cs

@@ -132,7 +132,7 @@ public class Simulator
         public SuperElevation SuperElevation;
         public int SuperElevationMinLen = 50;
         public float SuperElevationGauge = 1.435f;//1.435 guage
-        public LoadStationsOccupancyFile LoadStationsOccupancyFile;
+        public LoadStationsPopulationFile LoadStationsPopulationFile;
 
         // Used in save and restore form
         public string PathName = "<unknown>";
@@ -442,10 +442,10 @@ public void SetExploreThroughActivity(string path, string consist, string start,
         public void Start(CancellationToken cancellation)
         {
             ContainerManager = new ContainerManager(this);
-            if (Activity?.Tr_Activity?.Tr_Activity_Header?.LoadStationsOccupancyFile != null)
+            if (Activity?.Tr_Activity?.Tr_Activity_Header?.LoadStationsPopulationFile != null)
             {
-                var occupancyFilePath = RoutePath + @"\Activities\Openrails\" + Activity.Tr_Activity.Tr_Activity_Header.LoadStationsOccupancyFile + ".lso";
-                LoadStationsOccupancyFile = new LoadStationsOccupancyFile(occupancyFilePath);
+                var populationFilePath = RoutePath + @"\Activities\Openrails\" + Activity.Tr_Activity.Tr_Activity_Header.LoadStationsPopulationFile + ".lsp";
+                LoadStationsPopulationFile = new LoadStationsPopulationFile(populationFilePath);
             }
             Signals = new Signals(this, SIGCFG, cancellation);
             TurntableFile = new TurntableFile(RoutePath + @"\openrails\turntables.dat", RoutePath + @"\shapes\", MovingTables, this);