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

13.2.1-11 baseline

Browse source 
Former-commit-id: 41dc7c0396 [formerly 41dc7c0396 [formerly 9e9758e833caa408d168a5de2fe35be8e5451051]]
Former-commit-id: 0684d77845
Former-commit-id: 9cc1613b50
This commit is contained in:
Steve Harris 2013-03-04 17:34:39 -05:00
parent 5bb603608e
commit f3b395b8cb
25 changed files with 1016 additions and 923 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
View file

@ -64,7 +64,6 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.util.FileUtil;
import com.raytheon.uf.viz.core.DescriptorMap;
import com.raytheon.uf.viz.core.IDisplayPane;
import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.uf.viz.core.drawables.AbstractDescriptor;
import com.raytheon.uf.viz.core.drawables.AbstractRenderableDisplay;
@ -99,6 +98,7 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
* Oct 16, 2012 1229 rferrel Changes for non-blocking AlterBundleDlg.
* Oct 16, 2012 1229 rferrel Changes to have displayDialog method.
* Oct 16, 2012 1229 rferrel Changes for non-blocking ProcedureListDlg.
* Feb 25, 2013 1640 bsteffen Dispose old display in BundleLoader
*
* </pre>
*
@ -858,18 +858,6 @@ public class ProcedureDlg extends CaveSWTDialog {
editor.setLoopProperties(b.getLoopProperties());
}
/*
* Check if the bundle was used to open the editor. If it was then we do
* not want to clear the display.
*/
if (editor.getDisplayPanes()[0].getDescriptor() != b.getDisplays()[0]
.getDescriptor()) {
for (IDisplayPane pane : editor.getDisplayPanes()) {
pane.getRenderableDisplay().getDescriptor().getResourceList()
.clear();
}
}
ProcedureLoadJob.getInstance().enqueue(b, editor);
// add to history

3
cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/DataStoreResource.java
View file

@ -105,6 +105,7 @@ import com.vividsolutions.jts.geom.Point;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Oct 31, 2012 #1326 randerso Initial creation
* Feb 22, 2013 #1641 randerso Moved ID_ATTRIBUTE_NAME to package scope
*
* </pre>
*
@ -115,7 +116,7 @@ import com.vividsolutions.jts.geom.Point;
public class DataStoreResource extends
AbstractVizResource<DataStoreResourceData, MapDescriptor> implements
IPropertyChangeListener, IResourceDataChanged {
private static final String ID_ATTRIBUTE_NAME = "Feature.ID";
static final String ID_ATTRIBUTE_NAME = "Feature.ID";
private static final int CLICK_TOLERANCE = 3;

36
cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/ReloadJob.java
View file

@ -44,6 +44,23 @@ import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.GeometryCollection;
import com.vividsolutions.jts.geom.Point;
/**
* Job to reload data from GIS data stores
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Oct 31, 2012 #1326 randerso Initial creation
* Feb 22, 2013 #1641 randerso Added checks for using ID as label or shading attribute
*
* </pre>
*
* @author randerso
* @version 1.0
*/
class ReloadJob extends Job {
private static final int QUEUE_LIMIT = 1;
@ -199,11 +216,16 @@ class ReloadJob extends Job {
List<String> fields = new ArrayList<String>();
fields.add(req.geomField);
if (req.labelField != null && !fields.contains(req.labelField)) {
if (req.labelField != null
&& !fields.contains(req.labelField)
&& !req.labelField
.equals(DataStoreResource.ID_ATTRIBUTE_NAME)) {
fields.add(req.labelField);
}
if (req.shadingField != null
&& !fields.contains(req.shadingField)) {
&& !fields.contains(req.shadingField)
&& !req.shadingField
.equals(DataStoreResource.ID_ATTRIBUTE_NAME)) {
fields.add(req.shadingField);
}
@ -308,6 +330,16 @@ class ReloadJob extends Job {
}
}
if (DataStoreResource.ID_ATTRIBUTE_NAME
.equals(req.labelField)) {
labelAttr = id;
}
if (DataStoreResource.ID_ATTRIBUTE_NAME
.equals(req.shadingField)) {
shadingAttr = id;
}
if (labelAttr != null && g != null) {
String label;
if (labelAttr instanceof BigDecimal) {

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
View file

@ -64,7 +64,7 @@ import com.raytheon.viz.ui.input.EditableManager;
* retrieve the requested line style so
* that it can be stored in the
* StormTrackState.
*
* 02-12-2013 1600 jsanchez Changed the visibility of the method adjustAngle
* </pre>
*
* @author mschenke
@ -269,7 +269,7 @@ public abstract class AbstractStormTrackResource extends
* @param angle
* @return
*/
protected double adjustAngle(double angle) {
public static double adjustAngle(double angle) {
double newVal = angle % 360;
if (newVal > 180) {
newVal -= 360;

66
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
View file

@ -143,6 +143,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Changes for non-blocking FindReplaceDlg.
* Changes for non-blocking StoreTransmitDlg.
* Changes for non-blocking WrapLengthDialog.
* 28 Feb 2013 15889 ryu Removed detachAttributionPhrase and getVTECActionCodes
*
* </pre>
*
@ -1136,7 +1137,6 @@ public class ProductEditorComp extends Composite implements
boolean retVal = true;
if (!textComp.isCorMode()) {
detachAttributionPhrase();
retVal = changeTimes();
}
@ -1237,70 +1237,6 @@ public class ProductEditorComp extends Composite implements
return vtecList;
}
/**
* get the list of VTEC Action Codes for this segment one Action code per
* VTEC line
*/
private List<String> getVTECActionCodes(SegmentData segData,
ProductDataStruct pds) {
HashMap<String, TextIndexPoints> segMap = segData.getSementMap();
TextIndexPoints tipVtec = segMap.get("vtec");
if (tipVtec == null) {
return new ArrayList<String>();
}
int lineCount = tipVtec.getEndIndex().x - tipVtec.getStartIndex().x;
ArrayList<String> actioncodes = new ArrayList<String>(lineCount);
for (int i = 0; i < lineCount; i++) {
String vtec = pds.getProductTextArray()[i
+ tipVtec.getStartIndex().x];
// extract the action code
String vline = vtec.split("/", 3)[1];
String ac = vline.split("\\.")[1];
actioncodes.add(ac);
}
return actioncodes;
}
private void detachAttributionPhrase() {
final String attributionPhraseRgx = "THE NATIONAL WEATHER SERVICE IN [A-Z0-9\\p{Punct}\\s]+?\\n\\n";
Pattern attribPattern = Pattern.compile(attributionPhraseRgx);
StyledTextComp stc = textComp;
ProductDataStruct pds = stc.getProductDataStruct();
List<SegmentData> segs = pds.getSegmentsArray();
for (SegmentData segData : segs) {
String newSegTxt = null;
String oldSegTxt = segData.getSementMap().get("ugc").getText();
TextIndexPoints oldSegTip = segData.getSementMap().get("ugc");
List<String> actioncodes = getVTECActionCodes(segData, pds);
if (actioncodes == null || actioncodes.isEmpty()) {
return;
}
if (actioncodes.contains("NEW") || actioncodes.contains("EXA")
|| actioncodes.contains("EXB")) {
continue;
} else {
// all actions in {"CON","CAN","UPG","EXT","EXP"}
// Not the first issuance, strip the attribution phrase from
// segment text.
Matcher matcher = attribPattern.matcher(oldSegTxt);
while (matcher.find()) {
newSegTxt = matcher.replaceAll("");
final int segNum = segs.indexOf(segData) + 1;
statusHandler.handle(Priority.INFO,
"Detached attribution phrase from segment data number "
+ segNum);
}
}
if (newSegTxt != null) {
textComp.replaceText(oldSegTip, newSegTxt);
}
}
}
/**
* Retrieve the latest active VTEC for our site from server. Filter and keep
* only the ones for this pil.

11
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
View file

@ -65,7 +65,6 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* 28May2010 2187 cjeanbap Added StdTextProductFactory
* functionality.
* 09 NOV 2012 1298 rferrel Changes for non-blocking dialog.
* 10Jan2012 15564 mgamazaychikov Set the awipsWanPil based on productText data
* </pre>
*
* @author lvenable
@ -388,15 +387,7 @@ public class StoreTransmitDlg extends CaveSWTDialog implements
} else {
req = new OUPRequest();
OfficialUserProduct oup = new OfficialUserProduct();
/*
* DR15564 - set the awipsWanPil based on productText data
*/
String[] splitLines = productText.split("\n");
String[] firstLine = splitLines[0].split(" ");
String[] secondLine = splitLines[1].split(" ");
String cccc = firstLine[1];
String productNnnidXxxid = secondLine[0];
String awipsWanPil = cccc + productNnnidXxxid;
String awipsWanPil = productIdTF.getText();
oup.setAwipsWanPil(awipsWanPil);
oup.setProductText(productText);

5
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/BundleLoader.java
View file

@ -37,6 +37,7 @@ import com.raytheon.viz.ui.editor.IMultiPaneEditor;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jan 8, 2013 mschenke Initial creation
* Feb 25, 2013 1640 bsteffen Dispose old display in BundleLoader
*
* </pre>
*
@ -296,7 +297,11 @@ public class BundleLoader extends Job {
VizApp.runSync(new Runnable() {
@Override
public void run() {
IRenderableDisplay oldDisplay = loadTo.getRenderableDisplay();
loadTo.setRenderableDisplay(loadFrom);
if (oldDisplay != null && oldDisplay != loadFrom) {
oldDisplay.dispose();
}
}
});
}

7
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
View file

@ -27,6 +27,7 @@ import com.raytheon.uf.common.geospatial.SpatialQueryFactory;
import com.raytheon.uf.common.geospatial.SpatialQueryResult;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.maps.rsc.DbMapQueryFactory;
import com.raytheon.viz.awipstools.common.stormtrack.AbstractStormTrackResource;
import com.raytheon.viz.core.map.GeoUtil;
import com.raytheon.viz.warngen.gis.ClosestPoint;
import com.raytheon.viz.warngen.gis.ClosestPointComparator;
@ -47,6 +48,7 @@ import com.vividsolutions.jts.geom.Point;
* pre-history
* Sep 25, 2012 #15425 Qinglu Lin Added getGid().
* Oct 17, 2012 jsanchez Added pathcast algorithm.
* Feb 12, 2013 1600 jsanchez Used adjustAngle method from AbstractStormTrackResource.
*
* </pre>
*
@ -336,9 +338,10 @@ abstract public class AbstractDbSourceDataAdaptor {
gc.setStartingGeographicPoint(cp.getPoint().x, cp.getPoint().y);
gc.setDestinationGeographicPoint(closestCoord.x, closestCoord.y);
cp.setAzimuth(gc.getAzimuth());
cp.setOppositeAzimuth(ClosestPoint.adjustAngle(cp.getAzimuth() + 180));
cp.setOppositeAzimuth(AbstractStormTrackResource.adjustAngle(cp
.getAzimuth() + 180));
cp.setRoundedAzimuth(GeoUtil.roundAzimuth(cp.getAzimuth()));
cp.setOppositeRoundedAzimuth(ClosestPoint.adjustAngle(cp
cp.setOppositeRoundedAzimuth(AbstractStormTrackResource.adjustAngle(cp
.getRoundedAzimuth() + 180));
cp.setArea(area);
cp.setParentArea(parentArea);

34
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
View file

@ -29,14 +29,21 @@ import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.prep.PreparedGeometry;
/**
*
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description ------------ ---------- -----------
* --------------------------
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 25, 2012 #15425 Qinglu Lin Updated createClosestPoint().
* Feb 13, 2012 1605 jsanchez Calculated the point based on lat,lon values.
*
* @author jsanchez Sep 25, 2012 #15425 Qinglu Lin Updated createClosestPoint().
* </pre>
*
* @author jsanchez
* @version 1.0
*/
public class DbAreaSourceDataAdaptor extends AbstractDbSourceDataAdaptor {
@ -46,6 +53,10 @@ public class DbAreaSourceDataAdaptor extends AbstractDbSourceDataAdaptor {
private static final String cwaField = "cwa";
private static final String longitude = "lon";
private static final String latitude = "lat";
public DbAreaSourceDataAdaptor(PathcastConfiguration pathcastConfiguration,
UnitConverter distanceToMeters, Geometry searchArea,
String localizedSite) throws VizException {
@ -69,6 +80,8 @@ public class DbAreaSourceDataAdaptor extends AbstractDbSourceDataAdaptor {
ptFields.add(pointField);
ptFields.add(useDirectionField);
ptFields.add(suppressedDirectionsField);
ptFields.add(longitude);
ptFields.add(latitude);
List<String> fields = null;
if (sortBy != null && sortBy.length > 0) {
@ -96,7 +109,7 @@ public class DbAreaSourceDataAdaptor extends AbstractDbSourceDataAdaptor {
Map<String, Object> attributes = ptRslt.attributes;
String name = String.valueOf(attributes.get(pointField));
Coordinate point = ptRslt.geometry.getCoordinate();
Coordinate point = getPoint(attributes);
int population = getPopulation(ptFields, attributes);
int warngenlev = getWangenlev(ptFields, attributes);
List<String> partOfArea = getPartOfArea(ptFields, attributes,
@ -264,4 +277,17 @@ public class DbAreaSourceDataAdaptor extends AbstractDbSourceDataAdaptor {
return directions;
}
/**
* Returns a Coordinate based on the lat,lon values in the attributes.
*
* @param attributes
* @return
*/
private Coordinate getPoint(Map<String, Object> attributes) {
double lat = Double.valueOf(String.valueOf(attributes.get(latitude)));
double lon = Double.valueOf(String.valueOf(attributes.get(longitude)));
return new Coordinate(lon, lat);
}
}

21
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
View file

@ -39,6 +39,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* a copy constructor.
* Sep 25, 2012 #15425 Qinglu Lin Updated two ClosestPoint() and added getGid().
* Oct 17, 2012 jsanchez Added setter methods.
* Feb 12, 2013 1600 jsanchez Removed adjustAngle method.
*
* </pre>
*
@ -247,26 +248,6 @@ public class ClosestPoint implements Comparable<ClosestPoint> {
this.gid = gid;
}
/**
* Adjusts the angle from -360/360 to be between -180/180
*
* @param angle
* @return
*/
public static double adjustAngle(double angle) {
double newVal = angle % 360;
if (newVal > 180) {
newVal -= 360;
} else if (newVal < -180) {
newVal += 360;
}
if (newVal < 0) {
newVal += 360;
}
return newVal;
}
/*
* (non-Javadoc)
*

4
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.java
View file

@ -39,6 +39,7 @@ import org.apache.commons.lang.ArrayUtils;
* Mar 3, 2011 jsanchez Initial creation
* Sep 25, 2012 15425 Qinglu Lin Implemented sorting on 'gid' in ascending order.
* Oct 17, 2012 jsanchez Refactored the enum sort to be more flexible.
* Feb 14, 2013 1605 jsanchez Updated the distance comparison for more accuracy.
*
* </pre>
*
@ -148,8 +149,7 @@ public class ClosestPointComparator implements Comparator<ClosestPoint> {
value = cp1.parentArea.compareTo(cp2.parentArea);
break;
case DISTANCE:
value = new Integer(cp1.roundedDistance)
.compareTo(cp2.roundedDistance);
value = new Double(cp1.distance).compareTo(cp2.distance);
break;
case GID:
value = new Integer(cp1.gid).compareTo(cp2.gid);

7
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
View file

@ -66,6 +66,7 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.viz.awipstools.common.stormtrack.AbstractStormTrackResource;
import com.raytheon.viz.awipstools.common.stormtrack.StormTrackDisplay;
import com.raytheon.viz.awipstools.common.stormtrack.StormTrackState;
import com.raytheon.viz.core.map.GeoUtil;
@ -102,6 +103,7 @@ import com.vividsolutions.jts.geom.Point;
* which are at different locations in pathcast.
* Oct 17, 2012 jsanchez Moved the path cast data collecting to a separate class.
* Jan 31, 2013 1557 jsanchez Used allowDuplicates flag to collect points with duplicate names.
* Feb 12, 2013 1600 jsanchez Used adjustAngle method from AbstractStormTrackResource.
*
* </pre>
*
@ -845,9 +847,10 @@ public class Wx {
.getCoordinate());
gc.setDestinationGeographicPoint(cen.x, cen.y);
cp2.azimuth = gc.getAzimuth();
cp2.oppositeAzimuth = ClosestPoint.adjustAngle(cp2.azimuth + 180);
cp2.oppositeAzimuth = AbstractStormTrackResource
.adjustAngle(cp2.azimuth + 180);
cp2.roundedAzimuth = GeoUtil.roundAzimuth(cp2.azimuth);
cp2.oppositeRoundedAzimuth = ClosestPoint
cp2.oppositeRoundedAzimuth = AbstractStormTrackResource
.adjustAngle(cp2.roundedAzimuth + 180);
return cp2;

36
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/BulletListManager.java
View file

@ -33,6 +33,7 @@ import com.raytheon.uf.common.dataplugin.warning.config.WarngenConfiguration;
*
* 01/26/2012 14466 D.Friedman Fix parseString processing.
* 01/26/2012 14469 D.Friedman Fix followup bullet processing
* Feb 13, 2013 1606 jsanchez Did not set default bullets for CORs.
*
* </pre>
*
@ -87,6 +88,19 @@ public class BulletListManager {
* @param damInfoBullets
*/
public void recreateBullets(Bullet[] bullets, DamInfoBullet[] damInfoBullets) {
recreateBullets(bullets, damInfoBullets, null);
}
/**
* Separates all the bullets in it's corresponding group. Identifies all the
* bullets that should be selected by default unless the action is a COR.
*
* @param bullets
* @param damInfoBullets
* @param action
*/
public void recreateBullets(Bullet[] bullets,
DamInfoBullet[] damInfoBullets, WarningAction action) {
loadBullets(bullets, damInfoBullets);
clear();
String damName = null;
@ -128,10 +142,12 @@ public class BulletListManager {
}
}
if (action != WarningAction.COR) {
for (Integer index : defaultIndices) {
updateSelectedIndices(index, false);
}
}
}
/**
* Updates the bullets that should be selected based on the warning text and
@ -155,15 +171,14 @@ public class BulletListManager {
ArrayList<Bullet> displayedDamInfoBullets = null;
for (int pass = 0; pass < 2; ++pass) {
Bullet[] sourceList = pass == 0 ?
configuration.getBullets() :
configuration.getDamInfoBullets();
Bullet[] sourceList = pass == 0 ? configuration.getBullets()
: configuration.getDamInfoBullets();
ArrayList<Bullet> resultList = new ArrayList<Bullet>();
if (sourceList != null) {
for (Bullet b : sourceList) {
if (b != null
&& (b.getShowString() == null ||
selectBulletFromFollowup(b.getShowString(), warningText))) {
&& (b.getShowString() == null || selectBulletFromFollowup(
b.getShowString(), warningText))) {
resultList.add(b);
}
}
@ -175,9 +190,11 @@ public class BulletListManager {
}
/* Sets up the appropriate bullet groups */
recreateBullets(
displayedBullets.toArray(new Bullet[displayedBullets.size()]),
displayedDamInfoBullets.toArray(new DamInfoBullet[displayedDamInfoBullets.size()]));
recreateBullets(displayedBullets.toArray(new Bullet[displayedBullets
.size()]),
displayedDamInfoBullets
.toArray(new DamInfoBullet[displayedDamInfoBullets
.size()]), action);
if (configuration.getLockedGroupsOnFollowup() != null) {
for (String lockedGroup : configuration.getLockedGroupsOnFollowup()
@ -234,7 +251,8 @@ public class BulletListManager {
* @param isFollowup
* @param selectUnconditionally
*/
public void updateSelectedIndices(int selectionIndex, boolean isFollowup, boolean selectUnconditionally) {
public void updateSelectedIndices(int selectionIndex, boolean isFollowup,
boolean selectUnconditionally) {
if (selectionIndex < 0 || selectionIndex >= bullets.length
|| titleGroup.contains(selectionIndex)) {
return;

4
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
View file

@ -190,11 +190,11 @@ public class WarngenLayer extends AbstractStormTrackResource {
private class CustomMaps extends Job {
private Set<String> customMaps = new HashSet<String>();
private final Set<String> customMaps = new HashSet<String>();
private Set<String> mapsToLoad;
private MapManager manager;
private final MapManager manager;
public CustomMaps() {
super("Loading WarnGen Maps");

21
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
View file

@ -76,6 +76,7 @@ import com.raytheon.uf.viz.core.localization.LocalizationManager;
import com.raytheon.uf.viz.core.requests.ThriftClient;
import com.raytheon.viz.awipstools.ToolsDataManager;
import com.raytheon.viz.awipstools.common.StormTrackData;
import com.raytheon.viz.awipstools.common.stormtrack.AbstractStormTrackResource;
import com.raytheon.viz.awipstools.common.stormtrack.StormTrackState;
import com.raytheon.viz.awipstools.common.stormtrack.StormTrackState.DisplayType;
import com.raytheon.viz.core.mode.CAVEMode;
@ -133,6 +134,8 @@ import com.vividsolutions.jts.io.WKTReader;
* Dec 17, 2012 15571 Qinglu Lin For hydro products, resolved issue caused by calling wkt.read(loc)
* while loc is null.
* Jan 8, 2013 15664 Qinglu Lin Appended selectedAction to handler.handle()'s argument list.
* Feb 12, 2013 1600 jsanchez Correctly set the StormTrackData's motion direction for a CAN and EXP.
* Feb 15, 2013 1607 jsanchez Added two variables corEventTime and corCreateTime.
*
* </pre>
*
@ -506,17 +509,18 @@ public class TemplateRunner {
coords[i] = new Point2D.Double(locs[i].x, locs[i].y);
}
context.put("eventLocation", coords);
double motionDirection = oldWarn.getMotdir();
while (motionDirection >= 360) {
motionDirection -= 360;
}
context.put("movementDirection", motionDirection);
context.put("movementDirection", oldWarn.getMotdir());
context.put("movementInKnots", oldWarn.getMotspd());
// StormTrackData motion direction is between -180/180,
// whereas a WarningRecord motion direction is between
// -360/360
double motionDirection = AbstractStormTrackResource
.adjustAngle(oldWarn.getMotdir() - 180);
StormTrackData std = ToolsDataManager.getInstance()
.getStormTrackData();
std.setDate(simulatedTime);
std.setMotionDirection(oldWarn.getMotdir());
std.setMotionDirection(motionDirection);
std.setMotionSpeed(oldWarn.getMotspd());
t0 = System.currentTimeMillis();
ToolsDataManager.getInstance().setStormTrackData(std);
@ -580,9 +584,14 @@ public class TemplateRunner {
context.put("start", oldWarn.getIssueTime().getTime());
if (oldWarn.getAct().equals("NEW")) {
context.put("now", new Date(wwaMNDTime));
// original warning's 'now' time used in MND header
context.put("corCreateTime", new Date(wwaMNDTime));
} else
context.put("now", simulatedTime);
context.put("event", oldWarn.getIssueTime().getTime());
// original warning's 'event' time, which should match the storm
// track
context.put("corEventTime", eventTime);
String message = oldWarn.getRawmessage();
if (!stormTrackState.originalTrack) {

63
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SCANRunSiteConfigurationManager.java
View file

@ -20,6 +20,28 @@ import com.raytheon.uf.common.monitor.xml.SCANSiteRunConfigXML;
import com.raytheon.uf.common.monitor.xml.SCANSiteXML;
import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.common.serialization.SerializationUtil;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
/**
* ScanRunSiteConfigurationManager
*
* Holds the SCAN configuration
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 02/07/2009 2037 dhladky Initial Creation.
* 02/25/13 1660 D. Hladky Fixed configuration bug in scan.
*
* </pre>
*
* @author dhladky
* @version 1.0
*/
public class SCANRunSiteConfigurationManager implements
ILocalizationFileObserver {
@ -28,6 +50,9 @@ public class SCANRunSiteConfigurationManager implements
private static final String CONFIG_FILE_NAME = "scan" + File.separatorChar
+ "SCANRunSiteConfig.xml";
private static final IUFStatusHandler statusHandler = UFStatus
.getHandler(SCANRunSiteConfigurationManager.class);
/**
* SCAN Configuration XML object.
*/
@ -49,7 +74,7 @@ public class SCANRunSiteConfigurationManager implements
try {
readConfigXml();
} catch (Exception e) {
e.printStackTrace();
statusHandler.handle(Priority.ERROR, "Can not read the SCAN configuration", e);
}
}
@ -77,21 +102,19 @@ public class SCANRunSiteConfigurationManager implements
File file = lf.getFile();
// System.out.println("Reading -- " + file.getAbsolutePath());
if (!file.exists()) {
System.out
.println("WARNING [SCAN] SCANRunSiteConfigurationManager: "
statusHandler.handle(Priority.WARN, "SCANRunSiteConfigurationManager: "
+ file.getAbsolutePath() + " does not exist.");
try {
createValidConfig();
} catch (Exception e) {
System.out
.println("FATAL [SCAN] SCANRunSiteConfigurationManager: Couldn't create valid runnable configuration");
statusHandler.handle(Priority.ERROR,"SCANRunSiteConfigurationManager: Couldn't create valid runnable configuration");
}
}
SCANSiteRunConfigXML configXmltmp = null;
configXmltmp = (SCANSiteRunConfigXML) SerializationUtil
.jaxbUnmarshalFromXmlFile(file.getAbsolutePath());
configXmltmp = SerializationUtil
.jaxbUnmarshalFromXmlFile(SCANSiteRunConfigXML.class, file.getAbsolutePath());
configXml = configXmltmp;
isPopulated = true;
@ -135,7 +158,8 @@ public class SCANRunSiteConfigurationManager implements
lf = newXmlFile;
} catch (Exception e) {
e.printStackTrace();
statusHandler.handle(Priority.WARN, "SCANRunSiteConfigurationManager: "
+ newXmlFile.getName() + " couldn't be saved.", e);
}
}
@ -153,7 +177,8 @@ public class SCANRunSiteConfigurationManager implements
}
}
} catch (SerializationException e) {
e.printStackTrace();
statusHandler.handle(Priority.WARN, "SCANRunSiteConfigurationManager: "
+ message.getFileName() + " couldn't be updated.", e);
}
}
@ -236,15 +261,14 @@ public class SCANRunSiteConfigurationManager implements
*/
List<String> localsites = RadarsInUseUtil.getSite(null,
RadarsInUseUtil.LOCAL_CONSTANT);
List<String> dialsites = RadarsInUseUtil.getSite(null,
RadarsInUseUtil.DIAL_CONSTANT);
String modelDefault = "RUC130";
configXml = new SCANSiteRunConfigXML();
// run over list of available sites
int i = 0;
for (String site : localsites) {
if (i < 12) { // no more than 12 radars in scan config
SCANSiteXML siteXML = new SCANSiteXML();
siteXML.setScanSite(site);
siteXML.setMenuLocation(RadarsInUseUtil.LOCAL_CONSTANT);
@ -257,21 +281,8 @@ public class SCANRunSiteConfigurationManager implements
}
configXml.addSite(siteXML);
i++;
}
for (String site : dialsites) {
SCANSiteXML siteXML = new SCANSiteXML();
siteXML.setScanSite(site);
siteXML.setMenuLocation(RadarsInUseUtil.DIAL_CONSTANT);
for (DATA_TYPE param : DATA_TYPE.values()) {
SCANModelParameterXML paramXML = new SCANModelParameterXML();
paramXML.setParameterName(param.getType());
paramXML.setModelName(modelDefault);
siteXML.addModelParameter(paramXML);
}
configXml.addSite(siteXML);
}
saveConfigXml();

81
edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/CWATGenerator.java
View file

@ -28,8 +28,11 @@ import com.raytheon.edex.urifilter.URIFilter;
import com.raytheon.edex.urifilter.URIGenerateMessage;
import com.raytheon.uf.common.dataplugin.cwat.CWATRecord;
import com.raytheon.uf.common.dataplugin.cwat.dao.CWATDao;
import com.raytheon.uf.common.dataplugin.radar.util.RadarsInUseUtil;
import com.raytheon.uf.common.monitor.config.SCANRunSiteConfigurationManager;
import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
import com.raytheon.uf.common.monitor.events.MonitorConfigListener;
import com.raytheon.uf.common.monitor.scan.ScanUtils;
import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
@ -37,8 +40,26 @@ import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.edex.cpgsrv.CompositeProductGenerator;
import com.raytheon.uf.edex.plugin.cwat.common.CWATConfig;
public class CWATGenerator extends CompositeProductGenerator {
private static final transient IUFStatusHandler statusHandler = UFStatus
/**
* CWATGenerator Product
*
* CWAT files for use in EDEX.
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 02/25/13 1660 D. Hladky Fixed configuration bug in scan.
*
* </pre>
*
* @author dhladky
* @version 1.0
*/
public class CWATGenerator extends CompositeProductGenerator implements
MonitorConfigListener {
private static final IUFStatusHandler statusHandler = UFStatus
.getHandler(CWATGenerator.class);
private static final String genName = "CWAT";
@ -48,6 +69,9 @@ public class CWATGenerator extends CompositeProductGenerator {
/** Set of icaos to filter for */
private Set<String> icaos = null;
/** run configuration manager **/
public SCANRunSiteConfigurationManager srcm = null;
/**
* Public CWAT constructor
*
@ -61,12 +85,24 @@ public class CWATGenerator extends CompositeProductGenerator {
@Override
protected void configureFilters() {
statusHandler.handle(Priority.INFO, "Process Filter Config...");
// read this from localization eventually
icaos = new HashSet<String>(RadarsInUseUtil.getSite(null,
RadarsInUseUtil.LOCAL_CONSTANT));
icaos.addAll(RadarsInUseUtil.getSite(null,
RadarsInUseUtil.DIAL_CONSTANT));
statusHandler.handle(Priority.INFO, getGeneratorName()
+ " process Filter Config...");
try {
getRunConfig().readConfigXml();
} catch (SerializationException e) {
statusHandler.handle(Priority.ERROR,
"Couldn't read CWAT(scan) configuration!!!", e);
}
boolean configValid = getRunConfig().isPopulated();
if (!configValid) {
statusHandler.handle(Priority.WARN,
"Configuration for CWAT(scan) is invalid!!!");
return;
}
icaos = new HashSet<String>(getRunConfig().getSiteNames());
}
@Override
@ -82,7 +118,7 @@ public class CWATGenerator extends CompositeProductGenerator {
} catch (Exception e) {
statusHandler.handle(Priority.ERROR,
"Couldn't create CWAT Filter.." + icao
+ " is not a viable RADAR site.");
+ " is not a viable RADAR site.", e);
iter.remove();
}
}
@ -97,8 +133,7 @@ public class CWATGenerator extends CompositeProductGenerator {
cwa_config = new CWATConfig(genMessage, this);
} catch (Exception e) {
statusHandler.handle(Priority.ERROR,
"CWAT Configuration parameters for run not met...");
e.printStackTrace();
"CWAT Configuration parameters for run not met...",e);
return;
}
@ -149,4 +184,26 @@ public class CWATGenerator extends CompositeProductGenerator {
public boolean isRunning() {
return getConfigManager().getCWATState();
}
@Override
public void configChanged(MonitorConfigEvent fce) {
if (fce.getSource() instanceof SCANRunSiteConfigurationManager) {
statusHandler.handle(Priority.INFO,
"Re-configuring CWAT URI filters...Run Site Config change");
resetFilters();
}
}
/**
* run config manager
*
* @return
*/
public SCANRunSiteConfigurationManager getRunConfig() {
if (srcm == null) {
srcm = SCANRunSiteConfigurationManager.getInstance();
srcm.addListener(this);
}
return srcm;
}
}

10
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml
View file

@ -12,16 +12,16 @@
<property name="maxPoolSize" value="4" />
<property name="keepAliveSeconds" value="60000" />
</bean>
<bean id="ffmpProcessThreadPool"
<!-- <bean id="ffmpProcessThreadPool"
class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
<property name="corePoolSize" value="2" />
<property name="maxPoolSize" value="4" />
<property name="corePoolSize" value="1" />
<property name="maxPoolSize" value="2" />
<property name="keepAliveSeconds" value="60000" />
</bean>
</bean>-->
<bean id="ffmpGenerator" class="com.raytheon.uf.edex.plugin.ffmp.FFMPGenerator">
<constructor-arg ref="ffmpThreadPool"/>
<constructor-arg ref="ffmpProcessThreadPool"/>
</bean>
<bean factory-bean="cpgSrvDispatcher" factory-method="register">

512
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
View file

@ -43,9 +43,12 @@ import com.raytheon.edex.msg.DataURINotificationMessage;
import com.raytheon.edex.plugin.radar.dao.RadarStationDao;
import com.raytheon.edex.urifilter.URIFilter;
import com.raytheon.edex.urifilter.URIGenerateMessage;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPAggregateRecord;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPBasinData;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPBasinMetaData;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPDataContainer;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPGuidanceInterpolation;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPRecord;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPTemplates;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPTemplates.MODE;
@ -70,6 +73,7 @@ import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
import com.raytheon.uf.common.monitor.events.MonitorConfigListener;
import com.raytheon.uf.common.monitor.xml.DomainXML;
import com.raytheon.uf.common.monitor.xml.FFMPRunXML;
import com.raytheon.uf.common.monitor.xml.FFTIAttributeXML.ATTRIBUTE;
import com.raytheon.uf.common.monitor.xml.FFTISourceXML;
import com.raytheon.uf.common.monitor.xml.ProductRunXML;
import com.raytheon.uf.common.monitor.xml.ProductXML;
@ -96,8 +100,10 @@ import com.raytheon.uf.edex.database.cluster.ClusterTask;
import com.raytheon.uf.edex.plugin.ffmp.common.FFMPConfig;
import com.raytheon.uf.edex.plugin.ffmp.common.FFMPProcessor;
import com.raytheon.uf.edex.plugin.ffmp.common.FFTI;
import com.raytheon.uf.edex.plugin.ffmp.common.FFTIAccum;
import com.raytheon.uf.edex.plugin.ffmp.common.FFTIData;
import com.raytheon.uf.edex.plugin.ffmp.common.FFTIProcessor;
import com.raytheon.uf.edex.plugin.ffmp.common.FFTIRatioDiff;
/**
*
@ -111,6 +117,7 @@ import com.raytheon.uf.edex.plugin.ffmp.common.FFTIProcessor;
* 02/03/2011 6500 cjeanbap Fixed NullPointerException.
* 07/31/2011 578 dhladky FFTI modifications
* 01/27/13 1478 D. Hladky Added creation of full cache records to help read write stress on NAS
* 02/25/13 1660 D. Hladky Redesigned data flow for FFTI in order to have only one mosaic piece in memory at a time.
* </pre>
*
* @author dhladky
@ -119,19 +126,18 @@ import com.raytheon.uf.edex.plugin.ffmp.common.FFTIProcessor;
public class FFMPGenerator extends CompositeProductGenerator implements
MonitorConfigListener {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(FFMPGenerator.class);
/**
* Public constructor for FFMPGenerator
*
* @param name
* @param compositeProductType
*/
public FFMPGenerator(Executor executor, Executor processexecutor) {
public FFMPGenerator(Executor executor) {
super(genName, productType, executor);
this.processexecutor = processexecutor;
}
private static final String genName = "FFMP";
@ -164,9 +170,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
/** ffti finished processing **/
public boolean fftiDone = true;
/** products **/
private ConcurrentHashMap<String, FFMPRecord[]> products = null;
/** Processes map <dataKey, SourceXML> **/
private ConcurrentHashMap<String, SourceXML> processes = null;
@ -188,9 +191,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
/** checks for initial load **/
public ArrayList<String> loadedData = new ArrayList<String>();
/** thread the productkeys **/
public ConcurrentHashMap<String, ArrayList<String>> productKeys = new ConcurrentHashMap<String, ArrayList<String>>();
/** template config manager **/
public FFMPTemplateConfigurationManager tempConfig = null;
@ -206,12 +206,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
"apps_dir")
+ File.separator + "ffmp" + File.separator;
/** source bins used for finding basin to data correlations **/
private HashMap<String, SourceBinList> sourceBins = new HashMap<String, SourceBinList>();
/** thread executor **/
public Executor processexecutor = null;
@Override
protected void configureFilters() {
@ -394,8 +388,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements
statusHandler.handle(Priority.PROBLEM,
"Couldn't create FFMP Filter.." + " primary Domain: "
+ domain.getCwa()
+ " this RUNNER is not a viable FFMP config.");
e.printStackTrace();
+ " this RUNNER is not a viable FFMP config.", e);
}
}
@ -452,7 +445,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
long time = System.currentTimeMillis();
this.config = new FFMPConfig(
(FFMPURIGenerateMessage) genMessage, this);
products = new ConcurrentHashMap<String, FFMPRecord[]>();
processes = new ConcurrentHashMap<String, SourceXML>();
// read config updates, make sure we don't miss something
getRunConfig().readConfigXml();
@ -466,7 +458,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
}
// start threads
for (String source : processes.keySet()) {
this.getExecutor().execute(
new ProcessProduct(processes.get(source), this));
@ -476,72 +467,48 @@ public class FFMPGenerator extends CompositeProductGenerator implements
while (processes.size() > 0) {
// wait for all threads to finish before returning
try {
Thread.sleep(100);
Thread.sleep(50);
if (statusHandler.isPriorityEnabled(Priority.DEBUG)) {
statusHandler.handle(Priority.DEBUG,
"Checking status ..." + processes.size());
for (String source : processes.keySet()) {
statusHandler.handle(Priority.DEBUG,
"Still processing ..." + source);
}
}
} catch (InterruptedException e) {
e.printStackTrace();
statusHandler.handle(Priority.ERROR, "Process thread had been interupted!", e);
}
}
if (products.size() > 0) {
// Do the FFTI evaluation, if we have FFTI sources
if (fftiSources.size() > 0) {
this.getExecutor().execute(new FFTI(this));
}
ArrayList<FFMPRecord> records = new ArrayList<FFMPRecord>(
products.size());
for (String source : products.keySet()) {
for (FFMPRecord rec : products.get(source)) {
records.add(rec);
}
}
FFMPRecord[] recs = new FFMPRecord[records.size()];
for (int i = 0; i < records.size(); i++) {
recs[i] = records.get(i);
}
this.setPluginDataObjects(recs);
this.setPluginDao(new FFMPDao(getCompositeProductType(),
template, fscm, config.getCWA()));
while (fftiSources.size() > 0) {
try {
Thread.sleep(100);
Thread.sleep(50);
if (statusHandler.isPriorityEnabled(Priority.DEBUG)) {
statusHandler.handle(Priority.DEBUG,
"Checking status ..." + fftiDone);
}
} catch (InterruptedException e) {
statusHandler.handle(Priority.DEBUG,
"Checking status failed!" + e);
}
}
statusHandler.handle(
Priority.INFO,
config.getCWA() + " finished, duration: "
+ (System.currentTimeMillis() - time)
+ " ms, wrote " + records.size() + " ");
statusHandler.handle(Priority.INFO, config.getCWA()
+ " finished, duration: "
+ (System.currentTimeMillis() - time) + " ms ");
} else {
statusHandler.handle(Priority.WARN, config.getCWA()
+ " no new products to produce.");
}
// dump data we don't need anymore
ffmpData.clear();
// suggest garbage collection
System.gc();
} catch (Throwable e) {
statusHandler.handle(Priority.ERROR,
"Unable to process FFMP Records.");
e.printStackTrace();
"Unable to process FFMP Records.", e);
}
}
}
@ -587,7 +554,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
private class ProcessProduct implements Runnable {
SourceXML ffmpProduct;
FFMPGenerator generator;
@Override
@ -603,9 +569,10 @@ public class FFMPGenerator extends CompositeProductGenerator implements
"ProcessProduct: Finishing thread "
+ ffmpProduct.getSourceName());
} catch (Exception e) {
processes.remove(ffmpProduct.getSourceName());
statusHandler.handle(Priority.ERROR, "ProcessProduct: removed "
+ ffmpProduct.getSourceName(), e);
} finally {
processes.remove(ffmpProduct.getSourceName());
}
}
@ -621,8 +588,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
HashMap<String, Object> dataHash = config.getSourceData(ffmpProduct
.getSourceName());
ArrayList<FFMPRecord> ffmpRecords = new ArrayList<FFMPRecord>(
dataHash.size());
FFMPRunXML runner = getRunConfig().getRunner(config.getCWA());
@ -702,23 +667,13 @@ public class FFMPGenerator extends CompositeProductGenerator implements
sites.add(siteKey);
}
int i = 0;
if (sites != null) {
// set the latch keys
ArrayList<String> lsites = new ArrayList<String>();
for (String site : sites) {
lsites.add(site);
}
productKeys.put(ffmpProduct.getSourceName(), lsites);
}
for (String productKey : sites) {
// Go over all of the sites, if mosaic source, can be many.
for (String siteKey : sites) {
FFMPRecord ffmpRec = new FFMPRecord();
ffmpRec.setSourceName(ffmpProduct.getSourceName());
ffmpRec.setDataKey(dataKey);
ffmpRec.setSiteKey(productKey);
ffmpRec.setSiteKey(siteKey);
ffmpRec.setPluginName(getCompositeProductType());
ffmpRec.setWfo(config.getCWA());
FFMPProcessor ffmp = new FFMPProcessor(config, generator,
@ -728,54 +683,39 @@ public class FFMPGenerator extends CompositeProductGenerator implements
if (ffmpRec != null) {
persistRecord(ffmpRec);
processDataContainer(ffmpRec, siteKey);
// Now that we have the data container,
// we can process FFTI for this piece of the mosaic
if (ffmp.isFFTI()) {
fftiDone = false;
if (!fftiSources.contains(ffmp.getFFTISource())) {
FFTISourceXML fftiSource = ffmp.getFFTISource();
// This only runs once for the site key loop
if (!fftiSources.contains(fftiSource)) {
FFTIProcessor ffti = new FFTIProcessor(
generator, ffmpRec,
ffmp.getFFTISource());
fftiSources.add(ffmp.getFFTISource());
ffti.processFFTI();
}
}
// this is a threaded process!!!!!!!!!!!
// Added this to speed the processing of mosaiced
// sources.
// Before all processing was in line to the source
// thread.
// This caused slowness in the overall processing.
// By allowing the mosaic components to be concurrently
// processed it has drastically sped up overall FFMP
// performance.
processDataContainer(ffmpRec, productKey);
ffmpRecords.add(ffmpRec);
}
i++;
}
while (productKeys.size() > 0) {
// wait for all threads to finish before returning
try {
Thread.sleep(100);
statusHandler.handle(Priority.DEBUG,
"Checking status ..." + productKeys.size());
for (String source : productKeys.keySet()) {
statusHandler.handle(Priority.DEBUG,
"Still processing ..." + source);
}
} catch (InterruptedException e) {
statusHandler.handle(Priority.WARN,
"Product Procesing Interrupted! " + e);
// Do the accumulation now, more memory efficient.
// Only one piece in memory at a time
for (String attribute: ffmp.getAttributes()) {
if (attribute.equals(ATTRIBUTE.ACCUM.getAttribute())) {
FFTIAccum accum = getAccumulationForSite(ffmpProduct.getDisplayName(), siteKey, dataKey, fftiSource.getDurationHour(), ffmpProduct.getUnit(siteKey));
if (statusHandler.isPriorityEnabled(Priority.DEBUG)) {
statusHandler.debug("Accumulating FFTI for source: "+ffmpProduct.getDisplayName()+" site: "+siteKey+" data: "+dataKey+" duration: "+fftiSource.getDurationHour()+ " accumulation: "+accum.getAccumulation());
}
}
}
}
}
}
FFMPRecord[] recs = new FFMPRecord[ffmpRecords.size()];
for (int i = 0; i < ffmpRecords.size(); i++) {
recs[i] = ffmpRecords.get(i);
}
products.put(ffmpProduct.getSourceName(), recs);
processes.remove(ffmpProduct.getSourceName());
}
}
@ -885,7 +825,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements
// Didn't process a domain, locked by another cluster
// member, sleep and try again
try {
Thread.sleep(100);
Thread.sleep(50);
} catch (InterruptedException e) {
statusHandler.handle(Priority.WARN,
"Domain processing Interrupted!", e);
@ -1044,15 +984,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements
* @return
*/
public SourceBinList getSourceBinList(String sourceId) {
SourceBinList sbl = null;
if (!sourceBins.containsKey(sourceId)) {
sbl = readSourceBins(sourceId);
sourceBins.put(sourceId, sbl);
} else {
sbl = sourceBins.get(sourceId);
}
return sbl;
return readSourceBins(sourceId);
}
/**
@ -1061,7 +993,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
* @param sbl
*/
public void setSourceBinList(SourceBinList sbl) {
sourceBins.put(sbl.getSourceId(), sbl);
writeSourceBins(sbl);
}
@ -1228,53 +1159,12 @@ public class FFMPGenerator extends CompositeProductGenerator implements
}
/**
* Process this data container
*
* @param sourceSiteDataKey
* @param huc
* @param wfo
* @return
* Process the ffmp data container
* @param ffmpRec
* @param productKey
*/
public void processDataContainer(FFMPRecord ffmpRec, String productKey) {
this.getProcessExecutor().execute(
new ProcessDataContainer(ffmpRec, productKey));
}
/**
* Inner class to thread writing of BuddyFiles
*
* @author dhladky
*
*/
private class ProcessDataContainer implements Runnable {
private FFMPRecord ffmpRec;
private String productKey;
public void run() {
try {
processDataContainer(ffmpRec, productKey);
} catch (Exception e) {
statusHandler.handle(Priority.ERROR,
"ProcessDataContainer: removed " + e.getMessage());
}
}
public ProcessDataContainer(FFMPRecord ffmpRec, String productKey) {
this.ffmpRec = ffmpRec;
this.productKey = productKey;
}
/**
* Process this data container
*
* @param ffmpRec
* @param write
*/
private void processDataContainer(FFMPRecord ffmpRec, String productKey) {
String sourceName = null;
Date backDate = null;
String sourceSiteDataKey = null;
@ -1283,7 +1173,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
try {
// write out the fast loader cache file
long ptime = System.currentTimeMillis();
SourceXML source = getSourceConfig().getSource(
ffmpRec.getSourceName());
@ -1426,21 +1315,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
"Failed Processing FFMPDataContainer" + e.getMessage());
} finally {
// moved writing here to remain safe from possible race
// condition between processing threads
if (productKeys != null) {
if (productKeys.containsKey(ffmpRec.getSourceName())) {
productKeys.get(ffmpRec.getSourceName()).remove(
productKey);
// System.out.println("Removed productKey: "+productKey);
if (productKeys.get(ffmpRec.getSourceName()).size() == 0) {
// System.out.println("Removed source: "+ffmpRec.getSourceName()+" now writing");
productKeys.remove(ffmpRec.getSourceName());
// last one, allow write
write = true;
}
}
}
// purge it up
if (fdc != null) {
// this is defensive for if errors get thrown
@ -1458,7 +1332,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements
}
}
}
}
/**
* load existing container
@ -1744,7 +1618,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
} else {
if (file.exists() && file.canRead() && file.canWrite()
&& (file.lastModified() > backDate.getTime())) {
// System.out.println("File update and exists..."+sourceSiteDataKey);
return true;
}
}
@ -1791,10 +1664,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
ffgCheck = false;
resetFilters();
if (sourceBins != null) {
sourceBins.clear();
}
loadedData.clear();
if (ffmpData != null) {
@ -1955,16 +1824,283 @@ public class FFMPGenerator extends CompositeProductGenerator implements
}
/**
* the executor runner
* Get value for an individual piece of the puzzle
*
* @param fftiSourceKey
* @param fftiSiteKey
* @param fftiDataKey
* @param duration
* @param unit
* @return
*/
public Executor getProcessExecutor() {
return processexecutor;
public FFTIAccum getAccumulationForSite(String fftiSourceKey,
String fftiSiteKey, String fftiDataKey, double duration, String unit) {
SourceXML ffmpSource = getSourceConfig()
.getSourceByDisplayName(fftiSourceKey);
FFTIAccum accumulator = null;
String siteDataKey = ffmpSource.getDisplayName() + "-" + fftiSiteKey
+ "-" + fftiDataKey;
if (isFFTI(siteDataKey)) {
accumulator = (FFTIAccum) getFFTIData(siteDataKey);
} else {
accumulator = new FFTIAccum();
}
// This will only happen at initial load, update, and duration changes.
if (accumulator.isReset() || accumulator.getDuration() != duration) {
accumulator.setDuration(duration);
accumulator.setUnit(unit);
if (ffmpSource.isMosaic()) {
accumulator.setName(ffmpSource.getDisplayName());
} else {
accumulator.setName(fftiSiteKey + "-" + fftiSourceKey);
}
long cur = config.getDate().getTime();
long timeBack = (long) (duration * TimeUtil.MILLIS_PER_HOUR);
Date backDate = new Date(cur - timeBack);
long expirationTime = ffmpSource.getExpirationMinutes(fftiSiteKey) * TimeUtil.MILLIS_PER_MINUTE;
FFMPDataContainer fdc = null;
ArrayList<String> hucs = new ArrayList<String>();
hucs.add("ALL");
fdc = getFFMPDataContainer(siteDataKey, hucs, backDate);
if (fdc != null) {
FFMPBasinData fbd = fdc.getBasinData("ALL");
// go over the list of CWAs gathering the pfaf list
ArrayList<Long> pfafs = new ArrayList<Long>();
ArrayList<String> cwaList = config.fdm.getCwaList();
Double gap = FFTI.getGap(fdc, ffmpSource, config.getDate(), duration, fftiSiteKey);
if (!Double.isNaN(gap)) {
for (Long key : fbd.getBasins().keySet()) {
for (String cwa : cwaList) {
boolean primary = false;
if (cwa.equals(config.getCWA())) {
primary = true;
}
FFMPBasinMetaData fmdb = template.getBasin(
fftiSiteKey, key);
if (fmdb == null) {
continue;
}
// Gets buffer zones adjacent to CWA
if ((cwa.equals(fmdb.getCwa()))
|| (primary && fmdb.isPrimaryCwa())) {
if (!pfafs.contains(key)) {
pfafs.add(key);
}
}
}
}
double amount = fdc.getMaxValue(pfafs, backDate,
config.getDate(), expirationTime,
ffmpSource.isRate());
// max value for monitored area
accumulator.setAccumulation(amount);
accumulator.setGap(gap);
}
}
ffmpData.remove(siteDataKey);
accumulator.setReset(false);
writeFFTIData(siteDataKey, accumulator);
}
return accumulator;
}
/**
* Gets the ratio and difference values for this site
*
* @param qSourceKey
* @param qSiteKey
* @param ffgType
* @param duration
* @param unit
* @return
*/
public FFTIRatioDiff getRatioAndDiffForSite(String qSourceKey,
String qSiteKey, String ffgType, double duration, String unit) {
FFTIRatioDiff values = null;
SourceXML ffmpQSource = fscm.getSourceByDisplayName(qSourceKey);
if (ffmpQSource == null) {
ffmpQSource = fscm.getSource(qSourceKey);
}
String siteDataKey = ffgType + "-" + ffmpQSource.getSourceName() + "-"
+ qSiteKey;
if (isFFTI(siteDataKey)) {
values = (FFTIRatioDiff) getFFTIData(siteDataKey);
if (values.getGuids() == null || values.getQpes() == null) {
values.setReset(true);
}
} else {
values = new FFTIRatioDiff();
}
// This will only happen at initial load, update, and duration changes.
if (values.isReset() || values.getDuration() != duration) {
values.setDuration(duration);
values.setUnit(unit);
long cur = config.getDate().getTime();
long timeBack = (long) (duration * TimeUtil.MILLIS_PER_HOUR);
Date backDate = new Date(cur - timeBack);
long expirationTime = ffmpQSource.getExpirationMinutes(qSiteKey) * TimeUtil.MILLIS_PER_MINUTE;
// make sure we have data
Date ffgBackDate = new Date(config.getDate().getTime()
- (TimeUtil.MILLIS_PER_HOUR * FFMPGenerator.FFG_SOURCE_CACHE_TIME));
String primarySource = fscm.getPrimarySource(ffmpQSource);
ProductXML product = fscm.getProduct(primarySource);
ArrayList<String> hucs = new ArrayList<String>();
hucs.add("ALL");
FFMPDataContainer guidContainer = getFFMPDataContainer(
ffgType, hucs, ffgBackDate);
long guidSourceExpiration = 0l;
if (guidContainer == null) {
guidContainer = new FFMPDataContainer(ffgType, hucs);
}
for (SourceXML iguidSource : product
.getGuidanceSourcesByType(ffgType)) {
if (guidSourceExpiration == 0l) {
guidSourceExpiration = iguidSource
.getExpirationMinutes(qSiteKey) * TimeUtil.MILLIS_PER_MINUTE;
break;
}
}
// if still nothing, punt!
if (guidContainer.size() == 0) {
statusHandler.handle(Priority.PROBLEM,
"FFTI: No guidance sources available for " + qSiteKey
+ " " + qSourceKey + " " + " comparison.");
return values;
}
String qpeSiteSourceDataKey = ffmpQSource.getSourceName() + "-" + qSiteKey + "-"+ qSiteKey;
FFMPDataContainer qpeContainer = getFFMPDataContainer(qpeSiteSourceDataKey, hucs, backDate);
if (qpeContainer != null) {
// go over the list of CWAs gathering the pfaf list
ArrayList<Long> pfafs = new ArrayList<Long>();
ArrayList<String> cwaList = config.fdm.getCwaList();
FFMPBasinData fbd = qpeContainer.getBasinData("ALL");
for (Long key : fbd.getBasins().keySet()) {
for (String cwa : cwaList) {
boolean primary = false;
if (cwa.equals(config.getCWA())) {
primary = true;
}
FFMPBasinMetaData fmdb = template.getBasin(qSiteKey,
key);
if (fmdb == null) {
continue;
}
// Gets buffer zones adjacent to CWA
if ((cwa.equals(fmdb.getCwa()))
|| (primary && fmdb.isPrimaryCwa())) {
if (!pfafs.contains(key)) {
pfafs.add(key);
}
}
}
}
Double gap = FFTI.getGap(qpeContainer, ffmpQSource, config.getDate(), duration,
qSiteKey);
if (!Double.isNaN(gap)) {
ArrayList<Float> qpes = qpeContainer.getBasinData("ALL")
.getAccumValues(pfafs, backDate, config.getDate(),
expirationTime, false);
FFMPGuidanceInterpolation interpolator = new FFMPGuidanceInterpolation(
fscm, product, frcm.getRunner(
config.getCWA()).getProduct(qSiteKey),
primarySource, ffgType, qSiteKey);
interpolator.setInterpolationSources(duration);
ArrayList<Float> guids = guidContainer.getBasinData("ALL")
.getGuidanceValues(pfafs, interpolator,
guidSourceExpiration);
values.setQpes(qpes);
values.setGuids(guids);
values.setGap(gap);
}
} else {
return values;
}
// replace or insert it
ffmpData.remove(qpeSiteSourceDataKey);
values.setReset(false);
writeFFTIData(siteDataKey, values);
}
return values;
}
/**
* Persist the record that has finished processing.
* This is different than other DAT tools.
* Other tools wait until all are finished processing
* before persisting. FFMP persists as it goes in order
* to lessen the data surge being sent to pypies.
*
* @param record
* @return
*/
private synchronized void persistRecord(FFMPRecord record) {
// persist out this record
try {
setPluginDataObjects(new FFMPRecord[]{record});
setPluginDao(new FFMPDao(getCompositeProductType(),
template, fscm, config.getCWA()));
persistRecords();
fireTopicUpdate();
// clear out pdos that are written
pdos = null;
} catch (PluginException e) {
statusHandler.handle(Priority.PROBLEM, "Couldn't persist the record.", e);
}
public void setProcessExecutor(Executor processexecutor) {
this.processexecutor = processexecutor;
}
}

22
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
View file

@ -25,6 +25,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@ -93,6 +94,7 @@ import com.vividsolutions.jts.geom.Polygon;
*
* 07/14/09 2152 D. Hladky Initial release
* 10/25/12 DR 15514 G. Zhang Fix ConcurrentModificationException
* 02/25/13 1660 D. Hladky FFTI design change to help mosaic processing.
* </pre>
*
* @author dhladky
@ -164,6 +166,8 @@ public class FFMPProcessor {
private boolean isFFTI = false;
private List<String> fftiAttribute = new ArrayList<String>();
private FFTISourceXML fftiSource = null;
private RadarDataInterrogator rdi = null;
@ -1734,16 +1738,16 @@ public class FFMPProcessor {
SOURCE_TYPE.QPE.getSourceType())) {
fftiSource = setting.getQpeSource();
isFFTI = true;
break;
fftiAttribute.add(setting.getAttribute().getAttributeName());
} else if (source.getSourceType().equals(
SOURCE_TYPE.QPF.getSourceType())) {
fftiSource = setting.getQpfSource();
isFFTI = true;
break;
fftiAttribute.add(setting.getAttribute().getAttributeName());
} else {
fftiSource = setting.getGuidSource();
isFFTI = true;
break;
fftiAttribute.add(setting.getAttribute().getAttributeName());
}
}
@ -1756,7 +1760,7 @@ public class FFMPProcessor {
.getDisplayName())) {
fftiSource = setting.getQpeSource();
isFFTI = true;
break;
fftiAttribute.add(setting.getAttribute().getAttributeName());
}
}
}
@ -1771,7 +1775,7 @@ public class FFMPProcessor {
fftiSource = setting.getQpfSource();
isFFTI = true;
break;
fftiAttribute.add(setting.getAttribute().getAttributeName());
}
}
}
@ -1798,6 +1802,14 @@ public class FFMPProcessor {
return fftiSource;
}
/**
* Returns the FFTI attributes for this source
* @return
*/
public List<String> getAttributes() {
return fftiAttribute;
}
/**
* composite source ID key
*

282
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
View file

@ -24,12 +24,8 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPBasinData;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPBasinMetaData;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPDataContainer;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPGap;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPGuidanceInterpolation;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPTemplates;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPUtils;
import com.raytheon.uf.common.monitor.config.FFMPSourceConfigurationManager;
import com.raytheon.uf.common.monitor.config.FFMPSourceConfigurationManager.SOURCE_TYPE;
@ -57,6 +53,7 @@ import com.raytheon.uf.edex.plugin.ffmp.FFMPGenerator;
* ------------ ---------- ----------- --------------------------
* Apr 01, 2011 dhladky Initial creation
* July 13, 2012 dhladky Revamped to help memory
* 02/25/13 1660 D. Hladky Moved FFTI processing to help with mosaic memory usage
*
* </pre>
*
@ -78,8 +75,6 @@ public class FFTI implements Runnable {
private FFMPGenerator ffmpgen = null;
private FFMPTemplates templates = null;
private DecimalFormat formatter = null;
private Priority messagePriority = Priority.INFO;
@ -92,8 +87,6 @@ public class FFTI implements Runnable {
this.ffmpgen = ffmpgen;
this.config = ffmpgen.config;
this.fdm = ffmpgen.config.fdm;
this.templates = ffmpgen.template;
this.formatter = new DecimalFormat();
formatter.setMaximumFractionDigits(2);
formatter.setMinimumIntegerDigits(1);
@ -113,9 +106,6 @@ public class FFTI implements Runnable {
alertMessage.append(createAlertMessages());
monitorHandler.handle(messagePriority, alertMessage.toString());
}
// Debug
// statusHandler.handle(Priority.INFO, alertMessage.toString());
}
private boolean processSettings() {
@ -244,7 +234,7 @@ public class FFTI implements Runnable {
for (int j = 0; j < sites.size(); j++) {
FFTIAccum faccum = getAccumulationForSite(displayName,
FFTIAccum faccum = ffmpgen.getAccumulationForSite(displayName,
sites.get(j), dataKey, duration,
source.getUnit());
@ -287,7 +277,7 @@ public class FFTI implements Runnable {
source = ffmpgen.getSourceConfig().getSourceByDisplayName(
fftiSourceKey);
accum = getAccumulationForSite(fftiSourceKey, fftiSiteKey,
accum = ffmpgen.getAccumulationForSite(fftiSourceKey, fftiSiteKey,
fftiSiteKey, duration, source.getUnit());
if (accum != null) {
@ -336,7 +326,7 @@ public class FFTI implements Runnable {
for (String site : sites) {
FFTIRatioDiff values = getRatioAndDiffForSite(
FFTIRatioDiff values = ffmpgen.getRatioAndDiffForSite(
qSourceXML.getSourceName(), site,
guidDisplayNames.get(0), duration, unit);
@ -398,7 +388,7 @@ public class FFTI implements Runnable {
qSourceXML = ffmpgen.fscm.getSourceByDisplayName(qSourceKey);
unit = qSourceXML.getUnit();
FFTIRatioDiff values = getRatioAndDiffForSite(
FFTIRatioDiff values = ffmpgen.getRatioAndDiffForSite(
qSourceXML.getSourceName(), qSiteKey,
guidDisplayNames.get(0), duration, unit);
@ -790,259 +780,6 @@ public class FFTI implements Runnable {
return sites;
}
/**
* Get value for an individual piece of the puzzle
*
* @param fftiSourceKey
* @param fftiSiteKey
* @param duration
* @return
*/
private FFTIAccum getAccumulationForSite(String fftiSourceKey,
String fftiSiteKey, String fftiDataKey, double duration, String unit) {
SourceXML ffmpSource = ffmpgen.getSourceConfig()
.getSourceByDisplayName(fftiSourceKey);
FFTIAccum accumulator = null;
String siteDataKey = ffmpSource.getDisplayName() + "-" + fftiSiteKey
+ "-" + fftiDataKey;
if (ffmpgen.isFFTI(siteDataKey)) {
accumulator = (FFTIAccum) ffmpgen.getFFTIData(siteDataKey);
} else {
accumulator = new FFTIAccum();
}
// This will only happen at initial load, update, and duration changes.
if (accumulator.isReset() || accumulator.getDuration() != duration) {
accumulator.setDuration(duration);
accumulator.setUnit(unit);
if (ffmpSource.isMosaic()) {
accumulator.setName(ffmpSource.getDisplayName());
} else {
accumulator.setName(fftiSiteKey + "-" + fftiSourceKey);
}
long cur = config.getDate().getTime();
long timeBack = (long) (duration * TimeUtil.MILLIS_PER_HOUR);
Date backDate = new Date(cur - timeBack);
long expirationTime = ffmpSource.getExpirationMinutes(fftiSiteKey) * TimeUtil.MILLIS_PER_MINUTE;
FFMPDataContainer fdc = null;
ArrayList<String> hucs = new ArrayList<String>();
hucs.add("ALL");
fdc = ffmpgen.getFFMPDataContainer(siteDataKey, hucs, backDate);
if (fdc != null) {
FFMPBasinData fbd = fdc.getBasinData("ALL");
// go over the list of CWAs gathering the pfaf list
ArrayList<Long> pfafs = new ArrayList<Long>();
ArrayList<String> cwaList = fdm.getCwaList();
Double gap = getGap(fdc, ffmpSource, duration, fftiSiteKey);
if (gap != Double.NaN) {
for (Long key : fbd.getBasins().keySet()) {
for (String cwa : cwaList) {
boolean primary = false;
if (cwa.equals(config.getCWA())) {
primary = true;
}
FFMPBasinMetaData fmdb = templates.getBasin(
fftiSiteKey, key);
if (fmdb == null) {
continue;
}
// Gets buffer zones adjacent to CWA
if ((cwa.equals(fmdb.getCwa()))
|| (primary && fmdb.isPrimaryCwa())) {
if (!pfafs.contains(key)) {
pfafs.add(key);
}
}
}
}
double amount = fdc.getMaxValue(pfafs, backDate,
config.getDate(), expirationTime,
ffmpSource.isRate());
// max value for monitored area
accumulator.setAccumulation(amount);
accumulator.setGap(gap);
}
}
// replace or insert it, memory management
if (ffmpgen.ffmpData.containsKey(siteDataKey)) {
ffmpgen.ffmpData.remove(siteDataKey);
}
accumulator.setReset(false);
ffmpgen.writeFFTIData(siteDataKey, accumulator);
}
return accumulator;
}
/**
* Gets the ratio and difference values for this site
* @param qSourceKey
* @param qSiteKey
* @param ffgType
* @param duration
* @param unit
* @return
*/
private FFTIRatioDiff getRatioAndDiffForSite(String qSourceKey,
String qSiteKey, String ffgType, double duration, String unit) {
FFTIRatioDiff values = null;
SourceXML ffmpQSource = ffmpgen.fscm.getSourceByDisplayName(qSourceKey);
if (ffmpQSource == null) {
ffmpQSource = ffmpgen.fscm.getSource(qSourceKey);
}
String siteDataKey = ffgType + "-" + ffmpQSource.getSourceName() + "-"
+ qSiteKey;
if (ffmpgen.isFFTI(siteDataKey)) {
values = (FFTIRatioDiff) ffmpgen.getFFTIData(siteDataKey);
if (values.getGuids() == null || values.getQpes() == null) {
values.setReset(true);
}
} else {
values = new FFTIRatioDiff();
}
// This will only happen at initial load, update, and duration changes.
if (values.isReset() || values.getDuration() != duration) {
values.setDuration(duration);
values.setUnit(unit);
long cur = config.getDate().getTime();
long timeBack = (long) (duration * TimeUtil.MILLIS_PER_HOUR);
Date backDate = new Date(cur - timeBack);
long expirationTime = ffmpQSource.getExpirationMinutes(qSiteKey) * TimeUtil.MILLIS_PER_MINUTE;
// make sure we have data
Date ffgBackDate = new Date(config.getDate().getTime()
- (TimeUtil.MILLIS_PER_HOUR * FFMPGenerator.FFG_SOURCE_CACHE_TIME));
String primarySource = ffmpgen.fscm.getPrimarySource(ffmpQSource);
ProductXML product = ffmpgen.fscm.getProduct(primarySource);
ArrayList<String> hucs = new ArrayList<String>();
hucs.add("ALL");
FFMPDataContainer guidContainer = ffmpgen.getFFMPDataContainer(
ffgType, hucs, ffgBackDate);
long guidSourceExpiration = 0l;
if (guidContainer == null) {
guidContainer = new FFMPDataContainer(ffgType, hucs);
}
for (SourceXML iguidSource : product
.getGuidanceSourcesByType(ffgType)) {
if (guidSourceExpiration == 0l) {
guidSourceExpiration = iguidSource
.getExpirationMinutes(qSiteKey) * TimeUtil.MILLIS_PER_MINUTE;
break;
}
}
// if still nothing, punt!
if (guidContainer.size() == 0) {
statusHandler.handle(Priority.PROBLEM,
"FFTI: No guidance sources available for " + qSiteKey
+ " " + qSourceKey + " " + " comparison.");
return values;
}
FFMPDataContainer qpeContainer = ffmpgen.getFFMPDataContainer(
ffmpQSource.getSourceName() + "-" + qSiteKey + "-"
+ qSiteKey, hucs, backDate);
if (qpeContainer != null) {
// go over the list of CWAs gathering the pfaf list
ArrayList<Long> pfafs = new ArrayList<Long>();
ArrayList<String> cwaList = fdm.getCwaList();
FFMPBasinData fbd = qpeContainer.getBasinData("ALL");
for (Long key : fbd.getBasins().keySet()) {
for (String cwa : cwaList) {
boolean primary = false;
if (cwa.equals(config.getCWA())) {
primary = true;
}
FFMPBasinMetaData fmdb = templates.getBasin(qSiteKey,
key);
if (fmdb == null) {
continue;
}
// Gets buffer zones adjacent to CWA
if ((cwa.equals(fmdb.getCwa()))
|| (primary && fmdb.isPrimaryCwa())) {
if (!pfafs.contains(key)) {
pfafs.add(key);
}
}
}
}
Double gap = getGap(qpeContainer, ffmpQSource, duration,
qSiteKey);
if (gap != Double.NaN) {
ArrayList<Float> qpes = qpeContainer.getBasinData("ALL")
.getAccumValues(pfafs, backDate, config.getDate(),
expirationTime, false);
FFMPGuidanceInterpolation interpolator = new FFMPGuidanceInterpolation(
ffmpgen.fscm, product, ffmpgen.frcm.getRunner(
config.getCWA()).getProduct(qSiteKey),
primarySource, ffgType, qSiteKey);
interpolator.setInterpolationSources(duration);
ArrayList<Float> guids = guidContainer.getBasinData("ALL")
.getGuidanceValues(pfafs, interpolator,
guidSourceExpiration);
values.setQpes(qpes);
values.setGuids(guids);
values.setGap(gap);
}
} else {
return values;
}
// replace or insert it
values.setReset(false);
ffmpgen.writeFFTIData(siteDataKey, values);
}
return values;
}
/**
* gets the gap
*
@ -1051,12 +788,11 @@ public class FFTI implements Runnable {
* @param duration
* @return
*/
private Double getGap(FFMPDataContainer qpeContainer,
SourceXML ffmpQSource, double duration, String qSiteKey) {
public static Double getGap(FFMPDataContainer qpeContainer,
SourceXML ffmpQSource, Date curdate, double duration, String qSiteKey) {
long cur = config.getDate().getTime();
long timeBack = (long) (duration * TimeUtil.MILLIS_PER_HOUR);
Date backDate = new Date(cur - timeBack);
Date backDate = new Date(curdate.getTime() - timeBack);
long expirationTime = ffmpQSource.getExpirationMinutes(qSiteKey);
Double gapVal = 0.0;
@ -1065,7 +801,7 @@ public class FFTI implements Runnable {
gapVal = 0.0;
List<FFMPGap> gaps = FFMPGap.getGaps(
qpeContainer.getOrderedTimes(backDate), expirationTime,
backDate, config.getDate());
backDate, curdate);
for (FFMPGap gap : gaps) {
gapVal += gap.getGap();
}

62
edexOsgi/com.raytheon.uf.edex.plugin.preciprate/src/com/raytheon/uf/edex/plugin/preciprate/PrecipRateGenerator.java
View file

@ -29,7 +29,10 @@ import com.raytheon.edex.urifilter.URIGenerateMessage;
import com.raytheon.uf.common.dataplugin.preciprate.PrecipRateRecord;
import com.raytheon.uf.common.dataplugin.preciprate.dao.PrecipRateDao;
import com.raytheon.uf.common.dataplugin.radar.util.RadarConstants.DHRValues;
import com.raytheon.uf.common.dataplugin.radar.util.RadarsInUseUtil;
import com.raytheon.uf.common.monitor.config.SCANRunSiteConfigurationManager;
import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
import com.raytheon.uf.common.monitor.events.MonitorConfigListener;
import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
@ -47,6 +50,7 @@ import com.raytheon.uf.edex.plugin.preciprate.common.PrecipRateConfig;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 01/25/10 3796 D. Hladky Initial release
* 02/25/13 1660 D. Hladky Fixed SCAN configuration bug.
*
* </pre>
*
@ -54,14 +58,19 @@ import com.raytheon.uf.edex.plugin.preciprate.common.PrecipRateConfig;
* @version 1
*/
public class PrecipRateGenerator extends CompositeProductGenerator {
private static final transient IUFStatusHandler statusHandler = UFStatus
public class PrecipRateGenerator extends CompositeProductGenerator implements
MonitorConfigListener{
private static final IUFStatusHandler statusHandler = UFStatus
.getHandler(PrecipRateGenerator.class);
private static final String genName = "PrecipRate";
private static final String productType = "preciprate";
/** run configuration manager **/
public SCANRunSiteConfigurationManager srcm = null;
/** Set of icaos to filter for */
private Set<String> icaos = null;
@ -77,11 +86,24 @@ public class PrecipRateGenerator extends CompositeProductGenerator {
@Override
protected void configureFilters() {
logger.debug(getGeneratorName() + " process Filter Config...");
icaos = new HashSet<String>(RadarsInUseUtil.getSite(null,
RadarsInUseUtil.LOCAL_CONSTANT));
icaos.addAll(RadarsInUseUtil.getSite(null,
RadarsInUseUtil.DIAL_CONSTANT));
statusHandler.handle(Priority.INFO, getGeneratorName()
+ " process Filter Config...");
try {
getRunConfig().readConfigXml();
} catch (SerializationException e) {
statusHandler.handle(Priority.ERROR,
"Couldn't read PrecipRate(scan) configuration!!!", e);
}
boolean configValid = getRunConfig().isPopulated();
if (!configValid) {
statusHandler.handle(Priority.WARN,
"Configuration for PrecipRate(scan) is invalid!!!");
return;
}
icaos = new HashSet<String>(getRunConfig().getSiteNames());
}
@Override
@ -96,7 +118,7 @@ public class PrecipRateGenerator extends CompositeProductGenerator {
} catch (Exception e) {
statusHandler.handle(Priority.PROBLEM,
"Couldn't create PrecipRate URIFilter.." + icao
+ " is not a know RADAR site.");
+ " is not a know RADAR site.", e);
iter.remove();
}
}
@ -168,4 +190,26 @@ public class PrecipRateGenerator extends CompositeProductGenerator {
return getConfigManager().getPrecipRateState();
}
@Override
public void configChanged(MonitorConfigEvent fce) {
if (fce.getSource() instanceof SCANRunSiteConfigurationManager) {
statusHandler.handle(Priority.INFO,
"Re-configuring PrecipRate URI filters...Run Site Config change");
resetFilters();
}
}
/**
* run config manager
*
* @return
*/
public SCANRunSiteConfigurationManager getRunConfig() {
if (srcm == null) {
srcm = SCANRunSiteConfigurationManager.getInstance();
srcm.addListener(this);
}
return srcm;
}
}

59
edexOsgi/com.raytheon.uf.edex.plugin.qpf/src/com/raytheon/uf/edex/plugin/qpf/QPFGenerator.java
View file

@ -29,8 +29,11 @@ import com.raytheon.edex.urifilter.URIGenerateMessage;
import com.raytheon.uf.common.dataplugin.qpf.QPFRecord;
import com.raytheon.uf.common.dataplugin.qpf.QPFRecord.DATA_TYPE;
import com.raytheon.uf.common.dataplugin.qpf.dao.QPFDao;
import com.raytheon.uf.common.dataplugin.radar.util.RadarsInUseUtil;
import com.raytheon.uf.common.monitor.config.SCANRunSiteConfigurationManager;
import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
import com.raytheon.uf.common.monitor.events.MonitorConfigListener;
import com.raytheon.uf.common.monitor.scan.ScanUtils;
import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
@ -49,6 +52,7 @@ import com.raytheon.uf.edex.plugin.qpf.common.QPFConfig;
* 02/07/2009 1981 dhladky Initial Creation.
* 04/27/2012 #562 dgilling Accept getter and setter
* renames in QPFRecord.
* 02/25/13 1660 D. Hladky Fixed configuration bug in scan.
*
* </pre>
*
@ -56,7 +60,8 @@ import com.raytheon.uf.edex.plugin.qpf.common.QPFConfig;
* @version 1.0
*/
public class QPFGenerator extends CompositeProductGenerator {
public class QPFGenerator extends CompositeProductGenerator implements
MonitorConfigListener {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(QPFGenerator.class);
@ -65,6 +70,9 @@ public class QPFGenerator extends CompositeProductGenerator {
private static final String productType = "qpf";
/** run configuration manager **/
public SCANRunSiteConfigurationManager srcm = null;
/** Set of icaos to filter for */
private Set<String> icaos = null;
@ -92,7 +100,7 @@ public class QPFGenerator extends CompositeProductGenerator {
} catch (Exception e) {
statusHandler.handle(Priority.PROBLEM,
"Couldn't create QPF URIFilter.." + icao
+ " is not a know RADAR site.");
+ " is not a know RADAR site.", e);
iter.remove();
}
}
@ -102,11 +110,24 @@ public class QPFGenerator extends CompositeProductGenerator {
@Override
protected void configureFilters() {
logger.info(getGeneratorName() + " process Filter Config...");
icaos = new HashSet<String>(RadarsInUseUtil.getSite(null,
RadarsInUseUtil.LOCAL_CONSTANT));
icaos.addAll(RadarsInUseUtil.getSite(null,
RadarsInUseUtil.DIAL_CONSTANT));
statusHandler.handle(Priority.INFO, getGeneratorName()
+ " process Filter Config...");
try {
getRunConfig().readConfigXml();
} catch (SerializationException e) {
statusHandler.handle(Priority.ERROR,
"Couldn't read qpf(scan) configuration!!!", e);
}
boolean configValid = getRunConfig().isPopulated();
if (!configValid) {
statusHandler.handle(Priority.WARN,
"Configuration for qpf(scan) is invalid!!!");
return;
}
icaos = new HashSet<String>(getRunConfig().getSiteNames());
}
@Override
@ -168,4 +189,26 @@ public class QPFGenerator extends CompositeProductGenerator {
return getConfigManager().getQPFState();
}
/**
* run config manager
*
* @return
*/
public SCANRunSiteConfigurationManager getRunConfig() {
if (srcm == null) {
srcm = SCANRunSiteConfigurationManager.getInstance();
srcm.addListener(this);
}
return srcm;
}
@Override
public void configChanged(MonitorConfigEvent fce) {
if (fce.getSource() instanceof SCANRunSiteConfigurationManager) {
statusHandler.handle(Priority.INFO,
"Re-configuring QPF URI filters...Run Site Config change");
resetFilters();
}
}
}

28
edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanGenerator.java
View file

@ -47,9 +47,26 @@ import com.raytheon.uf.edex.cpgsrv.CompositeProductGenerator;
import com.raytheon.uf.edex.dat.utils.DatMenuUtil;
import com.raytheon.uf.edex.dat.utils.ScanDataCache;
/**
* Generator implementation for SCAN
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 02/25/13 1660 D. Hladky Fixed SCAN configuration bug.
*
* </pre>
*
* @author dhladky
* @version 1
*/
public class ScanGenerator extends CompositeProductGenerator implements
MonitorConfigListener {
private static final transient IUFStatusHandler statusHandler = UFStatus
private static final IUFStatusHandler statusHandler = UFStatus
.getHandler(ScanGenerator.class);
private static final String genName = "SCAN";
@ -79,21 +96,22 @@ public class ScanGenerator extends CompositeProductGenerator implements
@Override
protected void configureFilters() {
statusHandler.handle(Priority.DEBUG, getGeneratorName()
statusHandler.handle(Priority.INFO, getGeneratorName()
+ " process Filter Config...");
try {
getRunConfig().readConfigXml();
} catch (SerializationException e) {
e.printStackTrace();
statusHandler.handle(Priority.ERROR, "Couldn't read scan configuration!!!", e);
}
boolean configValid = getRunConfig().isPopulated();
if (!configValid) {
statusHandler.handle(Priority.WARN,
"Configuration for SCAN is invalid!!!");
return;
}
logger.debug(getGeneratorName() + " process Filter Config...");
icaos = new HashSet<String>(getRunConfig().getSiteNames());
}
@ -110,7 +128,7 @@ public class ScanGenerator extends CompositeProductGenerator implements
} catch (Exception e) {
statusHandler.handle(Priority.PROBLEM,
"Couldn't create SCAN URIFilter.." + icao
+ " is not a known RADAR site.");
+ " is not a known RADAR site.", e);
iter.remove();
}
}

61
edexOsgi/com.raytheon.uf.edex.plugin.vil/src/com/raytheon/uf/edex/plugin/vil/VILGenerator.java
View file

@ -26,11 +26,14 @@ import java.util.Set;
import com.raytheon.edex.urifilter.URIFilter;
import com.raytheon.edex.urifilter.URIGenerateMessage;
import com.raytheon.uf.common.dataplugin.radar.util.RadarsInUseUtil;
import com.raytheon.uf.common.dataplugin.vil.VILRecord;
import com.raytheon.uf.common.dataplugin.vil.VILRecord.DATA_TYPE;
import com.raytheon.uf.common.dataplugin.vil.dao.VILDao;
import com.raytheon.uf.common.monitor.config.SCANRunSiteConfigurationManager;
import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
import com.raytheon.uf.common.monitor.events.MonitorConfigListener;
import com.raytheon.uf.common.monitor.scan.ScanUtils;
import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
@ -47,6 +50,7 @@ import com.raytheon.uf.edex.plugin.vil.common.VILConfig;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 02/07/2009 2037 dhladky Initial Creation.
* 02/25/13 1660 D. Hladky Fixed SCAN configuration bug.
*
* </pre>
*
@ -54,8 +58,9 @@ import com.raytheon.uf.edex.plugin.vil.common.VILConfig;
* @version 1.0
*/
public class VILGenerator extends CompositeProductGenerator {
private static final transient IUFStatusHandler statusHandler = UFStatus
public class VILGenerator extends CompositeProductGenerator implements
MonitorConfigListener {
private static final IUFStatusHandler statusHandler = UFStatus
.getHandler(VILGenerator.class);
private static final String genName = "VIL";
@ -65,6 +70,9 @@ public class VILGenerator extends CompositeProductGenerator {
/** Set of icaos to filter for */
private Set<String> icaos = null;
/** run configuration manager **/
public SCANRunSiteConfigurationManager srcm = null;
/**
* Public constructor for VILGenerator
*
@ -88,7 +96,7 @@ public class VILGenerator extends CompositeProductGenerator {
} catch (Exception e) {
statusHandler.handle(Priority.PROBLEM,
"Couldn't create VIL URIFilter.." + icao
+ " is not a know RADAR site.");
+ " is not a know RADAR site.", e);
iter.remove();
}
}
@ -98,11 +106,24 @@ public class VILGenerator extends CompositeProductGenerator {
@Override
protected void configureFilters() {
statusHandler.handle(Priority.DEBUG, "Process Filter Config...");
icaos = new HashSet<String>(RadarsInUseUtil.getSite(null,
RadarsInUseUtil.LOCAL_CONSTANT));
icaos.addAll(RadarsInUseUtil.getSite(null,
RadarsInUseUtil.DIAL_CONSTANT));
statusHandler.handle(Priority.INFO, getGeneratorName()
+ " process Filter Config...");
try {
getRunConfig().readConfigXml();
} catch (SerializationException e) {
statusHandler.handle(Priority.ERROR,
"Couldn't read VIL(scan) configuration!!!", e);
}
boolean configValid = getRunConfig().isPopulated();
if (!configValid) {
statusHandler.handle(Priority.WARN,
"Configuration for vil(scan) is invalid!!!");
return;
}
icaos = new HashSet<String>(getRunConfig().getSiteNames());
}
@Override
@ -161,4 +182,26 @@ public class VILGenerator extends CompositeProductGenerator {
return getConfigManager().getVILState();
}
@Override
public void configChanged(MonitorConfigEvent fce) {
if (fce.getSource() instanceof SCANRunSiteConfigurationManager) {
statusHandler.handle(Priority.INFO,
"Re-configuring VIL URI filters...Run Site Config change");
resetFilters();
}
}
/**
* run config manager
*
* @return
*/
public SCANRunSiteConfigurationManager getRunConfig() {
if (srcm == null) {
srcm = SCANRunSiteConfigurationManager.getInstance();
srcm.addListener(this);
}
return srcm;
}
}