Update Colors + New Topo Maps

VATGER-Nav · Jan 19, 2025 · 6888d13 · 6888d13
1 parent 81bf75c
commit 6888d13
Show file tree

Hide file tree

Showing 25 changed files with 987 additions and 393 deletions.
diff --git a/mapdata/kml/topsky.kml b/mapdata/kml/topsky.kml
diff --git a/mapdata/maps/TOPSKY-PHOENIX-MAPS/000-color/dark.txt b/mapdata/maps/TOPSKY-PHOENIX-MAPS/000-color/dark.txt
@@ -1,27 +1,15 @@
-COLORDEF:background:0:0:0
-COLORDEF:NTZ:255:165:0
-COLORDEF:NTZ2:255:0:0
-COLORDEF:Standard:131:131:131
-COLORDEF:ECL:131:131:131
-COLORDEF:River:0:0:255
-COLORDEF:Distance:5:21:181
-COLORDEF:Text:166:255:166
-COLORDEF:Highway:100:60:0
-COLORDEF:DFSStand:255:255:0
-COLORDEF:red:255:0:0
 COLORDEF:white:255:255:255
-COLORDEF:yellow:255:255:0
+COLORDEF:red:237:28:36
+COLORDEF:yellow:255:222:23
+COLORDEF:orange:255:165:0
+COLORDEF:blue:0:143:193
+
+COLORDEF:background:0:0:0
+COLORDEF:standard:131:131:131
+COLORDEF:ecl:131:131:131
+COLORDEF:label:166:255:166
 
-// color definitions ground layout/maps
-COLORDEF:stands:200:200:200
-COLORDEF:closed:150:37:39
-COLORDEF:maxCodeB:255:140:0
-COLORDEF:maxCodeC:255:255:0
-COLORDEF:maxCodeD:255:105:180
-COLORDEF:maxCodeE:0:255:255
-COLORDEF:maxCodeE_B748:0:175:255
-COLORDEF:maxCodeF:0:255:0
-COLORDEF:taxiways:255:105:180
-COLORDEF:taxiway_background:83:83:83
-COLORDEF:apron_background:38:36:45
-COLORDEF:dfsorange:248:172:58
+COLORDEF:topo_water:33:64:154
+COLORDEF:topo_road:139:94:60
+COLORDEF:topo_border:30:30:30
+COLORDEF:topo_city:15:15:15
diff --git a/mapdata/maps/TOPSKY-PHOENIX-MAPS/100-vfr-points.jinja b/mapdata/maps/TOPSKY-PHOENIX-MAPS/100-vfr-points.jinja
@@ -4,7 +4,7 @@
 
 MAP:VFR Points | Labels
 FOLDER:ALL
-COLOR:Standard
+COLOR:standard
 TEXTALIGN:LB
 {%- for icao, fxnames in data.reporting_points['VFR'].items() %}
 // {{icao}}
@@ -15,7 +15,7 @@ SYMBOL:VFR:{{icao | replace('ED', '')}}-{{fx['name']}}:{{fx['name']}}:5:0
 
 MAP:Mil VFR Points | Labels
 FOLDER:ALL
-COLOR:Standard
+COLOR:standard
 TEXTALIGN:LB
 {%- for icao, fxnames in data.reporting_points['MIL'].items() %}
 // {{icao}}
@@ -30,7 +30,7 @@ SYMBOL:VFR:{{fx['fix']}}:{{fx['name']}}:5:0
 
 MAP:VFR Points
 FOLDER:ALL
-COLOR:Standard
+COLOR:standard
 ACTIVE:1
 {%- for icao, fxnames in data.reporting_points['VFR'].items() %}
 // {{icao}}
@@ -48,14 +48,14 @@ SYMBOL:VFR:{{fx['fix']}}
 
 MAP:Hospitals | Labels
 FOLDER:ALL
-COLOR:Standard
+COLOR:standard
 {%- for name, geom in data.topsky['common']['VFR']['Hospitals EDGG'].items() %}
 {{ geom | to_symbol('HOSPITAL') }}:{{name}}:0:-13
 {%- endfor %}
 
 MAP:Hospitals
 FOLDER:ALL
-COLOR:Standard
+COLOR:standard
 ACTIVE:1
 {%- for name, geom in data.topsky['common']['VFR']['Hospitals EDGG'].items() %}
 {{ geom | to_symbol('HOSPITAL') }}  // {{name}}

diff --git a/mapdata/maps/TOPSKY-PHOENIX-MAPS/101-navaids.jinja b/mapdata/maps/TOPSKY-PHOENIX-MAPS/101-navaids.jinja
@@ -1,7 +1,7 @@
 MAP:Navaids
 FOLDER:ALL
 ASRDATA:PHOENIX
-COLOR:Standard
+COLOR:standard
 ACTIVE:1
 LAYER:-2
 {%- for type in ['DME', 'VOR', 'NDB', 'TACAN'] %}

diff --git a/mapdata/maps/TOPSKY-PHOENIX-MAPS/111-aerodromes.jinja b/mapdata/maps/TOPSKY-PHOENIX-MAPS/111-aerodromes.jinja
@@ -1,6 +1,6 @@
 MAP:Aerodromes
 FOLDER:ALL
-COLOR:Standard
+COLOR:standard
 ACTIVE:1
 {%- for icao in data.navdata['Aerodromes'] %}
 SYMBOL:AIRPORT:{{icao}}

diff --git a/mapdata/maps/TOPSKY-PHOENIX-MAPS/200-EDDF/200-rnp.txt b/mapdata/maps/TOPSKY-PHOENIX-MAPS/200-EDDF/200-rnp.txt
@@ -4,7 +4,7 @@
 
 MAP:EDDF RNP X 25
 FOLDER:EDDF
-COLOR:Standard
+COLOR:standard
 STYLE:SOLID:1
 ASRDATA:PHOENIX
 // EDDF RNP X 25L/25C
@@ -26,7 +26,7 @@ SYMBOL:PLUS:DF902:DF902:25:0
 
 MAP:EDDF RNP X 07
 FOLDER:EDDF
-COLOR:Standard
+COLOR:standard
 STYLE:SOLID:1
 ASRDATA:PHOENIX
 // EDDF RNP X 07R/07C

diff --git a/mapdata/maps/TOPSKY-PHOENIX-MAPS/200-EDDF/201-ntz.jinja b/mapdata/maps/TOPSKY-PHOENIX-MAPS/200-EDDF/201-ntz.jinja
@@ -1,27 +1,27 @@
 MAP:NTZ 25L/R
 FOLDER:EDDF
-COLOR:NTZ
+COLOR:orange
 ASRDATA:PHOENIX
 STYLE:Solid:2
 {{ data.topsky['common']['EDDF']['NTZ']['25R-25L'] | to_line('') }}
 
 MAP:NTZ 25C/R
 FOLDER:EDDF
-COLOR:NTZ2
+COLOR:red
 ASRDATA:PHOENIX
 STYLE:Solid:2
 {{ data.topsky['common']['EDDF']['NTZ']['25R-25C'] | to_line('') }}
 
 MAP:NTZ 07R/L
 FOLDER:EDDF
-COLOR:NTZ
+COLOR:orange
 ASRDATA:PHOENIX
 STYLE:Solid:2
 {{ data.topsky['common']['EDDF']['NTZ']['07L-07R'] | to_line('') }}
 
 MAP:NTZ 07C/L
 FOLDER:EDDF
-COLOR:NTZ2
+COLOR:red
 ASRDATA:PHOENIX
 STYLE:Solid:2
 {{ data.topsky['common']['EDDF']['NTZ']['07L-07C'] | to_line('') }}
diff --git a/mapdata/maps/TOPSKY-PHOENIX-MAPS/200-EDDF/202-tools.jinja b/mapdata/maps/TOPSKY-PHOENIX-MAPS/200-EDDF/202-tools.jinja
@@ -1,21 +1,21 @@
 MAP:DEP FREQ
 FOLDER:EDDF
-COLOR:Distance
+COLOR:blue
 ASRDATA:PHOENIX
 TEXT:N050.04.39.386:E008.18.28.341:120.155
 TEXT:N049.53.37.594:E008.50.36.202:136.130
 
 MAP:DI DEP 18
 FOLDER:EDDF
-COLOR:Distance
+COLOR:blue
 STYLE:Solid:1
 ASRDATA:PHOENIX
 LINE:N049.57.54.755:E008.31.45.391:N049.57.54.642:E008.31.19.500
 LINE:N049.58.54.305:E008.31.20.285:N049.58.54.219:E008.31.46.891
 
 MAP:DI DEP 25
 FOLDER:EDDF
-COLOR:Distance
+COLOR:blue
 STYLE:Solid:1
 ASRDATA:PHOENIX
 LINE:N050.01.40.807:E008.30.31.448:N050.01.31.103:E008.30.36.521
@@ -24,15 +24,15 @@ LINE:N050.01.48.768:E008.29.02.278:N050.01.37.735:E008.29.00.077
 
 MAP:DI DEP 07
 FOLDER:EDDF
-COLOR:Distance
+COLOR:blue
 STYLE:Solid:1
 ASRDATA:PHOENIX
 LINE:N050.03.07.429:E008.36.34.064:N050.02.56.379:E008.36.39.912
 LINE:N050.03.18.479:E008.38.15.546:N050.03.29.750:E008.38.10.386
 
 MAP:M/H-DEP Line
 FOLDER:EDDF
-COLOR:Standard
+COLOR:standard
 STYLE:Dot:1
 ASRDATA:PHOENIX
 ACTIVE:RWY:ARR:*:DEP:EDDF25C

diff --git a/mapdata/maps/TOPSKY-PHOENIX-MAPS/200-EDDF/203-sids.txt b/mapdata/maps/TOPSKY-PHOENIX-MAPS/200-EDDF/203-sids.txt
@@ -1,6 +1,6 @@
 MAP:SID 25C - W/M / 25L - H/K 
 FOLDER:EDDF
-COLOR:ECL
+COLOR:ecl
 STYLE:DOT:1
 ASRDATA:PHOENIX
 //MARUN3W
@@ -166,7 +166,7 @@ LINE:N050.26.41.639:E008.37.07.939:N050.34.17.929:E008.47.08.811
 
 MAP:SID 25C/L - F/G (2 ENG Heavy)
 FOLDER:EDDF
-COLOR:ECL
+COLOR:ecl
 STYLE:DOT:1
 ASRDATA:PHOENIX
 //MARUN6F
@@ -212,7 +212,7 @@ LINE:N050.26.41.640:E008.37.07.940:N050.34.17.930:E008.47.08.812
 
 MAP:SID 25C/L - Southbound
 FOLDER:EDDF
-COLOR:ECL
+COLOR:ecl
 STYLE:DOT:1
 ASRDATA:PHOENIX
 //ANEKI1F
@@ -251,7 +251,7 @@ LINE:N049.49.15.892:E008.01.44.829:N049.51.38.999:E007.46.32.002
 
 MAP:SID 25C/L - N (22-07lcl)
 FOLDER:EDDF
-COLOR:ECL
+COLOR:ecl
 STYLE:DOT:1
 ASRDATA:PHOENIX
 //TOBAK2N
@@ -289,7 +289,7 @@ LINE:N050.43.32.420:E008.37.32.690:N050.49.16.202:E008.40.18.992
 
 MAP:SID 07C/R Northbound
 FOLDER:EDDF
-COLOR:ECL
+COLOR:ecl
 STYLE:Dot:1
 ASRDATA:PHOENIX
 //MARUN5E
@@ -330,7 +330,7 @@ LINE:N050.16.34.589:E008.50.55.050:N050.34.17.929:E008.47.08.811
 
 MAP:SID 07C/R Southbound
 FOLDER:EDDF
-COLOR:ECL
+COLOR:ecl
 STYLE:Dot:1
 ASRDATA:PHOENIX
 //ANEKI4E
@@ -424,7 +424,7 @@ LINE:N050.04.24.099:E010.14.33.748:N050.04.30.691:E010.43.43.708
 
 MAP:SID 18
 FOLDER:EDDF
-COLOR:ECL
+COLOR:ecl
 STYLE:Dot:1
 ASRDATA:PHOENIX
 //CINDY4S

diff --git a/mapdata/maps/TOPSKY-PHOENIX-MAPS/200-EDDF/204-etou-corner.txt b/mapdata/maps/TOPSKY-PHOENIX-MAPS/200-EDDF/204-etou-corner.txt
@@ -3,6 +3,7 @@ FOLDER:EDDF
 COLOR:yellow
 STYLE:Solid:1
 ASRDATA:PHOENIX
+LAYER:2
 ACTIVE:ID:*:*:TOUT:*
 ACTIVE:ID:TOUT:*:*:*
 LINE:N050.02.54.000:E008.19.27.000:N050.00.21.000:E008.20.53.000

diff --git a/mapdata/maps/TOPSKY-PHOENIX-MAPS/210-EDDL/210-topo.jinja b/mapdata/maps/TOPSKY-PHOENIX-MAPS/210-EDDL/210-topo.jinja
@@ -5,7 +5,7 @@
 MAP:Bridges
 FOLDER:EDDL
 ASRDATA:PHOENIX
-COLOR:Standard
+COLOR:standard
 STYLE:Solid:1
 ACTIVE:ID:DLT:*:*:*
 // Bridges

diff --git a/mapdata/maps/TOPSKY-PHOENIX-MAPS/400-airspace.jinja b/mapdata/maps/TOPSKY-PHOENIX-MAPS/400-airspace.jinja
@@ -15,14 +15,14 @@
 
 MAP:Airspace Labels
 FOLDER:Airspace
-COLOR:Standard
+COLOR:standard
 LAYER:+4
 ASRDATA:PHOENIX
 {{ data.airspace_labels }}
 
 MAP:Controlzone (CTR)
 FOLDER:Airspace
-COLOR:Standard
+COLOR:standard
 ACTIVE:1
 STYLE:Solid:1
 ASRDATA:PHOENIX
@@ -64,7 +64,7 @@ ASRDATA:PHOENIX
 
 MAP:Airspace C
 FOLDER:Airspace
-COLOR:Standard
+COLOR:standard
 ACTIVE:1
 LAYER:+2
 STYLE:DOT:1
@@ -77,7 +77,7 @@ ASRDATA:PHOENIX
 
 MAP:Airspace D
 FOLDER:Airspace
-COLOR:Standard
+COLOR:standard
 ACTIVE:1
 LAYER:+1
 STYLE:Solid:1
@@ -169,7 +169,7 @@ ASRDATA:PHOENIX
 
 MAP:Airspace E
 FOLDER:Airspace
-COLOR:Distance
+COLOR:blue
 STYLE:DASH:1
 LAYER:+3
 ASRDATA:PHOENIX
@@ -261,7 +261,7 @@ ASRDATA:PHOENIX
 
 MAP:TMZ/RMZ
 FOLDER:Airspace
-COLOR:Standard
+COLOR:standard
 ACTIVE:1
 STYLE:DASH:1
 ASRDATA:PHOENIX