- Switched from www.wx.com to www.weather.com (Weather Channel) for radar

  maps.  Still awaiting contact from the weather.com webmaster.

4 files changed, 245 insertions, 229 deletions

diff --git a/gweather/Locations b/gweather/Locations
index d3986a20c..9525f48b0 100644
--- a/gweather/Locations
+++ b/gweather/Locations
@@ -219,8 +219,8 @@ loc5=Fort\\ Smith KFSM ------ ---
 loc6=Harrison KHRO ARZ003 ---
 loc7=Hot\\ Springs KHOT ARZ042 ---
 loc8=Jonesboro KJBR ARZ026 ---
-loc9=Little\\ Rock KLIT ARZ044 LZK
-loc10=Little\\ Rock\\ AFB KLRF ARZ044 LZK
+loc9=Little\\ Rock KLIT ARZ044 ---
+loc10=Little\\ Rock\\ AFB KLRF ARZ044 ---
 loc11=Pine\\ Bluff KPBF ARZ056 ---
 loc12=Rogers KROG ARZ001 ---
 loc13=Siloam\\ Springs KSLG ARZ001 ---
@@ -230,19 +230,19 @@ loc16=Walnut\\ Ridge KARG ARZ017 ---
 
 [US_DC]
 name=District of Columbia
-loc0=Washington/Dulles KIAD DCZ013 LWX
-loc1=Washington KDCA DCZ013 LWX
+loc0=Washington/Dulles KIAD DCZ013 ---
+loc1=Washington KDCA DCZ013 ---
 
 [US_ID]
 name=Idaho
-loc0=Boise KBOI IDZ014 CBX
+loc0=Boise KBOI IDZ014 ---
 loc1=Burley KBYI IDZ022 ---
 loc2=Challis KU15 IDZ018 ---
 loc3=Coeur\\ d'Alene KCOE IDZ002 ---
 loc4=Elk\\ City KP69 IDZ006 ---
 loc5=Grangeville KS80 IDZ007 ---
 loc6=Hailey-Sun\\ Valley KSUN IDZ018 ---
-loc7=Idaho\\ Falls KIDA IDZ020 SFX
+loc7=Idaho\\ Falls KIDA IDZ020 ---
 loc8=Lewiston KLWS IDZ003 ---
 loc9=Malad\\ City KMLD IDZ022 ---
 loc10=Malta K77M IDZ022 ---
@@ -272,10 +272,10 @@ loc10=Clarion KCAV IAZ025 ---
 loc11=Clinton KCWI IAZ066 ---
 loc12=Council\\ Bluffs KCBF IAZ069 ---
 loc13=Creston KCSQ IAZ082 ---
-loc14=Davenport KDVN IAZ068 DVN
+loc14=Davenport KDVN IAZ068 ---
 loc15=Decorah KDEH IAZ010 ---
 loc16=Denison KDNS IAZ044 ---
-loc17=Des\\ Moines KDSM IAZ060 DMX
+loc17=Des\\ Moines KDSM IAZ060 ---
 loc18=Dubuque KDBQ IAZ042 ---
 loc19=Estherville KEST IAZ004 ---
 loc20=Fairfield KFFL IAZ087 ---
@@ -308,12 +308,12 @@ loc44=Webster\\ City KEBS ------ ---
 name=Kansas
 loc0=Chanute KCNU KSZ096 ---
 loc1=Concordia KCNK KSZ020 ---
-loc2=Dodge\\ City KDDC KSZ078 DDC
+loc2=Dodge\\ City KDDC KSZ078 ---
 loc3=Elkhart K1K5 KSZ084 ---
-loc4=Emporia KEMP KSZ054 TWX
+loc4=Emporia KEMP KSZ054 ---
 loc5=Fort\\ Riley KFRI KSZ036 ---
 loc6=Garden\\ City KGCK KSZ063 ---
-loc7=Goodland KGLD KSZ013 GLD
+loc7=Goodland KGLD KSZ013 ---
 loc8=Hays KHYS KSZ031 ---
 loc9=Hill\\ City KHLC KSZ016 ---
 loc10=Hutchinson KHUT KSZ067 ---
@@ -324,27 +324,27 @@ loc14=Olathe KOJC KSZ105 ---
 loc15=Olathe/Ind. KIXD KSZ105 ---
 loc16=Russell KRSL KSZ032 ---
 loc17=Salina KSLN KSZ049 ---
-loc18=Topeka KTOP KSZ039 TWX
-loc19=Topeka-Forbes\\ Field KFOE KSZ039 TWX
-loc20=Wichita KICT KSZ083 ICT
-loc21=Wichita-Jabara K3KM KSZ083 ICT
-loc22=Wichita-McConnell\\ AFB KIAB KSZ083 ICT
+loc18=Topeka KTOP KSZ039 ---
+loc19=Topeka-Forbes\\ Field KFOE KSZ039 ---
+loc20=Wichita KICT KSZ083 ---
+loc21=Wichita-Jabara K3KM KSZ083 ---
+loc22=Wichita-McConnell\\ AFB KIAB KSZ083 ---
 
 [US_KY]
 name=Kentucky
 loc0=Bowling\\ Green KBWG KYZ071 ---
 loc1=Covington KCVG KYZ092 ---
-loc2=Fort\\ Campbell KHOP KYZ017 HPX
+loc2=Fort\\ Campbell KHOP KYZ017 ---
 loc3=Fort\\ Knox KFTK KYZ028 ---
 loc4=Frankfort KFFT KYZ035 ---
 loc5=Henderson KEHR KYZ018 ---
-loc6=Jackson KJKL KYZ112 JKL
+loc6=Jackson KJKL KYZ112 ---
 loc7=Lexington KLEX KYZ041 ---
 loc8=London KLOZ ------ ---
-loc9=Louisville KLOU KYZ030 LVX
-loc10=Louisville-Standiford\\ Field KSDF KYZ030 LVX
+loc9=Louisville KLOU KYZ030 ---
+loc10=Louisville-Standiford\\ Field KSDF KYZ030 ---
 loc11=Owensboro KOWB KYZ019 ---
-loc12=Paducah KPAH KYZ005 PAH
+loc12=Paducah KPAH KYZ005 ---
 loc13=Pikeville K5I3 KYZ120 ---
 loc14=Somerset KSME KYZ079 ---
 
@@ -354,24 +354,24 @@ loc0=Alexandria KAEX LAZ028 ---
 loc1=Alexandria-Esler KESF LAZ028 ---
 loc2=Amelia K7R3 ------ ---
 loc3=Barksdale KBAD ------ ---
-loc4=Baton\\ Rouge KBTR LAZ048 LIX
+loc4=Baton\\ Rouge KBTR LAZ048 ---
 loc5=Cameron K7R5 LAZ051 ---
-loc6=Fort\\ Polk-Leesville KPOE LAZ027 POE
+loc6=Fort\\ Polk-Leesville KPOE LAZ027 ---
 loc7=Fourchon K9F2 ------ ---
 loc8=Grand\\ Isle KAXO LAZ061 ---
 loc9=Houma KHUM LAZ066 ---
 loc10=Intracoastal K7R4 LAZ052 ---
 loc11=Lafayette KLFT LAZ044 ---
-loc12=Lake\\ Charles KLCH LAZ041 LCH
+loc12=Lake\\ Charles KLCH LAZ041 ---
 loc13=Monroe KMLU LAZ014 ---
 loc14=New\\ Iberia KARA LAZ053 ---
-loc15=New\\ Orleans KMSY LAZ062 LIX
-loc16=New\\ Orleans\\ NAS KNBG LAZ062 LIX
-loc17=New\\ Orleans-Lakefront KNEW LAZ062 LIX
+loc15=New\\ Orleans KMSY LAZ062 ---
+loc16=New\\ Orleans\\ NAS KNBG LAZ062 ---
+loc17=New\\ Orleans-Lakefront KNEW LAZ062 ---
 loc18=Patterson KPTN ------ ---
 loc19=Salt\\ point KP92 ------ ---
-loc20=Shreveport\\ Downtown KDTN LAZ001 SHV
-loc21=Shreveport\\ Regional KSHV LAZ001 SHV
+loc20=Shreveport\\ Downtown KDTN LAZ001 ---
+loc21=Shreveport\\ Regional KSHV LAZ001 ---
 loc22=South\\ Marsh\\ Island K7R8 LAZ053 ---
 loc23=South\\ Timbalier KS58 ------ ---
 loc24=Venice K7R1 ------ ---
@@ -384,7 +384,7 @@ loc0=Augusta KAUG MEZ021 ---
 loc1=Bangor KBGR MEZ015 ---
 loc2=Bar\\ Harbor KBHB MEZ029 ---
 loc3=Brunswick KNHZ MEZ024 ---
-loc4=Caribou KCAR MEZ002 CBW
+loc4=Caribou KCAR MEZ002 ---
 loc5=Clayton\\ Lake K40B ------ ---
 loc6=Frenchville KFVE MEZ002 ---
 loc7=Fryeburg KIZG ------ ---
@@ -392,7 +392,7 @@ loc8=Greenville K3B1 MEZ010 ---
 loc9=Houlton KHUL MEZ002 ---
 loc10=Lewiston KLEW MEZ020 ---
 loc11=Millinocket KMLT MEZ015 ---
-loc12=Portland KPWM MEZ024 GYX
+loc12=Portland KPWM MEZ024 ---
 loc13=Presque\\ Isle KPQI MEZ002 ---
 loc14=Rockland KRKD MEZ027 ---
 loc15=Sanford KSFM MEZ023 ---
@@ -402,14 +402,14 @@ loc18=Wiscasset KIWI MEZ026 ---
 
 [US_MS]
 name=Mississippi
-loc0=Columbus KGTR MSZ031 GWX
-loc1=Columbus-W\\ Point-Starkville KCBM MSZ031 GWX
+loc0=Columbus KGTR MSZ031 ---
+loc1=Columbus-W\\ Point-Starkville KCBM MSZ031 ---
 loc2=Greenville KGLH ------ ---
 loc3=Greenwood KGWO MSZ025 ---
 loc4=Gulfport KGPT MSZ081 ---
-loc5=Jackson KJAN MSZ048 JAN
-loc6=Laurel KPIB MSZ066 JAN
-loc7=McComb KMCB MSZ070 JAN
+loc5=Jackson KJAN MSZ048 ---
+loc6=Laurel KPIB MSZ066 ---
+loc7=McComb KMCB MSZ070 ---
 loc8=Meridian KMEI MSZ052 ---
 loc9=Meridian-Lauderdale KNMM MSZ052 ---
 loc10=Natchez KHEZ MSZ060 ---
@@ -430,24 +430,24 @@ loc8=Kirksville KIRK MOZ017 ---
 loc9=Poplar\\ Bluff KP02 MOZ109 ---
 loc10=Sedalia KSZL MOZ045 ---
 loc11=Spickard KP35 MOZ015 ---
-loc12=Springfield KSGF MOZ095 SGF
-loc13=St\\ Joseph KSTJ MOZ020 LSX
-loc14=St\\ Louis KSTL MOZ064 LSX
-loc15=St\\ Louis-Spirit KSUS MOZ064 LSX
+loc12=Springfield KSGF MOZ095 ---
+loc13=St\\ Joseph KSTJ MOZ020 ---
+loc14=St\\ Louis KSTL MOZ064 ---
+loc15=St\\ Louis-Spirit KSUS MOZ064 ---
 loc16=Vichy-Rolla KVIH MOZ058 ---
 
 [US_MT]
 name=Montana
-loc0=Billings KBIL MTZ035 BLX
+loc0=Billings KBIL MTZ035 ---
 loc1=Bozeman KBZN MTZ015 ---
 loc2=Broadus K4BQ MTZ036 ---
 loc3=Butte KBTM MTZ007 ---
 loc4=Cut\\ Bank KCTB MTZ010 ---
 loc5=Dillon KDLN MTZ008 ---
 loc6=Drummond K3DU MTZ006 ---
-loc7=Glasgow KGGW MTZ017 GGW
+loc7=Glasgow KGGW MTZ017 ---
 loc8=Glendive KGDV MTZ025 ---
-loc9=Great\\ Falls KGFA MTZ012 TFX
+loc9=Great\\ Falls KGFA MTZ012 ---
 loc10=Harlowton K3HT MTZ028 ---
 loc11=Havre KHVR MTZ011 ---
 loc12=Helena KHLN MTZ014 ---
@@ -456,7 +456,7 @@ loc14=Kalispell KFCA MTZ003 ---
 loc15=Lewiston KLWT MTZ013 ---
 loc16=Livingston KLVM MTZ028 ---
 loc17=Miles\\ City KMLS MTZ032 ---
-loc18=Missoula KMSO MTZ005 MSX
+loc18=Missoula KMSO MTZ005 ---
 loc19=Monida KMQM ------ ---
 loc20=Sidney KSDY MTZ024 ---
 loc21=Thompson\\ Falls K3TH MTZ004 ---
@@ -474,7 +474,7 @@ loc4=Burwell KK20 ------ ---
 loc5=Chadron KCDR NEZ002 ---
 loc6=Columbus KOLU NEZ042 ---
 loc7=Falls\\ City KFNB NEZ093 ---
-loc8=Grand\\ Island KGRI NEZ062 UEX
+loc8=Grand\\ Island KGRI NEZ062 ---
 loc9=Hastings KHSI NEZ075 ---
 loc10=Imperial KIML NEZ069 ---
 loc11=Imperial\\ (2) K6V1 NEZ069 ---
@@ -483,9 +483,9 @@ loc13=Lincoln KLNK NEZ066 ---
 loc14=McCook KMCK NEZ081 ---
 loc15=Mullen KMHN NEZ007 ---
 loc16=Norfolk KOFK NEZ031 ---
-loc17=North\\ Platte KLBF NEZ059 LNX
+loc17=North\\ Platte KLBF NEZ059 ---
 loc18=O'Neill KONL NEZ010 ---
-loc19=Omaha KOMA NEZ052 OAX
+loc19=Omaha KOMA NEZ052 ---
 loc20=Omaha-Bellevue KOFF NEZ052 ---
 loc21=Ord-Sharp KODX NEZ039 ---
 loc22=Scottsbluff KBFF NEZ019 ---
@@ -510,7 +510,7 @@ loc11=Whitefield KHIE ------ ---
 [US_NM]
 name=New Mexico
 loc0=Alamogordo KHMN NMZ024 ---
-loc1=Albuquerque KABQ NMZ009 ABX
+loc1=Albuquerque KABQ NMZ009 ---
 loc2=Carlsbad KCNM NMZ028 ---
 loc3=Clayton KCAO NMZ007 ---
 loc4=Clovis-Cannon\\ AFB KCVS NMZ021 ---
@@ -536,16 +536,16 @@ loc23=Zuni\\ Pueblo KZUN ------ ---
 
 [US_ND]
 name=North Dakota
-loc0=Bismark KBIS NDZ035 BIS
+loc0=Bismark KBIS NDZ035 ---
 loc1=Devils\\ Lake KDVL NDZ015 ---
 loc2=Devils\\ Lake\\ (2) KP11 NDZ015 ---
 loc3=Dickinson KDIK NDZ033 ---
-loc4=Fargo KFAR NDZ039 MVX
-loc5=Grand\\ Forks KGFK NDZ027 MVX
+loc4=Fargo KFAR NDZ039 ---
+loc5=Grand\\ Forks KGFK NDZ027 ---
 loc6=Jamestown KJMS NDZ037 ---
 loc7=Lidgerwood KP67 NDZ053 ---
-loc8=Minot KMOT NDZ011 MBX
-loc9=Minot\\ AFB KMIB NDZ011 MBX
+loc8=Minot KMOT NDZ011 ---
+loc9=Minot\\ AFB KMIB NDZ011 ---
 loc10=Roseglen KP24 NDZ021 ---
 loc11=Williston KISN NDZ009 ---
 
@@ -563,17 +563,17 @@ loc8=Guymon KGUY ------ ---
 loc9=Hobart KHBR OKZ035 ---
 loc10=Lawton KLAW OKZ038 ---
 loc11=McAlester KMLC OKZ073 ---
-loc12=Oklahoma\\ City KOKC OKZ025 TLX
-loc13=Oklahoma\\ City-Bethany KPWA OKZ025 TLX
-loc14=Oklahoma\\ City-Midwest\\ City KTIK OKZ025 TLX
+loc12=Oklahoma\\ City KOKC OKZ025 ---
+loc13=Oklahoma\\ City-Bethany KPWA OKZ025 ---
+loc14=Oklahoma\\ City-Midwest\\ City KTIK OKZ025 ---
 loc15=Page KPGO OKZ076 ---
 loc16=Ponca\\ City KPNC OKZ008 ---
 loc17=Stillwater KSWO OKZ020 ---
-loc18=Tulsa KTUL OKZ060 INX
+loc18=Tulsa KTUL OKZ060 ---
 
 [US_SD]
 name=South Dakota
-loc0=Aberdeen KABR SDZ006 ABR
+loc0=Aberdeen KABR SDZ006 ---
 loc1=Brookings KBKX SDZ040 ---
 loc2=Chamberlain K9V9 SDZ057 ---
 loc3=Custer K0V1 SDZ029 ---
@@ -583,10 +583,10 @@ loc6=Mitchell KMHE SDZ059 ---
 loc7=Mobridge KY26 SDZ009 ---
 loc8=Philip KPHP SDZ032 ---
 loc9=Pierre KPIR SDZ035 ---
-loc10=Rapid\\ City KRAP SDZ031 UDX
-loc11=Rapid\\ City-Ellsworth\\ AFB KRCA SDZ031 UDX
+loc10=Rapid\\ City KRAP SDZ031 ---
+loc11=Rapid\\ City-Ellsworth\\ AFB KRCA SDZ031 ---
 loc12=Redig KREJ SDZ001 ---
-loc13=Sioux\\ Falls KFSD SDZ062 FSD
+loc13=Sioux\\ Falls KFSD SDZ062 ---
 loc14=Watertown KATY SDZ020 ---
 loc15=Yankton KYKN SDZ069 ---
 
@@ -595,7 +595,7 @@ name=Utah
 loc0=Blanding K4BL UTZ022 ---
 loc1=Bryce\\ Canyon KBCE UTZ020 ---
 loc2=Bullfrog KU17 UTZ021 ---
-loc3=Cedar\\ City KCDC UTZ016 ICX
+loc3=Cedar\\ City KCDC UTZ016 ---
 loc4=Delta KU24 UTZ015 ---
 loc5=Dugway KDPG UTZ005 ---
 loc6=Eagle\\ Range KU16 ------ ---
@@ -609,14 +609,14 @@ loc13=Price-Carbon KPUC UTZ012 ---
 loc14=Provo KPVU UTZ004 ---
 loc15=Roosevelt KU67 UTZ011 ---
 loc16=Saint\\ George KSGU UTZ019 ---
-loc17=Salt\\ Lake\\ City KSLC UTZ003 MTX
+loc17=Salt\\ Lake\\ City KSLC UTZ003 ---
 loc18=Vernal KVEL UTZ024 ---
 loc19=Wendover KENV UTZ005 ---
 
 [US_VT]
 name=Vermont
 loc0=Ball\\ Mountain K8B3 ------ ---
-loc1=Burlington KBTV VTZ005 BTV
+loc1=Burlington KBTV VTZ005 ---
 loc2=Canaan KVT1 ------ ---
 loc3=Enosburg\\ Falls K3B8 ------ ---
 loc4=Montpelier KMPV VTZ008 ---
@@ -633,7 +633,7 @@ loc12=Wilmington K0B0 VTZ014 ---
 name=Wyoming
 loc0=Big\\ Piney KBPI WYZ020 ---
 loc1=Casper KCPR WYZ064 ---
-loc2=Cheyenne KCYS WYZ069 CYS
+loc2=Cheyenne KCYS WYZ069 ---
 loc3=Cody KCOD WYZ002 ---
 loc4=Douglas K4DG WYZ059 ---
 loc5=Evanston KEVW WYZ021 ---
@@ -642,7 +642,7 @@ loc7=Jackson KJAC WYZ006 ---
 loc8=Lander KLND WYZ012 ---
 loc9=Laramie KLAR WYZ066 ---
 loc10=Rawlins KRWL WYZ061 ---
-loc11=Riverton KRIW WYZ013 RIW
+loc11=Riverton KRIW WYZ013 ---
 loc12=Rock\\ Springs KRKS WYZ022 ---
 loc13=Sheridan KSHR WYZ099 ---
 loc14=Worland KWRL WYZ009 ---
@@ -664,12 +664,12 @@ loc9=Latrobe KLBE PAZ030 ---
 loc10=Middletown KMDT PAZ057 ---
 loc11=Muir KMUI PAZ058 ---
 loc12=Northeast\\ Philadelphia KPNE PAZ071 ---
-loc13=Philadelphia KPHL PAZ071 DIX
+loc13=Philadelphia KPHL PAZ071 ---
 loc14=Philipsburg KPSB PAZ019 ---
-loc15=Pittsburgh KPIT PAZ021 PBZ
-loc16=Pittsburgh-West\\ Mifflin KAGC PAZ021 PBZ
+loc15=Pittsburgh KPIT PAZ021 pit
+loc16=Pittsburgh-West\\ Mifflin KAGC PAZ021 pit
 loc17=Reading KRDG PAZ060 ---
-loc18=State\\ College KUNV PAZ019 CCX
+loc18=State\\ College KUNV PAZ019 ---
 loc19=Wilkes-Barre-Scranton KAVP PAZ047 ---
 loc20=Williamsport KIPT PAZ046 ---
 
@@ -694,7 +694,7 @@ loc15=Chino KCNO CAZ048 ---
 loc16=Concord KCCR CAZ007 ---
 loc17=Crescent\\ City KCEC CAZ001 ---
 loc18=Daggett KDAG CAZ028 ---
-loc19=Edwards\\ AFB KEDW CAZ025 EYX
+loc19=Edwards\\ AFB KEDW CAZ025 ---
 loc20=El\\ Centro KNJK CAZ033 ---
 loc21=El\\ Monte KEMT CAZ047 ---
 loc22=Fairfield KSUU CAZ018 ---
@@ -713,10 +713,10 @@ loc34=Lemoore KNLC CAZ021 ---
 loc35=Livermore KLVK CAZ007 ---
 loc36=Lompoc KLPC CAZ035 ---
 loc37=Long\\ Beach KLGB CAZ041 ---
-loc38=Los\\ Angeles KLAX CAZ041 VTX
+loc38=Los\\ Angeles KLAX CAZ041 ---
 loc39=Mammoth\\ Lakes KMMH CAZ073 ---
 loc40=Marysville KMYV CAZ016 ---
-loc41=Marysville-Beale\\ AFB KBAB CAZ016 BBX
+loc41=Marysville-Beale\\ AFB KBAB CAZ016 ---
 loc42=McClellan KMCC ------ ---
 loc43=Merced KMCE CAZ020 ---
 loc44=Modesto KMOD CAZ019 ---
@@ -725,16 +725,16 @@ loc46=Montague KSIY CAZ011 ---
 loc47=Monterey KMRY CAZ009 ---
 loc48=Mount\\ Shasta KMHS CAZ011 ---
 loc49=Mount\\ Wilson KMWS CAZ047 ---
-loc50=Mountain\\ View KNUQ CAZ006 ---
+loc50=Mountain\\ View KNUQ CAZ006 sfo
 loc51=Napa KAPC CAZ064 ---
 loc52=Needles KEED CAZ029 ---
-loc53=Oakland KOAK CAZ007 ---
+loc53=Oakland KOAK CAZ007 sfo
 loc54=Oceanside KNFG CAZ043 ---
 loc55=Ontario KONT CAZ048 ---
 loc56=Oxnard KOXR CAZ040 ---
 loc57=Palm\\ Springs KPSP CAZ061 ---
 loc58=Palmdale KPMD CAZ054 ---
-loc59=Palo\\ Alto KPAO CAZ006 ---
+loc59=Palo\\ Alto KPAO CAZ006 sfo
 loc60=Paso\\ Robles KPRB CAZ037 ---
 loc61=Point\\ Mugu KNTD ------ ---
 loc62=Point\\ Piedras\\ Blanca K87Q ------ ---
@@ -743,22 +743,22 @@ loc64=Red\\ Bluff KRBL CAZ015 ---
 loc65=Redding KRDD CAZ013 ---
 loc66=Riverside KRAL CAZ048 ---
 loc67=Riverside/March\\ AFB KRIV CAZ061 ---
-loc68=Sacramento KSAC CAZ017 DAX
-loc69=Sacramento-Woodland KSMF CAZ017 DAX
+loc68=Sacramento KSAC CAZ017 ---
+loc69=Sacramento-Woodland KSMF CAZ017 ---
 loc70=Salinas KSNS CAZ009 ---
 loc71=San\\ Carlos KSQL CAZ006 ---
-loc72=San\\ Diego KSAN CAZ043 NKX
-loc73=San\\ Diego-Santee KSEE CAZ050 NKX
-loc74=San\\ Diego-Brown KSDM CAZ050 NKX
-loc75=San\\ Diego-Miramar KNKX CAZ043 NKX
-loc76=San\\ Diego-Montgomery KMYF CAZ043 NKX
-loc77=San\\ Diego-North\\ Island KNZY ------ NKX
-loc78=San\\ Francisco KSFO CAZ006 MUX
+loc72=San\\ Diego KSAN CAZ043 ---
+loc73=San\\ Diego-Santee KSEE CAZ050 ---
+loc74=San\\ Diego-Brown KSDM CAZ050 ---
+loc75=San\\ Diego-Miramar KNKX CAZ043 ---
+loc76=San\\ Diego-Montgomery KMYF CAZ043 ---
+loc77=San\\ Diego-North\\ Island KNZY ------ ---
+loc78=San\\ Francisco KSFO CAZ006 sfo
 loc79=San\\ Jose-Santa\\ Clara KSJC CAZ008 ---
 loc80=San\\ Luis\\ Obispo KSBP CAZ034 ---
 loc81=San\\ Nicholas\\ Island KNSI CAZ039 ---
 loc82=Sandberg KSDB ------ ---
-loc83=Santa\\ Ana KSNA CAZ042 SOX
+loc83=Santa\\ Ana KSNA CAZ042 ---
 loc84=Santa\\ Barbara KSBA CAZ039 ---
 loc85=Santa\\ Maria KSMX CAZ035 ---
 loc86=Santa\\ Monica KSMO CAZ041 ---
@@ -771,15 +771,15 @@ loc92=Truckee KTRK CAZ072 ---
 loc93=Twentynine\\ Palms KNXP CAZ028 ---
 loc94=Ukiah KUKI CAZ003 ---
 loc95=Van\\ Nuys KVNY CAZ047 ---
-loc96=Vandenberg\\ AFB KVBG CAZ039 VBX
-loc97=Vandenberg\\ Range KVBG CAZ039 VBX
+loc96=Vandenberg\\ AFB KVBG CAZ039 ---
+loc97=Vandenberg\\ Range KVBG CAZ039 ---
 loc98=Visalia KVIS CAZ021 ---
 
 [US_AL]
 name=Alabama
 loc0=Anniston KANB ALZ019 ---
 loc1=Auburn KAUO ALZ047 ---
-loc2=Birmingham KBHM ALZ024 BMX
+loc2=Birmingham KBHM ALZ024 ---
 loc3=Decatur KDCU ------ ---
 loc4=Dothan KDHN ALZ066 ---
 loc5=Evergreen KGZH ------ ---
@@ -798,7 +798,7 @@ name=Arizona
 loc0=Casa\\ Granda KCGZ AZZ028 ---
 loc1=Chandler KIWA AZZ015 ---
 loc2=Douglas KDUG AZZ030 ---
-loc3=Flagstaff KFLG AZZ015 FSX
+loc3=Flagstaff KFLG AZZ015 ---
 loc4=Fort\\ Huachuca KFHU AZZ035 ---
 loc5=Gila\\ Bend KGBN AZZ027 ---
 loc6=Grand\\ Canyon KGCN AZZ006 ---
@@ -807,18 +807,18 @@ loc8=Mesa-Falcon\\ Field KFFZ AZZ023 ---
 loc9=Nogales K13A AZZ034 ---
 loc10=Page KPGA AZZ005 ---
 loc11=Payson K0E4 AZZ018 ---
-loc12=Phoenix KPHX AZZ023 IWA
-loc13=Phoenix-Deer\\ Valley KDVT AZZ023 IWA
-loc14=Phoenix-Goodyear KGYR AZZ023 IWA
-loc15=Phoenix-Luke\\ AFB KLUF AZZ023 IWA
+loc12=Phoenix KPHX AZZ023 ---
+loc13=Phoenix-Deer\\ Valley KDVT AZZ023 ---
+loc14=Phoenix-Goodyear KGYR AZZ023 ---
+loc15=Phoenix-Luke\\ AFB KLUF AZZ023 ---
 loc16=Prescott KPRC AZZ008 ---
 loc17=Safford-Municipal\\ Airport KSAD AZZ030 ---
 loc18=Scottsdale KSDL AZZ023 ---
 loc19=Show\\ Low KSOW AZZ017 ---
-loc20=Tucson KTUS AZZ033 EMX
-loc21=Tucson-Davis\\ AFB KDMA AZZ033 EMX
+loc20=Tucson KTUS AZZ033 ---
+loc21=Tucson-Davis\\ AFB KDMA AZZ033 ---
 loc22=Winslow KINW AZZ013 ---
-loc23=Yuma\\ MCAS KNYL AZZ025 YUX
+loc23=Yuma\\ MCAS KNYL AZZ025 ---
 
 [US_CO]
 name=Colorado
@@ -829,17 +829,17 @@ loc3=Aspen KASE COZ010 ---
 loc4=Colorado\\ Springs KCOS COZ071 ---
 loc5=Cortez KCEZ COZ021 ---
 loc6=Craig KCAG COZ002 ---
-loc7=Denver KDEN COZ040 FTG
-loc8=Denver-Aurora KAPA COZ040 FTG
-loc9=Denver-Broomfield KBKF COZ040 FTG
-loc10=Denver-Cherry\\ Knolls KBJC COZ040 FTG
+loc7=Denver KDEN COZ040 ---
+loc8=Denver-Aurora KAPA COZ040 ---
+loc9=Denver-Broomfield KBKF COZ040 ---
+loc10=Denver-Cherry\\ Knolls KBJC COZ040 ---
 loc11=Durango KDRO COZ022 ---
 loc12=Durango\\ Awrs K4V5 COZ022 ---
 loc13=Eagle KEGE COZ010 ---
 loc14=Fort\\ Carson KFCS COZ071 ---
 loc15=Fort\\ Collins KFCL COZ035 ---
 loc16=Fort\\ Collins/Lovel KFNL COZ035 ---
-loc17=Grand\\ Junction KGJT COZ006 GJX
+loc17=Grand\\ Junction KGJT COZ006 ---
 loc18=Greeley KGXY COZ043 ---
 loc19=Gunnison KGUC COZ012 ---
 loc20=Gunnison\\ (2) K2V9 COZ012 ---
@@ -850,7 +850,7 @@ loc24=Leadville KLXV COZ012 ---
 loc25=Limon KLIC COZ047 ---
 loc26=Montrose KMTJ COZ017 ---
 loc27=Montrose\\ (2) K6V8 COZ017 ---
-loc28=Pueblo KPUB COZ073 PUX
+loc28=Pueblo KPUB COZ073 ---
 loc29=Rifle K1V1 COZ003 ---
 loc30=Salida KS29 COZ069 ---
 loc31=Salida-Harriet K0V2 COZ069 ---
@@ -870,7 +870,7 @@ loc6=Windsor\\ Locks KBDL CTZ002 ---
 
 [US_DE]
 name=Delaware
-loc0=Dover KDOV DEZ002 DOX
+loc0=Dover KDOV DEZ002 ---
 loc1=Wilmington KILG DEZ001 ---
 
 [US_FL]
@@ -884,7 +884,7 @@ loc5=Crestview KCEW FLZ006 ---
 loc6=Cross\\ City KCTY FLZ034 ---
 loc7=Daytona\\ Beach KDAB FLZ041 ---
 loc8=Destin KDTS ------ ---
-loc9=Eglin KEGI FLZ006 EVX
+loc9=Eglin KEGI FLZ006 ---
 loc10=Fort\\ Lauderdale\\ (International) KFLL FLZ072 ---
 loc11=Fort\\ Lauderdale KFXE FLZ072 ---
 loc12=Fort\\ Myers\\ (Page\\ Field) KFMY FLZ065 ---
@@ -892,20 +892,20 @@ loc13=Fort\\ Myers\\ (Southwest\\ Florida\\ International) KRSW FLZ065 ---
 loc14=Gainesville KGNV FLZ036 ---
 loc15=Homestead\\ AFB KHST FLZ074 ---
 loc16=Hurlburt KHRT ------ ---
-loc17=Jacksonville KJAX FLZ025 JAX
-loc18=Jacksonville\\ NAS KNIP FLZ025 JAX
-loc19=Jacksonville-Craig\\ Airport KCRG FLZ025 JAX
-loc20=Key\\ West KEYW FLZ075 EYW
-loc21=Key\\ West\\ NAS KNQX FLZ075 EYW
+loc17=Jacksonville KJAX FLZ025 ---
+loc18=Jacksonville\\ NAS KNIP FLZ025 ---
+loc19=Jacksonville-Craig\\ Airport KCRG FLZ025 ---
+loc20=Key\\ West KEYW FLZ075 ---
+loc21=Key\\ West\\ NAS KNQX FLZ075 ---
 loc22=Lakeland KLAL FLZ052 ---
 loc23=Leesburg KLEE ------ ---
 loc24=Marathon KMTH FLZ075 ---
 loc25=Marianna KMAI FLZ011 ---
 loc26=Mayport KNRB FLZ025 ---
-loc27=Melbourne KMLB FLZ047 MLB
-loc28=Miami KMIA FLZ074 AMX
-loc29=Miami-Kendall KTMB FLZ074 AMX
-loc30=Miami-Opa\\ Locka KOPF FLZ074 AMX
+loc27=Melbourne KMLB FLZ047 ---
+loc28=Miami KMIA FLZ074 ---
+loc29=Miami-Kendall KTMB FLZ074 ---
+loc30=Miami-Opa\\ Locka KOPF FLZ074 ---
 loc31=Milton KNSE FLZ004 ---
 loc32=Nasa\\ Shuttle KTTS ------ ---
 loc33=Naples KAPF FLZ069 ---
@@ -923,9 +923,9 @@ loc44=Sanford KSFB FLZ046 ---
 loc45=Sarasota KSRQ FLZ060 ---
 loc46=St\\ Petersburg KSPG FLZ050 ---
 loc47=St\\ Petersburg\\ /\\ Clearwater KPIE FLZ050 ---
-loc48=Tallahassee KTLH FLZ017 TLH
-loc49=Tampa KTPA FLZ051 TBW
-loc50=Tampa-Macdill\\ AFB KMCF FLZ051 TBW
+loc48=Tallahassee KTLH FLZ017 ---
+loc49=Tampa KTPA FLZ051 ---
+loc50=Tampa-Macdill\\ AFB KMCF FLZ051 ---
 loc51=Titusville KTIX FLZ047 ---
 loc52=Tyndall\\ AFB KPAM ------ ---
 loc53=Valparaiso KVPS FLZ006 ---
@@ -939,7 +939,7 @@ name=Georgia
 loc0=Albany KABY GAZ125 ---
 loc1=Alma KAMG GAZ134 ---
 loc2=Athens KAHN GAZ036 ---
-loc3=Atlanta KATL GAZ033 FFC
+loc3=Atlanta KATL GAZ033 ---
 loc4=Augusta KAGS GAZ065 ---
 loc5=Brunswick KSSI GAZ154 ---
 loc6=Columbus KCSG GAZ089 ---
@@ -956,8 +956,8 @@ loc16=Savannah KSAV GAZ119 ---
 loc17=Savannah-Hunter\\ AAF KSVN GAZ119 ---
 loc18=St\\ Simon's\\ Island KSSI GAZ154 ---
 loc19=Valdosta KVLD GAZ160 ---
-loc20=Valdosta-Moody\\ AFB KVAD GAZ160 VAX
-loc21=Warner\\ Robins KWRB GAZ095 JGX
+loc20=Valdosta-Moody\\ AFB KVAD GAZ160 ---
+loc21=Warner\\ Robins KWRB GAZ095 ---
 loc22=West\\ Atlanta KFTY GAZ033 ---
 loc23=Waycross KAYS GAZ151 ---
 
@@ -974,7 +974,7 @@ loc7=Kaneohe PHNG HIZ002 ---
 loc8=Lahaina PHJH HIZ003 ---
 loc9=Lanai PHNY HIZ003 ---
 loc10=Lihue PHLI HIZ001 ---
-loc11=Molokai PHMK HIZ005 HMO
+loc11=Molokai PHMK HIZ005 ---
 loc12=Oahu PHHI HIZ002 ---
 
 [US_IL]
@@ -986,10 +986,10 @@ loc3=Bloomington KBMI ILZ038 ---
 loc4=Cairo KCIR ILZ092 ---
 loc5=Carbondale KMDH ILZ084 ---
 loc6=Champaign KCMI ILZ045 ---
-loc7=Chicago-DuPage KDPA ILZ014 LOT
-loc8=Chicago-O'Hare KORD ILZ013 LOT
-loc9=Chicago-Lakefront KCGX ILZ014 LOT
-loc10=Chicago-Midway KMDW ILZ014 LOT
+loc7=Chicago-DuPage KDPA ILZ014 ---
+loc8=Chicago-O'Hare KORD ILZ013 ---
+loc9=Chicago-Lakefront KCGX ILZ014 ---
+loc10=Chicago-Midway KMDW ILZ014 ---
 loc11=Danville KDNV ILZ046 ---
 loc12=Decatur KDEC ILZ053 ---
 loc13=East\\ St\\ Louis KCPS ILZ101 ---
@@ -1012,7 +1012,7 @@ loc1=Elkhart KEKM INZ005 ---
 loc2=Evansville KEVV INZ086 ---
 loc3=Fort\\ Wayne KFWA INZ018 ---
 loc4=Gary KGYY INZ001 ---
-loc5=Indianapolis KIND INZ047 IND
+loc5=Indianapolis KIND INZ047 ---
 loc6=Lafayette KLAF INZ029 ---
 loc7=Marion KMZZ ------ ---
 loc8=Muncie KMIE INZ041 ---
@@ -1041,12 +1041,12 @@ loc2=Battle\\ Creek KBTL MIZ073 ---
 loc3=Benton\\ Harbor KBEH ------ ---
 loc4=Chippewa\\ County KCIU MIZ008 ---
 loc5=Copper\\ Harbor KP59 MIZ003 ---
-loc6=Detroit KDET MIZ076 DTX
-loc7=Detroit-Taylor KDTW MIZ076 DTX
-loc8=Detroit/Ypsilanti KYIP MIZ075 DTX
+loc6=Detroit KDET MIZ076 ---
+loc7=Detroit-Taylor KDTW MIZ076 ---
+loc8=Detroit/Ypsilanti KYIP MIZ075 ---
 loc9=Escanaba KESC MIZ013 ---
 loc10=Flint KFNT MIZ061 ---
-loc11=Grand\\ Rapids KGRR MIZ057 GRR
+loc11=Grand\\ Rapids KGRR MIZ057 ---
 loc12=Hancock KCMX MIZ003 ---
 loc13=Harbor\\ Beach KP58 MIZ049 ---
 loc14=Houghton\\ Lake KHTL MIZ034 ---
@@ -1056,7 +1056,7 @@ loc17=Jackson KJXN MIZ074 ---
 loc18=Kalamazoo KAZO MIZ072 ---
 loc19=Lansing KLAN MIZ066 ---
 loc20=Manistee KMBL MIZ031 ---
-loc21=Marquette KMQT MIZ005 MQT
+loc21=Marquette KMQT MIZ005 ---
 loc22=Menominee KMNM MIZ012 ---
 loc23=Mount\\ Clemens KMTC MIZ070 ---
 loc24=Muskegon KMKG MIZ050 ---
@@ -1076,7 +1076,7 @@ loc0=Alexandria KAXN MNZ041 ---
 loc1=Bemidji KBJI MNZ009 ---
 loc2=Brainerd KBRD MNZ034 ---
 loc3=Detroit\\ Lakes KDTL MNZ027 ---
-loc4=Duluth KDLH MNZ019 DLH
+loc4=Duluth KDLH MNZ019 ---
 loc5=Ely KELO MNZ019 ---
 loc6=Fairmont KFRM MNZ091 ---
 loc7=Fergus\\ Falls KFFM MNZ031 ---
@@ -1087,9 +1087,9 @@ loc11=International\\ Falls KINL MNZ010 ---
 loc12=Litchfield KY69 MNZ058 ---
 loc13=Mankato KMKT MNZ083 ---
 loc14=Marshall KMML MNZ072 ---
-loc15=Minneapolis KMSP MNZ060 MPX
-loc16=Minneapolis\\ (2) KFCM MNZ060 MPX
-loc17=Minneapolis\\ (3) KMIC MNZ060 MPX
+loc15=Minneapolis KMSP MNZ060 ---
+loc16=Minneapolis\\ (2) KFCM MNZ060 ---
+loc17=Minneapolis\\ (3) KMIC MNZ060 ---
 loc18=Pequot\\ Lake KP39 MNZ034 ---
 loc19=Redwood\\ Falls KRWF MNZ073 ---
 loc20=Rochester KRST MNZ087 ---
@@ -1105,17 +1105,17 @@ loc0=Austin KU31 NVZ012 ---
 loc1=Battle\\ Mountain KBAM NVZ012 ---
 loc2=Caliente KP38 NVZ015 ---
 loc3=Desert\\ Rock KDRA ------ ---
-loc4=Elko KEKO NVZ008 LRX
+loc4=Elko KEKO NVZ008 ---
 loc5=Ely KELY NVZ011 ---
-loc6=Eureka KP68 NVZ012 BHX
+loc6=Eureka KP68 NVZ012 ---
 loc7=Fallon KNFL NVZ004 ---
 loc8=Hawthorne KHTH NVZ001 ---
 loc9=Indian\\ Springs KL63 NVZ017 ---
-loc10=Las\\ Vegas KLAS NVZ020 ESX
+loc10=Las\\ Vegas KLAS NVZ020 ---
 loc11=Lovelock KLOL NVZ004 ---
 loc12=N\\ Las\\ Vegas KLSV NVZ020 ---
 loc13=Owyhee KOWY NVZ007 ---
-loc14=Reno KRNO NVZ003 RGX
+loc14=Reno KRNO NVZ003 ---
 loc15=Tonopah KTPH NVZ014 ---
 loc16=Winnemucca KWMC NVZ006 ---
 
@@ -1153,19 +1153,19 @@ loc13=Kinston KISO NCZ091 ---
 loc14=New\\ Bern KEWN NCZ093 ---
 loc15=New\\ River KNCA NCZ098 ---
 loc16=Pope\\ AFB KPOB NCZ088 ---
-loc17=Raleigh-Durham KRDU NCZ041 RAX
+loc17=Raleigh-Durham KRDU NCZ041 ---
 loc18=Rocky\\ Mount KRWI NCZ028 ---
 loc19=Stumpy\\ Point K2DP ------ ---
-loc20=Wilmington KILM NCZ101 LTX
+loc20=Wilmington KILM NCZ101 ---
 loc21=Winston-Salem KINT NCZ021 ---
 
 [US_OH]
 name=Ohio
 loc0=Akron KCAK OHZ021 ---
 loc1=Cincinnati KLUK OHZ077 ---
-loc2=Cleveland KCLE OHZ011 CLE
-loc3=Cleveland-Lakefront KBKL OHZ011 CLE
-loc4=Cleveland/Cuyahoga KCGF OHZ011 CLE
+loc2=Cleveland KCLE OHZ011 ---
+loc3=Cleveland-Lakefront KBKL OHZ011 ---
+loc4=Cleveland/Cuyahoga KCGF OHZ011 ---
 loc5=Columbus-Gahanna KCMH OHZ055 ---
 loc6=Columbus-OSU KOSU OHZ055 ---
 loc7=Dayton KDAY OHZ061 ---
@@ -1178,7 +1178,7 @@ loc13=Mansfield KMFD OHZ029 ---
 loc14=Rickenbacker KLCK OHZ070 ---
 loc15=Toledo KTOL OHZ003 ---
 loc16=Willoughby KLNN OHZ012 ---
-loc17=Wilmington KILN OHZ072 ILN
+loc17=Wilmington KILN OHZ072 ---
 loc18=Wooster KBJJ OHZ031 ---
 loc19=Youngstown KYNG OHZ033 ---
 loc20=Zanesville KZZV OHZ057 ---
@@ -1192,16 +1192,16 @@ loc3=Brookings K4BK ORZ003 ---
 loc4=Burns KBNO ORZ022 ---
 loc5=Cascade KCZK ORZ015 ---
 loc6=Eugene KEUG ORZ006 ---
-loc7=Hillsboro KHIO ORZ004 RTX
+loc7=Hillsboro KHIO ORZ004 ---
 loc8=Klamath\\ Falls KLMT ORZ012 ---
 loc9=Lakeview K4LW ORZ015 ---
 loc10=Meacham KMEH ORZ017 ---
-loc11=Medford KMFR ORZ008 MAX
+loc11=Medford KMFR ORZ008 ---
 loc12=Newport KONP ORZ002 ---
 loc13=North\\ Bend KOTH ORZ003 ---
 loc14=Ontario KONO ORZ021 ---
-loc15=Pendleton KPDT ORZ017 PDT
-loc16=Portland KPDX ORZ004 RTX
+loc15=Pendleton KPDT ORZ017 ---
+loc16=Portland KPDX ORZ004 ---
 loc17=Redmond KRDM ORZ014 ---
 loc18=Roseburg KRBG ORZ007 ---
 loc19=Salem KSLE ORZ005 ---
@@ -1219,9 +1219,9 @@ loc2=Providence KPVD RIZ002 ---
 name=South Carolina
 loc0=Anderson KAND SCZ010 ---
 loc1=Beaufort KNBC SCZ048 ---
-loc2=Charleston KCHS SCZ050 CLX
-loc3=Columbia KCAE SCZ028 CAE
-loc4=Columbia-McEntire KMMT SCZ028 CAE
+loc2=Charleston KCHS SCZ050 ---
+loc3=Columbia KCAE SCZ028 ---
+loc4=Columbia-McEntire KMMT SCZ028 ---
 loc5=Florence KFLO SCZ032 ---
 loc6=Greenville KGMU SCZ006 ---
 loc7=Greenville-Spartanburg KGSP SCZ007 ---
@@ -1237,56 +1237,56 @@ loc1=Chattanooga KCHA TNZ099 ---
 loc2=Crossville KCSV TNZ066 ---
 loc3=Dyersburg KDYR TNZ019 ---
 loc4=Jackson KMKL TNZ052 ---
-loc5=Knoxville KTYS TNZ069 MRX
-loc6=Knoxville-Downtown KDKX TNZ069 MRX
-loc7=Memphis KMEM TNZ088 NQA
-loc8=Memphis-NAS KNQA TNZ088 NQA
-loc9=Nashville KBNA TNZ027 OHX
+loc5=Knoxville KTYS TNZ069 ---
+loc6=Knoxville-Downtown KDKX TNZ069 ---
+loc7=Memphis KMEM TNZ088 ---
+loc8=Memphis-NAS KNQA TNZ088 ---
+loc9=Nashville KBNA TNZ027 ---
 loc10=Smyrna KMQY TNZ062 ---
 
 [US_TX]
 name=Texas
 loc0=Abilene KABI TXZ127 ---
 loc1=Alice KALI TXZ241 ---
-loc2=Amarillo KAMA TXZ017 AMA
+loc2=Amarillo KAMA TXZ017 ---
 loc3=Angleton KLBX ------ ---
 loc4=Arlington KF54 TXZ119 ---
-loc5=Austin KAUS TXZ192 GRK
+loc5=Austin KAUS TXZ192 ---
 loc6=Beaumont-Port\\ Arthur KBPT TXZ215 ---
 loc7=Bergstrom\\ AFB KBSM TXZ192 ---
 loc8=Borger KBGD TXZ008 ---
-loc9=Brownsville KBRO TXZ255 BRO
+loc9=Brownsville KBRO TXZ255 ---
 loc10=Burnet KBMQ ------ ---
 loc11=Childress KCDS TXZ026 ---
 loc12=College\\ Station KCLL TXZ196 ---
 loc13=Conroe KCXO ------ ---
-loc14=Corpus\\ Christi KCRP TXZ243 CRP
-loc15=Corpus\\ Christi\\ NAS KNGP TXZ243 CRP
+loc14=Corpus\\ Christi KCRP TXZ243 ---
+loc15=Corpus\\ Christi\\ NAS KNGP TXZ243 ---
 loc16=Corsicana KCRS TXZ146 ---
 loc17=Cotulla KCOT TXZ229 ---
 loc18=Dalhart KDHT TXZ001 ---
 loc19=Dallas-Addison KADS TXZ119 ---
-loc20=Dallas-Fort\\ Worth KDFW TXZ119 FWS
+loc20=Dallas-Fort\\ Worth KDFW TXZ119 ---
 loc21=Dallas-Love\\ Field KDAL TXZ119 ---
 loc22=Dallas-Redbird KRBD TXZ119 ---
 loc23=Del\\ Rio KDRT TXZ183 ---
 loc24=Denton KDTO ------ ---
-loc25=El\\ Paso KELP TXZ055 EPZ
+loc25=El\\ Paso KELP TXZ055 ---
 loc26=Fort\\ Stockton KFST TXZ075 ---
-loc27=Fort\\ Worth-Meacham KFTW TXZ118 FWS
-loc28=Fort\\ Worth\\ NAS KNFW TXZ118 FWS
-loc29=Fort\\ Worth-Alliance KAFW TXZ118 FWS
+loc27=Fort\\ Worth-Meacham KFTW TXZ118 ---
+loc28=Fort\\ Worth\\ NAS KNFW TXZ118 ---
+loc29=Fort\\ Worth-Alliance KAFW TXZ118 ---
 loc30=Galveston KGLS TXZ238 ---
 loc31=Georgetown KGTU TXZ173 ---
 loc32=Greenville KGVT ------ ---
 loc33=Guadalupe\\ Pass KGDP TXZ234 ---
 loc34=Harlingen KHRL TXZ255 ---
 loc35=Hondo KHDO TXZ204 ---
-loc36=Houston-Bush KIAH TXZ213 HGX
-loc37=Houston-Hooks KDWH TXZ213 HGX
-loc38=Houston-Ellington\\ Field KEFD TXZ213 HGX
-loc39=Houston-Clover KT02 TXZ213 HGX
-loc40=Houston-Hobby KHOU TXZ213 HGX
+loc36=Houston-Bush KIAH TXZ213 ---
+loc37=Houston-Hooks KDWH TXZ213 ---
+loc38=Houston-Ellington\\ Field KEFD TXZ213 ---
+loc39=Houston-Clover KT02 TXZ213 ---
+loc40=Houston-Hobby KHOU TXZ213 ---
 loc41=Huntsville KUTS ------ ---
 loc42=Junction KJCT TXZ169 ---
 loc43=Killeen KILE TXZ158 ---
@@ -1294,13 +1294,13 @@ loc44=Killeen-Ft\\ Hood KHLR TXZ158 ---
 loc45=Killeen-Gray\\ AAF KGRK TXZ158 ---
 loc46=Kingsville KNQI TXZ242 ---
 loc47=Laredo KLRD TXZ239 ---
-loc48=Laughlin KDLF ------ DFX
+loc48=Laughlin KDLF ------ ---
 loc49=Longview KGGG TXZ138 ---
-loc50=Lubbock KLBB TXZ035 LBB
+loc50=Lubbock KLBB TXZ035 ---
 loc51=Lufkin KLFK TXZ165 ---
 loc52=Mc\\ Gregor KPWG ------ ---
 loc53=McAllen KMFE TXZ253 ---
-loc54=Midland KMAF TXZ062 MAF
+loc54=Midland KMAF TXZ062 ---
 loc55=Mineral\\ Wells KMWL TXZ117 ---
 loc56=Nacogdoches KOCH TXZ152 ---
 loc57=New\\ Braunfels K3R5 TXZ207 ---
@@ -1309,10 +1309,10 @@ loc59=Paris KPRX TXZ095 ---
 loc60=Randolph\\ AFB KRND ------ ---
 loc61=Rockport KRKP TXZ245 ---
 loc62=Sabine\\ Pass KRPE ------ ---
-loc63=San\\ Angelo KSJT TXZ072 SJT
-loc64=San\\ Antonio KSAT TXZ205 EWX
-loc65=San\\ Antonio-Kelly\\ AFB KSKF TXZ205 EWX
-loc66=San\\ Antonio-Stinson KSSF TXZ205 EWX
+loc63=San\\ Angelo KSJT TXZ072 ---
+loc64=San\\ Antonio KSAT TXZ205 ---
+loc65=San\\ Antonio-Kelly\\ AFB KSKF TXZ205 ---
+loc66=San\\ Antonio-Stinson KSSF TXZ205 ---
 loc67=Sanderson KP07 TXZ082 ---
 loc68=Sherman-Denison KF39 TXZ093 ---
 loc69=Temple KTPL TXZ158 ---
@@ -1345,12 +1345,12 @@ loc16=Marion-Wytheville KMKJ VAZ009 ---
 loc17=Martinsville KMTV VAZ043 ---
 loc18=Melfa KMFV VAZ099 ---
 loc19=Newport\\ News KPHF VAZ093 ---
-loc20=Norfolk KORF VAZ093 AKQ
-loc21=Norfolk\\ NAS KNGU VAZ093 AKQ
+loc20=Norfolk KORF VAZ093 ---
+loc21=Norfolk\\ NAS KNGU VAZ093 ---
 loc22=Petersburg KPTB VAZ081 ---
 loc23=Quantico KNYG VAZ052 ---
 loc24=Richmond KRIC VAZ071 ---
-loc25=Roanoke KROA VAZ022 FCX
+loc25=Roanoke KROA VAZ022 ---
 loc26=Shannon KEZF ------ ---
 loc27=Staunton KSHD VAZ025 ---
 loc28=Virginia\\ Beach KNTU VAZ098 ---
@@ -1364,15 +1364,15 @@ loc34=Wise KLNP VAZ002 ---
 [US_WV]
 name=West Virginia
 loc0=Beckley KBKW WVZ035 ---
-loc1=Bluefield KBLF WVZ042 RLX
-loc2=Charleston KCRW WVZ015 RLX
+loc1=Bluefield KBLF WVZ042 ---
+loc2=Charleston KCRW WVZ015 ---
 loc3=Clarksburg KCKB WVZ031 ---
 loc4=Elkins KEKN WVZ047 ---
 loc5=Huntington KHTS WVZ006 ---
 loc6=Lewisburg KLWB WVZ045 ---
-loc7=Martinsburg KMRB WVZ052 LWX
-loc8=Morgantown KMGW WVZ022 RLX
-loc9=Parkersburg KPKB WVZ009 RLX
+loc7=Martinsburg KMRB WVZ052 ---
+loc8=Morgantown KMGW WVZ022 ---
+loc9=Parkersburg KPKB WVZ009 ---
 loc10=Wheeling KHLG WVZ004 ---
 loc11=White\\ Sulphur KSSU WVZ045 ---
 
@@ -1382,17 +1382,17 @@ loc0=Antigo KAIG WIZ019 ---
 loc1=Appleton KATW WIZ038 ---
 loc2=Eau\\ Claire KEAU WIZ028 ---
 loc3=Fond\\ Du\\ Lac KFLD WIZ051 ---
-loc4=Green\\ Bay KGRB WIZ039 GRB
+loc4=Green\\ Bay KGRB WIZ039 ---
 loc5=Hayward KHYR WIZ008 ---
 loc6=Janesville KJVL WIZ069 ---
 loc7=Kenosha KENW WIZ072 ---
-loc8=La\\ Crosse KLSE WIZ041 ARX
+loc8=La\\ Crosse KLSE WIZ041 ---
 loc9=Lone\\ Rock KLNR WIZ055 ---
 loc10=Madison KMSN WIZ063 ---
 loc11=Manitowoc KMTW WIZ050 ---
 loc12=Marshfield KMFI WIZ035 ---
-loc13=Milwaukee KMKE WIZ066 MKX
-loc14=Milwaukee-Timmerman KMWC WIZ066 MKX
+loc13=Milwaukee KMKE WIZ066 ---
+loc14=Milwaukee-Timmerman KMWC WIZ066 ---
 loc15=Minocqua KARV WIZ010 ---
 loc16=Mosinee KCWA WIZ030 ---
 loc17=Oshkosh KOSH WIZ048 ---
@@ -1413,7 +1413,7 @@ loc0=Ashburnam K9B4 ------ ---
 loc1=Ashfield K2B5 ------ ---
 loc2=Bedford KBED MAZ005 ---
 loc3=Beverly KBVY MAZ007 ---
-loc4=Boston KBOS MAZ015 BOX
+loc4=Boston KBOS MAZ015 ---
 loc5=Chatham KCQX MAZ022 ---
 loc6=Chicopee\\ Falls KCEF ------ ---
 loc7=Falmouth-Otis\\ AFB KFMH MAZ022 ---
@@ -1434,9 +1434,9 @@ loc21=Worcester KORH MAZ012 ---
 
 [US_NY]
 name=New York
-loc0=Albany KALB NYZ052 ENX
-loc1=Binghamton KBGM NYZ056 BGM
-loc2=Buffalo KBUF NYZ010 BUF
+loc0=Albany KALB NYZ052 ---
+loc1=Binghamton KBGM NYZ056 ---
+loc2=Buffalo KBUF NYZ010 ---
 loc3=Elmira KELM NYZ024 ---
 loc4=Farmingdale KFRG NYZ077 ---
 loc5=Fort\\ Drum KGTB NYZ007 ---
@@ -1448,8 +1448,8 @@ loc10=Jamestown KJHW NYZ019 ---
 loc11=Massena KMSS NYZ026 ---
 loc12=Montgomery KMGJ NYZ067 ---
 loc13=Monticello KMSV NYZ062 ---
-loc14=New\\ York-JFK\\ Arpt KJFK NYZ076 OKX
-loc15=New\\ York-La\\ Guardia KLGA NYZ076 OKX
+loc14=New\\ York-JFK\\ Arpt KJFK NYZ076 ---
+loc15=New\\ York-La\\ Guardia KLGA NYZ076 ---
 loc16=Newburgh KSWF NYZ067 ---
 loc17=Niagara\\ Falls KIAG NYZ001 ---
 loc18=Ogdensburg KOGS NYZ026 ---
@@ -1482,15 +1482,15 @@ loc11=Oak\\ Harbor K76S WAZ009 ---
 loc12=Olympia KOLM WAZ008 ---
 loc13=Omak K4OM WAZ038 ---
 loc14=Pasco KPSC WAZ028 ---
-loc15=Port\\ Angeles KCLM WAZ013 VTX
+loc15=Port\\ Angeles KCLM WAZ013 ---
 loc16=Pullman KPUW WAZ032 ---
 loc17=Quillayute KUIL ------ ---
 loc18=Renton KRNT WAZ007 ---
-loc19=Seattle KSEA WAZ007 ATX
-loc20=Seattle-Boeing KBFI WAZ007 ATX
+loc19=Seattle KSEA WAZ007 ---
+loc20=Seattle-Boeing KBFI WAZ007 ---
 loc21=Shelton KSHN WAZ010 ---
-loc22=Spokane KGEG WAZ034 OTX
-loc23=Spokane-Parkwater KSFF WAZ034 OTX
+loc22=Spokane KGEG WAZ034 ---
+loc23=Spokane-Parkwater KSFF WAZ034 ---
 loc24=Stampede\\ Pass KSMP ------ ---
 loc25=Tacoma KTIW WAZ007 ---
 loc26=Tacoma-Lakewood KTCM WAZ007 ---
@@ -2592,7 +2592,7 @@ loc0=Acajutla MSAC ------ ---
 loc1=El\\ Salvador\\ Int. MSLP ------ ---
 loc2=San\\ Miguel MSSM ------ ---
 loc3=San\\ Salvador MSSS ------ ---
-loc4=Santa\\ Ana MSSA ------ SOX
+loc4=Santa\\ Ana MSSA ------ ---
 
 [M__GT]
 name=Guatemala
@@ -2662,7 +2662,7 @@ loc10=Riberalta SLRI ------ ---
 loc11=Robore SLRB ------ ---
 loc12=Rurrenabaque SLRQ ------ ---
 loc13=San\\ Ignacio\\ De\\ Velasco SLSI ------ ---
-loc14=San\\ Joaquin SLJO ------ HNX
+loc14=San\\ Joaquin SLJO ------ ---
 loc15=San\\ Jose\\ De\\ Chiquitos SLJE ------ ---
 loc16=Santa\\ Ana SLSA ------ ---
 loc17=Sucre SLSU ------ ---
@@ -2929,7 +2929,7 @@ states=AG PR
 [AT_PR]
 name=Puerto Rico
 loc0=Aquadilla TJBQ ------ ---
-loc1=San\\ Juan TJSJ ------ JUA
+loc1=San\\ Juan TJSJ ------ ---
 loc2=Mayaguez TJMZ ------ ---
 loc3=Ponce TJPS ------ ---
 
diff --git a/gweather/gweather-applet.c b/gweather/gweather-applet.c
index 0b83689e3..c0bac4fa0 100644
--- a/gweather/gweather-applet.c
+++ b/gweather/gweather-applet.c
@@ -281,6 +281,9 @@ static void update_finish (WeatherInfo *info)
     if (gweather_pref.update_enabled)
         timeout_tag =  gtk_timeout_add (gweather_pref.update_interval * 1000,
                                         timeout_cb, NULL);
+
+    /* Update dialog -- if one is present */
+    gweather_dialog_update();
 }
 
 void gweather_update (void)
diff --git a/gweather/gweather-dialog.c b/gweather/gweather-dialog.c
index bc454c37d..eb24470fc 100644
--- a/gweather/gweather-dialog.c
+++ b/gweather/gweather-dialog.c
@@ -39,18 +39,22 @@ static GtkWidget *cond_pressure;
 static GtkWidget *cond_vis;
 static GtkWidget *cond_pixmap;
 static GtkWidget *forecast_text;
-static GtkWidget *radar_pixmap = NULL;
-static GtkWidget *radar_scroller;
+static GtkWidget *radar_pixmap;
 
 static GdkPixmap *pixmap;
 static GdkBitmap *mask = NULL;
 
 
-static void close_cb (GtkButton *button, gpointer user_data)
+static void close_cb (GtkButton *button, gpointer data)
 {
     gweather_dialog_close();
 }
 
+static void link_cb (GtkButton *button, gpointer data)
+{
+    gnome_url_show("http://www.weather.com/");
+}
+
 void gweather_dialog_create (void)
 {
   GtkWidget *weather_vbox;
@@ -72,6 +76,9 @@ void gweather_dialog_create (void)
   GtkWidget *current_note_lbl;
   GtkWidget *forecast_note_lbl;
   GtkWidget *radar_note_lbl;
+  GtkWidget *radar_vbox;
+  GtkWidget *radar_link_btn;
+  GtkWidget *radar_link_alignment;
   GtkWidget *forecast_scroll;
   GtkObject *forecast_adj;
   GtkWidget *forecast_hbox;
@@ -82,7 +89,7 @@ void gweather_dialog_create (void)
 
   gweather_dialog = gnome_dialog_new (_("GNOME Weather"), NULL);
   if (gweather_pref.radar_enabled)
-      gtk_widget_set_usize (gweather_dialog, 640, 420);
+      gtk_widget_set_usize (gweather_dialog, 570, 440);
   else
       gtk_widget_set_usize (gweather_dialog, 590, 340);
   gtk_window_set_policy (GTK_WINDOW (gweather_dialog), FALSE, FALSE, FALSE);
@@ -302,11 +309,26 @@ void gweather_dialog_create (void)
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (weather_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (weather_notebook), 1), forecast_note_lbl);
 
   if (gweather_pref.radar_enabled) {
-      radar_scroller = gtk_scrolled_window_new (GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 0, 0, 0, 0)),
-                                                GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 0, 0, 0, 0)));
-      gtk_widget_show (radar_scroller);
+      radar_vbox = gtk_vbox_new (FALSE, 6);
+      gtk_widget_show (radar_vbox);
+      gtk_container_add (GTK_CONTAINER (weather_notebook), radar_vbox);
+      gtk_container_set_border_width (GTK_CONTAINER (radar_vbox), 6);
+
+      radar_pixmap = gtk_pixmap_new (pixmap, mask);  /* Tmp hack */
+      gtk_widget_show (radar_pixmap);
+      gtk_box_pack_start (GTK_BOX (radar_vbox), radar_pixmap, FALSE, FALSE, 0);
+
+      radar_link_alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
+      gtk_widget_show (radar_link_alignment);
+      gtk_box_pack_start (GTK_BOX (radar_vbox), radar_link_alignment, FALSE, FALSE, 0);
 
-      gtk_container_add (GTK_CONTAINER (weather_notebook), radar_scroller);
+      radar_link_btn = gtk_button_new_with_label (_("Visit Weather.com"));
+      gtk_widget_set_usize(radar_link_btn, 450, -2);
+      gtk_widget_show (radar_link_btn);
+      gtk_container_add (GTK_CONTAINER (radar_link_alignment), radar_link_btn);
+
+      gtk_signal_connect (GTK_OBJECT (radar_link_btn), "clicked",
+                          GTK_SIGNAL_FUNC (link_cb), NULL);
 
       radar_note_lbl = gtk_label_new (_("Radar map"));
       gtk_widget_show (radar_note_lbl);
@@ -324,8 +346,7 @@ void gweather_dialog_create (void)
   GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
 
   gtk_signal_connect (GTK_OBJECT (close_button), "clicked",
-                      GTK_SIGNAL_FUNC (close_cb),
-                      NULL);
+                      GTK_SIGNAL_FUNC (close_cb), NULL);
 }
 
 void gweather_dialog_open (void)
@@ -342,7 +363,6 @@ void gweather_dialog_close (void)
     gtk_widget_hide(gweather_dialog);
     gtk_widget_destroy(gweather_dialog);
     gweather_dialog = NULL;
-    radar_pixmap = NULL;
     mask = NULL;
 }
 
@@ -358,9 +378,11 @@ void gweather_dialog_update (void)
 {
     gchar *forecast;
 
-    g_return_if_fail(gweather_dialog != NULL);
     g_return_if_fail(gweather_info != NULL);
 
+    if (!gweather_dialog)
+        return;
+
     /* Update pixmap */
     weather_info_get_pixmap(gweather_info, &pixmap, &mask);
     gtk_pixmap_set(GTK_PIXMAP(cond_pixmap), pixmap, mask);
@@ -392,17 +414,9 @@ void gweather_dialog_update (void)
 
     /* Update radar map */
     if (gweather_pref.radar_enabled) {
-        GdkPixmap *radar;
-        if (radar_pixmap) {
-            /* gtk_container_remove(GTK_CONTAINER(radar_scroller), radar_pixmap); */
-            gtk_widget_destroy(radar_pixmap);
-            radar_pixmap = NULL;
-        }
-        radar = weather_info_get_radar(gweather_info);
+        GdkPixmap *radar = weather_info_get_radar(gweather_info);
         if (radar) {
-            radar_pixmap = gtk_pixmap_new(radar, NULL);
-            gtk_widget_show (radar_pixmap);
-            gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW(radar_scroller), radar_pixmap);
+            gtk_pixmap_set (GTK_PIXMAP(radar_pixmap), radar, NULL);
         }
     }
 }
diff --git a/gweather/weather.c b/gweather/weather.c
index df5cc3b35..f737e6a86 100644
--- a/gweather/weather.c
+++ b/gweather/weather.c
@@ -1038,7 +1038,6 @@ static void wx_get_finish (ghttp_request *req, ghttp_status status, gpointer dat
     if (status == ghttp_error) {
         g_warning(_("Failed to get radar map image.\n"));
     } else {
-
         body = ghttp_get_body(wx_request);
         body_len = ghttp_get_body_len(wx_request);
         g_return_if_fail(body != NULL);
@@ -1066,7 +1065,7 @@ static void wx_get_start (WeatherInfo *info)
     if (loc->radar[0] == '-')
         return;
 
-    url = g_strdup_printf("http://www.wx.com/nbr/ss2.cfm?radar=%s", loc->radar);
+    url = g_strdup_printf("http://image.weather.com/images/radar/single_site/%sloc_450x284.gif", loc->radar);
     wx_request = ghttp_request_new();
     ghttp_set_uri(wx_request, url);
     g_free(url);