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

Omaha #4658 Fixed expiration times in FFMP DAF access

Browse source 
Change-Id: Iac02790c4d24efc220b9c0b5d488df403681b3be

Former-commit-id: 94de80dd125cd4a004678e7d0c92fc8d0e99f70e
This commit is contained in:
Dave Hladky 2015-07-16 08:59:36 -05:00
parent 66ab0249ec
commit 91aab92db5
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/dataaccess/FFMPGeometryFactory.java
View file

@ -55,6 +55,7 @@ import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.common.time.util.TimeUtil;
import com.vividsolutions.jts.geom.Geometry;
/**
@ -78,6 +79,7 @@ import com.vividsolutions.jts.geom.Geometry;
* Jul 30, 2014 3184 njensen Overrode required and optional identifiers
* Feb 27, 2015 4180 mapeters Overrode getAvailableParameters().
* Jun 15, 2015 4560 ccody Added support for configurable rate/accumulation calculation for getGeometryData
* Jul 16, 2015 4658 dhladky Expiration times fixed.
*
* </pre>
*
@ -252,9 +254,6 @@ public class FFMPGeometryFactory extends AbstractDataPluginFactory {
HucLevelGeometriesFactory geomFactory = HucLevelGeometriesFactory
.getInstance();
// BAL - Switched to use siteKey instead of dataKey.
// Map<Long, Geometry> geomMap = geomFactory.getGeometries(templates,
// dataKey, cwa, huc);
Map<Long, Geometry> geomMap = geomFactory.getGeometries(templates,
siteKey, cwa, huc);
@ -303,18 +302,14 @@ public class FFMPGeometryFactory extends AbstractDataPluginFactory {
}
if (basin instanceof FFMPGuidanceBasin) {
/*
* Bryon L - Added test for FFMPGuidanceBasin object.
* Couldn't use getValue(Date, Sourcename) here. Odd problem
* with date key reference.
*/
value = ((FFMPGuidanceBasin) basin).getValue(
rec.getSourceName(), 1000);
rec.getSourceName(),
sourceXml.getExpirationMinutes(rec.getSiteKey())
* TimeUtil.MILLIS_PER_MINUTE);
} else {
value = basin.getAccumValue(start, end,
sourceXml.getExpirationMinutes(rec.getSiteKey()),
isRate);
// value = basin.getValue(rec.getDataTime().getRefTime());
sourceXml.getExpirationMinutes(rec.getSiteKey())
* TimeUtil.MILLIS_PER_MINUTE, isRate);
}
String parameter = rec.getSourceName();
String unitStr = sourceXml.getUnit();