From e2e440ce2189ff2c8530226c52a7c1dab89f05b0 Mon Sep 17 00:00:00 2001
From: luke11brown <luke.vatsim@gmail.com>
Date: Mon, 6 Jun 2022 18:19:17 +0100
Subject: [PATCH] vSMR Font Changes & Deafult to Pro Mode (#305)

* Change default to Pro Mode

* Remove tendency due font issue

* All Heathrow ASRs to have Heathrow profile, Gatwick now pro mode

* OBS ASRs ref Easy Profile

* Fixes

* CL
---
 .github/CHANGELOG.md                       |  1 +
 UK/Data/ASR/AC_S/Heathrow SMR.asr          |  1 +
 UK/Data/ASR/AC_SC/Heathrow SMR.asr         |  1 +
 UK/Data/ASR/Heathrow/Heathrow SMR.asr      |  1 +
 UK/Data/ASR/LTC/Heathrow SMR.asr           |  1 +
 UK/Data/ASR/Observer/Observer EGGD SMR.asr |  1 +
 UK/Data/ASR/Observer/Observer EGGP SMR.asr |  1 +
 UK/Data/ASR/Observer/Observer EGPF SMR.asr |  1 +
 UK/Data/ASR/Observer/Observer EGPH SMR.asr |  1 +
 UK/Data/ASR/Observer/Observer EGSS SMR.asr |  1 +
 UK/Data/Plugin/vSMR/vSMR_Profiles.json     | 52 +++++++++++-----------
 11 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index 86b8949e3..b754c35ae 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -4,6 +4,7 @@
 3. Procedure Change (2205) - Amended Midlands Buffer Zone (TopSky only) - thanks to @hsugden (Harry Sugden)
 4. Bug - Fixed TopSky Map display due to Eurocontrol West controller identifier change (TopSky only) - thanks to @hsugden (Harry Sugden)
 5. Enhancement - Added Belfast profiles - thanks to @PLM1995 (Peter Mooney)
+6. Enhancement - vSMR Defaults to pro mode & fonts changed - thanks to @luke11brown (Luke Brown)
 
 # Changes from release 2022/02 to 2022/03
 1. Bug - Updated Sector File Descriptor URL to re-enable auto-download - thanks to @hsugden (Harry Sugden)
diff --git a/UK/Data/ASR/AC_S/Heathrow SMR.asr b/UK/Data/ASR/AC_S/Heathrow SMR.asr
index f67d3853a..95d204854 100644
--- a/UK/Data/ASR/AC_S/Heathrow SMR.asr	
+++ b/UK/Data/ASR/AC_S/Heathrow SMR.asr	
@@ -2450,5 +2450,6 @@ PLUGIN:UK Controller Plugin:RegionalPressureScreenPosX:1554
 PLUGIN:UK Controller Plugin:RegionalPressureScreenPosY:112
 PLUGIN:UK Controller Plugin:SelectedMinStack:tma.LTMA;tma.MTMA;tma.STMA
 PLUGIN:UK Controller Plugin:SelectedRegionalPressures:ASR_LONDON;ASR_SCOTTISH
+PLUGIN:vSMR:ActiveProfile:Heathrow
 PLUGIN:vSMR:Airport:EGLL
 PLUGIN:vSMR:GndTrailsDots:0
diff --git a/UK/Data/ASR/AC_SC/Heathrow SMR.asr b/UK/Data/ASR/AC_SC/Heathrow SMR.asr
index 88c2e7a8b..ade9b8ae1 100644
--- a/UK/Data/ASR/AC_SC/Heathrow SMR.asr	
+++ b/UK/Data/ASR/AC_SC/Heathrow SMR.asr	
@@ -2461,5 +2461,6 @@ PLUGIN:UK Controller Plugin:SelectedRegionalPressures:ASR_LONDON;ASR_SCOTTISH
 PLUGIN:UK Controller Plugin:wakeCalculatorVisibility:0
 PLUGIN:UK Controller Plugin:wakeCalculatorXPosition:200
 PLUGIN:UK Controller Plugin:wakeCalculatorYPosition:200
+PLUGIN:vSMR:ActiveProfile:Heathrow
 PLUGIN:vSMR:Airport:EGLL
 PLUGIN:vSMR:GndTrailsDots:0
diff --git a/UK/Data/ASR/Heathrow/Heathrow SMR.asr b/UK/Data/ASR/Heathrow/Heathrow SMR.asr
index 18fdbb774..bc4872b91 100644
--- a/UK/Data/ASR/Heathrow/Heathrow SMR.asr	
+++ b/UK/Data/ASR/Heathrow/Heathrow SMR.asr	
@@ -2450,5 +2450,6 @@ PLUGIN:UK Controller Plugin:RegionalPressureScreenPosX:100
 PLUGIN:UK Controller Plugin:RegionalPressureScreenPosY:100
 PLUGIN:UK Controller Plugin:SelectedMinStack:tma.LTMA;tma.MTMA;tma.STMA
 PLUGIN:UK Controller Plugin:SelectedRegionalPressures:ASR_LONDON;ASR_SCOTTISH
+PLUGIN:vSMR:ActiveProfile:Heathrow
 PLUGIN:vSMR:Airport:EGLL
 PLUGIN:vSMR:GndTrailsDots:0
diff --git a/UK/Data/ASR/LTC/Heathrow SMR.asr b/UK/Data/ASR/LTC/Heathrow SMR.asr
index 88c2e7a8b..ade9b8ae1 100644
--- a/UK/Data/ASR/LTC/Heathrow SMR.asr	
+++ b/UK/Data/ASR/LTC/Heathrow SMR.asr	
@@ -2461,5 +2461,6 @@ PLUGIN:UK Controller Plugin:SelectedRegionalPressures:ASR_LONDON;ASR_SCOTTISH
 PLUGIN:UK Controller Plugin:wakeCalculatorVisibility:0
 PLUGIN:UK Controller Plugin:wakeCalculatorXPosition:200
 PLUGIN:UK Controller Plugin:wakeCalculatorYPosition:200
+PLUGIN:vSMR:ActiveProfile:Heathrow
 PLUGIN:vSMR:Airport:EGLL
 PLUGIN:vSMR:GndTrailsDots:0
diff --git a/UK/Data/ASR/Observer/Observer EGGD SMR.asr b/UK/Data/ASR/Observer/Observer EGGD SMR.asr
index ab7720ee1..14ebc80dc 100644
--- a/UK/Data/ASR/Observer/Observer EGGD SMR.asr	
+++ b/UK/Data/ASR/Observer/Observer EGGD SMR.asr	
@@ -2706,5 +2706,6 @@ PLUGIN:UK Controller Plugin:HistoryTrailMinAltitudeFilter:0
 PLUGIN:UK Controller Plugin:HistoryTrailType:0
 PLUGIN:UK Controller Plugin:MinStackScreenPosX:100
 PLUGIN:UK Controller Plugin:MinStackScreenPosY:100
+PLUGIN:vSMR:ActiveProfile:Easy/Observer
 PLUGIN:vSMR:Airport:EGGD
 PLUGIN:vSMR:GndTrailsDots:0
\ No newline at end of file
diff --git a/UK/Data/ASR/Observer/Observer EGGP SMR.asr b/UK/Data/ASR/Observer/Observer EGGP SMR.asr
index 7b48db8f3..a67a713c0 100644
--- a/UK/Data/ASR/Observer/Observer EGGP SMR.asr	
+++ b/UK/Data/ASR/Observer/Observer EGGP SMR.asr	
@@ -2449,5 +2449,6 @@ PLUGIN:UK Controller Plugin:HistoryTrailMinAltitudeFilter:0
 PLUGIN:UK Controller Plugin:HistoryTrailType:0
 PLUGIN:UK Controller Plugin:MinStackScreenPosX:100
 PLUGIN:UK Controller Plugin:MinStackScreenPosY:100
+PLUGIN:vSMR:ActiveProfile:Easy/Observer
 PLUGIN:vSMR:Airport:EGGP
 PLUGIN:vSMR:GndTrailsDots:0
\ No newline at end of file
diff --git a/UK/Data/ASR/Observer/Observer EGPF SMR.asr b/UK/Data/ASR/Observer/Observer EGPF SMR.asr
index 571f64cf6..3518550fb 100644
--- a/UK/Data/ASR/Observer/Observer EGPF SMR.asr	
+++ b/UK/Data/ASR/Observer/Observer EGPF SMR.asr	
@@ -2706,5 +2706,6 @@ PLUGIN:UK Controller Plugin:HistoryTrailMinAltitudeFilter:0
 PLUGIN:UK Controller Plugin:HistoryTrailType:0
 PLUGIN:UK Controller Plugin:MinStackScreenPosX:100
 PLUGIN:UK Controller Plugin:MinStackScreenPosY:100
+PLUGIN:vSMR:ActiveProfile:Easy/Observer
 PLUGIN:vSMR:Airport:EGPF
 PLUGIN:vSMR:GndTrailsDots:0
\ No newline at end of file
diff --git a/UK/Data/ASR/Observer/Observer EGPH SMR.asr b/UK/Data/ASR/Observer/Observer EGPH SMR.asr
index 565398ab9..0f2e91d83 100644
--- a/UK/Data/ASR/Observer/Observer EGPH SMR.asr	
+++ b/UK/Data/ASR/Observer/Observer EGPH SMR.asr	
@@ -2449,5 +2449,6 @@ PLUGIN:UK Controller Plugin:HistoryTrailMinAltitudeFilter:0
 PLUGIN:UK Controller Plugin:HistoryTrailType:0
 PLUGIN:UK Controller Plugin:MinStackScreenPosX:100
 PLUGIN:UK Controller Plugin:MinStackScreenPosY:100
+PLUGIN:vSMR:ActiveProfile:Easy/Observer
 PLUGIN:vSMR:Airport:EGPH
 PLUGIN:vSMR:GndTrailsDots:0
\ No newline at end of file
diff --git a/UK/Data/ASR/Observer/Observer EGSS SMR.asr b/UK/Data/ASR/Observer/Observer EGSS SMR.asr
index 3051f82ed..f89c28b5a 100644
--- a/UK/Data/ASR/Observer/Observer EGSS SMR.asr	
+++ b/UK/Data/ASR/Observer/Observer EGSS SMR.asr	
@@ -2447,5 +2447,6 @@ PLUGIN:UK Controller Plugin:HistoryTrailMinAltitudeFilter:0
 PLUGIN:UK Controller Plugin:HistoryTrailType:0
 PLUGIN:UK Controller Plugin:MinStackScreenPosX:100
 PLUGIN:UK Controller Plugin:MinStackScreenPosY:100
+PLUGIN:vSMR:ActiveProfile:Easy/Observer
 PLUGIN:vSMR:Airport:EGSS
 PLUGIN:vSMR:GndTrailsDots:0
\ No newline at end of file
diff --git a/UK/Data/Plugin/vSMR/vSMR_Profiles.json b/UK/Data/Plugin/vSMR/vSMR_Profiles.json
index 904de320a..a8784f42e 100644
--- a/UK/Data/Plugin/vSMR/vSMR_Profiles.json
+++ b/UK/Data/Plugin/vSMR/vSMR_Profiles.json
@@ -1,8 +1,8 @@
 [
   {
-    "name": "Default",
+   "name": "Default",
     "font": {
-      "font_name": "EuroScope",
+      "font_name": "Arial",
       "weight": "Regular",
       "sizes": {
         "one": 11,
@@ -18,7 +18,7 @@
       "radar_range_nm": 300,
       "night_alpha_setting": 110,
       "pro_mode": {
-        "enable": false,
+        "enable": true,
         "accept_pilot_squawk": false,
         "do_not_autocorrelate_squawks": [
           "2000",
@@ -87,8 +87,7 @@
         "use_departure_arrival_coloring": false,
         "definition": [
           [ "callsign" ],
-          [ "flightlevel", "tendency", "gs" ],
-          [ "actype" ]
+          [ "flightlevel" ]
         ],
         "text_color": {
           "r": 255,
@@ -196,9 +195,9 @@
         "b": 0
       },
       "background_color": {
-        "r": 100,
-        "g": 100,
-        "b": 100
+        "r": 127,
+        "g": 122,
+        "b": 122
       }
     },
     "maps": {
@@ -239,10 +238,10 @@
     }
   },
   {
-    "name": "Professional Mode",
+    "name": "Easy/Observer",
     "font": {
       "font_name": "Arial",
-      "weight": "Bold",
+      "weight": "Regular",
       "sizes": {
         "one": 11,
         "two": 12,
@@ -252,12 +251,12 @@
       }
     },
     "filters": {
-      "hide_above_alt": 9000,
-      "hide_above_spd": 300,
+      "hide_above_alt": 4000,
+      "hide_above_spd": 250,
       "radar_range_nm": 300,
       "night_alpha_setting": 110,
       "pro_mode": {
-        "enable": true,
+        "enable": false,
         "accept_pilot_squawk": false,
         "do_not_autocorrelate_squawks": [
           "2000",
@@ -270,7 +269,7 @@
     "labels": {
       "auto_deconfliction": true,
       "leader_line_length": 50,
-      "use_aspeed_for_gate": true,
+      "use_aspeed_for_gate": false,
       "squawk_error_color": {
         "r": 255,
         "g": 255,
@@ -278,7 +277,8 @@
       },
       "departure": {
         "definition": [
-          [ "callsign" ]
+          [ "callsign" ],
+          [ "sctype", "deprwy" ]
         ],
         "background_color": {
           "r": 40,
@@ -301,7 +301,7 @@
       "arrival": {
         "definition": [
           [ "callsign" ],
-          [ "uk_stand" ]
+          [ "uk_stand", "actype" ]
         ],
         "background_color": {
           "r": 170,
@@ -322,9 +322,11 @@
         }
       },
       "airborne": {
-        "use_departure_arrival_coloring": true,
+        "use_departure_arrival_coloring": false,
         "definition": [
-          [ "callsign" ]
+          [ "callsign" ],
+          [ "flightlevel", "gs" ],
+          [ "actype" ]
         ],
         "text_color": {
           "r": 255,
@@ -432,9 +434,9 @@
         "b": 0
       },
       "background_color": {
-        "r": 127,
-        "g": 122,
-        "b": 122
+        "r": 100,
+        "g": 100,
+        "b": 100
       }
     },
     "maps": {
@@ -477,7 +479,7 @@
   {
     "name": "Heathrow",
     "font": {
-      "font_name": "EuroScope",
+      "font_name": "Arial",
       "weight": "Regular",
       "sizes": {
         "one": 11,
@@ -561,7 +563,7 @@
         "use_departure_arrival_coloring": false,
         "definition": [
           [ "callsign" ],
-          [ "flightlevel", "tendency" ]
+          [ "flightlevel" ]
         ],
         "text_color": {
           "r": 255,
@@ -731,7 +733,7 @@
       "radar_range_nm": 300,
       "night_alpha_setting": 110,
       "pro_mode": {
-        "enable": false,
+        "enable": true,
         "accept_pilot_squawk": false,
         "do_not_autocorrelate_squawks": [
           "2000",
@@ -800,7 +802,7 @@
         "use_departure_arrival_coloring": false,
         "definition": [
           [ "callsign" ],
-          [ "flightlevel", "tendency", "gs" ],
+          [ "flightlevel", "gs" ],
           [ "actype" ]
         ],
         "text_color": {