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

Issue #2316 remove edex pirep/airep dependencies on ncep plugins.

Browse source 
Former-commit-id: e99a97ed150f08a6095e6b7036f91596b394d391
This commit is contained in:
Ben Steffensmeier 2013-09-12 10:32:59 -05:00
parent a52ea0a481
commit f05f6ffff6
6 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ncep/gov.noaa.nws.ncep.edex.plugin.airep/META-INF/MANIFEST.MF
View file

@ -18,6 +18,4 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174",
Export-Package: gov.noaa.nws.ncep.edex.plugin.airep,
gov.noaa.nws.ncep.edex.plugin.airep.decoder
Import-Package: com.raytheon.uf.edex.pointdata,
gov.noaa.nws.ncep.common.tools,
gov.noaa.nws.ncep.edex.util,
org.apache.commons.logging

4
ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/decoder/AIREPWeather.java
View file

@ -4,7 +4,7 @@
**/
package gov.noaa.nws.ncep.edex.plugin.airep.decoder;
import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
/*a
* TODO Enter a description here.
@ -29,7 +29,7 @@ public class AIREPWeather
private static final int WX_WEATHER = 1;
private static final int WX_FLIGHT = 2;
private static final int IMISSD = IDecoderConstantsN.INTEGER_MISSING;
private static final int IMISSD = IDecoderConstants.VAL_MISSING;
private final String theRawData;

7
ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/decoder/AirepParser.java
View file

@ -19,9 +19,9 @@ import com.raytheon.uf.edex.decodertools.aircraft.AircraftLatitude;
import com.raytheon.uf.edex.decodertools.aircraft.AircraftLongitude;
import com.raytheon.uf.edex.decodertools.aircraft.AircraftRemarks;
import com.raytheon.uf.edex.decodertools.core.BasePoint;
import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
import com.raytheon.uf.edex.decodertools.core.PlatformLocationProxy;
import com.raytheon.uf.edex.decodertools.time.TimeTools;
import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
/**
* The AirepParser takes a String that should contain a single AIREP observation
@ -64,8 +64,9 @@ public class AirepParser
// Once set the obs data cannot be changed!
private final String reportData;
private static final float RMISSD = IDecoderConstantsN.UAIR_FLOAT_MISSING;
private static final int IMISSD = IDecoderConstantsN.INTEGER_MISSING;
private static final float RMISSD = -9999.f;
private static final int IMISSD = IDecoderConstants.VAL_MISSING;
private static final Map<String,String> WX_COND_WORDS = new HashMap<String,String>();
static {

1
ncep/gov.noaa.nws.ncep.edex.plugin.pirep/META-INF/MANIFEST.MF
View file

@ -18,5 +18,4 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174",
Export-Package: gov.noaa.nws.ncep.edex.plugin.pirep,
gov.noaa.nws.ncep.edex.plugin.pirep.decoder
Import-Package: com.raytheon.uf.edex.pointdata,
gov.noaa.nws.ncep.common.tools,
org.apache.commons.logging

17
ncep/gov.noaa.nws.ncep.edex.plugin.pirep/src/gov/noaa/nws/ncep/edex/plugin/pirep/decoder/PirepParser.java
View file

@ -18,8 +18,6 @@
* further licensing information.
**/
package gov.noaa.nws.ncep.edex.plugin.pirep.decoder;
import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
@ -39,6 +37,7 @@ import com.raytheon.uf.edex.decodertools.aircraft.AircraftFlightCondition;
import com.raytheon.uf.edex.decodertools.aircraft.AircraftFlightLevel;
import com.raytheon.uf.edex.decodertools.aircraft.AircraftRemarks;
import com.raytheon.uf.edex.decodertools.core.BasePoint;
import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
import com.raytheon.uf.edex.decodertools.core.LatLonPoint;
import com.raytheon.uf.edex.decodertools.time.TimeTools;
import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
@ -84,9 +83,9 @@ public class PirepParser {
// Allowable future time in milliseconds (15 minutes).
private static final int ALLOWABLE_TIME = 15;
private static final float RMISSD = IDecoderConstantsN.UAIR_FLOAT_MISSING;
private static final float RMISSD = -9999.f;
private static final int IMISSD = IDecoderConstantsN.UAIR_INTEGER_MISSING;
private static final int IMISSD = IDecoderConstants.VAL_MISSING;;
private static final String[] RPIDS = { "UUA", "UA" };
@ -325,7 +324,7 @@ public class PirepParser {
*/
public Integer getFlightLevel() {
//Integer retValue = null;
Integer retValue = IDecoderConstantsN.UAIR_INTEGER_MISSING; //-9999;
Integer retValue = PirepTools.UAIR_INTEGER_MISSING; // -9999;
if (flightLevel != null) {
retValue = flightLevel.getFlightLevel();
}
@ -1732,12 +1731,12 @@ public class PirepParser {
s1 = matcher.group(8);
s2 = matcher.group(9);
if(BLO_HGT.equals(s1)) {
at.setBaseHeight(IDecoderConstantsN.UAIR_INTEGER_MISSING);
at.setBaseHeight(PirepTools.UAIR_INTEGER_MISSING);
at.setTopHeight(decodeHeight(s2));
} else if (ABV_HGT.equals(s1)) {
at.setBaseHeight(decodeHeight(s2));
at.setTopHeight(IDecoderConstantsN.UAIR_INTEGER_MISSING);
at.setTopHeight(PirepTools.UAIR_INTEGER_MISSING);
} else {
// Check for one or more levels
s1 = matcher.group(11);
@ -1751,8 +1750,8 @@ public class PirepParser {
if((s1 != null)&&(s2 != null)) {
Integer base = at.getBaseHeight();
Integer top = at.getTopHeight();
if(base != IDecoderConstantsN.UAIR_INTEGER_MISSING) {
if(top != IDecoderConstantsN.UAIR_INTEGER_MISSING) {
if (base != PirepTools.UAIR_INTEGER_MISSING) {
if (top != PirepTools.UAIR_INTEGER_MISSING) {
if(base > top) {
logger.debug(traceId + "- BASE-TOP inversion fixed");
at.setBaseHeight(top);

8
ncep/gov.noaa.nws.ncep.edex.plugin.pirep/src/gov/noaa/nws/ncep/edex/plugin/pirep/decoder/PirepTools.java
View file

@ -2,8 +2,6 @@ package gov.noaa.nws.ncep.edex.plugin.pirep.decoder;
//import gov.noaa.nws.ncep.edex.plugin.pirep.common.AircraftFlightCondition;
import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
import java.util.ArrayList;
import java.util.List;
@ -31,6 +29,8 @@ import com.raytheon.uf.edex.decodertools.aircraft.WordTranslator;
public class PirepTools {
public static final int UAIR_INTEGER_MISSING = -9999;
private static final char SPACE = ' ';
private static final char DASH = '-';
@ -292,12 +292,12 @@ public class PirepTools {
case MOD_ID: {
switch(e.getFirstId()) {
case MOD_ID_ABV : {
afc.setTopHeight(IDecoderConstantsN.UAIR_INTEGER_MISSING); //-9999
afc.setTopHeight(UAIR_INTEGER_MISSING); // -9999
flB = true;
break;
}
case MOD_ID_BLO : {
afc.setBaseHeight(IDecoderConstantsN.UAIR_INTEGER_MISSING);
afc.setBaseHeight(UAIR_INTEGER_MISSING);
flA = true;
break;
}