Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1

Former-commit-id: 4269f9d875 [formerly 0e02910adc2ef73df2eff5b41c1e9945a5536a0a] Former-commit-id: c6f2010ce6
2014-03-10 15:42:38 -04:00 · 2014-03-10 15:42:38 -04:00 · bcf9a5dc83
commit bcf9a5dc83
parent 24785068be 1a482f91bc
16 changed files with 56 additions and 44 deletions
--- a/RadarServer/build.rcm/build.xml
+++ b/RadarServer/build.rcm/build.xml
@ -60,6 +60,10 @@
        <available file="${basedir}/../org.springframework" />
    </condition>

+    <condition property="edexsrc.dir" value="${basedir}/.." else="${basedir}/../../edexOsgi">
+        <available file="${basedir}/../com.raytheon.uf.common.util" />
+    </condition>
+
    <!-- Set default EDEX install location for copy filter -->
    <property name="def.edex.install.dir" value="/awips" />
    <condition property="edex.home" value="$EdexBaseDir" else="${def.edex.install.dir}">
@ -165,6 +169,8 @@
                includes="**/*.class" />
            <fileset dir="tmp/plugins/com.raytheon.rcm.server.mq/@dot"
                includes="**/*.txt" />
+            <fileset dir="tmp/plugins/com.raytheon.uf.common.util/@dot"
+                includes="**/*.class" />
        </copy>
    </target>

@ -175,6 +181,7 @@
            <fileset dir="../com.raytheon.rcm.server/bin" includes="**/*.class" />
            <fileset dir="../com.raytheon.rcm.server.mq/bin" includes="**/*.class" />
            <fileset dir="../com.raytheon.rcm.server.mq/bin" includes="**/*.txt" />
+            <fileset dir="${edexsrc.dir}/com.raytheon.uf.common.util/bin" includes="**/*.class" />
        </copy>
    </target>

--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/GageTableDataManager.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/GageTableDataManager.java
@ -61,7 +61,7 @@ import com.vividsolutions.jts.geom.Coordinate;
 *                                       header creation.
 * May 20, 2013 15962      lbousaidi   Added a new routine getRadarIdsTrue()
 *                                     for Radar Sites dialog.                                    
- * 
+ * Mar 05, 2014 17114      lbousaidi   display PC data in gage table. 
 * </pre>
 * 
 * @author mpduff
@ -620,9 +620,6 @@ public class GageTableDataManager {
        index = 0;

        for (MPEGageData gage : gageRecordList) {
-            if (!gage.getPe().equalsIgnoreCase("PP")) {
-                continue;
-            }

            Map<String, Double> productValueMap = new HashMap<String, Double>();

--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory.vm
@ -14,8 +14,9 @@
 ##           Phil Kurimski   02-05-2013 for OB13.2.1-3 Added rain so far section ##
 ##           Mike Dangelo    09-18-2013 added code for init pos & pathcasting    ##
 ##           Evan Bookbinder 09-18-2013 implemented config.vm                    ##
-##           Mike Rega       01-17-2104 added GP Alaska changes 14.2.1           ##
-##  Mike Dangelo  1/24/2014 made many changes for first bullet to match 10-922
+##           Mike Rega       01-17-2014 added GP Alaska changes 14.2.1           ##
+##  Mike Dangelo  1/24/2014 made many changes for first bullet to match 10-922   ##
+##           Mike Rega       02-27-2014 changed hycType IJ to match 10-922       ##
 ###################################################################################
 #parse("config.vm")
 #if(${action} == "EXT")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.vm
@ -49,7 +49,7 @@
 #end
 #if(${ic} == "IJ")
  #set ($cause = "AN ICE JAM") 
-  #set ($hycType = "FOR ICE JAM FLOODING ")  
+  #set ($hycType = "FOR AN ICE JAM ")  
 #end
 #if(${ic} == "DR")
  #set ($cause = "A DAM FLOODGATE RELEASE") 
--- 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
@ -11,6 +11,7 @@
                 Phil Kurimski   02-05-2013 Added rain so far section          
                 Mike Dangelo    09-18-2013 to optionally allow <trackEnabled>true for pathcasting, and add pointMarker.xml 'include'
                 Phil Kurimski   09-19-2013 added geospatialConfig.xml
+                 Mike Rega       01-18-2014 added Alaska GP changes for 14.2.1
                 Mike Dangelo 1/23/2014 added IC and advType group to bottom of bullets (for info only, they are locked anyway, no need to have it at the top)
 -->
 <warngenConfig>
@ -137,6 +138,9 @@ 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="source" 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;"/>
@ -192,6 +196,9 @@ 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="source" 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.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning.vm
@ -8,6 +8,7 @@
 ## Mike Dangelo 09-18-2013 added code for init pos & pathcasting
 ## Evan Bookbinder 9-18-2013 implemented config.vm
 ## Mike Rega 01-18-2014 added Alaska GP changes for 14.2.1
+## Mike Rega 02-26-2014 changed MND to IMMEDIATE BROADCAST
 #################################### SET SOME VARIABLES ###################################
 #parse("config.vm")
 ##
@ -63,7 +64,7 @@
 ${WMOId} ${vtecOffice} 000000 ${BBBId}
 FLW${siteId}

-BULLETIN - EAS ACTIVATION REQUESTED
+BULLETIN - IMMEDIATE BROADCAST REQUESTED
 #if(${productClass}=="T")
 TEST...FLOOD WARNING...TEST
 #else
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.vm
@ -10,22 +10,23 @@
 ##           Mike Dangelo    9-18-2013 added initial position and pathcasting options
 ##           Evan Bookbinder 9-18-2013 implemented config.vm
 ##           Mike Rega       1-18-2014 added Alaska GP changes for 14.2.1
+##           Mike Rega       2-27-2014 changed headline items to match 10-922
 #################################### SET SOME VARs ###################################
 #parse("config.vm")
 #set($hycType = "")
 #set($floodReason = "")
 #set($floodType = "FLOODING")
 #if(${ic} == "SM")
-    #set($hycType = "RAPID SNOWMELT")
+    #set($hycType = "SNOWMELT")
    #set($floodReason = " RAPID SNOWMELT IS OCCURRING AND WILL CONTINUE TO CAUSE ${floodType}.")
 #elseif(${ic} == "RS")
 	#set($hycType = "RAIN AND SNOWMELT")
    #set($floodReason = " RAPID SNOWMELT IS ALSO OCCURRING AND WILL ADD TO THE ${floodType}.")
 #elseif(${ic} == "IJ")
-    #set($hycType = "ICE JAM FLOODING")
+    #set($hycType = "AN ICE JAM")
    #set($floodReason = " AN ICE JAM IS OCCURRING AND WILL CONTINUE TO CAUSE ${floodType}.")
 #elseif(${ic} == "IC")
-    #set($hycType = "AN ICE JAM AND HEAVY RAIN")
+    #set($hycType = "")
    #set($floodReason = " FLOODING DUE TO AN ICE JAM AND HEAVY RAIN WILL CONTINUE.")
 #elseif(${ic} == "MC")
    #set($hycType = "")
@ -34,11 +35,14 @@
    #set($hycType = "")
    #set($floodReason = "")
 #elseif(${ic} == "DM")
-    #set($hycType = "LEVEE FAILURE")
+    #set($hycType = "A LEVEE FAILURE")
    #set($floodReason = " FLOODING DUE TO A LEVEE FAILURE WILL CONTINUE.")
 #elseif(${ic} == "DR")
-    #set($hycType = "DAM GATE RELEASE")
-    #set($floodReason = " FLOODING DUE TO A DAM GATE RELEASE.")
+    #set($hycType = "A DAM FLOODGATE RELEASE")
+    #set($floodReason = " FLOODING DUE TO A DAM FLOODGATE RELEASE WILL CONTINUE.")
+#elseif(${ic} == "GO")
+    #set($hycType = "A GLACIER-DAMMED LAKE OUTBURST")
+    #set($floodReason = " FLOODING DUE TO A GLACIER-DAMMED LAKE OUTBURST WILL CONTINUE.")
 #end
 ##
 ######################################################################################
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/extremeWindWarningFollowup.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/extremeWindWarningFollowup.vm
@ -214,7 +214,7 @@ THIS IS A TEST MESSAGE. ##
 #end

 ###### mile markers ##############
-#parse("milemarkers.vm")
+## #parse("mileMarkers.vm")
 #####################
 ## CALL TO ACTIONS ##
 #####################
@ -425,7 +425,7 @@ THIS IS A TEST MESSAGE. ##

 #end
 ###### mile markers ##############
-## #parse("milemarkers.vm")
+## #parse("mileMarkers.vm")

 ##################################
 ######### CALLS TO ACTION ########
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning.vm
@ -9,6 +9,7 @@
 ##           Evan Bookbinder 9-18-2013 Implemented config.vm
 ##           Gene Petrescu 09-19-2013 Added Alaska Modifications (GP comments)
 ##           Mike Rega     01-18-2014 added Alaska GP changes for 14.2.1
+##           Mike Rega     03-05-2014 added 3rd bullet text ACROSS THE WARNED AREA
 #################################### SET SOME VARIABLES ###################################
 #parse("config.vm")
 #set($hycType = "")
@ -25,7 +26,7 @@
 #set($snowMelt = "")
 #if(${list.contains(${bullets}, "icrs")})
 	#set($ic = "RS")
-    #set($hycType = "HEAVY RAIN AND EXTREMELY RAPID SNOWMELT IN...")
+    #set($hycType = "EXTREMELY RAPID SNOWMELT IN...")
    #set($snowMelt = "RAPID SNOWMELT IS ALSO OCCURRING AND WILL ADD TO THE FLOODING. ")
 #end
 ##
@ -391,7 +392,8 @@ THE RAIN IS MOVING ##
 #end
 #end
 #else
-!** LOCATION **! ##
+ACROSS THE WARNED AREA. ##
+##  !** LOCATION **! ##
 #end
 ${rainAmount}${isExpected}${snowMelt}${burnScar}

--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup.vm
@ -120,10 +120,10 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}
 ...THE FLASH FLOOD WARNING FOR ##
 ### modified by GP
 #if(${hycType} != "" && ${alaska} == "false")
-<L>  ${hycType}</L> IN ##
+<L>${hycType}</L> IN ##
 #end
 #if(${hycType} != "" && ${alaska} == "true")
-<L>  ${hycType}</L> ##
+<L>${hycType}</L> ##
 #end
 #if(${alaska}=="true")
 !**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**! ${expcanHLTag}...
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/geospatialConfig_COUNTY.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/geospatialConfig_COUNTY.xml
@ -1,6 +1,6 @@
-<!-- CREATED 9-16-2013 EVAN BOOKBINDER WFO EAX
+<!-- CREATED 9-16-2013 EVAN BOOKBINDER WFO EAX (MODIFIED 2-6-14 CORRECT TYPO)
     THIS DOCUMENT CONTAINS GLOBAL SPATIAL CONFIGURATION SETTINGS FOR **COUNTY**
-     BASED PRODUCTS. INCLUDE THIS FILE INTO EACH ZONE TEMPLATE'S .XML FILE.
+     BASED PRODUCTS. INCLUDE THIS FILE INTO EACH COUNTY TEMPLATE'S .XML FILE.
     THIS REPLACES THE PER-TEMPLATE XML SECTIONS BELOW. IF YOU HAVE LOCAL
     CONFIGURATIONS, YOU CAN EITHER:
     1.) Copy this file to another geospatialConfig_XXXX.xml file and include 
@ -15,7 +15,7 @@
     EXISTS TO THIS FILE.      
 -->

-<!-- CREATE PRIMARY areaSource OBJECT TO GENERATE ZONE-BASED INFORMATION OFF WARNGEN HATCHING -->
+<!-- CREATE PRIMARY areaSource OBJECT TO GENERATE COUNTY-BASED INFORMATION OFF WARNGEN HATCHING -->
 <areaSource variable="areas">
   <areaSource>County</areaSource>
   <inclusionPercent>0</inclusionPercent>
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/geospatialConfig_MARINE.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/geospatialConfig_MARINE.xml
@ -1,6 +1,6 @@
-<!-- CREATED 9-16-2013 EVAN BOOKBINDER WFO EAX
+<!-- CREATED 9-16-2013 EVAN BOOKBINDER WFO EAX (MODIFIED 2-6-14 CORRECT TYPO)
     THIS DOCUMENT CONTAINS GLOBAL SPATIAL CONFIGURATION SETTINGS FOR **MARINE**
-     BASED PRODUCTS. INCLUDE THIS FILE INTO EACH ZONE TEMPLATE'S .XML FILE.
+     BASED PRODUCTS. INCLUDE THIS FILE INTO EACH MARINE TEMPLATE'S .XML FILE.
     THIS REPLACES THE PER-TEMPLATE XML SECTIONS BELOW. IF YOU HAVE LOCAL
     CONFIGURATIONS, YOU CAN EITHER:
     1.) Copy this file to another geospatialConfig_XXXX.xml file and include 
@ -11,7 +11,7 @@
         If you have multiple objects with the same name, the last one read is used.
     
     THIS CHANGE WAS DONE SO THAT CONFIGURATIONS COULD BE MADE IN ONE LOCATION
-     AND NOT ACROSS 20-30 TEMPLATES. A COUNTY-BASED and MARINE-BASED COUNTERPART
+     AND NOT ACROSS 20-30 TEMPLATES. A COUNTY-BASED and ZONE-BASED COUNTERPART
     EXISTS TO THIS FILE.      
 -->

@ -168,4 +168,4 @@
  		<sort>distance</sort>
  	</sortBy>  	
 </pointSource>
- 
+ 
--- 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
@ -112,10 +112,9 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <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 14.1.1 baseline, MR not sure why they are so different than GP lines -->
+<!-- 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;"/> -->
-<!--  end of 14.1.1 baseline items -->  
  <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"/>
@ -195,10 +194,9 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <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 14.1.1 baseline - MR not sure why so different from GP lines -->
+<!-- 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;"/> -->
-<!--  end 14.1.1 lines -->  
  <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"/>
@ -277,10 +275,9 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <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 14.1.1 baseline - MR not sure why so different from GP lines -->
+<!-- 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;"/>  -->
-<!--  end 14.1.1 lines --> 
  <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"/>
--- 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
@ -48,12 +48,12 @@
 #elseif(${list.contains(${bullets}, "icejam")})
 	#set($ic = "IJ")
 	#set($hycType = "ICE JAM FLOODING")
-        #set($headline = "FOR ICE JAM FLOODING ")
+	    #set($headline = "FOR AN ICE JAM ")
 	#set($reportType1 = "AN ICE JAM ON THE !** **! RIVER AT !** **! BROKE CAUSING FLASH FLOODING DOWNSTREAM")
 #elseif(${list.contains(${bullets}, "rain")})
 	#set($ic = "RS")
 	#set($hycType = "EXTREMELY RAPID RAIN SNOWMELT")
-        #set($headline = "FOR EXTREMELY RAPID RAIN SNOWMELT ")
+        #set($headline = "FOR EXTREMELY RAPID SNOWMELT ")
 	#set($reportType1 = "RAIN FALLING ON EXISTING SNOWPACK WAS GENERATING FLASH FLOODING FROM EXCESSIVE RUNOFF")
 #elseif(${list.contains(${bullets}, "volcano")})
 	#set($ic = "SM")
--- 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
@ -100,10 +100,9 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <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 14.1.1 baseline - MR not sure why they are so different from GP changes -->
+<!--  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;"/> -->
-<!-- end 14.1.1 lines -->  
  <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"/>
@ -151,10 +150,9 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <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 14.1.1 baseline - MR not sure why they are so different from GP changes -->
+<!--  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;"/> -->
-<!--  end 14.1.1 lines -->
  <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"/>
@ -198,10 +196,9 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <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 14.1.1 baseline - MR not sure why they are so different from GP changes -->
+<!--  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;"/> -->
-<!--  end 14.1.1 lines -->  
  <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"/>
@ -288,10 +285,9 @@ turned on unless the corresponding .vm file is turned on in a given template's .
  <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 14.1.1 baseline - MR not sure why they are so different from GP changes -->
+<!--  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;"/> -->
-<!-- end 14.1.1 lines -->  
  <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"/>
--- a/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/run_update_nrldb.ksh
+++ b/nativeLib/files.native/awipsShare/hydroapps/whfs/bin/run_update_nrldb.ksh
@ -12,7 +12,7 @@ export BIN_DIR=`get_apps_defaults whfs_bin_dir"`
 export NRLDB_LOG=`get_apps_defaults nrldb_log`
 export NRLDB_CONFIG=`get_apps_defaults nrldb_config`
 export NRLDB_DATA=`get_apps_defaults nrldb_data`
-#export NRLDB_TMP=`get_apps_defaults nrldb_tmp`
+export NRLDB_TMP=`get_apps_defaults nrldb_tmp`
 export db_name=`get_apps_defaults db_name`
 export PGHOST=`get_apps_defaults pghost`