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

Merge branch 'master_14.2.2' (14.2.2-9,10,11) into omaha_14.2.2

Browse source 
Former-commit-id: 9313e045bf [formerly 03b376033b3374694bc8a6e0a2c55b830db058e1]
Former-commit-id: c7ef7878f5
This commit is contained in:
Steve Harris 2014-05-29 07:43:38 -05:00
commit 53645445fe
3 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
View file

@ -722,15 +722,6 @@ public class StormTrackDisplay implements IRenderable {
|| currentState.newDuration != -1 || update) { || currentState.newDuration != -1 || update) {
if (currentState.timePoints != null if (currentState.timePoints != null
&& currentState.timePoints.length != frameCount) { && currentState.timePoints.length != frameCount) {
// need to set theAnchorPoint and theAnchorIndex here
// because timePoints get erased before we get to updateAnchorPoint
DataTime frameTime = paintProps.getDataTime();
for (int j=0;j<currentState.timePoints.length;j++){
if (frameTime.equals(currentState.timePoints[j].time)) {
theAnchorPoint = currentState.timePoints[j].coord;
theAnchorIndex = j;
}
}
currentState.timePoints = null; currentState.timePoints = null;
} }

11
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
View file

@ -477,6 +477,7 @@ public class PostShef {
data.setCreationDate("1970-01-01 00:00:00"); data.setCreationDate("1970-01-01 00:00:00");
} }
locId = data.getLocationId();
String key = locId + prodId + data.getObservationTime(); String key = locId + prodId + data.getObservationTime();
if (idLocations.containsKey(key)) { if (idLocations.containsKey(key)) {
postLocData = idLocations.get(key); postLocData = idLocations.get(key);
@ -2099,9 +2100,9 @@ public class PostShef {
String telem = null; String telem = null;
String sql = null; String sql = null;
Object[] oa = null; Object[] oa = null;
String key = locId + data.getPeTsE();
try { try {
if (!ingestSwitchMap.containsKey(locId)) { if (!ingestSwitchMap.containsKey(key)) {
errorMsg.append("Error getting connection to IHFS Database"); errorMsg.append("Error getting connection to IHFS Database");
sql = "select lid, pe, dur, ts, extremum, ts_rank, ingest, ofs_input, stg2_input from IngestFilter where lid = '" sql = "select lid, pe, dur, ts, extremum, ts_rank, ingest, ofs_input, stg2_input from IngestFilter where lid = '"
+ locId + "'"; + locId + "'";
@ -2138,11 +2139,11 @@ public class PostShef {
} }
} }
ingestSwitchMap.put(locId, ingestSwitch); ingestSwitchMap.put(key, ingestSwitch);
} }
matchFound = ingestSwitchMap.containsKey(locId); matchFound = ingestSwitchMap.containsKey(key);
ingestSwitch = ingestSwitchMap.get(locId); ingestSwitch = ingestSwitchMap.get(key);
/* /*
* if there is no ingest record for this entry, then check if the * if there is no ingest record for this entry, then check if the

5
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
View file

@ -11,6 +11,7 @@
##### Evan Bookbinder 05-05-2013 handleClosesPoints and 3rd bullet changes (OVER & now) ##### Evan Bookbinder 05-05-2013 handleClosesPoints and 3rd bullet changes (OVER & now)
##### Evan Bookbinder 09-20-2013 Fixed rural area otherPoints in pathcast section, added rural phrase ##### Evan Bookbinder 09-20-2013 Fixed rural area otherPoints in pathcast section, added rural phrase
##### Qinglu Lin 03-17-2014 DR 16309. Updated inserttorwatches and insertsvrwatches. ##### Qinglu Lin 03-17-2014 DR 16309. Updated inserttorwatches and insertsvrwatches.
##### Qinglu Lin 05-21-2014 DR 16309. Updated inserttorwatches and insertsvrwatches by changing 'FOR##' to 'FOR ##'.
#################################################################################################### ####################################################################################################
#* #*
Mile Marker Test Code Mile Marker Test Code
@ -202,7 +203,7 @@ ${dateUtil.period(${watches.getLatestTorTime()},${timeFormat.plain}, 15, ${local
#if(${secondtimezone}) #if(${secondtimezone})
/${dateUtil.format(${watch.getEndTime()}, ${timeFormat.plain}, 15, ${secondtimezone})}/## /${dateUtil.format(${watch.getEndTime()}, ${timeFormat.plain}, 15, ${secondtimezone})}/##
#end #end
FOR## FOR ##
#set($numPortions = ${list.size(${watch.getPortions()})}) #set($numPortions = ${list.size(${watch.getPortions()})})
#set($count = 0) #set($count = 0)
#foreach(${portion} in ${watch.getPortions()}) #foreach(${portion} in ${watch.getPortions()})
@ -236,7 +237,7 @@ ${dateUtil.period(${watches.getLatestSvrTime()},${timeFormat.plain}, 15, ${local
#if(${secondtimezone}) #if(${secondtimezone})
/${dateUtil.format(${watch.getEndTime()}, ${timeFormat.plain}, 15, ${secondtimezone})}/## /${dateUtil.format(${watch.getEndTime()}, ${timeFormat.plain}, 15, ${secondtimezone})}/##
#end #end
FOR## FOR ##
#set($numPortions = ${list.size(${watch.getPortions()})}) #set($numPortions = ${list.size(${watch.getPortions()})})
#set($count = 0) #set($count = 0)
#foreach(${portion} in ${watch.getPortions()}) #foreach(${portion} in ${watch.getPortions()})