VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 24 ; fixes #4796

Change-Id: I2df1ea83b9cd17735ee835914febd3739ff4671d Former-commit-id: fe574dd41d [formerly ecc2b0c99a4e849b9472dd6c0cd63416e880d4cb] Former-commit-id: c1d51b3588
2014-10-24 14:28:08 -04:00 · 2014-10-24 14:28:08 -04:00 · e0b0edd8e1
commit e0b0edd8e1
parent e9e3ad94ab
12 changed files with 238 additions and 182 deletions
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
@ -11,7 +11,11 @@
 #####    Evan Bookbinder    05-05-2013 handleClosesPoints and 3rd bullet changes (OVER & now) 
 #####    Evan Bookbinder    09-20-2013 Fixed rural area otherPoints in pathcast section, added rural phrase
 #####         Qinglu Lin    03-17-2014 DR 16309. Updated inserttorwatches and insertsvrwatches. 
-#####         Qinglu Lin    05-21-2014 DR 16309. Updated inserttorwatches and insertsvrwatches by changing 'FOR##' to 'FOR ##'. 
+#####         Qinglu Lin    05-21-2014 DR 16309. Updated inserttorwatches and insertsvrwatches by changing 'FOR##' to 'FOR ##'.
+#####         D. Friedman   08-28-2014 ASM #15658.  Add marine watch wording.
+#####         Qinglu Lin    09-15-2014 ASM #15551. Overhauled inserttorwatches and insertsvrwatches, added until.
+#####         Qinglu Lin    10-06-2014 ASN #556.   Updated secondBullet.
+#####    Evan Bookbinder    10-24-2014 Fixed UGC > 500 check for Indep Cities in svrl macros to ignore zone codes
 ####################################################################################################
 #*
 Mile Marker Test Code                                     
@ -190,73 +194,120 @@ ${drainage.name}##

 #macro(inserttorwatches $watches $list $secondtimezone $dateUtil $timeFormat)
 #set($tornadoWatches = [])
+#set($ALSO = "")
+
 #foreach(${watch} in ${watches})
 #if(${watch.getPhenSig()} == 'TO.A')
 #set($success = $tornadoWatches.add($watch))
-#set($endTime = ${watch.endTime})
-#if(!$latestEndTime || ${endTime.after($latestEndTime)})
-#set($latestEndTime = ${endTime})
 #end
 #end
-#end
-#if(!${list.isEmpty($tornadoWatches)})

-A TORNADO WATCH REMAINS IN EFFECT UNTIL ${dateUtil.format(${latestEndTime}, ${timeFormat.plain}, 15, ${localtimezone})}##
-${dateUtil.period(${latestEndTime},${timeFormat.plain}, 15, ${localtimezone})}##
-#if(${secondtimezone})
-/${dateUtil.format(${watch.getEndTime()}, ${timeFormat.plain}, 15, ${secondtimezone})}/##
-#end
- FOR ##
-#set($numPortions = ${list.size(${tornadoWatches})})
+#set($etns = [])
+#set($lastTime = "")
+#set($currTime = "")
+#set($lastEtn = "")
 #set($count = 0)
 #foreach(${watch} in ${tornadoWatches})
+#set($success = $etns.add(${watch.etn}))
+#end
+#foreach(${watch} in ${tornadoWatches})
 #set($count = $count + 1)
-#areaFormat(${watch.partOfState} true false true)${watch.state}##
-#if($count == $numPortions - 1)
- AND ##
-#elseif($count < $numPortions)
-...##
-#end
-#end
+#if(${lastEtn} != "" && ${watch.etn} != ${lastEtn})
 . ##
 #end
-
+#set($endTime = ${watch.endTime})
+#if(${watch.etn} != ${lastEtn})
+#set($lastTime = "#until(${endTime}, ${timeFormat}, ${secondtimezone}, ${watch})")
+A TORNADO WATCH${ALSO} REMAINS IN EFFECT ${lastTime}##
+#set($ALSO = " ALSO")
+#else
+#if(!$foreach.hasNext() || ${watch.etn} != $etns.get(${count}))
+ AND ##
+#else
+...##
+#end
+#set($currTime = "#until(${endTime}, ${timeFormat}, ${secondtimezone}, ${watch})")
+#if(${currTime} != ${lastTime})
+${currTime}##
+#set($lastTime = ${currTime})
+#end
+#end
+#if(!${watch.marineArea})
+#areaFormat(${watch.partOfState} true false true)${watch.state}##
+#else
+#formatMarineArea(${watch.marineArea})
+#end
+#set($lastEtn = ${watch.etn})
+#end
+#if(${lastEtn} != "")
+.
+#end
 #end
 ########END MACRO

-#macro(insertsvrwatches $watches $list $secondtimezone $dateUtil $timeFormat)
-#set($severeWatches = [])
-#foreach(${watch} in ${watches})
-#if(${watch.getPhenSig()} == 'SV.A')
-#set($success = $severeWatches.add($watch))
-#set($endTime = ${watch.endTime})
-#if(!$latestEndTime || ${endTime.after($latestEndTime)})
-#set($latestEndTime = ${endTime})
-#end
-#end
-#end
-#if(!${list.isEmpty($severeWatches)})
-
-A SEVERE THUNDERSTORM WATCH REMAINS IN EFFECT UNTIL ${dateUtil.format(${latestEndTime}, ${timeFormat.plain}, 15, ${localtimezone})}##
-${dateUtil.period(${latestEndTime},${timeFormat.plain}, 15, ${localtimezone})}##
+#macro(until $endTime $timeFormat $secondtimezone $watch)
+UNTIL ${dateUtil.formatUseNoonMidnight(${endTime}, ${timeFormat.clock}, 15, ${localtimezone})}##
 #if(${secondtimezone})
-/${dateUtil.format(${watch.getEndTime()}, ${timeFormat.plain}, 15, ${secondtimezone})}/##
+/${dateUtil.formatUseNoonMidnight(${watch.getEndTime()}, ${timeFormat.clock}, 15, ${secondtimezone})}/##
 #end
 FOR ##
-#set($numPortions = ${list.size(${severeWatches})})
-#set($count = 0)
-#foreach(${watch} in ${severeWatches})
-#set($count = $count + 1)
-#areaFormat(${watch.partOfState} true false true)${watch.state}##
-#if($count == $numPortions - 1)
- AND ##
-#elseif($count < $numPortions)
-...##
-#end
-#end
-. ##
 #end

+#macro(insertsvrwatches $watches $list $secondtimezone $dateUtil $timeFormat)
+#set($svrWatches = [])
+#set($ALSO = "")
+
+#foreach(${watch} in ${watches})
+#if(${watch.getPhenSig()} == 'SV.A')
+#set($success = $svrWatches.add($watch))
+#end
+#end
+
+#set($etns = [])
+#set($lastTime = "")
+#set($currTime = "")
+#set($lastEtn = "")
+#set($count = 0)
+#foreach(${watch} in ${svrWatches})
+#set($success = $etns.add(${watch.etn}))
+#end
+#foreach(${watch} in ${svrWatches})
+#set($count = $count + 1)
+#if(${lastEtn} != "" && ${watch.etn} != ${lastEtn})
+. ##
+#end
+#set($endTime = ${watch.endTime})
+#if(${watch.etn} != ${lastEtn})
+#set($lastTime = "#until(${endTime}, ${timeFormat}, ${secondtimezone}, ${watch})")
+A SEVERE THUNDERSTORM WATCH${ALSO} REMAINS IN EFFECT ${lastTime}##
+#set($ALSO = " ALSO")
+#else
+#if(!$foreach.hasNext() || ${watch.etn} != $etns.get(${count}))
+ AND ##
+#else
+...##
+#end
+#set($currTime = "#until(${endTime}, ${timeFormat}, ${secondtimezone}, ${watch})")
+#if(${currTime} != ${lastTime})
+${currTime}##
+#set($lastTime = ${currTime})
+#end
+#end
+#if(!${watch.marineArea})
+#areaFormat(${watch.partOfState} true false true)${watch.state}##
+#else
+#formatMarineArea(${watch.marineArea})
+#end
+#set($lastEtn = ${watch.etn})
+#end
+#if(${lastEtn} != "")
+.
+#end
+#end
+########END MACRO
+
+#macro(formatMarineArea $marineArea)
+${marineArea}##
 #end
 ########END MACRO

@ -508,6 +559,12 @@ ${closestPoint.roundedDistance} ${units} #direction(${closestPoint.oppositeRound
 ## useExtremexxx = boolean to use the word EXTREME in the county of State phrase
 ##################################################################
 #macro(headlineLocList $areas $useCentralCounty $useExtremeCounty $useCentralState $useExtremeState)
+#### DETERMINE IF WE HAVE A FIPS OR ZONE BASED PRODUCT
+#if(${areaSource.equalsIgnoreCase("COUNTY")})
+#set($areaFIPS = true)
+#else
+#set($areaFIPS = false)
+#end
 #set($countyCount = 0)
 #set($countyCounter = 0)
 #set($itemCount = 0)
@ -548,7 +605,7 @@ ${closestPoint.roundedDistance} ${units} #direction(${closestPoint.oppositeRound
 #end
 #set($FIPS = ${area.fips.substring(${fipsIdx})})
 #set($intFIPS = 0)
-#if(${intFIPS.parseInt($FIPS)} < 500 || ${area.stateabbr} == "TX")
+#if(${intFIPS.parseInt($FIPS)} < 500 || ${areaFIPS} == "false" || ${area.stateabbr} == "TX")
 #set($countyCounter = $countyCounter + 1)
 ##INITIALIZE CHECK VARIABLES
 #if($countyCount == 0)
@ -738,7 +795,7 @@ ${prevCounty}##
 #foreach (${area} in ${areas})
 #set($FIPS = ${area.fips.substring(2)})
 #set($intFIPS = 0)
-#if(${intFIPS.parseInt($FIPS)} >= 500 && ${area.stateabbr} != "TX")
+#if(${intFIPS.parseInt($FIPS)} >= 500 && ${area.stateabbr} != "TX" && ${areaFIPS} == "true")
 #set($indepCityCount= $indepCityCount + 1)
 #if(${indepCityCount} == 1 && ${countyCount} > 0)
 #if(${countyCounter} > 1) 
@ -997,7 +1054,7 @@ ${prevZone}##
 #set($FIPS = ${area.fips.substring(2)})
 #set($intFIPS = 0)
 ##OUTPUT FOR NORMAL COUNTIES/ZONES
-#if((${intFIPS.parseInt($FIPS)} < 500 || ${area.stateabbr} == "TX") && ${area.stateabbr} != "DC")
+#if((${intFIPS.parseInt($FIPS)} < 500 || ${areaFIPS} == "false" || ${area.stateabbr} == "TX") && ${area.stateabbr} != "DC")
 #if(${area.partOfArea})
 #areaFormat(${area.partOfArea} true true true)##
 #end
@ -1101,7 +1158,7 @@ THE FOLLOWING COUNTIES AND PARISHES...
 #set($intFIPS = 0)
 #set($partOfArea = "")
 ##OUTPUT FOR NORMAL COUNTIES/ZONES
-#if((${intFIPS.parseInt($FIPS)} < 500 || ${area.stateabbr} == "TX") && ${area.stateabbr} != "DC")
+#if((${intFIPS.parseInt($FIPS)} < 500 || ${areaFIPS} == "false" || ${area.stateabbr} == "TX") && ${area.stateabbr} != "DC")
 #if(${area.partOfArea})
 #set($partOfArea = "#areaFormat(${area.partOfArea} true true true)")
 #end
@ -1135,15 +1192,15 @@ ${partOfArea}${area.name}...
 ######### MACRO TO GENERATE SECOND BULLET (UNTIL XXXX AMPM TZ (DAY) IN WARNINGS ##########
 #macro(secondBullet $dateUtil $expire $timeFormat $localtimezone $secondtimezone $duration)
 #if(${duration} >= 360)
-UNTIL ${dateUtil.format(${expire}, ${timeFormat.plain}, 15, ${localtimezone})}##
+UNTIL ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.plain}, 15, ${localtimezone})}##
 #else
-UNTIL ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})}##
+UNTIL ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.clock}, 15, ${localtimezone})}##
 #end
 #if(${secondtimezone})
 #if(${duration} >= 360)
-/${dateUtil.format(${expire}, ${timeFormat.plain}, 15, ${secondtimezone})}/##
+/${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.plain}, 15, ${secondtimezone})}/##
 #else
-/${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${secondtimezone})}/##
+/${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.clock}, 15, ${secondtimezone})}/##
 #end
 #end
 #end
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory.xml
@ -125,9 +125,7 @@ Must be paired with proper vm code (which are commented out in arealFloodAdvisor
  <bullet bulletName="lawEnforcement" bulletText="Local law enforcement reported" bulletGroup="advSource" parseString="LOCAL LAW ENFORCEMENT REPORTED"/>
  <bullet bulletName="emergencyManagement" bulletText="Emergency management reported" bulletGroup="advSource" parseString="EMERGENCY MANAGEMENT REPORTED"/>
  <bullet bulletName="satelliteEstimates" bulletText="Satellite Estimates" bulletGroup="advSource" parseString="SATELLITE ESTIMATES"/>
-<!-- added by GP -->
  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="advSource" parseString="GAUGE REPORTS"/>
-<!--  GP end -->
  <bullet bulletText="*********** EVENT (choose one) *********** " bulletType="title"/>
  <bullet bulletName="thunder" bulletText="Thunderstorm(s)" bulletGroup="advEvent" bulletDefault="true" parseString="&quot;THUNDERSTORM&quot;,&quot;-CAUSING&quot;,&quot;-RAPID RIVER RISES&quot;,&quot;-MINOR FLOODING OF POOR DRAINAGE&quot;"/>
  <bullet bulletName="plainRain" bulletText="Due to only heavy rain" bulletGroup="advEvent" parseString="&quot;HEAVY RAIN&quot;,&quot;-THUNDERSTORM&quot;,&quot;-CAUSING&quot;,&quot;-RAPID RIVER RISES&quot;,&quot;-MINOR FLOODING OF POOR DRAINAGE&quot;"/>
@ -180,9 +178,7 @@ Must be paired with proper vm code (which are commented out in arealFloodAdvisor
  <bullet bulletName="public" bulletText="Public reported" bulletGroup="advSource" parseString="THE PUBLIC REPORTED"/>
  <bullet bulletName="lawEnforcement" bulletText="Local law enforcement reported" bulletGroup="advSource" parseString="LOCAL LAW ENFORCEMENT REPORTED"/>
  <bullet bulletName="emergencyManagement" bulletText="Emergency management reported" bulletGroup="advSource" parseString="EMERGENCY MANAGEMENT REPORTED"/>
-<!-- added by GP -->
  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="advSource" parseString="GAUGE REPORTS"/>
-<!--  GP end -->
  <bullet bulletText="*********** EVENT (choose one) *********** " bulletType="title"/>
  <bullet bulletName="thunder" bulletText="Thunderstorm(s)" bulletGroup="advEvent" bulletDefault="true" parseString="&quot;THUNDERSTORM&quot;,&quot;-CAUSING&quot;,&quot;-RAPID RIVER RISES&quot;,&quot;-MINOR FLOODING OF POOR DRAINAGE&quot;"/>
  <bullet bulletName="plainRain" bulletText="Due to only heavy rain" bulletGroup="advEvent" parseString="&quot;HEAVY RAIN&quot;,&quot;-THUNDERSTORM&quot;,&quot;-CAUSING&quot;,&quot;-RAPID RIVER RISES&quot;,&quot;-MINOR FLOODING OF POOR DRAINAGE&quot;"/>
@ -236,9 +232,7 @@ Must be paired with proper vm code (which are commented out in arealFloodAdvisor
  <bullet bulletName="public" bulletText="Public reported" bulletGroup="advSource" parseString="THE PUBLIC REPORTED"/>
  <bullet bulletName="lawEnforcement" bulletText="Local law enforcement reported" bulletGroup="advSource" parseString="LOCAL LAW ENFORCEMENT REPORTED"/>
  <bullet bulletName="emergencyManagement" bulletText="Emergency management reported" bulletGroup="advSource" parseString="EMERGENCY MANAGEMENT REPORTED"/>
-<!-- added by GP -->
  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="advSource" parseString="GAUGE REPORTS"/>
-<!--  GP end -->
  <bullet bulletText="*********** EVENT (choose one) *********** " bulletType="title"/>
  <bullet bulletName="thunder" bulletText="Thunderstorm(s)" bulletGroup="advEvent" bulletDefault="true" parseString="&quot;THUNDERSTORM&quot;,&quot;-CAUSING&quot;,&quot;-RAPID RIVER RISES&quot;,&quot;-MINOR FLOODING OF POOR DRAINAGE&quot;"/>
  <bullet bulletName="plainRain" bulletText="Due to only heavy rain" bulletGroup="advEvent" parseString="&quot;HEAVY RAIN&quot;,&quot;-THUNDERSTORM&quot;,&quot;-CAUSING&quot;,&quot;-RAPID RIVER RISES&quot;,&quot;-MINOR FLOODING OF POOR DRAINAGE&quot;"/>
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.xml
@ -98,7 +98,7 @@ Must be paired with proper vm code (also commented out in arealFloodAdvisoryFoll
  <bullet bulletName="IJ" bulletText="Ice jam" bulletGroup="ic" parseString=".IJ." showString=".IJ."/>
  <bullet bulletName="IC" bulletText="Ice jam and rain" bulletGroup="ic" parseString=".IC." showString=".IC."/>
  <bullet bulletName="DR" bulletText="Dam Gate Release" bulletGroup="ic" parseString=".DR." showString=".DR."/>
-    <bullet bulletText="*********** OPTIONAL SPECIFIC TYPE (locked)  *********** " bulletType="title"/>
+  <bullet bulletText="*********** OPTIONAL SPECIFIC TYPE (locked)  *********** " bulletType="title"/>
  <bullet bulletName="rapidRiver" bulletText="Rapid river rises" bulletGroup="hyCond" parseString="FOR RAPID RIVER RISES" showString="RAPID RIVER RISES"/>
  <bullet bulletName="poorDrainage" bulletText="Minor flooding for poor drainage" bulletGroup="hyCond" parseString="MINOR FLOODING OF POOR DRAINAGE AREAS" showString="MINOR FLOODING OF POOR DRAINAGE AREAS"/>
  <bullet bulletText="****** CANCELLATION OPTIONS **********" bulletType="title"/>
@ -154,9 +154,7 @@ Must be paired with proper vm code (also commented out in arealFloodAdvisoryFoll
  <bullet bulletName="public" bulletText="Public reported" bulletGroup="advSource" parseString="THE PUBLIC REPORTED"/>
  <bullet bulletName="lawEnforcement" bulletText="Local law enforcement reported" bulletGroup="advSource" parseString="LOCAL LAW ENFORCEMENT REPORTED"/>
  <bullet bulletName="emergencyManagement" bulletText="Emergency management reported" bulletGroup="advSource" parseString="EMERGENCY MANAGEMENT REPORTED"/>
-<!-- added by GP -->
  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="advSource" parseString="GAUGE REPORTS"/>
-<!--  GP end -->
  <bullet bulletText="*********** EVENT (choose one) *********** " bulletType="title"/>
  <bullet bulletName="thunder" bulletText="Thunderstorm(s)" bulletGroup="advEvent" parseString="&quot;THUNDERSTORM&quot;,&quot;-CAUSING&quot;,&quot;-RAPID RIVER RISES&quot;,&quot;-MINOR FLOODING OF POOR DRAINAGE&quot;"/>
  <bullet bulletName="plainRain" bulletText="Due to only heavy rain" bulletGroup="advEvent" parseString="&quot;HEAVY RAIN&quot;,&quot;-THUNDERSTORM&quot;,&quot;-CAUSING&quot;,&quot;-RAPID RIVER RISES&quot;,&quot;-MINOR FLOODING OF POOR DRAINAGE&quot;"/>
@ -207,9 +205,7 @@ Must be paired with proper vm code (also commented out in arealFloodAdvisoryFoll
  <bullet bulletName="public" bulletText="Public reported" bulletGroup="advSource" parseString="THE PUBLIC REPORTED"/>
  <bullet bulletName="lawEnforcement" bulletText="Local law enforcement reported" bulletGroup="advSource" parseString="LOCAL LAW ENFORCEMENT REPORTED"/>
  <bullet bulletName="emergencyManagement" bulletText="Emergency management reported" bulletGroup="advSource" parseString="EMERGENCY MANAGEMENT REPORTED"/>
-<!-- added by GP -->
  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="advSource" parseString="GAUGE REPORTS"/>
-<!--  GP end -->
  <bullet bulletText="*********** EVENT (choose one) *********** " bulletType="title"/>
  <bullet bulletName="thunder" bulletText="Thunderstorm(s)" bulletGroup="advEvent" parseString="&quot;THUNDERSTORM&quot;,&quot;-CAUSING&quot;,&quot;-RAPID RIVER RISES&quot;,&quot;-MINOR FLOODING OF POOR DRAINAGE&quot;"/>
  <bullet bulletName="plainRain" bulletText="Due to only heavy rain" bulletGroup="advEvent" parseString="&quot;HEAVY RAIN&quot;,&quot;-THUNDERSTORM&quot;,&quot;-CAUSING&quot;,&quot;-RAPID RIVER RISES&quot;,&quot;-MINOR FLOODING OF POOR DRAINAGE&quot;"/>
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning.xml
@ -98,7 +98,7 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)!
 <bulletActionGroup action="NEW" phen="FA" sig="W">
 <bullets>
  <bullet bulletText="*************   TYPE OF WARNING   ***********" bulletType="title"/>
-  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletDefault="true" bulletGroup="ttt" parseString="FLOOD WARNING FOR..."/>
+  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletDefault="true" bulletGroup="ttt" parseString="&quot;FLOOD WARNING FOR&quot;,&quot;-WARNING FOR SMALL STREAMS&quot;,&quot;-WARNING FOR URBAN&quot;"/>
  <bullet bulletName="smallstreams" bulletText="Flood warning for small streams" bulletGroup="ttt" parseString="FLOOD WARNING FOR SMALL STREAMS" />
  <bullet bulletName="urbansmallstreams" bulletText="Flood warning for urban areas and small streams" bulletGroup="ttt" parseString="FLOOD WARNING FOR URBAN"/>
  <bullet bulletText="****** PRIMARY CAUSE ******" bulletType="title"/>
@ -121,9 +121,7 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)!
  <bullet bulletName="emergencyManagement" bulletText="Emergency management reported" bulletGroup="source" parseString="EMERGENCY MANAGEMENT REPORTED"/>
  <bullet bulletName="satellite" bulletText="Satellite estimates" bulletGroup="source" parseString="SATELLITE ESTIMATES"/>
  <bullet bulletName="satelliteGauge" bulletText="Satellite estimates and automated gauges" bulletGroup="source" parseString="SATELLITE AND "/>
-<!-- added by GP -->
  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="source" parseString="GAUGE REPORTS "/>
-<!--  GP end --> 
  <bullet bulletText="*********** EVENT (CHOOSE 1) **********" bulletType="title"/>
  <bullet bulletName="thunder" bulletText="Thunderstorms with heavy rainfall" bulletGroup="event" parseString="&quot;THUNDERSTORM&quot;,&quot;-REPORTED FLOODING&quot;"/>
  <bullet bulletName="plainRain" bulletText="Heavy rainfall (no thunder)" bulletGroup="event" parseString="&quot;HEAVY RAIN&quot;,&quot;-THUNDERSTORM&quot;,&quot;-REPORTED FLOODING&quot;"/>
@ -157,7 +155,7 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)!
 <bulletActionGroup action="COR" phen="FA" sig="W">
 <bullets>
  <bullet bulletText="****  TYPE OF WARNING (locked) ****" bulletType="title"/>
-  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletGroup="ttt" parseString="FLOOD WARNING FOR..." showString="FLOOD WARNING FOR..."/>
+  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletGroup="ttt" parseString="&quot;FLOOD WARNING FOR&quot;,&quot;-WARNING FOR SMALL STREAMS&quot;,&quot;-WARNING FOR URBAN&quot;" showString="&quot;FLOOD WARNING FOR&quot;,&quot;-WARNING FOR SMALL STREAMS&quot;,&quot;-WARNING FOR URBAN&quot;"/>
  <bullet bulletName="smallstreams" bulletText="Flood warning for small streams" bulletGroup="ttt" parseString="FLOOD WARNING FOR SMALL STREAMS" showString="FLOOD WARNING FOR SMALL STREAMS" />
  <bullet bulletName="urbansmallstreams" bulletText="Flood warning for urban areas and small stream" bulletGroup="ttt" parseString="FLOOD WARNING FOR URBAN" showString="FLOOD WARNING FOR URBAN"/>
  <bullet bulletText="*** PRIMARY CAUSE *** (locked)" bulletType="title"/>
@ -216,7 +214,7 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)!
 <bulletActionGroup action="EXT" phen="FA" sig="W">
 <bullets>
  <bullet bulletText="****  TYPE OF WARNING (locked) ****" bulletType="title"/>
-  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletGroup="ttt" parseString="FLOOD WARNING FOR..." showString="FLOOD WARNING FOR..."/>
+  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletGroup="ttt" parseString="&quot;FLOOD WARNING FOR&quot;,&quot;-WARNING FOR SMALL STREAMS&quot;,&quot;-WARNING FOR URBAN&quot;" showString="&quot;FLOOD WARNING FOR&quot;,&quot;-WARNING FOR SMALL STREAMS&quot;,&quot;-WARNING FOR URBAN&quot;"/>
  <bullet bulletName="smallstreams" bulletText="Flood warning for small streams" bulletGroup="ttt" parseString="FLOOD WARNING FOR SMALL STREAMS" showString="FLOOD WARNING FOR SMALL STREAMS" />
  <bullet bulletName="urbansmallstreams" bulletText="Flood warning for urban areas and small stream" bulletGroup="ttt" parseString="FLOOD WARNING FOR URBAN" showString="FLOOD WARNING FOR URBAN"/>
  <bullet bulletText="*** PRIMARY CAUSE *** (locked)" bulletType="title"/>
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.xml
@ -13,6 +13,7 @@
               Mike Dangelo 1/23/2014 added IC group to bottom of CON bullets (it's locked anyway, no need to have it at the top) 
               Phil Kurimski   06-24-2014 Put types of warnings and IC back at the top (forecasters rely on this when choosing a con statement
                                          to determine what warning they are following up!)
+               Evan Bookbinder 10-24-2014 Fixed parseString for EXT for generic flooding
 -->
                 
 <warngenConfig>
@ -96,7 +97,7 @@ Must be paired with proper vm code (which are commented out in arealFloodWarning
 <bulletActionGroup action="CAN" phen="FA" sig="W">
 <bullets>
  <bullet bulletText="****  TYPE OF WARNING (locked) ****" bulletType="title"/>
-  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletGroup="ttt" parseString="FLOOD WARNING FOR..." showString="FLOOD WARNING FOR..."/>
+  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletGroup="ttt" parseString="&quot;FLOOD WARNING FOR&quot;,&quot;-WARNING FOR SMALL STREAMS&quot;,&quot;-WARNING FOR URBAN&quot;" showString="&quot;FLOOD WARNING FOR&quot;,&quot;-WARNING FOR SMALL STREAMS&quot;,&quot;-WARNING FOR URBAN&quot;"/>
  <bullet bulletName="smallstreams" bulletText="Flood warning for small streams" bulletGroup="ttt" parseString="FLOOD WARNING FOR SMALL STREAMS" showString="FLOOD WARNING FOR SMALL STREAMS" />
  <bullet bulletName="urbansmallstreams" bulletText="Flood warning for urban areas and small stream" bulletGroup="ttt" parseString="FLOOD WARNING FOR URBAN" showString="FLOOD WARNING FOR URBAN"/>
  <bullet bulletText="*** PRIMARY CAUSE *** (locked)" bulletType="title"/>
@ -118,7 +119,7 @@ Must be paired with proper vm code (which are commented out in arealFloodWarning
 <bulletActionGroup action="EXP" phen="FA" sig="W">
 <bullets>
  <bullet bulletText="****  TYPE OF WARNING (locked) ****" bulletType="title"/>
-  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletGroup="ttt" parseString="FLOOD WARNING FOR..." showString="FLOOD WARNING FOR..."/>
+  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletGroup="ttt" parseString="&quot;FLOOD WARNING FOR&quot;,&quot;-WARNING FOR SMALL STREAMS&quot;,&quot;-WARNING FOR URBAN&quot;" showString="&quot;FLOOD WARNING FOR&quot;,&quot;-WARNING FOR SMALL STREAMS&quot;,&quot;-WARNING FOR URBAN&quot;"/>
  <bullet bulletName="smallstreams" bulletText="Flood warning for small streams" bulletGroup="ttt" parseString="FLOOD WARNING FOR SMALL STREAMS" showString="FLOOD WARNING FOR SMALL STREAMS" />
  <bullet bulletName="urbansmallstreams" bulletText="Flood warning for urban areas and small stream" bulletGroup="ttt" parseString="FLOOD WARNING FOR URBAN" showString="FLOOD WARNING FOR URBAN"/>
  <bullet bulletText="*** PRIMARY CAUSE *** (locked)" bulletType="title"/>
@ -140,7 +141,7 @@ Must be paired with proper vm code (which are commented out in arealFloodWarning
 <bulletActionGroup action="CON" phen="FA" sig="W">
 <bullets>
  <bullet bulletText="****  TYPE OF WARNING (locked) ****" bulletType="title"/>
-  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletGroup="ttt" parseString="FLOOD WARNING FOR..." showString="FLOOD WARNING FOR..."/>
+  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletGroup="ttt" parseString="&quot;FLOOD WARNING FOR&quot;,&quot;-WARNING FOR SMALL STREAMS&quot;,&quot;-WARNING FOR URBAN&quot;" showString="&quot;FLOOD WARNING FOR&quot;,&quot;-WARNING FOR SMALL STREAMS&quot;,&quot;-WARNING FOR URBAN&quot;"/>
  <bullet bulletName="smallstreams" bulletText="Flood warning for small streams" bulletGroup="ttt" parseString="FLOOD WARNING FOR SMALL STREAMS" showString="FLOOD WARNING FOR SMALL STREAMS" />
  <bullet bulletName="urbansmallstreams" bulletText="Flood warning for urban areas and small stream" bulletGroup="ttt" parseString="FLOOD WARNING FOR URBAN" showString="FLOOD WARNING FOR URBAN"/>
  <bullet bulletText="*** PRIMARY CAUSE *** (locked)" bulletType="title"/>
@ -200,7 +201,7 @@ Must be paired with proper vm code (which are commented out in arealFloodWarning
 <bulletActionGroup action="COR" phen="FA" sig="W">
  <bullets>
  <bullet bulletText="****  TYPE OF WARNING (locked) ****" bulletType="title"/>
-  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletGroup="ttt" parseString="FLOOD WARNING FOR..." showString="FLOOD WARNING FOR..."/>
+  <bullet bulletName="generic" bulletText="Flood warning: generic" bulletGroup="ttt" parseString="&quot;FLOOD WARNING FOR&quot;,&quot;-WARNING FOR SMALL STREAMS&quot;,&quot;-WARNING FOR URBAN&quot;" showString="&quot;FLOOD WARNING FOR&quot;,&quot;-WARNING FOR SMALL STREAMS&quot;,&quot;-WARNING FOR URBAN&quot;"/>
  <bullet bulletName="smallstreams" bulletText="Flood warning for small streams" bulletGroup="ttt" parseString="FLOOD WARNING FOR SMALL STREAMS" showString="FLOOD WARNING FOR SMALL STREAMS" />
  <bullet bulletName="urbansmallstreams" bulletText="Flood warning for urban areas and small stream" bulletGroup="ttt" parseString="FLOOD WARNING FOR URBAN" showString="FLOOD WARNING FOR URBAN"/>
  <bullet bulletText="*** PRIMARY CAUSE *** (locked)" bulletType="title"/>
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning.xml
@ -67,11 +67,11 @@ Must be paired with proper vm code (also commented out in flashFloodWarning.vm)!
  <!-- <trackEnabled>true</trackEnabled> -->  
 
  <!-- Included watches: If a tornado watch or severe thunderstorm watch is to be 
- 	included with the warning product include torWatches and/or svrWatches, 
+ 	included with the warning product include TO.A and/or SV.A, 
 	respectively. Please refer to 'includedWatchAreaBuffer' in <areaConfig/>. -->
 <includedWatches>
-  <includedWatch>torWatches</includedWatch>
-  <includedWatch>svrWatches</includedWatch>
+  <includedWatch>TO.A</includedWatch>
+  <includedWatch>SV.A</includedWatch>
 </includedWatches>
 
 <!-- durations: the list of possible durations of the warning -->
@ -109,9 +109,7 @@ Must be paired with proper vm code (also commented out in flashFloodWarning.vm)!
  <bullet bulletName="emergencyManagement" bulletText="Emergency management reported" bulletGroup="source" parseString="EMERGENCY MANAGEMENT REPORTED"/>
  <bullet bulletName="satellite" bulletText="Satellite estimates" bulletGroup="source" parseString="SATELLITE ESTIMATES INDICATED"/>
  <bullet bulletName="satelliteGauge" bulletText="Satellite estimates and automated gauges" bulletGroup="source" parseString="SATELLITE ESTIMATES AND RAIN"/>
-<!-- added by GP -->
  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="source" parseString="GAUGE REPORTS "/>
-<!--  GP end -->
  <bullet bulletText="*********** EVENT (CHOOSE 1) **********" bulletType="title"/>
  <bullet bulletName="thunder" bulletText="Thunderstorm(s)" bulletGroup="event" bulletDefault="true" parseString="THUNDERSTORM"/>
  <bullet bulletName="plainRain" bulletText="Due to only heavy rain" bulletGroup="event" parseString="&quot;HEAVY RAIN&quot;,&quot;-THUNDERSTORM&quot;"/>
@ -159,9 +157,7 @@ Must be paired with proper vm code (also commented out in flashFloodWarning.vm)!
  <bullet bulletName="emergencyManagement" bulletText="Emergency management reported" bulletGroup="source" parseString="EMERGENCY MANAGEMENT REPORTED"/>
  <bullet bulletName="satellite" bulletText="Satellite estimates" bulletGroup="source" parseString="SATELLITE ESTIMATES"/>
  <bullet bulletName="satelliteGauge" bulletText="Satellite estimates and automated gauges" bulletGroup="source" parseString="SATELLITE AND "/>
-<!-- added by GP -->
  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="source" parseString="GAUGE REPORTS "/>
-<!--  GP end -->  
  <bullet bulletText="*********** EVENT (CHOOSE 1) **********" bulletType="title"/>
  <bullet bulletName="thunder" bulletText="Thunderstorm(s)" bulletGroup="event" bulletDefault="true" parseString="THUNDERSTORM"/>
  <bullet bulletName="plainRain" bulletText="Due to only heavy rain" bulletGroup="event" parseString="&quot;HEAVY RAIN&quot;,&quot;-THUNDERSTORM&quot;"/>
@ -211,9 +207,7 @@ Must be paired with proper vm code (also commented out in flashFloodWarning.vm)!
  <bullet bulletName="emergencyManagement" bulletText="Emergency management reported" bulletGroup="source" parseString="EMERGENCY MANAGEMENT REPORTED"/>
  <bullet bulletName="satellite" bulletText="Satellite estimates" bulletGroup="source" parseString="SATELLITE ESTIMATES INDICATED"/>
  <bullet bulletName="satelliteGauge" bulletText="Satellite estimates and automated gauges" bulletGroup="source" parseString="SATELLITE ESTIMATES AND RAIN"/>
-<!-- added by GP -->
  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="source" parseString="GAUGE REPORTS "/>
-<!--  GP end -->
  <bullet bulletText="*********** EVENT (CHOOSE 1) **********" bulletType="title"/>
  <bullet bulletName="thunder" bulletText="Thunderstorm(s)" bulletGroup="event" bulletDefault="true" parseString="THUNDERSTORM"/>
  <bullet bulletName="plainRain" bulletText="Due to only heavy rain" bulletGroup="event" parseString="&quot;HEAVY RAIN&quot;,&quot;-THUNDERSTORM&quot;"/>
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup.xml
@ -107,9 +107,7 @@ Must be paired with proper vm code (also commented out in flashFloodWarningFollo
  <bullet bulletName="emergencyManagement" bulletText="Emergency management reported" bulletGroup="source" parseString="EMERGENCY MANAGEMENT REPORTED"/>
  <bullet bulletName="satellite" bulletText="Satellite estimates" bulletGroup="source" parseString="SATELLITE ESTIMATES INDICATED"/>
  <bullet bulletName="satelliteGauge" bulletText="Satellite estimates and automated gauges" bulletGroup="source" parseString="SATELLITE ESTIMATES AND RAIN"/>
-<!-- added by GP -->
  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="source" parseString="GAUGE REPORTS "/>
-<!--  GP end -->
  <bullet bulletText="*********** EVENT (CHOOSE 1) **********" bulletType="title"/>
  <bullet bulletName="thunder" bulletText="Thunderstorm(s)" bulletGroup="event" parseString="THUNDERSTORM"/>
  <bullet bulletName="plainRain" bulletText="Due to only heavy rain" bulletGroup="event" parseString="&quot;HEAVY RAIN&quot;,&quot;-THUNDERSTORM&quot;"/>
@ -161,9 +159,7 @@ Must be paired with proper vm code (also commented out in flashFloodWarningFollo
  <bullet bulletName="emergencyManagement" bulletText="Emergency management reported" bulletGroup="source" parseString="EMERGENCY MANAGEMENT REPORTED"/>
  <bullet bulletName="satellite" bulletText="Satellite estimates" bulletGroup="source" parseString="SATELLITE ESTIMATES INDICATED"/>
  <bullet bulletName="satelliteGauge" bulletText="Satellite estimates and automated gauges" bulletGroup="source" parseString="SATELLITE AND RAIN"/>
-<!-- added by GP -->
  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="source" parseString="GAUGE REPORTS "/>
-<!--  GP end -->
  <bullet bulletText="*********** EVENT (CHOOSE 1) **********" bulletType="title"/>
  <bullet bulletName="thunder" bulletText="Thunderstorm(s)" bulletGroup="event" parseString="THUNDERSTORM"/>
  <bullet bulletName="plainRain" bulletText="Due to only heavy rain" bulletGroup="event" parseString="&quot;HEAVY RAIN&quot;,&quot;-THUNDERSTORM&quot;"/>
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.xml
@ -17,6 +17,7 @@
 	 Evan Bookbinder 2-18-2014 corrected supercell CTA typo & added DSSEvents & 2014 IBW impacts
     Evan Bookbinder 2-27-2014 parseStrings for Tornado Emergency and Default CTAs
     Evan Bookbinder 9-5-2014 fixed parseStrings for law enf CTA
+     Evan Bookbinder 10-24-2014 fixed parseString for SqLn embedded TOR
 	                
 -->
 <!--
@ -79,8 +80,8 @@ turned on unless the corresponding .vm file is turned on in a given template's .
 </phensigs>
 
 <includedWatches>
-  <includedWatch>torWatches</includedWatch>
-  <includedWatch>svrWatches</includedWatch>
+  <includedWatch>TO.A</includedWatch>
+  <includedWatch>SV.A</includedWatch>
 </includedWatches>
 
 <enableRestart>false</enableRestart>
@ -210,8 +211,8 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="landspoutTornado" bulletText="LANDSPOUT/VERY WEAK TORNADO" bulletGroup="headline" parseString="IMPACT...EXPECT DAMAGE TO MOBILE HOMES"/>
  <bullet bulletText="" bulletType="title"/>
  <bullet bulletText="*********** BASIS FOR WARNING (CHOOSE 1) **********" bulletType="title"/>
-  <bullet bulletName="dopplerTOR" bulletText="Doppler radar indicated" bulletGroup="group1" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;-SQUALL LINE&quot;"/>
-  <bullet bulletName="dopplerSquallTOR" bulletText="Squall line w/ embedded tornadoes" bulletGroup="group1" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;SQUALL LINE&quot;"/>
+  <bullet bulletName="dopplerTOR" bulletText="Doppler radar indicated" bulletGroup="group1" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;-PRODUCING BOTH TORNADOES AND EXTENSIVE STRAIGHT LINE&quot;"/>
+  <bullet bulletName="dopplerSquallTOR" bulletText="Squall line w/ embedded tornadoes" bulletGroup="group1" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;PRODUCING BOTH TORNADOES AND EXTENSIVE STRAIGHT LINE&quot;"/>
  <bullet bulletName="confirmedDopplerTOR" bulletText="Confirmed tornado (TDS sig - OBSERVED Tag)" bulletGroup="group1" parseString="SOURCE...RADAR CONFIRMED"/>
  <bullet bulletName="spotterTOR" bulletText="Trained weather spotters reported a tornado" bulletGroup="group1" parseString="&quot;SOURCE...WEATHER SPOTTERS&quot;,&quot;-FUNNEL CLOUD&quot;"/>
  <bullet bulletName="lawEnforcementTOR" bulletText="Law enforcement reported a tornado" bulletGroup="group1" parseString="SOURCE...LAW ENFORCEMENT"/>
@ -347,8 +348,8 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="landspoutTornado" bulletText="LANDSPOUT/VERY WEAK TORNADO" bulletGroup="headline" parseString="IMPACT...EXPECT DAMAGE TO MOBILE HOMES"/>
  <bullet bulletText="" bulletType="title"/>
  <bullet bulletText="*********** BASIS FOR WARNING (CHOOSE 1) **********" bulletType="title"/>
-  <bullet bulletName="dopplerTOR" bulletText="Doppler radar indicated" bulletGroup="group1" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;-SQUALL LINE&quot;"/>
-  <bullet bulletName="dopplerSquallTOR" bulletText="Squall line w/ embedded tornadoes" bulletGroup="group1" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;SQUALL LINE&quot;"/>
+  <bullet bulletName="dopplerTOR" bulletText="Doppler radar indicated" bulletGroup="group1" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;-PRODUCING BOTH TORNADOES AND EXTENSIVE STRAIGHT LINE&quot;"/>
+  <bullet bulletName="dopplerSquallTOR" bulletText="Squall line w/ embedded tornadoes" bulletGroup="group1" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;PRODUCING BOTH TORNADOES AND EXTENSIVE STRAIGHT LINE&quot;"/>
  <bullet bulletName="confirmedDopplerTOR" bulletText="Confirmed tornado (TDS sig - OBSERVED Tag)" bulletGroup="group1" parseString="SOURCE...RADAR CONFIRMED"/>
  <bullet bulletName="spotterTOR" bulletText="Trained weather spotters reported a tornado" bulletGroup="group1" parseString="&quot;SOURCE...WEATHER SPOTTERS&quot;,&quot;-FUNNEL CLOUD&quot;"/>
  <bullet bulletName="lawEnforcementTOR" bulletText="Law enforcement reported a tornado" bulletGroup="group1" parseString="SOURCE...LAW ENFORCEMENT"/>
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactTornadoWarning.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactTornadoWarning.xml
@ -13,6 +13,8 @@
     Mike Dangelo 1/23/2014 changed parseString for defaultCTAs to match iTW.vm statements, 
     removed cta1 bulletGroup from COR to ensure it is selected when doing a COR for a torEMER
     Evan Bookbinder 2-18-2014 added dssEvents hook, 2014 IBW impacts
+     Evan Bookbinder 10-24-2014 Fixed parse strings for Base TOR option for COR
+                                Fixed parseString for SqLn embedded TOR for COR
 -->

 <warngenConfig>
@ -82,12 +84,12 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletText="*********** TYPE OF WARNING **********" bulletType="title"/>
  <bullet bulletName="torEmergency" bulletText="TORNADO EMERGENCY/CATASTROPHIC TORNADO" bulletGroup="headline" parseString="TORNADO EMERGENCY"/>
  <bullet bulletName="considerableTornado" bulletText="CONSIDERABLE TORNADO TAG" bulletGroup="headline" parseString="TORNADO DAMAGE THREAT...CONSIDERABLE"/>
-  <bullet bulletName="baseTornado" bulletText="BASE TORNADO WARNING" bulletGroup="headline" bulletDefault="true" parseString="IMPACT...MOBILE HOMES WILL BE DAMAGED OR DESTROYED"/>
+  <bullet bulletName="baseTornado" bulletText="BASE TORNADO WARNING" bulletGroup="headline" bulletDefault="true" parseString="IMPACT...FLYING DEBRIS WILL BE DANGEROUS"/>
  <bullet bulletName="landspoutTornado" bulletText="LANDSPOUT/VERY WEAK TORNADO" bulletGroup="headline" parseString="IMPACT...EXPECT DAMAGE TO MOBILE HOMES"/>
  <bullet bulletText="" bulletType="title"/>
  <bullet bulletText="*********** BASIS FOR WARNING (CHOOSE 1) **********" bulletType="title"/>
-  <bullet bulletName="doppler" bulletText="Doppler radar indicated" bulletGroup="group1" bulletDefault="true" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;-SQUALL LINE&quot;"/>
-  <bullet bulletName="dopplerSquall" bulletText="Squall line w/ embedded tornadoes" bulletGroup="group1" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;SQUALL LINE&quot;"/>
+  <bullet bulletName="doppler" bulletText="Doppler radar indicated" bulletGroup="group1" bulletDefault="true" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;-PRODUCING BOTH TORNADOES AND EXTENSIVE STRAIGHT LINE&quot;"/>
+  <bullet bulletName="dopplerSquall" bulletText="Squall line w/ embedded tornadoes" bulletGroup="group1" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;PRODUCING BOTH TORNADOES AND EXTENSIVE STRAIGHT LINE&quot;"/>
  <bullet bulletName="confirmedDoppler" bulletText="Confirmed tornado (TDS sig - OBSERVED Tag)" bulletGroup="group1" parseString="SOURCE...RADAR CONFIRMED"/>
  <bullet bulletName="spotter" bulletText="Trained weather spotters reported a tornado" bulletGroup="group1" parseString="&quot;SOURCE...WEATHER SPOTTERS&quot;,&quot;-FUNNEL CLOUD&quot;"/>
  <bullet bulletName="lawEnforcement" bulletText="Law enforcement reported a tornado" bulletGroup="group1" parseString="SOURCE...LAW ENFORCEMENT"/>
@ -154,12 +156,12 @@ do not have mobile homes. If you wish to switch defaults or provide a single opt
  <bullet bulletText="*********** TYPE OF WARNING **********" bulletType="title"/>
  <bullet bulletName="torEmergency" bulletText="TORNADO EMERGENCY/CATASTROPHIC TORNADO" bulletGroup="headline" parseString="TORNADO EMERGENCY"/>
  <bullet bulletName="considerableTornado" bulletText="CONSIDERABLE TORNADO TAG" bulletGroup="headline" parseString="TORNADO DAMAGE THREAT...CONSIDERABLE"/>
-  <bullet bulletName="baseTornado" bulletText="BASE TORNADO WARNING" bulletGroup="headline" bulletDefault="true" parseString="IMPACT...MOBILE HOMES WILL BE DAMAGED OR DESTROYED"/>
+  <bullet bulletName="baseTornado" bulletText="BASE TORNADO WARNING" bulletGroup="headline" bulletDefault="true" parseString="IMPACT...FLYING DEBRIS WILL BE DANGEROUS"/>
  <bullet bulletName="landspoutTornado" bulletText="LANDSPOUT/VERY WEAK TORNADO" bulletGroup="headline" parseString="IMPACT...EXPECT DAMAGE TO MOBILE HOMES"/>
  <bullet bulletText="" bulletType="title"/>
  <bullet bulletText="*********** BASIS FOR WARNING (CHOOSE 1) **********" bulletType="title"/>
-  <bullet bulletName="doppler" bulletText="Doppler radar indicated" bulletGroup="group1" bulletDefault="true" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;-SQUALL LINE&quot;"/>
-  <bullet bulletName="dopplerSquall" bulletText="Squall line w/ embedded tornadoes" bulletGroup="group1" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;SQUALL LINE&quot;"/>
+  <bullet bulletName="doppler" bulletText="Doppler radar indicated" bulletGroup="group1" bulletDefault="true" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;-PRODUCING BOTH TORNADOES AND EXTENSIVE STRAIGHT LINE&quot;"/>
+  <bullet bulletName="dopplerSquall" bulletText="Squall line w/ embedded tornadoes" bulletGroup="group1" parseString="&quot;SOURCE...RADAR INDICATED&quot;,&quot;PRODUCING BOTH TORNADOES AND EXTENSIVE STRAIGHT LINE&quot;"/>
  <bullet bulletName="confirmedDoppler" bulletText="Confirmed tornado (TDS sig - OBSERVED Tag)" bulletGroup="group1" parseString="SOURCE...RADAR CONFIRMED"/>
  <bullet bulletName="spotter" bulletText="Trained weather spotters reported a tornado" bulletGroup="group1" parseString="&quot;SOURCE...WEATHER SPOTTERS&quot;,&quot;-FUNNEL CLOUD&quot;"/>
  <bullet bulletName="lawEnforcement" bulletText="Law enforcement reported a tornado" bulletGroup="group1" parseString="SOURCE...LAW ENFORCEMENT"/>
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning.xml
@ -15,7 +15,9 @@
          Modified Evan Bookbinder       06-26-2013 Added "U" Unknown severity          
          Modified Phil Kurimski         09-19-2013 added geospatialConfig.xml
          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                                      
+          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                                  
 -->

 <!-- INCLUDE ALL GEOSPTATIAL INFORMATION FOR THIS PRODUCT
@ -108,13 +110,10 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="glacier" bulletText="Glacier-dammed lake outburst" bulletGroup="ic" parseString=".GO." showString=".GO."/>
  <bullet bulletName="icejam" bulletText="Ice jam" bulletGroup="ic" parseString=".IJ." showString=".IJ."/>
  <bullet bulletName="rain" bulletText="Rapid snowmelt (with or without rain)" bulletGroup="ic" parseString=".RS." showString=".RS."/>
-<!-- modified by GP -->
+<!-- Uncomment for Alaska
  <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="VOLCANIC INDUCED SNOWMELT" showString=".SM."/>
  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="VOLCANIC INDUCED DEBRIS FLOW" showString=".SM."/>
-<!-- GP end -->
-<!-- following two lines from 13.5.2 baseline, may need the more complex parseString added to the GP changes above -->
-<!-- <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;-MELTING OF SNOW AND ICE&quot;,&quot;-TORRENT&quot;" showString="&quot;VOLCANIC SNOWMELT&quot;,&quot;-MELTING OF SNOW AND ICE&quot;,&quot;-TORRENT&quot;"/>
-  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;MELTING OF SNOW AND ICE&quot;,&quot;TORRENT&quot;" showString="&quot;VOLCANIC SNOWMELT&quot;,&quot;MELTING OF SNOW AND ICE&quot;,&quot;TORRENT&quot;"/> -->
+Alaska end -->
  <bullet bulletText="****** REPORTED BY (choose 1) ******" bulletType="title"/>
  <bullet bulletName="county" bulletText="County dispatch" bulletGroup="reportedBy" bulletDefault="true" parseString="COUNTY DISPATCH REPORTED"/>
  <bullet bulletName="lawEnforcement" bulletText="Law enforcement" bulletGroup="reportedBy" parseString="LOCAL LAW ENFORCEMENT REPORTED"/>
@ -122,12 +121,12 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="damop" bulletText="Dam operator" bulletGroup="reportedBy" parseString="DAM OPERATORS REPORTED"/>
  <bullet bulletName="bureau" bulletText="Bureau of reclamation" bulletGroup="reportedBy" parseString="BUREAU OF RECLAMATION REPORTED"/>
  <bullet bulletName="public" bulletText="Public" bulletGroup="reportedBy" parseString="THE PUBLIC REPORTED"/>
-<!-- added by GP -->
-  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="source" parseString="GAUGE REPORTS "/>
-  <bullet bulletName="CAP" bulletText="Civil Air Patrol" bulletGroup="source" parseString="CIVIL AIR PATROL "/>
-  <bullet bulletName="alaskaVoc" bulletText="Alaska Volcano Observatory" bulletGroup="source" parseString="ALASKA VOLCANO OBSERVATORY "/>
-  <bullet bulletName="cascadeVoc" bulletText="Cascades Volcano Observatory" bulletGroup="source" parseString="CASCADES VOLCANO OBSERVATORY "/>
-<!--  GP end -->
+  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="reportedBy" parseString="GAUGE REPORTS "/>
+<!-- Uncomment for Alaska
+  <bullet bulletName="CAP" bulletText="Civil Air Patrol" bulletGroup="reportedBy" parseString="CIVIL AIR PATROL "/>
+  <bullet bulletName="alaskaVoc" bulletText="Alaska Volcano Observatory" bulletGroup="reportedBy" parseString="ALASKA VOLCANO OBSERVATORY "/>
+  <bullet bulletName="cascadeVoc" bulletText="Cascades Volcano Observatory" bulletGroup="reportedBy" parseString="CASCADES VOLCANO OBSERVATORY "/>
+Alaska end -->
  <bullet bulletText="************ (OPTIONAL) LOCATIONS IMPACTED  **************" bulletType="title"/>
 <!-- <bullet bulletName="pathcast" bulletText="Select for pathcast" bulletGroup="pcast" parseString="WILL BE NEAR..."/> -->
  <bullet bulletName="listofcities" bulletText="Select for a list of cities" bulletGroup="pcast"/>
@ -190,13 +189,10 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="glacier" bulletText="Glacial-dammed lake outburst" bulletGroup="ic" parseString=".GO." showString=".GO."/>
  <bullet bulletName="icejam" bulletText="Ice jam" bulletGroup="ic" parseString=".IJ." showString=".IJ."/>
  <bullet bulletName="rain" bulletText="Rapid rain induced snowmelt" bulletGroup="ic" parseString=".RS." showString=".RS."/>
-<!-- modified by GP -->
+<!-- Uncomment for Alaska
  <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="VOLCANIC INDUCED SNOWMELT" showString=".SM."/>
  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="VOLCANIC INDUCED DEBRIS FLOW" showString=".SM."/>
-<!-- GP end -->
-<!-- following two lines from 13.5.2 baseline, may need the more complex parseString added to the GP changes above -->
-<!--  <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;-MELTING OF SNOW AND ICE&quot;,&quot;-TORRENT&quot;" showString="&quot;VOLCANIC SNOWMELT&quot;,&quot;-MELTING OF SNOW AND ICE&quot;,&quot;-TORRENT&quot;"/>
-  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;MELTING OF SNOW AND ICE&quot;,&quot;TORRENT&quot;" showString="&quot;VOLCANIC SNOWMELT&quot;,&quot;MELTING OF SNOW AND ICE&quot;,&quot;TORRENT&quot;"/> -->
+Alaska end -->
  <bullet bulletText="****** REPORTED BY (choose 1) ******" bulletType="title"/>
  <bullet bulletName="county" bulletText="County dispatch" bulletGroup="reportedBy" bulletDefault="true" parseString="COUNTY DISPATCH REPORTED"/>
  <bullet bulletName="lawEnforcement" bulletText="Law enforcement" bulletGroup="reportedBy" parseString="LOCAL LAW ENFORCEMENT REPORTED"/>
@ -204,12 +200,12 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="damop" bulletText="Dam operator" bulletGroup="reportedBy" parseString="DAM OPERATORS REPORTED"/>
  <bullet bulletName="bureau" bulletText="Bureau of reclamation" bulletGroup="reportedBy" parseString="BUREAU OF RECLAMATION REPORTED"/>
  <bullet bulletName="public" bulletText="The public" bulletGroup="reportedBy" parseString="THE PUBLIC REPORTED"/>
-<!-- added by GP -->
-  <bullet bulletName="onlyGauge" bulletText="gauge reports" bulletGroup="source" parseString="GAUGE REPORTS "/>
-  <bullet bulletName="CAP" bulletText="Civil Air Patrol" bulletGroup="source" parseString="CIVIL AIR PATROL "/>
-  <bullet bulletName="alaskaVoc" bulletText="Alaska Volcano Observatory" bulletGroup="source" parseString="ALASKA VOLCANO OBSERVATORY "/>
-  <bullet bulletName="cascadeVoc" bulletText="Cascades Volcano Observatory" bulletGroup="source" parseString="CASCADES VOLCANO OBSERVATORY "/>
-<!--  GP end -->
+  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="reportedBy" parseString="GAUGE REPORTS "/>
+<!-- Uncomment for Alaska  
+  <bullet bulletName="CAP" bulletText="Civil Air Patrol" bulletGroup="reportedBy" parseString="CIVIL AIR PATROL "/>
+  <bullet bulletName="alaskaVoc" bulletText="Alaska Volcano Observatory" bulletGroup="reportedBy" parseString="ALASKA VOLCANO OBSERVATORY "/>
+  <bullet bulletName="cascadeVoc" bulletText="Cascades Volcano Observatory" bulletGroup="reportedBy" parseString="CASCADES VOLCANO OBSERVATORY "/>
+Alaska end -->
 <!-- end all call to action bullets with "CTA" ex: "obviousNameCTA" -->
  <bullet bulletText="************ (OPTIONAL) LOCATIONS IMPACTED  **************" bulletType="title"/>
 <!-- <bullet bulletName="pathcast" bulletText="Select for pathcast" bulletGroup="pcast" parseString="WILL BE NEAR..."/> -->
@ -271,13 +267,10 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="glacier" bulletText="Glacial-dammed lake outburst" bulletGroup="ic" parseString=".GO." showString=".GO."/>
  <bullet bulletName="icejam" bulletText="Ice jam" bulletGroup="ic" parseString=".IJ." showString=".IJ."/>
  <bullet bulletName="rain" bulletText="Rapid rain induced snowmelt" bulletGroup="ic" parseString=".RS." showString=".RS."/>
-<!-- modified by GP -->
+<!-- Uncomment for Alaska  
  <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="VOLCANIC INDUCED SNOWMELT" showString=".SM."/>
  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="VOLCANIC INDUCED DEBRIS FLOW" showString=".SM."/>
-<!-- GP end -->
-<!-- following two lines from 13.5.2 baseline, may need the more complex parseString added to the GP changes above -->
-<!-- <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;-MELTING OF SNOW AND ICE&quot;,&quot;-TORRENT&quot;" showString="&quot;VOLCANIC SNOWMELT&quot;,&quot;-MELTING OF SNOW AND ICE&quot;,&quot;-TORRENT&quot;"/>
-  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;MELTING OF SNOW AND ICE&quot;,&quot;TORRENT&quot;" showString="&quot;VOLCANIC SNOWMELT&quot;,&quot;MELTING OF SNOW AND ICE&quot;,&quot;TORRENT&quot;"/>  -->
+Alaska end -->
  <bullet bulletText="****** REPORTED BY (choose 1) ******" bulletType="title"/>
  <bullet bulletName="county" bulletText="County dispatch" bulletGroup="reportedBy" bulletDefault="true" parseString="COUNTY DISPATCH REPORTED"/>
  <bullet bulletName="lawEnforcement" bulletText="Law enforcement" bulletGroup="reportedBy" parseString="LOCAL LAW ENFORCEMENT REPORTED"/>
@ -285,12 +278,12 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="damop" bulletText="Dam operator" bulletGroup="reportedBy" parseString="DAM OPERATORS REPORTED"/>
  <bullet bulletName="bureau" bulletText="Bureau of reclamation" bulletGroup="reportedBy" parseString="BUREAU OF RECLAMATION REPORTED"/>
  <bullet bulletName="public" bulletText="The public" bulletGroup="reportedBy" parseString="THE PUBLIC REPORTED"/>
-<!-- added by GP -->
-  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="source" parseString="GAUGE REPORTS "/>
-  <bullet bulletName="CAP" bulletText="Civil Air Patrol" bulletGroup="source" parseString="CIVIL AIR PATROL "/>
-  <bullet bulletName="cascadeVoc" bulletText="Cascades Volcano Observatory" bulletGroup="source" parseString="CASCADES VOLCANO OBSERVATORY "/>
-  <bullet bulletName="alaskaVoc" bulletText="Alaska Volcano Observatory" bulletGroup="source" parseString="ALASKA VOLCANO OBSERVATORY "/>
-<!--  GP end -->
+  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="reportedBy" parseString="GAUGE REPORTS "/>
+<!-- Uncomment for Alaska    
+  <bullet bulletName="CAP" bulletText="Civil Air Patrol" bulletGroup="reportedBy" parseString="CIVIL AIR PATROL "/>
+  <bullet bulletName="cascadeVoc" bulletText="Cascades Volcano Observatory" bulletGroup="reportedBy" parseString="CASCADES VOLCANO OBSERVATORY "/>
+  <bullet bulletName="alaskaVoc" bulletText="Alaska Volcano Observatory" bulletGroup="reportedBy" parseString="ALASKA VOLCANO OBSERVATORY "/>
+Alaska end -->
 <!-- end all call to action bullets with "CTA" ex: "obviousNameCTA" -->
  <bullet bulletText="************ (OPTIONAL) LOCATIONS IMPACTED  **************" bulletType="title"/>
 <!-- <bullet bulletName="pathcast" bulletText="Select for pathcast" bulletGroup="pcast" parseString="WILL BE NEAR..."/> -->
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.vm
@ -11,12 +11,24 @@
 ##      Phil Kurimski  -- SEP 17 2013 FFW Emerg    ##
 ##      Mike Rega      -- JAN 18 2014 14.2.1       ##
 ##                        added Alaska GP changes  ##
-#####################################################
+##      Evan Bookbinder -- Oct 24 2014 Fixed floodSeverity code
+##########################################################
 ##
 #parse("config.vm")
 #set($headline = "")
 ## set reportType2 to a default value in case nothing is selected for site specific
 #set($reportType2 = "THE FAILURE OF")
+#if(${list.contains(${bullets}, "sev3")} || ${list.contains(${bullets}, "ffwEmergency")})
+	#set($sev = "3")
+#elseif(${list.contains(${bullets}, "sev1")})
+	#set($sev = "1")
+#elseif(${list.contains(${bullets}, "sev2")})
+	#set($sev = "2")
+#elseif(${list.contains(${bullets}, "sevUnk")})
+	#set($sev = "U")	
+#else
+	#set($sev = "0")
+#end
 #####################################################################
 ## set variables to be used in site specific dam break selections
 #####################################################################
@ -44,7 +56,6 @@
        #set($headline = "FOR A GLACIAL DAMMED LAKE OUTBURST ")
 	#set($reportType1 = "A GLACIER DAMMED LAKE AT !** **! IS RAPIDLY RELEASING LARGE QUANTITIES OF IMPOUNDED WATER RESULTING IN FLASH FLOODING !** **!")
 ### GP end
-###	#set($reportType1 = "A GLACIER AT !** **! HAS MELTED...RELEASING LARGE QUANTITIES OF IMPOUNDED WATER AND CAUSING FLASH FLOODING !** **!")
 #elseif(${list.contains(${bullets}, "icejam")})
 	#set($ic = "IJ")
 	#set($hycType = "ICE JAM FLOODING")
@ -139,7 +150,7 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}

 ${ugcline}
 /${productClass}.${action}.${vtecOffice}.FF.W.${etn}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/
-/00000.${floodseverity}.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/
+/00000.${sev}.${ic}.000000T0000Z.000000T0000Z.000000T0000Z.OO/
 #foreach (${area} in ${areas}) 
 ${area.name}##
 #if(${includeStateAbbreviation}==true)
@ -228,10 +239,10 @@ THIS IS A TEST MESSAGE.##
 #if(${list.contains(${bullets}, "public")})
  #set($report = "THE PUBLIC REPORTED ${reportType1}") 
 #end
-### added by GP
 #if(${list.contains(${bullets}, "onlyGauge")})
  #set($report = "GAUGES INDICATED ${reportType1}") 
 #end
+### added by GP
 #if(${list.contains(${bullets}, "CAP")})
  #set($report = "THE CIVIL AIR PATROL REPORTED ${reportType1}") 
 #end
@ -497,14 +508,20 @@ THIS IS A TEST MESSAGE.##
 #if(${list.contains(${bullets}, "public")})
  #set($report = "THE PUBLIC REPORTED ${reportType1}") 
 #end
-### added by GP
 #if(${list.contains(${bullets}, "onlyGauge")})
  #set($report = "GAUGES INDICATED ${reportType1}") 
 #end
+## added by GP
 #if(${list.contains(${bullets}, "CAP")})
  #set($report = "THE CIVIL AIR PATROL REPORTED ${reportType1}") 
 #end
-### GP end
+#if(${list.contains(${bullets}, "alaskaVoc")})
+  #set($report = "THE ALASKA VOLCANO OBSERVATORY REPORTED ${reportType1}") 
+#end
+#if(${list.contains(${bullets}, "cascadeVoc")})
+  #set($report = "THE CASCADES VOLCANO OBSERVATORY REPORTED ${reportType1}") 
+#end
+## GP end

 ## Storm current location description
 #if(${productClass}=="T")
@ -740,14 +757,20 @@ THIS IS A TEST MESSAGE.##
 #if(${list.contains(${bullets}, "public")})
  #set($report = "THE PUBLIC REPORTED ${reportType1}") 
 #end
-### added by GP
 #if(${list.contains(${bullets}, "onlyGauge")})
  #set($report = "GAUGES INDICATED ${reportType1}") 
 #end
+## added by GP
 #if(${list.contains(${bullets}, "CAP")})
  #set($report = "THE CIVIL AIR PATROL REPORTED ${reportType1}") 
 #end
-### GP end
+#if(${list.contains(${bullets}, "alaskaVoc")})
+  #set($report = "THE ALASKA VOLCANO OBSERVATORY REPORTED ${reportType1}") 
+#end
+#if(${list.contains(${bullets}, "cascadeVoc")})
+  #set($report = "THE CASCADES VOLCANO OBSERVATORY REPORTED ${reportType1}") 
+#end
+## GP end

 ## Storm current location description
 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.xml
@ -11,6 +11,9 @@
         Modified Phil Kurimski          09-19-2013 added geospatialConfig.xml
         Modified Mike Rega              01-18-2014 added Alaska GP changes for 14.2.1
         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        
 -->

 <warngenConfig>
@ -97,13 +100,10 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="glacier" bulletText="Glacial-dammed lake outburst" bulletGroup="ic" parseString=".GO." showString=".GO."/>
  <bullet bulletName="icejam" bulletText="Ice jam" bulletGroup="ic" parseString=".IJ." showString=".IJ."/>
  <bullet bulletName="rain" bulletText="Rapid rain induced snowmelt" bulletGroup="ic" parseString=".RS." showString=".RS."/>
-<!-- modified by GP -->
+<!-- Uncomment for Alaska
  <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="VOLCANIC INDUCED SNOWMELT" showString=".SM."/>
  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="VOLCANIC INDUCED DEBRIS FLOW" showString=".SM."/>
-<!-- GP end -->
-<!--  next two lines from 13.5.2 baseline - may need the more complex parseString for the GP changes above -->
-<!-- <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;-MELTING OF SNOW AND ICE&quot;,&quot;-TORRENT&quot;" showString="&quot;VOLCANIC SNOWMELT&quot;,&quot;-MELTING OF SNOW AND ICE&quot;,&quot;-TORRENT&quot;"/>
-  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;MELTING OF SNOW AND ICE&quot;,&quot;TORRENT&quot;" showString="&quot;VOLCANIC SNOWMELT&quot;,&quot;MELTING OF SNOW AND ICE&quot;,&quot;TORRENT&quot;"/> -->
+Alaska end -->
  <bullet bulletName="siteimminent" bulletText="Dam break - site specific (pick below) - imminent failure" bulletGroup="damic" parseString="THE IMMINENT FAILURE OF" showString="&quot;DAM&quot;,&quot;.DM.&quot;,&quot;-LEVEE&quot;"/>
  <bullet bulletName="sitefailed" bulletText="Dam break - site specific (pick below) - failure has occurred" bulletGroup="damic" parseString="THE FAILURE OF" showString="&quot;DAM&quot;,&quot;.DM.&quot;,&quot;-LEVEE&quot;"/>
  <bullet bulletText="" bulletType="title"/>
@ -147,13 +147,10 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="glacier" bulletText="Glacial-dammed lake outburst" bulletGroup="ic" parseString=".GO." showString=".GO."/>
  <bullet bulletName="icejam" bulletText="Ice jam" bulletGroup="ic" parseString=".IJ." showString=".IJ."/>
  <bullet bulletName="rain" bulletText="Rapid rain induced snowmelt" bulletGroup="ic" parseString=".RS." showString=".RS."/>
-<!-- modified by GP -->
+<!-- Uncomment for Alaska
  <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="VOLCANIC INDUCED SNOWMELT" showString=".SM."/>
  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="VOLCANIC INDUCED DEBRIS FLOW" showString=".SM."/>
-<!-- GP end -->
-<!--  next two lines from 13.5.2 baseline - may need the more complex parseString for the GP changes above -->
-<!--  <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;-MELTING OF SNOW AND ICE&quot;,&quot;-TORRENT&quot;" showString="&quot;VOLCANIC SNOWMELT&quot;,&quot;-MELTING OF SNOW AND ICE&quot;,&quot;-TORRENT&quot;"/>
-  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;MELTING OF SNOW AND ICE&quot;,&quot;TORRENT&quot;" showString="&quot;VOLCANIC SNOWMELT&quot;,&quot;MELTING OF SNOW AND ICE&quot;,&quot;TORRENT&quot;"/> -->
+Alaska end -->
  <bullet bulletName="siteimminent" bulletText="Dam break - site specific (pick below) - imminent failure" bulletGroup="damic" parseString="THE IMMINENT FAILURE OF" showString="&quot;DAM&quot;,&quot;.DM.&quot;,&quot;-LEVEE&quot;"/>
  <bullet bulletName="sitefailed" bulletText="Dam break - site specific (pick below) - failure has occurred" bulletGroup="damic" parseString="THE FAILURE OF" showString="&quot;DAM&quot;,&quot;.DM.&quot;,&quot;-LEVEE&quot;"/>
  <bullet bulletText="" bulletType="title"/>
@ -186,6 +183,11 @@ turned on unless the corresponding .vm file is turned on in a given template's .
 <bulletActionGroup action="CON" phen="FF" sig="W">
 <bullets>
  <bullet bulletName="ffwEmergency" bulletText="**SELECT FOR FLASH FLOOD EMERGENCY**" floodSeverity="3" 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."/>
+  <bullet bulletName="sev2" bulletText="Moderate flood" bulletGroup="floodSeverity" floodSeverity="2" parseString=".2."/>
+  <bullet bulletName="sev3" bulletText="Major flood" bulletGroup="floodSeverity" floodSeverity="3" parseString=".3."/>  
  <bullet bulletText="******** PRIMARY CAUSE (choose 1) *******" bulletType="title"/>
  <bullet bulletName="dam" bulletText="Dam failure - generic" bulletGroup="damic" parseString="A DAM FAILURE" showString="&quot;DAM&quot;,&quot;.DM.&quot;,&quot;-LEVEE&quot;"/>
  <bullet bulletName="levee" bulletText="Levee failure" bulletGroup="ic" parseString="A LEVEE FAILURE" showString="LEVEE FAILURE"/>
@ -193,16 +195,13 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="glacier" bulletText="Glacial-dammed lake outburst" bulletGroup="ic" parseString=".GO." showString=".GO."/>
  <bullet bulletName="icejam" bulletText="Ice jam" bulletGroup="ic" parseString=".IJ." showString=".IJ."/>
  <bullet bulletName="rain" bulletText="Rapid rain induced snowmelt" bulletGroup="ic" parseString="EXTREMELY RAPID RAIN SNOWMELT" showString=".RS."/>
-<!-- modified by GP -->
+<!-- Uncomment for Alaska
  <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="VOLCANIC INDUCED SNOWMELT" showString=".SM."/>
  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="VOLCANIC INDUCED DEBRIS FLOW" showString=".SM."/>
-<!-- GP end -->
-<!--  next two lines from 13.5.2 baseline - may need the more complex parseString for the GP changes above -->
-<!-- <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;-MELTING OF SNOW AND ICE&quot;,&quot;-TORRENT&quot;" showString="&quot;VOLCANIC&quot;,&quot;-TORRENT&quot;"/>
-  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;MELTING OF SNOW AND ICE&quot;,&quot;TORRENT&quot;" showString="&quot;VOLCANIC&quot;,&quot;TORRENT&quot;"/> -->
+Alaska end -->
  <bullet bulletName="siteimminent" bulletText="Dam break - site specific (pick below) - imminent failure" bulletGroup="damic" parseString="THE IMMINENT FAILURE OF" showString="&quot;DAM&quot;,&quot;.DM.&quot;,&quot;-LEVEE&quot;"/>
  <bullet bulletName="sitefailed" bulletText="Dam break - site specific (pick below) - failure has occurred" bulletGroup="damic" parseString="THE FAILURE OF" showString="&quot;DAM&quot;,&quot;.DM.&quot;,&quot;-LEVEE&quot;"/>
- <bullet bulletText="" bulletType="title"/>
+  <bullet bulletText="" bulletType="title"/>
  <bullet bulletText="****** REPORTED BY (choose 1) ******" bulletType="title"/>
  <bullet bulletName="county" bulletText="County dispatch" bulletGroup="reportedBy" parseString="COUNTY DISPATCH REPORTED"/>
  <bullet bulletName="lawEnforcement" bulletText="Law enforcement" bulletGroup="reportedBy" parseString="LOCAL LAW ENFORCEMENT REPORTED"/>
@ -210,12 +209,12 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="damop" bulletText="Dam operator" bulletGroup="reportedBy" parseString="DAM OPERATORS REPORTED"/>
  <bullet bulletName="bureau" bulletText="Bureau of reclamation" bulletGroup="reportedBy" parseString="BUREAU OF RECLAMATION REPORTED"/>
  <bullet bulletName="public" bulletText="The public" bulletGroup="reportedBy" parseString="THE PUBLIC REPORTED"/>
-<!-- added by GP -->
-  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="source" parseString="GAUGE REPORTS "/>
-  <bullet bulletName="CAP" bulletText="Civil Air Patrol" bulletGroup="source" parseString="CIVIL AIR PATROL "/>
-  <bullet bulletName="alaskaVoc" bulletText="Alaska Volcano Observatory" bulletGroup="source" parseString="ALASKA VOLCANO OBSERVATORY "/>
-  <bullet bulletName="cascadeVoc" bulletText="Cascades Volcano Observatory" bulletGroup="source" parseString="CASCADES VOLCANO OBSERVATORY "/>
-<!--  GP end -->
+  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="reportedBy" parseString="GAUGE REPORTS "/>
+<!-- Uncomment for Alaska
+  <bullet bulletName="CAP" bulletText="Civil Air Patrol" bulletGroup="reportedBy" parseString="CIVIL AIR PATROL "/>
+  <bullet bulletName="alaskaVoc" bulletText="Alaska Volcano Observatory" bulletGroup="reportedBy" parseString="ALASKA VOLCANO OBSERVATORY "/>
+  <bullet bulletName="cascadeVoc" bulletText="Cascades Volcano Observatory" bulletGroup="reportedBy" parseString="CASCADES VOLCANO OBSERVATORY "/>
+Alaska end -->
  <bullet bulletText="************ (OPTIONAL) LOCATIONS IMPACTED  **************" bulletType="title"/>
 <!-- <bullet bulletName="pathcast" bulletText="Select for pathcast" bulletGroup="pcast" parseString="WILL BE NEAR..."/> -->
  <bullet bulletName="listofcities" bulletText="Select for a list of cities" bulletGroup="pcast" parseString="&quot;LOCATIONS&quot;,&quot;INCLUDE...&quot;"/>
@ -234,11 +233,11 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="stayAwayCTA" bulletText="Stay away or be swept away" parseString="STAY AWAY OR BE SWEPT AWAY"/>
  <bullet bulletName="arroyosCTA" bulletText="Arroyos..." parseString="ARROYOS...STREAMS AND RIVERS CAN BECOME RAGING KILLER CURRENTS"/>
  <bullet bulletName="burnAreasCTA" bulletText="Burn Areas..." parseString="MOVE AWAY FROM RECENTLY BURNED AREAS"/>
-<!-- added by GP -->
+<!-- Uncomment for Alaska
  <bullet bulletName="volcanicFloodCTA" bulletText="Volanic Snowmelt..." parseString="VOLCANIC SNOWMELT"/>
  <bullet bulletName="volcanicLaharCTA" bulletText="Volanic Lahar..." parseString="VOLCANIC LAHARS"/>
  <bullet bulletName="glacierOutburstCTA" bulletText="Glacier Outburst..." parseString="STAY AWAY FROM"/>
-<!--  GP end -->
+Alaska end -->
  <bullet bulletName="reportFloodingCTA" bulletText="Report flooding to local law enforcement" parseString="PLEASE REPORT TO YOUR LOCAL LAW ENFORCEMENT AGENCY WHEN YOU CAN"/>
  <bullet bulletText="" bulletType="title"/>
  <bullet bulletText="************************************************************" bulletType="title"/>
@ -275,20 +274,22 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <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 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."/>
+  <bullet bulletName="sev2" bulletText="Moderate flood" bulletGroup="floodSeverity" floodSeverity="2" parseString=".2."/>
+  <bullet bulletName="sev3" bulletText="Major flood" bulletGroup="floodSeverity" floodSeverity="3" parseString=".3."/>    
  <bullet bulletText="******** PRIMARY CAUSE (choose 1) *******" bulletType="title"/>
  <bullet bulletName="dam" bulletText="Dam failure - generic" bulletGroup="damic" parseString="A DAM FAILURE" showString="&quot;DAM&quot;,&quot;.DM.&quot;,&quot;-LEVEE&quot;"/>
  <bullet bulletName="levee" bulletText="Levee failure" bulletGroup="ic" parseString="A LEVEE FAILURE" showString="LEVEE FAILURE"/>
  <bullet bulletName="floodgate" bulletText="Floodgate opening" bulletGroup="ic" parseString="FLOODGATE RELEASE" showString="FLOODGATE RELEASE"/>
  <bullet bulletName="glacier" bulletText="Glacial-dammed lake outburst" bulletGroup="ic" parseString=".GO." showString=".GO."/>
-  <bullet bulletName="icejam" bulletText="Ice jam" bulletGroup="ic" parseString="ICE JAM FLOODING" showString=".IJ."/>
+  <bullet bulletName="icejam" bulletText="Ice jam" bulletGroup="ic" parseString=".IJ." showString=".IJ."/>
  <bullet bulletName="rain" bulletText="Rapid rain induced snowmelt" bulletGroup="ic" parseString="EXTREMELY RAPID RAIN SNOWMELT" showString=".RS."/>
-<!-- modified by GP -->
+<!-- Uncomment for Alaska
  <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="VOLCANIC INDUCED SNOWMELT" showString=".SM."/>
  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="VOLCANIC INDUCED DEBRIS FLOW" showString=".SM."/>
-<!-- GP end -->
-<!--  next two lines from 13.5.2 baseline - may need the more complex parseString for the GP changes above -->
-<!-- <bullet bulletName="volcano" bulletText="Volcano induced snowmelt" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;-MELTING OF SNOW AND ICE&quot;,&quot;-TORRENT&quot;" showString="&quot;VOLCANIC&quot;,&quot;-TORRENT&quot;"/>
-  <bullet bulletName="volcanoLahar" bulletText="Volcano induced lahar/debris flow" bulletGroup="ic" parseString="&quot;VOLCANIC SNOWMELT&quot;,&quot;MELTING OF SNOW AND ICE&quot;,&quot;TORRENT&quot;" showString="&quot;VOLCANIC&quot;,&quot;TORRENT&quot;"/> -->
+Alaska end -->
  <bullet bulletName="siteimminent" bulletText="Dam break - site specific (pick below) - imminent failure" bulletGroup="damic" parseString="THE IMMINENT FAILURE OF" showString="&quot;DAM&quot;,&quot;.DM.&quot;,&quot;-LEVEE&quot;"/>
  <bullet bulletName="sitefailed" bulletText="Dam break - site specific (pick below) - failure has occurred" bulletGroup="damic" parseString="THE FAILURE OF" showString="&quot;DAM&quot;,&quot;.DM.&quot;,&quot;-LEVEE&quot;"/>
  <bullet bulletText="" bulletType="title"/>
@ -299,12 +300,12 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="damop" bulletText="Dam operator" bulletGroup="reportedBy" parseString="DAM OPERATORS REPORTED"/>
  <bullet bulletName="bureau" bulletText="Bureau of reclamation" bulletGroup="reportedBy" parseString="BUREAU OF RECLAMATION REPORTED"/>
  <bullet bulletName="public" bulletText="The public" bulletGroup="reportedBy" parseString="THE PUBLIC REPORTED"/>
-<!-- added by GP -->
-  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="source" parseString="GAUGE REPORTS "/>
-  <bullet bulletName="CAP" bulletText="Civil Air Patrol" bulletGroup="source" parseString="CIVIL AIR PATROL "/>
-  <bullet bulletName="alaskaVoc" bulletText="Alaska Volcano Observatory" bulletGroup="source" parseString="ALASKA VOLCANO OBSERVATORY "/>
-  <bullet bulletName="cascadeVoc" bulletText="Cascades Volcano Observatory" bulletGroup="source" parseString="CASCADES VOLCANO OBSERVATORY "/>
-<!--  GP end -->
+  <bullet bulletName="onlyGauge" bulletText="Gauge reports" bulletGroup="reportedBy" parseString="GAUGE REPORTS "/>
+<!-- Uncomment for Alaska  
+  <bullet bulletName="CAP" bulletText="Civil Air Patrol" bulletGroup="reportedBy" parseString="CIVIL AIR PATROL "/>
+  <bullet bulletName="alaskaVoc" bulletText="Alaska Volcano Observatory" bulletGroup="reportedBy" parseString="ALASKA VOLCANO OBSERVATORY "/>
+  <bullet bulletName="cascadeVoc" bulletText="Cascades Volcano Observatory" bulletGroup="reportedBy" parseString="CASCADES VOLCANO OBSERVATORY "/>
+Alaska end -->
  <bullet bulletText="************ (OPTIONAL) LOCATIONS IMPACTED  **************" bulletType="title"/>
 <!-- <bullet bulletName="pathcast" bulletText="Select for pathcast" bulletGroup="pcast" parseString="WILL BE NEAR..."/> -->
  <bullet bulletName="listofcities" bulletText="Select for a list of cities" bulletGroup="pcast" parseString="&quot;LOCATIONS&quot;,&quot;INCLUDE...&quot;"/>
@ -323,11 +324,11 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <bullet bulletName="stayAwayCTA" bulletText="Stay away or be swept away" parseString="STAY AWAY OR BE SWEPT AWAY"/>
  <bullet bulletName="arroyosCTA" bulletText="Arroyos..." parseString="ARROYOS...STREAMS AND RIVERS CAN BECOME RAGING KILLER CURRENTS"/>
  <bullet bulletName="burnAreasCTA" bulletText="Burn Areas..." parseString="MOVE AWAY FROM RECENTLY BURNED AREAS"/>
-<!-- added by GP -->
+<!-- Uncomment for Alaska  
  <bullet bulletName="volcanicFloodCTA" bulletText="Volanic Snowmelt..." parseString="VOLCANIC SNOWMELT"/>
  <bullet bulletName="volcanicLaharCTA" bulletText="Volanic Lahar..." parseString="VOLCANIC LAHARS"/>
  <bullet bulletName="glacierOutburstCTA" bulletText="Glacier Outburst..." parseString="STAY AWAY FROM"/>
-<!--  GP end -->
+Alaska end -->
  <bullet bulletName="reportFloodingCTA" bulletText="Report flooding to local law enforcement" parseString="PLEASE REPORT TO YOUR LOCAL LAW ENFORCEMENT AGENCY WHEN YOU CAN"/>
  <bullet bulletText="" bulletType="title"/>
  <bullet bulletText="************************************************************" bulletType="title"/>