Storing map webpage layer choice in the HTML Web Storage instead of the registry

Author: sweiland-openrails

Source/ORTS.Common/InfoApiMap.cs

@@ -21,12 +21,6 @@
 
 namespace Orts.Common
 {
-    public class OverlayLayer
-    {
-        public string name;
-        public bool show;
-    }
-
     public enum TypeOfPointOnApiMap {
         track,
         named,
@@ -50,8 +44,6 @@ public class LineOnApiMap
     public class InfoApiMap
     {
         public string typeOfLocomotive;
-        public string baseLayer;
-        public OverlayLayer[] overlayLayer;
 
         public LinkedList<PointOnApiMap> pointOnApiMapList;
         public LinkedList<LineOnApiMap> lineOnApiMapList;
@@ -61,14 +53,9 @@ public class InfoApiMap
         public float lonMin;
         public float lonMax;
 
-        public const string RegistrySection = "ApiMap";
-        public const string RegistryKeyBaselayer = "baseLayer";
-        public const string RegistrySectionLayers = "ApiMap\\Layers";
-
-        public InfoApiMap(string powerSupplyName, string settingsFilePath, string registryKey) 
+        public InfoApiMap(string powerSupplyName) 
         {
             initTypeOfLocomotive(powerSupplyName);
-            initLayers(settingsFilePath, registryKey);
 
             pointOnApiMapList = new LinkedList<PointOnApiMap>();
             lineOnApiMapList = new LinkedList<LineOnApiMap>();
@@ -99,54 +86,6 @@ private void initTypeOfLocomotive(string powerSupplyName)
             }
         }
 
-        private void initLayers(string settingsFilePath, string registryKey)
-        {
-            var store = SettingsStore.GetSettingStore(settingsFilePath, registryKey, RegistrySection);
-            baseLayer = (string)store.GetUserValue(RegistryKeyBaselayer, typeof(string));
-
-            overlayLayer = null;
-            store = SettingsStore.GetSettingStore(settingsFilePath, registryKey, RegistrySectionLayers);
-            string[] names = store.GetUserNames();
-            if (names.Length > 0)
-            {
-                overlayLayer = new OverlayLayer[names.Length];
-
-                int index = 0;
-                foreach (string name in names)
-                {
-                    overlayLayer[index] = new OverlayLayer
-                    {
-                        name = name,
-                        show = (bool)store.GetUserValue(name, typeof(bool))
-                    };
-                    index++;
-                }
-            }
-        }
-
-        public static void storeLayerSetting(
-            string settingsFilePath, string registryKey,
-            string layerAction, string layerName)
-        {
-            if (layerAction == "baseLayerChange")
-            {
-                var store = SettingsStore.GetSettingStore(settingsFilePath, registryKey, InfoApiMap.RegistrySection);
-                store.SetUserValue(InfoApiMap.RegistryKeyBaselayer, layerName);
-            }
-            else
-            {
-                var store = SettingsStore.GetSettingStore(settingsFilePath, registryKey, InfoApiMap.RegistrySectionLayers);
-                if (layerAction == "overlayAdd")
-                {
-                    store.SetUserValue(layerName, (bool)true);
-                }
-                if (layerAction == "overlayRemove")
-                {
-                    store.SetUserValue(layerName, (bool)false);
-                }
-            }
-        }
-
         public static LatLon convertToLatLon(int TileX, int TileZ, float X, float Y, float Z)
         {
             double latitude = 1f;

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

@@ -22,6 +22,9 @@ const hr3 = new XMLHttpRequest;
 const httpCodeSuccess = 200;
 const xmlHttpRequestCodeDone = 4;
 
+const storageBaseLayerKey = "OpenRails/apimap/baseLayer";
+const storageLayersKey = "OpenRails/apimap/layers/";
+
 let map;
 let initToBeDone = true;
 let locomotiveMarker;
@@ -92,19 +95,6 @@ function ApiMapInit() {
 
     layerControl = L.control.layers(baseLayers, null).addTo(map);
 
-    if ((apiMapInitInfo.baseLayer == null) || (apiMapInitInfo.baseLayer == "standard")) {
-        orm.addTo(map);
-    }
-    if (apiMapInitInfo.baseLayer == "maximum speed") {
-        ormMaxSpeed.addTo(map);
-    }
-    if (apiMapInitInfo.baseLayer == "gauge") {
-        ormGauge.addTo(map);
-    }
-    if (apiMapInitInfo.baseLayer == "electrification") {
-        ormElectrification.addTo(map);
-    }
-
     trackLayerGroup = L.layerGroup();
     namedLayerGroup = L.layerGroup();
     restLayerGroup = L.layerGroup();
@@ -165,28 +155,47 @@ function ApiMapInit() {
     layerControl.addOverlay(namedLayerGroup, 'named');
     layerControl.addOverlay(restLayerGroup, 'rest');
 
-    if (apiMapInitInfo.overlayLayer != null) {
-        for (const layer of apiMapInitInfo.overlayLayer) {
-            if ((layer.name == "track") && (layer.show == 1)) {
-                trackLayerGroup.addTo(map);
+    baseLayerFound = false;
+    for (let i = 0; i < localStorage.length; i++) {
+        key = localStorage.key(i);
+
+        if (key == storageBaseLayerKey) {
+            if (value == "standard") {
+                orm.addTo(map);
+            }
+            if (value == "maximum speed") {
+                ormMaxSpeed.addTo(map);
             }
-            if ((layer.name == "named") && (layer.show == 1)) {
-                namedLayerGroup.addTo(map);
+            if (value == "gauge") {
+                ormGauge.addTo(map);
             }
-            if ((layer.name == "rest") && (layer.show == 1)) {
-                restLayerGroup.addTo(map);
+            if (value == "electrification") {
+                ormElectrification.addTo(map);
             }
         }
+
+        if ((key == storageLayersKey + "track") && (value == "true")) {
+            trackLayerGroup.addTo(map);
+        }
+        if ((key == storageLayersKey + "named") && (value == "true")) {
+            namedLayerGroup.addTo(map);
+        }
+        if ((key == storageLayersKey + "rest") && (value == "true")) {
+            restLayerGroup.addTo(map);
+        }
+    }
+    if (!baseLayerFound) {
+        orm.addTo(map);
     }
 
-    map.on('baselayerchange', function(e) {
-        ApiSendLayerChange('baseLayerChange', e.name);
+    map.on('baselayerchange', function (e) {
+        localStorage.setItem(storageBaseLayerKey, e.name);
     });
     map.on('overlayadd', function (e) {
-        ApiSendLayerChange('overlayAdd', e.name);
+        localStorage.setItem(storageLayersKey + e.name, "true");
     });
     map.on('overlayremove', function (e) {
-        ApiSendLayerChange('overlayRemove', e.name);
+        localStorage.setItem(storageLayersKey + e.name, "false");
     });
 }
 
@@ -237,16 +246,3 @@ function ApiMap() {
     }
     hr1.send();
 }
-
-function ApiSendLayerChange(action, name) {
-
-    hr3.open("POST", "/API/MAP", true);
-    hr3.setRequestHeader("Content-Type", "application/json");
-    hr3.send
-        (JSON.stringify
-            ({
-                "LayerAction": action,
-                "LayerName": name
-            })
-        )
-}

Source/RunActivity/Viewer3D/WebServices/WebServer.cs

@@ -90,14 +90,6 @@ private static async Task SerializationCallback(IHttpContext context, object dat
             }
         }
 
-        public static async Task<T> DeserializationCallback<T>(IHttpContext context)
-        {
-            using (var text = context.OpenRequestText())
-            {
-                return JsonConvert.DeserializeObject<T>(await text.ReadToEndAsync());
-            }
-        }
-
         /// <summary>
         /// This contract resolver fixes JSON serialization for certain XNA classes.
         /// </summary>
@@ -278,8 +270,7 @@ public InfoApiMap apiMapInfo()
         public static InfoApiMap getApiMapInfo(Viewer viewer)
         {
             InfoApiMap infoApiMap = new InfoApiMap(
-                viewer.PlayerLocomotive.PowerSupply.GetType().Name, 
-                UserSettings.SettingsFilePath, UserSettings.RegistryKey);
+                viewer.PlayerLocomotive.PowerSupply.GetType().Name);
 
             viewer.Simulator.TDB.TrackDB.addTrNodesToPointsOnApiMap(infoApiMap);
 
@@ -292,20 +283,5 @@ public static InfoApiMap getApiMapInfo(Viewer viewer)
         [Route(HttpVerbs.Get, "/MAP")]
         public LatLonDirection LatLonDirection() => Viewer.Simulator.PlayerLocomotive.GetLatLonDirection();
         #endregion
-
-        #region /API/MAP
-        [Route(HttpVerbs.Post, "/MAP")]
-        public async Task StoreLayerChance()
-        {
-            var data = await HttpContext.GetRequestDataAsync<ApiMapLayerAction>(WebServer.DeserializationCallback<ApiMapLayerAction>);
-            storeLayerSetting(UserSettings.SettingsFilePath, UserSettings.RegistryKey, data.LayerAction, data.LayerName);
-        }
-        #endregion
-    }
-    
-    public class ApiMapLayerAction
-    {
-        public string LayerAction;
-        public string LayerName;
     }
 }