Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1

Former-commit-id: 05e4e92e65 [formerly 862712a00f [formerly 4b2f00f3baeb6715ff76beb823978605742bc13d]]
Former-commit-id: 862712a00f
Former-commit-id: a1de83a7a8
This commit is contained in:
Brian.Dyke 2014-10-10 13:17:54 -04:00
commit 9d33c64bd2

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.
##
@ -104,10 +104,11 @@ class TextProduct(GenericHazards.TextProduct):
('RP.S', allActions, 'RipCurrent'), # HIGH RIP CURRENT RISK
]
def _bulletDict(self):
def _bulletDict(self):
return {
"CF" : ("COASTAL FLOODING,TIMING,IMPACTS"), ### coastal flood warning, advisory, watch
"LS" : ("LAKE SHORE FLOODING,TIMING,IMPACTS"), ### lake shore flood warning, advisory, watch
"BH" : ("HAZARDS,TIMING,LOCATION,POTENTIAL IMPACTS"), ### hazardous beach conditions
"SU" : ("WAVES AND SURF,TIMING,IMPACTS"), ### high surf warning, advisory
"RP" : ("TIMING,IMPACTS"), ### high rip current risk
}
@ -117,11 +118,14 @@ class TextProduct(GenericHazards.TextProduct):
"COASTAL FLOODING",
"LAKE SHORE FLOODING",
"WAVES AND SURF",
"HAZARDS",
"TIMING",
"LOCATION",
"POTENTIAL IMPACTS",
"IMPACTS",
]
#
# Overridden to allow for attribution statement
#