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

Merge branch 'tcv_14.3.4' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.4

Browse source 
Former-commit-id: cbc4c0821a4a87299904755c0aceb1176a8c4370
This commit is contained in:
Fay.Liang 2015-05-29 09:45:45 -04:00
commit f89b10d668
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1654,8 +1654,7 @@ class TextProduct(HLSTCV_Common.TextProduct):
summarySearch = re.search("(?is)SUMMARY OF (.+?)\.{3}.+?" + summarySearch = re.search("(?is)SUMMARY OF (.+?)\.{3}.+?" +
"LOCATION\.{3}(.+?[NS]) +(.+?[WE]).+?" + "LOCATION\.{3}(.+?[NS]) +(.+?[WE]).+?" +
"(ABOUT .+?)MAXIMUM SUSTAINED WIND.+?" + "(ABOUT .+?)MAXIMUM SUSTAINED WIND.+?" +
"(\d+ MPH).+?PRESENT MOVEMENT\.{3}" + "(\d+ MPH).+?", tcp)
"(.+?)\.{3}", tcp)
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# If we found the NHC summary section # If we found the NHC summary section
@ -1668,7 +1667,17 @@ class TextProduct(HLSTCV_Common.TextProduct):
dict["StormLon"] = summarySearch.group(3).strip() dict["StormLon"] = summarySearch.group(3).strip()
dict["StormReference"] = summarySearch.group(4).strip() dict["StormReference"] = summarySearch.group(4).strip()
dict["StormIntensity"] = summarySearch.group(5).strip() dict["StormIntensity"] = summarySearch.group(5).strip()
dict["StormMotion"] = summarySearch.group(6).strip()
haveStormMotion = True
if tcp.find("PRESENT MOVEMENT...STATIONARY") != -1:
dict["StormMotion"] = "STATIONARY"
else:
summarySearch = re.search("PRESENT MOVEMENT\.{3}(.+?)\.{3}", tcp)
if summarySearch is not None:
dict["StormMotion"] = summarySearch.group(1).strip()
else:
haveStormMotion = False
#================================================================ #================================================================
# Use the remaining summary groups to contruct a paragraph # Use the remaining summary groups to contruct a paragraph
@ -1731,6 +1740,7 @@ class TextProduct(HLSTCV_Common.TextProduct):
#---------------------------------------------------------------- #----------------------------------------------------------------
# Now add the storm motion # Now add the storm motion
if haveStormMotion:
dict["StormCenter"] = "%s THE STORM MOTION WAS %s." % \ dict["StormCenter"] = "%s THE STORM MOTION WAS %s." % \
(dict["StormCenter"], (dict["StormCenter"],
self._removeKM(dict["StormMotion"])) self._removeKM(dict["StormMotion"]))