From 115a9c1fd9f938a98ae4e776bb8fc6c6a072312f Mon Sep 17 00:00:00 2001
From: "Shawn.Hooper" <Shawn.Hooper@noaa.gov>
Date: Tue, 21 Oct 2014 11:09:50 -0400
Subject: [PATCH] ASM #13467 - Update GenericHazards.py for Shannon

Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e

Former-commit-id: 700bc0691cedcdc1d15084768780a28726c7ff8d [formerly 4d81023184d813440a94d1432a08f2f5c1a77bba] [formerly ddeec493c3d358a289154c76e3d0b53b0fed70c6 [formerly f4e8f7493bbfb025e8040f7663dc582414a87413]]
Former-commit-id: ddeec493c3d358a289154c76e3d0b53b0fed70c6
Former-commit-id: f1feaee0ea839ca91b43aa8d4b2252b54a624e64
---
 .../templates/product/GenericHazards.py       | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/GenericHazards.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/GenericHazards.py
index 22bbc3898c..e09bffa4b8 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/GenericHazards.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/GenericHazards.py
@@ -1,19 +1,19 @@
 ##
 # This software was developed and / or modified by Raytheon Company,
-# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
-# 
-# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
 # This software product contains export-restricted data whose
 # export/transfer/disclosure is restricted by U.S. law. Dissemination
 # to non-U.S. persons whether in the United States or abroad requires
 # an export license or other authorization.
 # 
-# Contractor Name:        Raytheon Company
-# Contractor Address:     6825 Pine Street, Suite 340
-#                         Mail Stop B8
-#                         Omaha, NE 68106
-#                         402.291.0100
-# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
 # See the AWIPS II Master Rights File ("Master Rights File.pdf") for
 # further licensing information.
 ##
@@ -505,7 +505,8 @@ class TextProduct(TextRules.TextRules, SampleAnalysis.SampleAnalysis,
             hazNameA = self.hazardName(eachHazard['hdln'], argDict, True)
             hazName = self.hazardName(eachHazard['hdln'], argDict, False)
 
-            if hazName == "WINTER WEATHER ADVISORY" or hazName == "WINTER STORM WARNING":
+#            if hazName == "WINTER WEATHER ADVISORY" or hazName == "WINTER STORM WARNING":
+            if hazName in ["WINTER WEATHER ADVISORY", "WINTER STORM WARNING", "BEACH HAZARDS STATEMENT"]:
                 forPhrase = " FOR |* ENTER HAZARD TYPE *|"
             else:
                 forPhrase =""
@@ -735,8 +736,12 @@ class TextProduct(TextRules.TextRules, SampleAnalysis.SampleAnalysis,
                             segmentTextSplit[1] = PRECAUTION + segmentTextSplit2[1]
                     segmentText = string.join(segmentTextSplit,"")
 
-            if removeBulletList != []:
+            if keepBulletList == []:
+                segmentText = "\n\n|* WRAP-UP TEXT GOES HERE *|.\n"
+            elif removeBulletList != []:
                 segmentText = "|*\n" + segmentText + "*|"
+            else:
+                segmentText = segmentText
 
         #
         # If segment passes the above checks, add the text