xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'unidata_18.2.1' into unidata_18.2.1-osx-merge

Browse source 
Bring over latest unidata_18.2.1 changes
This commit is contained in:
Shay Carter 2022-03-21 15:37:10 -06:00
commit 54107e64f1
7 changed files with 140 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/ui/DrawingPropertiesDialog.java
View file

@ -25,6 +25,7 @@ import com.raytheon.viz.warnings.rsc.AbstractWWAResource;
* Date Ticket# Engineer Description
* ------------ ---------- ---------------- --------------------------
* Mar 15, 2022 srcarter@ucar Initial creation
* Mar 21, 2022 srcarter@ucar Set the current values every time initializeComponents is called (also called from .Open)
*
* </pre>
*
@ -154,8 +155,7 @@ public class DrawingPropertiesDialog extends CaveSWTDialog {
// --- end Buttons ---
//set all the values
// setCurrentValues();
resetDefaults();
setToCurrentValues();
}
/**
@ -195,10 +195,12 @@ public class DrawingPropertiesDialog extends CaveSWTDialog {
myResource.setWarnFillDisplay(warnFillChk.getSelection());
myResource.setWarnTextDisplay(warnTextChk.getSelection());
myResource.setWarnTimeDisplay(warnTimeChk.getSelection());
myResource.setWatchOutlineDisplay(watchOutlineChk.getSelection());
myResource.setWatchFillDisplay(watchFillChk.getSelection());
myResource.setWatchTextDisplay(watchTextChk.getSelection());
myResource.setWatchTimeDisplay(watchTimeChk.getSelection());
myResource.setAdvisoryOutlineDisplay(advOutlineChk.getSelection());
myResource.setAdvisoryFillDisplay(advFillChk.getSelection());
myResource.setAdvisoryTextDisplay(advTextChk.getSelection());
@ -226,4 +228,25 @@ public class DrawingPropertiesDialog extends CaveSWTDialog {
advTextChk.setSelection(AbstractWWAResource.ADV_TEXT_DEFAULT);
advTimeChk.setSelection(AbstractWWAResource.ADV_TIME_DEFAULT);
}
/**
* Set all the GUI checkboxes to the current boolean values from
* the associated resource
*/
protected void setToCurrentValues(){
warnOutlineChk.setSelection(myResource.showWarnOutline());
warnFillChk.setSelection(myResource.showWarnFill());
warnTextChk.setSelection(myResource.showWarnText());
warnTimeChk.setSelection(myResource.showWarnTime());
watchOutlineChk.setSelection(myResource.showWatchOutline());
watchFillChk.setSelection(myResource.showWatchFill());
watchTextChk.setSelection(myResource.showWatchText());
watchTimeChk.setSelection(myResource.showWatchTime());
advOutlineChk.setSelection(myResource.showAdvisoryOutline());
advFillChk.setSelection(myResource.showAdvisoryFill());
advTextChk.setSelection(myResource.showAdvisoryText());
advTimeChk.setSelection(myResource.showAdvisoryTime());
}
}

4
rpms/awips2.edex/Installer.edex/ndm/MTR.goodness
View file

@ -631,6 +631,7 @@
0 K8D4 43.1272 -85.6784 236 500
0 K8G2 41.9075 -79.6410 1766 8769
0 K8K2 37.27819 -98.04348 435 500
0 K8T6 28.36281 -98.11647 39 500
0 K8W2 38.6560 -78.7085 293 2500
0 K92S 42.83 -124.57 33 500
0 K96D 48.94057 -97.902775 290 500
@ -683,6 +684,7 @@
0 KAFP 35.0206 -80.0771 91 500
0 KAFW 32.9800 -97.3200 220 9524
0 KAGC 40.35504 -79.92134 382 11721
0 KAGO 33.22747 -93.2170 97 500
72218 KAGS 33.3800 -81.9700 45 27101
72311 KAHN 33.9600 -83.3200 246 27100
0 KAHQ 41.24061 -96.59456 373 500
@ -2127,6 +2129,7 @@
0 KNQA 35.3600 -89.8700 98 6401
0 KNQI 27.5072 -97.8097 15 500
0 KNQX 24.5757 -81.6888 2 13123
0 KNRA 48.1833 -122.6333 61 500
0 KNRB 30.3919 -81.4237 5 6019
0 KNRN 39.8504 -99.8947 726 500
0 KNRS 32.5800 -117.1200 8 2185
@ -3185,6 +3188,7 @@
91348 PTPN 6.97 158.22 46 500
91408 PTRO 7.33 134.48 33 500
0 PTTP 6.95 158.25 46 500
0 RJTX 35.289 139.6801 5 500
0 ROTM 26.271 127.7541 75 500
78543 TIST 18.3300 -64.9700 67 7392
78547 TISX 17.7000 -64.8000 17 10506

48
rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt
View file

@ -9597,6 +9597,8 @@ GUMOUATKR UXKA80 PTKR
GUMOUATTP UXKA80 PTTP
GUMPFMMY FOMY50 PGUM
GUMPFMPQ FOPQ50 PGUM
GUMPFMPQ1 FOPQ51 PGUM
GUMPFMPQ2 FOPQ52 PGUM
GUMPNSGUM NOPQ40 PGUM
GUMPNSKMR NOMH40 PKMR
GUMPNSPQ NOPQ40 PGUM
@ -9637,6 +9639,8 @@ GUMSFPTKR FPKA60 PTKR
GUMSFPTTP FPKA60 PTTP
GUMSFTGU FPMY60 PGUM
GUMSFTGUM FPMY60 PGUM
GUMSFTPQ1 FPPQ61 PGUM
GUMSFTPQ2 FPPQ62 PGUM
GUMSGLGUM UMGM40 PGUM
GUMSGLKMR UMMH40 PKMR
GUMSGLT11 UMKA40 PTYA
@ -9741,6 +9745,8 @@ GUMWSVPQ5 WVPQ25 PGUM
GUMZFPGUM FPMY50 PGUM
GUMZFPKMR FZKA50 PKMR
GUMZFPMY FPMY50 PGUM
GUMZFPPQ1 FPPQ51 PGUM
GUMZFPPQ2 FPPQ52 PGUM
GUMZFPT11 FPKA50 PTYA
GUMZFPTKK FPKA50 PTKK
GUMZFPTKR FPKA50 PTKR
@ -16452,6 +16458,7 @@ NEWCLMLCH CXUS54 KLCH
NEWCLMLFT CXUS54 KLCH
NEWCLMMCB CXUS54 KLIX
NEWCLMMLU CXUS54 KSHV
NEWCLMMSY CXUS54 KLIX
NEWCLMNEW CXUS54 KLIX
NEWCLMSHV CXUS54 KSHV
NEWCMMSHV CSUS54 KSHV
@ -16778,6 +16785,7 @@ NEWRERLCH SXUS74 KLCH
NEWRERLFT SXUS74 KLCH
NEWRERLIX SRUS74 KLIX
NEWRERMCB SXUS74 KLIX
NEWRERMSY SXUS74 KLIX
NEWRERNEW SXUS74 KLIX
NEWRERSHV SXUS74 KSHV
NEWRETRAN NZXX99 KLIX
@ -28355,6 +28363,46 @@ WBCTAFPHF FTUS41 KAKQ
WBCTAFRIC FTUS41 KAKQ
WBCTAFROA FTUS41 KRNK
WBCTAFSBY FTUS41 KAKQ
WBCTCDAT0 WTNT40 KWNH
WBCTCDAT1 WTNT41 KWNH
WBCTCDAT2 WTNT42 KWNH
WBCTCDAT3 WTNT43 KWNH
WBCTCDAT4 WTNT44 KWNH
WBCTCDAT5 WTNT45 KWNH
WBCTCDAT6 WTNT46 KWNH
WBCTCDAT7 WTNT47 KWNH
WBCTCDAT8 WTNT48 KWNH
WBCTCDAT9 WTNT49 KWNH
WBCTCDEP0 WTPZ40 KWNH
WBCTCDEP1 WTPZ41 KWNH
WBCTCDEP2 WTPZ42 KWNH
WBCTCDEP3 WTPZ43 KWNH
WBCTCDEP4 WTPZ44 KWNH
WBCTCDEP5 WTPZ45 KWNH
WBCTCDEP6 WTPZ46 KWNH
WBCTCDEP7 WTPZ47 KWNH
WBCTCDEP8 WTPZ48 KWNH
WBCTCDEP9 WTPZ49 KWNH
WBCTCMAT0 WTNT20 KWNH
WBCTCMAT1 WTNT21 KWNH
WBCTCMAT2 WTNT22 KWNH
WBCTCMAT3 WTNT23 KWNH
WBCTCMAT4 WTNT24 KWNH
WBCTCMAT5 WTNT25 KWNH
WBCTCMAT6 WTNT26 KWNH
WBCTCMAT7 WTNT27 KWNH
WBCTCMAT8 WTNT28 KWNH
WBCTCMAT9 WTNT29 KWNH
WBCTCMEP0 WTPZ20 KWNH
WBCTCMEP1 WTPZ21 KWNH
WBCTCMEP2 WTPZ22 KWNH
WBCTCMEP3 WTPZ23 KWNH
WBCTCMEP4 WTPZ24 KWNH
WBCTCMEP5 WTPZ25 KWNH
WBCTCMEP6 WTPZ26 KWNH
WBCTCMEP7 WTPZ27 KWNH
WBCTCMEP8 WTPZ28 KWNH
WBCTCMEP9 WTPZ29 KWNH
WBCTCVAKQ WTUS81 KAKQ
WBCTCVLWX WTUS81 KLWX
WBCTCVRNK WTUS81 KRNK

51
rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt
View file

@ -10165,6 +10165,8 @@ GUMOUATKK
GUMOUATKR
GUMOUATTP
GUMPFMGUM
GUMPFMPQ1
GUMPFMPQ2
GUMPNSGUM
GUMPNSKMR
GUMPNSPQ
@ -10207,6 +10209,8 @@ GUMSFPTKR
GUMSFPTTP
GUMSFTGU
GUMSFTGUM
GUMSFTPQ1
GUMSFTPQ2
GUMSGLGUM
GUMSGLKMR
GUMSGLKWA
@ -10314,6 +10318,8 @@ GUMZFPGUM
GUMZFPKMR
GUMZFPMY
GUMZFPPQ
GUMZFPPQ1
GUMZFPPQ2
GUMZFPT11
GUMZFPTKK
GUMZFPTKR
@ -11327,6 +11333,7 @@ IJMROBJM2
IJPHSF101
IJPHSF102
IJPMTRJOI
IJPMTRJTX
IJPMTROTM
IJPSIG10
IJPTAF10
@ -17000,6 +17007,7 @@ LITMISLZK
LITMSMLIT
LITMTR1M1
LITMTRADF
LITMTRAGO
LITMTRARG
LITMTRASG
LITMTRBPK
@ -32719,6 +32727,7 @@ NEWCLMLCH
NEWCLMLFT
NEWCLMMCB
NEWCLMMLU
NEWCLMMSY
NEWCLMNEW
NEWCLMSHV
NEWCMMSHV
@ -33099,6 +33108,7 @@ NEWRERLCH
NEWRERLFT
NEWRERLIX
NEWRERMCB
NEWRERMSY
NEWRERNEW
NEWRERSHV
NEWRFDLCH
@ -39157,6 +39167,7 @@ SATMTR5C1
SATMTR5T9
SATMTR66R
SATMTR6R3
SATMTR8T6
SATMTRALI
SATMTRAPY
SATMTRAQO
@ -44355,6 +44366,46 @@ WBCTAFPHF
WBCTAFRIC
WBCTAFROA
WBCTAFSBY
WBCTCDAT0
WBCTCDAT1
WBCTCDAT2
WBCTCDAT3
WBCTCDAT4
WBCTCDAT5
WBCTCDAT6
WBCTCDAT7
WBCTCDAT8
WBCTCDAT9
WBCTCDEP0
WBCTCDEP1
WBCTCDEP2
WBCTCDEP3
WBCTCDEP4
WBCTCDEP5
WBCTCDEP6
WBCTCDEP7
WBCTCDEP8
WBCTCDEP9
WBCTCMAT0
WBCTCMAT1
WBCTCMAT2
WBCTCMAT3
WBCTCMAT4
WBCTCMAT5
WBCTCMAT6
WBCTCMAT7
WBCTCMAT8
WBCTCMAT9
WBCTCMEP0
WBCTCMEP1
WBCTCMEP2
WBCTCMEP3
WBCTCMEP4
WBCTCMEP5
WBCTCMEP6
WBCTCMEP7
WBCTCMEP8
WBCTCMEP9
WBCTCVAKQ
WBCTCVLWX
WBCTCVRNK

7
rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt
View file

@ -1230,6 +1230,7 @@
0000000000|K8G2 | 41.9075| -79.6410| 1766|CORRY, PA |US|MTR
0000000000|K8K2 | 37.27819|-98.04348| 435|Harper Muni AP, Harper, KS |US|MTR
0000000000|K8S0 | 48.601|-113.115| 1419|Browning/Starr-Browning Airstp, MT |US|MTR
0000000000|K8T6 | 28.36281|-98.11647| 39|Live Oak Cnty AP, George West, TX |US|MTR
0000000000|K8W2 | 38.6560| -78.7085| 293|New Market AP, New Market, VA |US|MTR
0000000000|K8Y8 | 48.28 | -92.48 | 341|CRANE LAKE, MN |US|MTR
0000000000|K90J | 29.12 | -81.57 | 33|ASTOR NAS, FL |US|MTR
@ -1290,6 +1291,7 @@
0000000000|KAFP | 35.021| -80.077| 91|Anson Cnty AP, Wadesboro, NC |US|MTR
0000000000|KAFW | 32.98 | -97.32 | 220|Fort Worth/Alliance, TX |US|MTR
0000000000|KAGC | 40.35504|-79.92134| 382|Pittsburgh/Allegheny Co, PA |US|MTR
0000000000|KAGO | 33.22747|-93.2170| 97|Ralph C Weiser AP, Magnolia, AR |US|MTR
0000072218|KAGS | 33.38 | -81.97 | 45|AUGUSTA/BUSH FIE, GA |US|MTR
0000072311|KAHN | 33.96 | -83.32 | 246|Athens/Ben Epps AP, Athens, GA |US|MTR
0000000000|KAHQ | 41.24061| -96.59456| 383|Wahoo Muni, Wahoo, NE |US|MTR
@ -2458,7 +2460,7 @@
0000000000|KL98 | 34.46 |-120.04 | 27|EL CAPITAN BEACH, CA |US|MTR
0000000000|KLAA | 38.07 |-102.68 | 1129|LAMAR, CO |US|MTR
0000000000|KLAF | 40.43 | -86.93 | 184|LAFAYETTE/PURDUE, IN |US|MTR
0000000000|KLAL | 27.989| -82.019| 43|Lakeland Linder Rgnl, Lakeland, FL |US|MTR
0000000000|KLAL | 27.989| -82.019| 43|Lakeland Linder Intl, Lakeland, FL |US|MTR
0000000000|KLAM | 35.88 |-106.269| 2186|Los Alamos AP, Los Alamos, NM |US|MTR
0000072539|KLAN | 42.776110|-84.599728| 266|LANSING/CAPITAL, MI |US|MTR
0000000000|KLAR | 41.33 |-105.68 | 2218|LARAMIE/BREES, WY |US|MTR
@ -2824,7 +2826,7 @@
0000000000|KNQA | 35.36 | -89.87 | 98|MEMPHIS NAS, TN |US|MTR
0000000000|KNQI | 27.507| -97.810| 15|Kingsville NAS, Kingsville, TX |US|MTR
0000000000|KNQX | 24.576| -81.689| 2|Key West NAS, FL |US|MTR
0000000000|KNRA | 48.183|-122.633| 61|Coupeville NOF, Coupeville, WA |US|MTR
0000000000|KNRA | 48.1833|-122.6333| 61|Coupeville NOF, Coupeville, WA |US|MTR
0000000000|KNRB | 30.392| -81.424| 5|Mayport NAS, FL |US|MTR
0000000000|KNRC | 37.41 |-121.10 | 50|CROWS LANDING, CA |US|MTR
0000000000|KNRN | 39.850| -99.895| 726|Norton, KS |US|MTR
@ -4024,6 +4026,7 @@
0000047764|RJOI | 34.15 | 132.23 | 2|Iwacuni MCAS |JP|MTR
0000047771|RJOO | 34.78 | 135.45 | 15|Osaka Intl/Itami |JP|MTR
0000047671|RJTT | 35.55 | 139.78 | 8|Tokyo Intl |JP|MTR
0000000000|RJTX | 35.289| 139.6801| 5|NOAC Yokosuka, JP |JP|MTR
0000047642|RJTY | 35.75 | 139.35 | 139|Yokota |JP|MTR
0000047141|RKJK | 35.90 | 126.62 | 9|Kunsan |KO|MTR
0000047122|RKSO | 37.08 | 127.03 | 12|Osan |KO|MTR

3
rpms/awips2.edex/Installer.edex/ndm/national_category_table.template
View file

@ -1141,6 +1141,7 @@ K8D4 ARB
K8G2 PHL
K8K2 TOP
K8S0 GTF
K8T6 SAT
K8W2 WBC
K92S PDX
K96D BIS
@ -1196,6 +1197,7 @@ KAFO CYS
KAFP RDU
KAFW FTW
KAGC PIT
KAGO LIT
KAGS CAE
KAHN ATL
KAHQ OMA
@ -4136,6 +4138,7 @@ RJNN IJP
RJOI IJP
RJOO IJP
RJTT IJP
RJTX IJP
RJTY IJP
RKJK IKO
RKSO IKO

5
rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt
View file

@ -642,6 +642,7 @@
8G2 CORREY, PA
8K2 Harper Muni AP, Harper, KS
8S0 Browning/Starr-Browning Airstp, MT
8T6 Live Oak County Airport, George West, TX
8W2 New Market AP, New Market, VA
8Y8 Crane Lake, MN
90J Astor NAS, FL
@ -750,6 +751,7 @@ AGK Gulkana Arpt, AK
AGL Golovin, AK
AGM Gambell, AK
AGN P-Angoon, AK
AGO Ralph C Weiser Airport, Magnolia, AR
AGS K-Augusta, GA; P-Gustavus, AK
AGY Skagway, AK
AHC P-Holy Cross AP, Holy Cross, AK
@ -2537,6 +2539,7 @@ JST Johnstown, PA
JSV Sallisaw Muni, OK
JSY Joseph State Airport, Joseph, OR
JTC Springerville Muni, AZ
JTX NOAC Yokosuka, JP
JUA San Juan, Puerto Rico WSR-88D
JVL Janesville, WI
JVU Queen Cty AP, Allentown, PA
@ -2611,7 +2614,7 @@ LA1 South Louisiana Area
LA2 North Louisiana Area
LAA Lamar, CO
LAF Lafayette, IN
LAL Lakeland Linder Rgnl, Lakeland, FL
LAL Lakeland Linder Intl, Lakeland, FL
LAM Los Alamos, NM
LAN Lansing, MI
LAR Laramie, WY