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

Merge tag 'OB_14.3.3-5' into master_14.4.1

Browse source 
Merges 14.3.3-3, 14.3.3-4, and 14.3.3-5


Former-commit-id: 66eb429aee1d602cf216f1509e780afdbd1cbd23
This commit is contained in:
Fay.Liang 2015-04-10 13:48:19 -04:00
commit 88d6e796f5
3 changed files with 1161 additions and 1011 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cave/com.raytheon.viz.redbook/localization/redbook/redbookMapping.xml
View file

@ -899,5 +899,25 @@
<key>PEIE41, PEII42, PEIK98</key>
<value><name>Precip Fcst - 24hr accum</name></value>
</entry>
<entry>
<key>PGNW49</key>
<value><name>Day 4 Severe Outlook</name></value>
</entry>
<entry>
<key>PGNW50</key>
<value><name>Day 5 Severe Outlook</name></value>
</entry>
<entry>
<key>PGNW51</key>
<value><name>Day 6 Severe Outlook</name></value>
</entry>
<entry>
<key>PGNW52</key>
<value><name>Day 7 Severe Outlook</name></value>
</entry>
<entry>
<key>PGNW53</key>
<value><name>Day 8 Severe Outlook</name></value>
</entry>
</mapping>
</redbookWMOMap>

376
edexOsgi/com.raytheon.uf.edex.plugin.redbook/utility/edex_static/base/redbook/redbookFcstMap.xml Normal file → Executable file
View file

@ -22,13 +22,19 @@
<mapping>
<entry>
<key>PAWO82</key>
<value prd="3600" ofs="2100">
</value>
<value prd="3600" ofs="2100"/>
</entry>
<entry>
<key>PAWO83</key>
<value prd="3600" ofs="2100">
</value>
<value prd="3600" ofs="2100"/>
</entry>
<entry>
<key>PAW883</key>
<value/>
</entry>
<entry>
<key>PDKI59</key>
<value/>
</entry>
<entry>
<key>PPKK01</key>
@ -56,8 +62,7 @@
</entry>
<entry>
<key>PEI745</key>
<value prd="21600">
</value>
<value prd="21600"/>
</entry>
<entry>
<key>PEIB40</key>
@ -131,6 +136,28 @@
<fcstHR>60</fcstHR>
</value>
</entry>
<entry>
<key>PEIS46</key>
<value prd="43200" ofs="43200">
<fcstHR>168</fcstHR>
</value>
</entry>
<entry>
<key>PEWA31</key>
<value/>
</entry>
<entry>
<key>PEWA32</key>
<value/>
</entry>
<entry>
<key>PEWA33</key>
<value/>
</entry>
<entry>
<key>PEWA34</key>
<value/>
</entry>
<entry>
<key>PGIC42</key>
<value prd="21600">
@ -143,6 +170,18 @@
<fcstHR>24</fcstHR>
</value>
</entry>
<entry>
<key>PGWA31</key>
<value prd="3600"/>
</entry>
<entry>
<key>PGWA32</key>
<value prd="3600"/>
</entry>
<entry>
<key>PGWA39</key>
<value prd="3600"/>
</entry>
<entry>
<key>PJMB44</key>
<value prd="10800">
@ -155,6 +194,10 @@
<fcstHR>6</fcstHR>
</value>
</entry>
<entry>
<key>PGWE46</key>
<value prd="3600"/>
</entry>
<entry>
<key>PGWI47</key>
<value prd="3600">
@ -179,6 +222,18 @@
<fcstHR>144</fcstHR>
</value>
</entry>
<entry>
<key>PLQI51</key>
<value/>
</entry>
<entry>
<key>PNWA68</key>
<value/>
</entry>
<entry>
<key>POWA31</key>
<value/>
</entry>
<entry>
<key>PPHK01</key>
<value prd="86400" ofs="43200">
@ -197,6 +252,18 @@
<fcstHR>120</fcstHR>
</value>
</entry>
<entry>
<key>PYAA98</key>
<value prd="10800">
<fcstHR>0</fcstHR>
</value>
</entry>
<entry>
<key>PYBA98</key>
<value prd="21600">
<fcstHR>0</fcstHR>
</value>
</entry>
<entry>
<key>PPIC01</key>
<value prd="21600">
@ -221,6 +288,14 @@
<fcstHR>48</fcstHR>
</value>
</entry>
<entry>
<key>PPAA89</key>
<value prd="10800"/>
</entry>
<entry>
<key>PPBA89</key>
<value prd="21600"/>
</entry>
<entry>
<key>PPZM50</key>
<value>
@ -239,6 +314,10 @@
<fcstHR>144</fcstHR>
</value>
</entry>
<entry>
<key>PRWA51</key>
<value/>
</entry>
<entry>
<key>PTIC94</key>
<value prd="21600">
@ -251,12 +330,6 @@
<fcstHR>24</fcstHR>
</value>
</entry>
<entry>
<key>PJBI88</key>
<value>
<fcstHR>48</fcstHR>
</value>
</entry>
<entry>
<key>PTIO52</key>
<value>
@ -270,22 +343,60 @@
</value>
</entry>
<entry>
<key>PYWB61</key>
<value>
<fcstHR>6</fcstHR>
</value>
<key>PTWA31</key>
<value/>
</entry>
<entry>
<key>PYWC62</key>
<value>
<fcstHR>12</fcstHR>
</value>
<key>PTWA32</key>
<value/>
</entry>
<entry>
<key>PYWD63</key>
<value>
<fcstHR>18</fcstHR>
</value>
<key>PTWA94</key>
<value/>
</entry>
<entry>
<key>PTWA93</key>
<value/>
</entry>
<entry>
<key>PXVA01</key>
<value/>
</entry>
<entry>
<key>PXWA50</key>
<value/>
</entry>
<entry>
<key>PYMA20</key>
<value/>
</entry>
<entry>
<key>PYMA25</key>
<value/>
</entry>
<entry>
<key>PYMA30</key>
<value/>
</entry>
<entry>
<key>PYMA50</key>
<value/>
</entry>
<entry>
<key>PYMA70</key>
<value/>
</entry>
<entry>
<key>PYMA85</key>
<value/>
</entry>
<entry>
<key>PYWA31</key>
<value prd="10800"/>
</entry>
<entry>
<key>PYWA32</key>
<value prd="10800"/>
</entry>
<entry>
<key>PYWK43</key>
@ -293,6 +404,10 @@
<fcstHR>72</fcstHR>
</value>
</entry>
<entry>
<key>PYWK62</key>
<value/>
</entry>
<entry>
<key>PYWM44</key>
<value>
@ -305,18 +420,16 @@
<fcstHR>120</fcstHR>
</value>
</entry>
<entry>
<key>PZKY51</key>
<value/>
</entry>
<entry>
<key>PEIY47</key>
<value prd="86400" ofs="86400">
<fcstHR>180</fcstHR>
</value>
</entry>
<entry>
<key>PETT00</key>
<value>
<fcstHR>264</fcstHR>
</value>
</entry>
<entry>
<key>PTIY51</key>
<value>
@ -329,34 +442,10 @@
<fcstHR>180</fcstHR>
</value>
</entry>
<entry>
<key>PYWE64</key>
<value>
<fcstHR>24</fcstHR>
</value>
</entry>
<entry>
<key>PMNE98</key>
<value prd="43200">
<fcstHR>24</fcstHR>
</value>
</entry>
<entry>
<key>PMNE85</key>
<value prd="43200">
<fcstHR>24</fcstHR>
</value>
</entry>
<entry>
<key>PMNE70</key>
<value prd="43200">
<fcstHR>24</fcstHR>
</value>
</entry>
<entry>
<key>PWIA98</key>
<value>
<fcstHR>12</fcstHR>
<value prd="10800">
<fcstHR>0</fcstHR>
</value>
</entry>
<entry>
@ -365,54 +454,18 @@
<fcstHR>24</fcstHR>
</value>
</entry>
<entry>
<key>PWIA97</key>
<value prd="10800">
<fcstHR>0</fcstHR>
</value>
</entry>
<entry>
<key>PWIE97</key>
<value>
<fcstHR>24</fcstHR>
</value>
</entry>
<entry>
<key>PJME07</key>
<value>
<fcstHR>24</fcstHR>
</value>
</entry>
<entry>
<key>PJMG07</key>
<value>
<fcstHR>36</fcstHR>
</value>
</entry>
<entry>
<key>PJMI07</key>
<value>
<fcstHR>48</fcstHR>
</value>
</entry>
<entry>
<key>PEIY50</key>
<value prd="86400" ofs="43200">
<fcstHR>240</fcstHR>
</value>
</entry>
<entry>
<key>PTIY98</key>
<value prd="86400" ofs="43200">
<fcstHR>240</fcstHR>
</value>
</entry>
<entry>
<key>PYIY88</key>
<value prd="86400" ofs="43200">
<fcstHR>240</fcstHR>
</value>
</entry>
<entry>
<key>PEIY96</key>
<value prd="86400" ofs="43200">
<fcstHR>336</fcstHR>
</value>
</entry>
<entry>
<key>PEIY97</key>
<value prd="86400" ofs="43200">
@ -420,7 +473,7 @@
</value>
</entry>
<entry>
<key>PTIY96</key>
<key>PEIY96</key>
<value prd="86400" ofs="43200">
<fcstHR>336</fcstHR>
</value>
@ -432,7 +485,7 @@
</value>
</entry>
<entry>
<key>PYIY96</key>
<key>PTIY96</key>
<value prd="86400" ofs="43200">
<fcstHR>336</fcstHR>
</value>
@ -443,6 +496,12 @@
<fcstHR>168</fcstHR>
</value>
</entry>
<entry>
<key>PYIY96</key>
<value prd="86400" ofs="43200">
<fcstHR>336</fcstHR>
</value>
</entry>
<entry>
<key>PEIK98</key>
<value>
@ -559,7 +618,7 @@
</entry>
<entry>
<key>PEBJ88</key>
<value>
<value prd="21600">
<fcstHR>66</fcstHR>
</value>
</entry>
@ -575,6 +634,44 @@
<fcstHR>78</fcstHR>
</value>
</entry>
<entry>
<key>PYNA98</key>
<value prd="21600"/>
</entry>
<entry>
<key>PWAA85</key>
<value/>
</entry>
<entry>
<key>PWAA20</key>
<value/>
</entry>
<entry>
<key>PWAA00</key>
<value/>
</entry>
<entry>
<key>PWAA65</key>
<value/>
</entry>
<entry>
<key>PWBA88</key>
<value/>
</entry>
<entry>
<key>PWDA00</key>
<value/>
</entry>
<entry>
<key>PWDA65</key>
<value/>
</entry>
<entry>
<key>PWEA88</key>
<value prd="21600">
<fcstHR>00</fcstHR>
</value>
</entry>
<entry>
<key>PWEC88</key>
<value prd="21600">
@ -593,6 +690,14 @@
<fcstHR>36</fcstHR>
</value>
</entry>
<entry>
<key>PYAA89</key>
<value prd="21600"/>
</entry>
<entry>
<key>PJAA88</key>
<value prd="86400" ofs="43200"/>
</entry>
<entry>
<key>PJAI88</key>
<value>
@ -605,18 +710,6 @@
<fcstHR>24</fcstHR>
</value>
</entry>
<entry>
<key>PTWO33</key>
<value prd="86400" ofs="0">
<fcstHR></fcstHR>
</value>
</entry>
<entry>
<key>PTWO34</key>
<value prd="86400" ofs="43200">
<fcstHR></fcstHR>
</value>
</entry>
<entry>
<key>PPAI89</key>
<value>
@ -629,6 +722,20 @@
<fcstHR>96</fcstHR>
</value>
</entry>
<entry>
<key>PYBA89</key>
<value prd="21600"/>
</entry>
<entry>
<key>PJBA88</key>
<value prd="86400"/>
</entry>
<entry>
<key>PJBI88</key>
<value>
<fcstHR>48</fcstHR>
</value>
</entry>
<entry>
<key>PPBE89</key>
<value>
@ -863,6 +970,12 @@
<fcstHR>36</fcstHR>
</value>
</entry>
<entry>
<key>PETT00</key>
<value>
<fcstHR>264</fcstHR>
</value>
</entry>
<entry>
<key>PTTU98</key>
<value>
@ -929,6 +1042,10 @@
<fcstHR>24</fcstHR>
</value>
</entry>
<entry>
<key>PGNA00</key>
<value prd="60"/>
</entry>
<entry>
<key>PSBB04</key>
<value>
@ -1176,24 +1293,37 @@
</value>
</entry>
<entry>
<key>PGWE46</key>
<value prd="3600" ofs="0">
</value>
<key>PENA01</key>
<value/>
</entry>
<!-- 3 hour period for HPC->Temps&Weather->MSL Pressure Analysis -->
<entry>
<key>PPAA89</key>
<value prd="10800" ofs="0">
<key>PGNW49</key>
<value prd="86400" ofs="43200">
<fcstHR>96</fcstHR>
</value>
</entry>
<entry>
<key>PYAA98</key>
<value prd="10800" ofs="0">
<key>PGNW50</key>
<value prd="86400" ofs="43200">
<fcstHR>120</fcstHR>
</value>
</entry>
<entry>
<key>PGNA00</key>
<value prd="60" ofs="0">
<key>PGNW51</key>
<value prd="86400" ofs="43200">
<fcstHR>144</fcstHR>
</value>
</entry>
<entry>
<key>PGNW52</key>
<value prd="86400" ofs="43200">
<fcstHR>168</fcstHR>
</value>
</entry>
<entry>
<key>PGNW53</key>
<value prd="86400" ofs="43200">
<fcstHR>192</fcstHR>
</value>
</entry>
</mapping>

2
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
View file

@ -435,7 +435,7 @@ HDS ^(SF(US|PA)41) ([A-Z]{4}) (..)(..)(..)
# WMO Heading for Earth Networks Total Lightning
NGRID ^(SFPA42) ([A-Z]{4}) (..)(..)(..)
FILE -overwrite -log -edex -close /data_store/entlightning/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).%Y%m%d%H
FILE -overwrite -log -edex -close /data_store/entlightning/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H
# AWIPS1: TEXT ^[ABCFMNRSUVW]......[KPTMC] /text/NO_STORE
# TEXT ^[ABCFMNRSUVW].....[KPTMC] /text/NO_STORE