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

ASM #13467 - Update GenericHazards.py for Shannon

Browse source 
Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e

Former-commit-id: 4d81023184 [formerly 4d81023184 [formerly f4e8f7493bbfb025e8040f7663dc582414a87413]]
Former-commit-id: ddeec493c3
Former-commit-id: f1feaee0ea
This commit is contained in:
Shawn.Hooper 2014-10-21 11:09:50 -04:00
parent 30c0cf769c
commit 2d96f0e149
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/GenericHazards.py
View file

@ -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