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

ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products

Browse source 
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5

Former-commit-id: ef851d0016 [formerly 8b194664458246dad7509c44bcc07480cb088ddd]
Former-commit-id: 94fed71091
This commit is contained in:
Qinglu.Lin 2014-09-25 15:16:33 -04:00
parent 0ed1ce5726
commit 1c55b5c400
1 changed files with 52 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/WatchUtil.java
View file

@ -28,6 +28,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@ -78,8 +79,11 @@ import com.vividsolutions.jts.geom.Polygon;
* Aug 28, 2014 ASM #15658 D. Friedman Add marine zones.
* Aug 29, 2014 ASM #15551 Qinglu Lin Sort watches by ETN and filter out ActiveTableRecord
* with act of CAN and EXP in processRecords().
* Sep 12, 2014 ASM #15551 Qinglu Lin Prevent a county's WOU from being used while its
* corresponding WCN is canceled or expired.
* Sep 25, 2014 ASM #15551 Qinglu Lin Prevent a county's WOU from being used while its
* corresponding WCN is canceled or expired, prevent NEW
* from being used while CON/EXT is issued, and prevent duplicate
* /missing (part of state, state abbreviation) which resulted from
* extension of a watch to counties which are of same/different fe_area.
*
* </pre>
*
@ -365,6 +369,16 @@ public class WatchUtil {
}
}
Collections.sort(records, Comparators.PEUI);
// Filters out extra ActiveTableRecords that have same phenSig, etn, and ugcZone.
Map<String, ActiveTableRecord> atrMap = new LinkedHashMap<String, ActiveTableRecord>();
for (ActiveTableRecord atr: records) {
String key = atr.getPhensig() + atr.getEtn() + atr.getUgcZone();
atrMap.put(key, atr);
}
records = new ArrayList<ActiveTableRecord>(atrMap.values());
return records;
}
@ -447,7 +461,7 @@ public class WatchUtil {
}
}
/* Sorts the watches based on ETN, then state. Marine areas
/* Sorts the watches based on ETN, then state. Marine areas
* have a null state value so they appear at the end of each
* watch.
*/
@ -482,6 +496,19 @@ public class WatchUtil {
}
});
// Filters out extra Watches that have different startTime but same phenSig, etn, state, partOfState, endTime, and marineArea.
Map<String, Watch> watchMap = new LinkedHashMap<String, Watch>();
for (Watch w: watches) {
List<String> pos = w.getPartOfState();
Collections.sort(pos);
String key = w.getPhenSig() + w.getEtn() + w.getState() + pos.toString() + w.getEndTime().toString();
if (w.getMarineArea() != null) {
key = key + w.getMarineArea();
}
watchMap.put(key, w);
}
watches = new ArrayList<Watch>(watchMap.values());
return watches;
}
@ -707,4 +734,26 @@ public class WatchUtil {
return abrev;
}
public static class Comparators {
// ActiveTableRecord: phenSig, etn, ugcZone, issueTime
public static Comparator<ActiveTableRecord> PEUI = new Comparator<ActiveTableRecord>() {
@Override
public int compare(ActiveTableRecord o1, ActiveTableRecord o2) {
int i = o1.getPhensig().compareTo(o2.getPhensig());
if (i == 0) {
i = o1.getEtn().compareTo(o2.getEtn());
if (i == 0) {
i = o1.getUgcZone().compareTo(o2.getUgcZone());
if (i == 0) {
i = o1.getIssueTime().compareTo(o2.getIssueTime());
}
}
}
return i;
}
};
}
}