diff --git 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 index 78775d8d12..7b4fd8a8cf 100755 --- 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") diff --git 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 index 6fefb1dee6..efc30f0a48 100755 --- 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") diff --git 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 index 0344345968..a30f005bfe 100755 --- 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 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) --> @@ -137,6 +138,9 @@ Must be paired with proper vm code (also commented out in arealFloodAdvisoryFoll + + + @@ -192,6 +196,9 @@ Must be paired with proper vm code (also commented out in arealFloodAdvisoryFoll + + + diff --git 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 index 4026ad5847..ec604fe124 100755 --- 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 diff --git 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 index bd5712a1a4..caf8433c89 100755 --- 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 ## ###################################################################################### diff --git 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 index 88b81211e0..c5f48fd652 100755 --- 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 ######## diff --git 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 index 390e41178a..09ff52ab12 100755 --- 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} diff --git 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 index 6d95249a68..ee1d408dee 100755 --- 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") - ${hycType} IN ## +${hycType} IN ## #end #if(${hycType} != "" && ${alaska} == "true") - ${hycType} ## +${hycType} ## #end #if(${alaska}=="true") !**INSERT RIVER/STREAM OR AREA**! IN !**INSERT GEO AREA**! ${expcanHLTag}... diff --git 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 index cff158ac8e..f0a517f785 100755 --- 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 @@ - - + County 0 diff --git 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 index 652e170cc0..846d5ccc29 100755 --- 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 @@ - @@ -168,4 +168,4 @@ distance - \ No newline at end of file + diff --git 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 index 2efcef54dc..0c741e9df8 100755 --- 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 . - + - @@ -195,10 +194,9 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + - @@ -277,10 +275,9 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + - diff --git 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 index be2809857f..1085576ea1 100755 --- 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") diff --git 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 index 0a90091036..9e4e1eb7ea 100755 --- 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 . - + - @@ -151,10 +150,9 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + - @@ -198,10 +196,9 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + - @@ -288,10 +285,9 @@ turned on unless the corresponding .vm file is turned on in a given template's . - + -