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

Merge "Issue #2457 Improve error messages for missing radar icao." into development

Browse source 
Former-commit-id: e8f53dd99a [formerly e67b29df638e59b18e552d1e596034f70d08adbc]
Former-commit-id: 4b541c4c23
This commit is contained in:
Nate Jensen 2013-10-09 13:10:28 -05:00 • committed by Gerrit Code Review
commit 1d3742a979
2 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
View file

@ -86,7 +86,7 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* ------------- -------- ----------- --------------------------
* Feb 14, 2007 139 Phillippe Initial check-in. Refactor of initial
* implementation.
* Dec 17, 2007 600 bphillip Added dao pool usage
@ -96,6 +96,7 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* Mar 19, 2013 1785 bgonzale Added performance status handler and
* added status to decode.
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Oct 09, 2013 2457 bsteffen Improve error message for missing icao.
* </pre>
*
* @author bphillip
@ -222,8 +223,8 @@ public class RadarDecoder extends AbstractDecoder {
if (station == null) {
record.setIcao("unkn");
logger.error(headers.get("ingestfilename")
+ "-Unknown radar station id: "
+ l3Radar.getSourceId());
+ " contains an rpg id(" + l3Radar.getSourceId()
+ ") that is not in the radar_spatial table.");
} else {
record.setIcao(station.getRdaId().toLowerCase());
}

9
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarSpatialUtil.java
View file

@ -38,9 +38,11 @@ import com.vividsolutions.jts.geom.Coordinate;
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* ------------- -------- ----------- --------------------------
* Mar 19, 2010 #4473 rjpeter Initial creation.
* Mar 19, 2013 1804 bsteffen Cache db queries in radar decoder.
* Oct 09, 2013 2457 bsteffen Eliminate NullPointerException for rpg
* ids that are not in the database.
*
* </pre>
*
@ -110,9 +112,12 @@ public class RadarSpatialUtil {
RadarStation station = rpgIdDec2radarStation.get(rpgIdDec);
if (station == null) {
RadarStationDao stat = new RadarStationDao();
station = stat.queryByRpgIdDec(String.format("%03d", rpgIdDec));
String rpgId = String.format("%03d", rpgIdDec);
station = stat.queryByRpgIdDec(rpgId);
if (station != null) {
rpgIdDec2radarStation.put(rpgIdDec, station);
}
}
return station;
}