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

Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1

Browse source 
Former-commit-id: d12d6cf7e6862a87c00f833ee02e72e5c0ad8252
This commit is contained in:
Brian.Dyke 2014-10-28 15:25:05 -04:00
commit 9907c37a0e
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning.xml
View file

@ -17,7 +17,8 @@
Modified Mike Rega 01-18-2014 added Alaska GP changes for 14.2.1
Mike Dangelo - 1/23/2014 multiple changes to CTAs for FFW EMER
Evan Bookbinder 10/24/2014 commented out AK additions from baseline and
corrected their bulletGroup="" settings
corrected their bulletGroup="" settings
Mike Rega 10/27/2014 fixed EMER floodSeverity=3 error
-->
<!-- INCLUDE ALL GEOSPTATIAL INFORMATION FOR THIS PRODUCT
@ -174,7 +175,7 @@ Alaska end -->
<bullets>
<bullet bulletText="***CORRECTED PRODUCT. CLICK CREATE TEXT***" bulletType="title"/>
<bullet bulletText="" bulletType="title"/>
<bullet bulletName="ffwEmergency" bulletText="**SELECT FOR FLASH FLOOD EMERGENCY**" bulletGroup="ffwEMER" floodSeverity="3" parseString="FLASH FLOOD EMERGENCY"/>
<bullet bulletName="ffwEmergency" bulletText="**SELECT FOR FLASH FLOOD EMERGENCY**" bulletGroup="ffwEMER" parseString="FLASH FLOOD EMERGENCY"/>
<bullet bulletText="******** FLOOD SEVERITY (choose 1) *******" bulletType="title"/>
<bullet bulletName="sevUnk" bulletText="Unknown" bulletGroup="floodSeverity" floodSeverity="U"/>
<bullet bulletName="sev1" bulletText="Minor flood" bulletGroup="floodSeverity" floodSeverity="1"/>
@ -252,7 +253,7 @@ Alaska end -->
</bulletActionGroup>
<bulletActionGroup action="EXT" phen="FF" sig="W">
<bullets>
<bullet bulletName="ffwEmergency" bulletText="**SELECT FOR FLASH FLOOD EMERGENCY**" floodSeverity="3" parseString="FLASH FLOOD EMERGENCY"/>
<bullet bulletName="ffwEmergency" bulletText="**SELECT FOR FLASH FLOOD EMERGENCY**" parseString="FLASH FLOOD EMERGENCY"/>
<bullet bulletText="******** FLOOD SEVERITY (choose 1) *******" bulletType="title"/>
<bullet bulletName="sevUnk" bulletText="Unknown" bulletGroup="floodSeverity" floodSeverity="U"/>
<bullet bulletName="sev1" bulletText="Minor flood" bulletGroup="floodSeverity" floodSeverity="1"/>

7
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.xml
View file

@ -13,7 +13,8 @@
Modified Phil Kurimski 06-24-2014 fixed Ice Jam Parse String error 14.2.2-9
Modified Evan Bookbinder 10-24-2014 commented out AK additions from baseline and
corrected their bulletGroup="" settings
Added floodSeverity bullets
Added floodSeverity bullets
Modified Mike Rega 10-27-2014 fixed EMER floodSeverity=3 error
-->
<warngenConfig>
@ -182,7 +183,7 @@ Alaska end -->
</bulletActionGroup>
<bulletActionGroup action="CON" phen="FF" sig="W">
<bullets>
<bullet bulletName="ffwEmergency" bulletText="**SELECT FOR FLASH FLOOD EMERGENCY**" floodSeverity="3" parseString="FLASH FLOOD EMERGENCY"/>
<bullet bulletName="ffwEmergency" bulletText="**SELECT FOR FLASH FLOOD EMERGENCY**" parseString="FLASH FLOOD EMERGENCY"/>
<bullet bulletText="******** FLOOD SEVERITY (choose 1) *******" bulletType="title"/>
<bullet bulletName="sevUnk" bulletText="Unknown" bulletGroup="floodSeverity" floodSeverity="U" parseString=".U."/>
<bullet bulletName="sev1" bulletText="Minor flood" bulletGroup="floodSeverity" floodSeverity="1" parseString=".1."/>
@ -273,7 +274,7 @@ Alaska end -->
<bullets>
<bullet bulletText="***CORRECTED PRODUCT. CLICK CREATE TEXT***" bulletType="title"/>
<bullet bulletText="" bulletType="title"/>
<bullet bulletName="ffwEmergency" bulletText="**SELECT FOR FLASH FLOOD EMERGENCY**" floodSeverity="3" bulletGroup="ffwEMER" parseString="FLASH FLOOD EMERGENCY"/>
<bullet bulletName="ffwEmergency" bulletText="**SELECT FOR FLASH FLOOD EMERGENCY**" bulletGroup="ffwEMER" parseString="FLASH FLOOD EMERGENCY"/>
<bullet bulletText="******** FLOOD SEVERITY (choose 1) *******" bulletType="title"/>
<bullet bulletName="sevUnk" bulletText="Unknown" bulletGroup="floodSeverity" floodSeverity="U" parseString=".U."/>
<bullet bulletName="sev1" bulletText="Minor flood" bulletGroup="floodSeverity" floodSeverity="1" parseString=".1."/>