diff --git a/html/config.js b/html/config.js index c3b3a3e..6a1a318 100644 --- a/html/config.js +++ b/html/config.js @@ -40,6 +40,28 @@ //range_outline_width = 1.7; //range_outline_colored_by_altitude = false; +// which map is displayed to new visitors +// valid values: +// terrain_roads +// osm +// wikimedia +// terrain_roads +// terrain +// carto_light_all +// carto_light_nolabels +// carto_dark_all +// carto_dark_nolabels +// only with bing key: +// bing_aerial +// bing_roads + +// which map is displayed to new visitors +//MapType_tar1090 = "carto_light_all"; + +// Default map dim state, true or false. +//MapDim = true; + + // -- Marker settings ------------------------------------- //markerScaleFactor = 1.2; diff --git a/html/defaults.js b/html/defaults.js index fd0dc98..20edcdc 100644 --- a/html/defaults.js +++ b/html/defaults.js @@ -40,6 +40,12 @@ var range_outline_color = '#0000DD'; var range_outline_width = 1.7; var range_outline_colored_by_altitude = false; +// which map is displayed to new visitors +var MapType_tar1090 = "carto_light_all"; + +// Default map dim state +var MapDim = true; + // -- Marker settings ------------------------------------- var markerScaleFactor = 1.2; diff --git a/html/script.js b/html/script.js index 0c0a270..44cdef9 100644 --- a/html/script.js +++ b/html/script.js @@ -74,7 +74,7 @@ var SpecialSquawks = { }; // Get current map settings -var CenterLat, CenterLon, ZoomLvl, ZoomLvlCache, MapType_tar1090; +var CenterLat, CenterLon, ZoomLvl, ZoomLvlCache; var zoomTimeout; @@ -895,9 +895,9 @@ function initialize_map() { CenterLat = Number(localStorage['CenterLat']) || DefaultCenterLat; ZoomLvl = Number(localStorage['ZoomLvl']) || DefaultZoomLvl; ZoomLvlCache = ZoomLvl; - MapType_tar1090 = localStorage['MapType_tar1090']; - if (!MapType_tar1090) - MapType_tar1090="carto_light_all"; + if (localStorage['MapType_tar1090']) { + MapType_tar1090 = localStorage['MapType_tar1090']; + } // Set SitePosition if (SiteLat != null && SiteLon != null) { @@ -1118,7 +1118,7 @@ function initialize_map() { } } - if (localStorage['MapDim'] == undefined || localStorage['MapDim'] == "true") { + if (localStorage['MapDim'] === "true" || MapDim) { toggleMapDim(true); } @@ -2538,6 +2538,7 @@ function dim(evt) { function toggleMapDim(switchOn) { if (!switchOn && localStorage['MapDim'] === "true") { localStorage['MapDim'] = "false"; + MapDim = false; ol.control.LayerSwitcher.forEachRecursive(layers_group, function(lyr) { if (lyr.get('type') != 'base') @@ -2556,6 +2557,7 @@ function toggleMapDim(switchOn) { */ } else { localStorage['MapDim'] = "true"; + MapDim = true; ol.control.LayerSwitcher.forEachRecursive(layers_group, function(lyr) { if (lyr.get('type') != 'base')