diff --git a/html/config.js b/html/config.js index 2836382..2948557 100644 --- a/html/config.js +++ b/html/config.js @@ -238,8 +238,15 @@ MapboxAPIKey = null; // Only display labels when zoomed in this far: //labelZoom = 8; //labelZoomGround = 12.5; +/ +// font family for labels, default bold, could be empty or italic as well +// labelStyle = 'bold'; +// labelFamily = 'Tahoma, Verdana, Helvetica, sans-serif'; +// labelScale = 1; -//labelFont = 'bold 12px tahoma'; +// globalScale = 1; +// userScale = 1; +// iconScale = 1; //displayUATasADSB = false; //uatNoTISB = true; diff --git a/html/defaults.js b/html/defaults.js index a214a05..29debac 100644 --- a/html/defaults.js +++ b/html/defaults.js @@ -256,7 +256,19 @@ let utcTimesHistoric = true; let labelZoom = 0; let labelZoomGround = 14.8; -let labelFont = 'bold 12px tahoma'; +// font family for labels, default bold, could be empty or italic as well +let labelStyle = 'bold'; +let labelFamily = 'Tahoma, Verdana, Helvetica, sans-serif'; +let labelScale = 1; + +// labelFont this is now generated from the detailed settings above, setting this in config.js won't +// have ANY effect +let labelFont; + +// some scaling for fonts and things +let globalScale = 1; +let userScale = 1; +let iconScale = 1; let displayUATasADSB = false; let uatNoTISB = false; diff --git a/html/script.js b/html/script.js index 5b7e07b..a973ff6 100644 --- a/html/script.js +++ b/html/script.js @@ -97,10 +97,6 @@ let traceDate = null; let traceDateString = null; let traceOpts = {}; let icaoParam = null; -let globalScale = 1; -let userScale = 1; -let iconScale = 1; -let labelScale = 1; let newWidth = lineWidth; let SiteOverride = (SiteLat != null && SiteLon != null); let onJumpInput = null; @@ -5643,7 +5639,7 @@ function setGlobalScale(scale, init) { globalScale = scale; document.documentElement.style.setProperty("--SCALE", globalScale); - labelFont = "bold " + (12 * globalScale * labelScale) + "px/" + (14 * globalScale * labelScale) + "px Tahoma, Verdana, Helvetica, sans-serif"; + labelFont = `${labelStyle} ${(12 * globalScale * labelScale)}px/${(14 * globalScale * labelScale)}px ${labelFamily}`; checkScale(); setLineWidth();