From 80d7f18e57ab3f6599c35c16382e065ed97ab985 Mon Sep 17 00:00:00 2001
From: Jonathan Sanchez <jpsanchez1@raytheon.com>
Date: Wed, 6 Aug 2014 17:40:44 -0500
Subject: [PATCH] Issue #3493 Grouped common VTECs together

Change-Id: Ia72150a4782e95ea075f42979c489f7ef5d69fb9

Former-commit-id: e9b5d0afe0eaddd025067df8d3418c6072b6ac3f [formerly 46c3625f0c24f87eac16589843508452b6adecf2] [formerly 0302efdc772349e5ec3cd98e10828f676b277e14] [formerly e9b5d0afe0eaddd025067df8d3418c6072b6ac3f [formerly 46c3625f0c24f87eac16589843508452b6adecf2] [formerly 0302efdc772349e5ec3cd98e10828f676b277e14] [formerly 31c3135496be5c9963fa7b8e7abe53efa75ceabb [formerly 0302efdc772349e5ec3cd98e10828f676b277e14 [formerly 47de8da4cadd899ae9aa0ffe6c89a109491966bc]]]]
Former-commit-id: 31c3135496be5c9963fa7b8e7abe53efa75ceabb
Former-commit-id: 2dff112b6246658352b6e586350afcba1eb7b767 [formerly a2dce9ca73fc2d48fb3d126ceb49f33190b5c440] [formerly 38fe40e483379640f40fd247edf0ae3bd23e3aee [formerly f5abf465e2856f39ae964059c1f3b97460702483]]
Former-commit-id: 7cd0d66ca2db47ccffa8c0aa34f9ec4390ca53ae [formerly 88f1984064c688f816ec0492b0024410e5471274]
Former-commit-id: 1693c4cef5e5665c54af2f3d1073036f74369fed
---
 .../base/warngen/VM_global_library.vm         | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
index 4f6a787328..370ca5642e 100755
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
@@ -189,14 +189,25 @@ ${drainage.name}##
 ########END MACRO
 
 #macro(inserttorwatches $watches $list $secondtimezone $dateUtil $timeFormat)
-#set($tornadoWatches = [])
+#set($keys = [])
+#set($mymap = {})
 #foreach(${watch} in ${watches})
 #if(${watch.getPhenSig()} == 'TO.A')
-#set($success = $tornadoWatches.add($watch))
+#set($key = ${watch.action} + ${watch.etn} + ${watch.startTime} + ${watch.endTime})
+#if (${list.contains(${keys}, $key)})
+#set($value = ${mymap.get($key)})
+#else
+#set($value = [])
+#set($success = $keys.add($key))
+#end
+#set($success = $value.add($watch))
+#set($success = ${mymap.put($key,$value)})
 #end
 #end
 #set($torWatchAlso = "")
-#foreach(${tornadoWatch} in ${tornadoWatches})
+#foreach(${key} in ${keys})
+#set($tornadoWatches = ${mymap.get($key)})
+#set($tornadoWatch = ${tornadoWatches.get(0)})
 A TORNADO WATCH ${torWatchAlso}REMAINS IN EFFECT UNTIL ${dateUtil.format(${tornadoWatch.endTime}, ${timeFormat.plain}, 15, ${localtimezone})}##
 ${dateUtil.period(${tornadoWatch.endTime},${timeFormat.plain}, 15, ${localtimezone})}##
 #if(${secondtimezone})
@@ -223,14 +234,25 @@ ${dateUtil.period(${tornadoWatch.endTime},${timeFormat.plain}, 15, ${localtimezo
 ########END MACRO
 
 #macro(insertsvrwatches $watches $list $secondtimezone $dateUtil $timeFormat)
-#set($severeWatches = [])
+#set($keys = [])
+#set($mymap = {})
 #foreach(${watch} in ${watches})
 #if(${watch.getPhenSig()} == 'SV.A')
-#set($success = $severeWatches.add($watch))
+#set($key = ${watch.action} + ${watch.etn} + ${watch.startTime} + ${watch.endTime})
+#if (${list.contains(${keys}, $key)})
+#set($value = ${mymap.get($key)})
+#else
+#set($value = [])
+#set($success = $keys.add($key))
+#end
+#set($success = $value.add($watch))
+#set($success = ${mymap.put($key,$value)})
 #end
 #end
 #set($svrWatchAlso = "")
-#foreach(${svrWatch} in ${severeWatches})
+#foreach(${key} in ${keys})
+#set($severeWatches = ${mymap.get($key)})
+#set($svrWatch = ${severeWatches.get(0)})
 A SEVERE THUNDERSTORM WATCH ${svrWatchAlso}REMAINS IN EFFECT UNTIL ${dateUtil.format(${svrWatch.endTime}, ${timeFormat.plain}, 15, ${localtimezone})}##
 ${dateUtil.period(${svrWatch.endTime},${timeFormat.plain}, 15, ${localtimezone})}##
 #if(${secondtimezone})
@@ -251,10 +273,10 @@ ${dateUtil.period(${svrWatch.endTime},${timeFormat.plain}, 15, ${localtimezone})
 #set($svrWatchAlso = "ALSO ")
 . ##
 #end
-  
-  
+
+
 #end
-########END 
+########END
 
 #macro(printcoords $coordinates $list)
 #set($count = 0)