Created class LatLon. Created function GetLatLon in TrainCar. Reworke…

…d index.js. Returned LatLon object for /API/MAP.
openrails · Nov 22, 2022 · db5764c · db5764c
1 parent 7dab270
commit db5764c
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 37 deletions.
diff --git a/Source/Orts.Simulation/Common/WorldLatLon.cs b/Source/Orts.Simulation/Common/WorldLatLon.cs
@@ -287,4 +287,22 @@ static double Adjust_Lon(double value)
         }
 
     }
+
+    /// <summary>
+    /// Class to store the latitude and longitude values of a point on the map
+    /// </summary>
+    public class LatLon
+    {
+        private readonly float _lat;
+        private readonly float _lon;
+
+        public LatLon(float lat, float lon)
+        {
+            this._lat = lat;
+            this._lon = lon;
+        }
+
+        public float Lat => _lat;
+        public float Lon => _lon;
+    }
 }
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs b/Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
@@ -34,6 +34,7 @@
 //#define DEBUG_BRAKE_SLIDE
 
 using Microsoft.Xna.Framework;
+using Orts.Common;
 using Orts.Formats.Msts;
 using Orts.Parsers.Msts;
 using Orts.Simulation.AIs;
@@ -3348,6 +3349,25 @@ public virtual void UpdateHeatLoss()
 
             TotalCarCompartmentHeatLossW = HeatLossTransmissionW + HeatLossInfiltrationW + HeatLossVentilationW;
         }
+
+        /// <summary>
+        /// Determine latitude/longitude position of the current TrainCar
+        /// </summary>
+        public LatLon GetLatLon()
+        {
+            double lat = 0;
+            double lon = 0;
+
+            var playerLocation = WorldPosition.WorldLocation;
+
+            new WorldLatLon().ConvertWTC(playerLocation.TileX, playerLocation.TileZ, playerLocation.Location, ref lat, ref lon);
+
+            LatLon latLon = new LatLon(
+                MathHelper.ToDegrees((float)lat),
+                MathHelper.ToDegrees((float)lon));
+
+            return (latLon);
+        }
     }
 
     public class WheelAxle : IComparer<WheelAxle>

diff --git a/Source/RunActivity/Viewer3D/WebServices/Web/Map/index.js b/Source/RunActivity/Viewer3D/WebServices/Web/Map/index.js
@@ -16,11 +16,11 @@
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-var hr = new XMLHttpRequest;
-var httpCodeSuccess = 200;
-var xmlHttpRequestCodeDone = 4;
+const hr = new XMLHttpRequest;
+const httpCodeSuccess = 200;
+const xmlHttpRequestCodeDone = 4;
 
-var locomotivMarker;
+var locomotiveMarker;
 var map;
 var latLonPrev = [0, 0];
 
@@ -44,28 +44,29 @@ function ApiMap() {
     hr.send();
     hr.onreadystatechange = function () {
         if (this.readyState == xmlHttpRequestCodeDone && this.status == httpCodeSuccess) {
-            var responseText = JSON.parse(hr.responseText);
-            if (responseText.length > 0) {
-                latLon = responseText.split(" ");
-                if (typeof locomotivMarker !== 'undefined') {
-                    if ((latLon[0] != latLonPrev[0]) || (latLon[1] != latLonPrev[1])) {
-                        map.panTo(latLon);
-                    }
-                } else {
-                    MapInit(latLon);
-                }
 
-                if ((latLon[0] != latLonPrev[0]) || (latLon[1] != latLonPrev[1])) {
-                    if (typeof locomotivMarker !== 'undefined') {
-                        locomotivMarker.removeFrom(map);
-                    }
-                    locomotivMarker = L.marker(
+            let latLonObj = JSON.parse(hr.responseText);
+
+            if (latLonObj != null) {
+
+                let latLon = [latLonObj.Lat, latLonObj.Lon];
+
+                if (typeof locomotiveMarker == 'undefined') {
+                    // init
+                    MapInit(latLon);
+                    locomotiveMarker = L.marker(
                         latLon,
                         { icon: myIcon }
                     ).addTo(map);
-                    latLonPrev[0] = latLon[0];
-                    latLonPrev[1] = latLon[1];
+                } else {
+                    if ((latLon[0] != latLonPrev[0]) || (latLon[1] != latLonPrev[1])) {
+                        // changed
+                        map.panTo(latLon);
+                        locomotiveMarker.setLatLng(latLon).update();
+                    }
                 }
+                latLonPrev[0] = latLon[0];
+                latLonPrev[1] = latLon[1];
             }
         }
     }

diff --git a/Source/RunActivity/Viewer3D/WebServices/WebServer.cs b/Source/RunActivity/Viewer3D/WebServices/WebServer.cs
@@ -121,21 +121,6 @@ public ORTSApiController(Viewer viewer)
             Viewer = viewer;
         }
 
-        public string getLatLon()
-        {
-            double latitude = 0;
-            double longitude = 0;
-
-            var playerLocation = Viewer.Simulator.PlayerLocomotive.WorldPosition.WorldLocation;
-
-            new WorldLatLon().ConvertWTC(playerLocation.TileX, playerLocation.TileZ, playerLocation.Location, ref latitude, ref longitude);;
-
-            string latitudeStr = (MathHelper.ToDegrees((float)latitude)).ToString("F6").Replace(',', '.');
-            string longitudeStr = (MathHelper.ToDegrees((float)longitude)).ToString("F6").Replace(',', '.');
-
-            return (latitudeStr + " " + longitudeStr);
-        }
-
         #region /API/APISAMPLE
         public struct Embedded
         {
@@ -274,7 +259,7 @@ IEnumerable<string> GetValues()
 
         #region /API/MAP
         [Route(HttpVerbs.Get, "/MAP")]
-        public string LatLon() => getLatLon();
+        public LatLon LatLon() => Viewer.Simulator.PlayerLocomotive.GetLatLon();
         #endregion
     }
 }