();
- retElements.addAll(reportElements);
- return retElements;
- } // parseElementsTestPoint()
-
- /**
- * Parse the AIREP observation into individual elements.
- */
- private void parseElements() {
- StringTokenizer st = new StringTokenizer(reportData, DELIMITER,
- WANT_DELIMITERS);
-
- // Now get the elements
- while (st.hasMoreTokens()) {
- String s = st.nextToken();
- if (!DELIMITER.equals(s)) {
- Object o = AIREPObsType.obsTypeFactory(s);
- if ((o != null) && (reportType == null)) {
- reportType = ((AIREPObsType) o).getValue();
- } else {
- if (s.length() > 0) {
- reportElements.add(s);
- }
- }
- }
- }
- decodeMID();
- splitLatLon();
- decodeLatitude();
- decodeLongitude();
- decodeTime();
- // By now we should have found lat lon information. If not then
- // run back through the data to see if there is a waypoint. If we
- // get to the time information, quit, it's not there.
- if ((latitude == null) && (longitude == null)) {
- for (int i = 0; i < reportElements.size(); i++) {
- Object o = reportElements.get(i);
- if (o instanceof String) {
- BasePoint wayPoint = PlatformLocationProxy.lookup(
- (String) o, null);
- // found a waypoint
- if (wayPoint != null) {
- // lat =
- // AircraftLatitude.createLatitude(wayPoint);
- // Longitude lon =
- // AircraftLongitude.createLongitude(wayPoint);
- // theElements.set(i,lat);
- // theElements.add(i+1,lon);
- // theLatitude = lat;
- // longitude = lon;
- // break;
- }
- } else if (o instanceof Calendar) {
- break;
- }
- }
- }
- // Need to have lat / lon data
- if ((latitude == null) || (longitude == null)) {
- // set the observation time to null, to signal that this ob
- // is invalid and quit.
- observationTime = null;
- return;
- }
- determineAircraftId();
-
- decodeFlightLevel();
- decodeTemperature();
-
- decodeTurb();
-
- decodeWeatherGroup();
- decodeWinds();
-
- collectRemarks();
- } // parseElements()
-
- /**
- * When the primary decode is complete the aircraft ID should be the only
- * data left prior to the latitude/longitude data. If found then set this
- * data as the id.
- */
- private void determineAircraftId() {
- for (int i = 0; i < reportElements.size(); i++) {
- Object o = reportElements.get(i);
- // Search only up to the obs time.
- if (observationTime.equals(o)) {
- break;
- } else if (o instanceof String) {
- aircraftId = (String) o;
- break;
- }
- }
- } // determineAircraftId()
-
- /**
- * Determine if a latitude/longitude group is run-together or may be a
- * navigation waypoint. As an example
- *
- *
- * 5802N02015W
- *
- *
- * is split into 2 groups
- *
- *
- * 5802N 02015W
- *
- *
- * which is then processed normally.
- */
- private void splitLatLon() {
- for (int i = 0; i < reportElements.size(); i++) {
- Object o = reportElements.get(i);
- if (o instanceof String) {
- String[] latLon = AircraftLatitude.splitLatLon((String) o);
- if ((latLon != null) && (latLon.length == 2)) {
- reportElements.set(i, latLon[1]);
- reportElements.add(i, latLon[0]);
- break;
- }
- }
- } // for
- } // splitLatLon()
-
- /**
- * Attempt to locate and decode the latitude information within this AIREP
- * observation. The decode object replaces the string data within the
- * observation elements collection.
- */
- private void decodeLatitude() {
- if (latitude == null) {
- for (int i = 0; i < reportElements.size(); i++) {
- Object o = reportElements.get(i);
- if (o instanceof String) {
- AircraftLatitude lat = AircraftLatitude
- .aircraftLatitudeFactory((String) o);
- if (lat != null) {
- reportElements.set(i, lat);
- latitude = lat.decodeLatitude();
- break;
- }
- }
- }
- }
- } // decodeLatitude()
-
- /**
- * Attempt to locate and decode the longitude information within this AIREP
- * observation. The decode object replaces the string data within the
- * observation elements collection.
- */
- private void decodeLongitude() {
- if (longitude == null) {
- for (int i = 0; i < reportElements.size(); i++) {
- Object o = reportElements.get(i);
- if (o instanceof String) {
- AircraftLongitude lon = AircraftLongitude
- .aircraftLongitudeFactory((String) o);
- if (lon != null) {
- reportElements.set(i, lon);
- longitude = lon.decodeLongitude();
- break;
- }
- }
- }
- }
- } // decodeLongitude()
-
- /**
- * Attempt to locate and decode the time information within this AIREP
- * observation. The decode object replaces the string data within the
- * observation elements collection.
- */
- private void decodeTime() {
- for (int i = 0; i < reportElements.size(); i++) {
- Object o = reportElements.get(i);
- if (o instanceof String) {
- String s = (String) o;
- if (TIME.matcher(s).matches()) {
-
- int hour = Integer.parseInt(s.substring(0, 2));
- int minute = Integer.parseInt(s.substring(2));
-
- if (refTime != null) {
-
- observationTime = TimeTools.copy(refTime);
- observationTime.set(Calendar.HOUR_OF_DAY, hour);
- observationTime.set(Calendar.MINUTE, minute);
- observationTime.set(Calendar.SECOND, 0);
- observationTime.set(Calendar.MILLISECOND, 0);
- // If the observation time ends up greater than
- // the reference time, back up a day.
- if (observationTime.compareTo(refTime) > 0) {
- observationTime.add(Calendar.DAY_OF_MONTH, -1);
- }
-
- reportElements.set(i, observationTime);
- }
- break;
- }
- }
- }
- }
-
- private void decodeFlightLevel() {
- for (int i = 0; i < reportElements.size(); i++) {
- Object o = reportElements.get(i);
- if (o instanceof String) {
- String s = (String) o;
- if (FL_SHORT.matcher(s).matches()) {
- double fLevel = Integer.parseInt(s.substring(1)) * 100;
-
- flightLevel = new AircraftFlightLevel(fLevel);
- reportElements.set(i, flightLevel);
- break;
- } else if (FL_LONG.matcher(s).matches()) {
- double fLevel = Integer.parseInt(s.substring(1)) * 100;
-
- flightLevel = new AircraftFlightLevel(fLevel);
- reportElements.set(i, flightLevel);
- break;
- }
- }
- }
- }
-
- /**
- * Decode the temperature information in this observation.
- */
- private void decodeTemperature() {
- for (int i = 0; i < reportElements.size(); i++) {
- Object o = reportElements.get(i);
- if (o instanceof String) {
- double temp = Double.NaN;
- String s = (String) o;
- if (TEMP_LONG.matcher(s).matches()) {
- String ss = s.substring(2);
- if (!"//".equals(ss)) {
- temp = Double.parseDouble(ss);
-
- if ("MS".equals(s.substring(0, 2))) {
- temp *= -1;
- }
- temperature = new Double(temp);
- reportElements.set(i, temperature);
- }
- break;
- } else if (TEMP_SHORT.matcher(s).matches()) {
- String ss = s.substring(1);
- if (!"//".equals(ss)) {
- temp = Double.parseDouble(ss);
-
- if ("M".equals(s.substring(0, 1))) {
- temp *= -1;
- }
- temperature = new Double(temp);
- reportElements.set(i, temperature);
- }
- break;
- }
- }
- }
- }
-
- /**
- * Decode airep turbulenceEncoded turbulence for storage.
- *
- *
- * T
- * Int
- * Type
- * Freg
- *
- *
- * 1
- * 111
- * 11
- * 11
- *
- *
- * 00
- * no frequency
- *
- *
- * 01
- * Ocnl
- *
- *
- * 10
- * Isolated
- *
- *
- * 11
- * Continous
- *
- *
- * 00
- * No type reported
- *
- *
- * 01
- * CAT 4
- *
- *
- * 10
- * Chop 6
- *
- *
- * 11
- * LLWS 7
- *
- *
- * 000
- * No Intensity
- *
- *
- * 001
- * Smooth-Light
- *
- *
- * 010
- * Light
- *
- *
- * 011
- * Light - Mod
- *
- *
- * 100
- * Mod
- *
- *
- * 101
- * Mod - Severe
- *
- *
- * 110
- * Severe
- *
- *
- * 111
- * Extreme
- *
- *
- */
- private void decodeTurb() {
- int intensity = -1;
- int i = 0;
- for (; i < reportElements.size(); i++) {
- Object o = reportElements.get(i);
- if (TURB_WORDS.get(o) != null) {
- // We have turbulence of some type.
- turbulence = new Turbulence();
- reportElements.remove(i);
- break;
- }
- }
- if (i > 0) {
- while (i < reportElements.size()) {
- Object o = reportElements.get(i);
- // Check words that absolutely terminate search for turbulence.
- if (TURB_TERM_WORDS.contains(o)) {
- break;
- } else {
- if (i < reportElements.size()) {
- o = reportElements.get(i);
- Integer n = null;
- if ((n = TURB_FREQ.get(o)) != null) {
- turbulence.setFrequency(n);
- reportElements.remove(i);
- } else if ((n = TURB_TYPE.get(o)) != null) {
- turbulence.setType(n);
- reportElements.remove(i);
- } else if ((n = TURB_INT.get(o)) != null) {
- if (intensity < 0) {
- intensity = n;
- } else {
- if (n > intensity) {
- intensity = n;
- }
- }
- reportElements.remove(i);
- } else if ("NOT".equals(o)) {
- reportElements.remove(i);
- if (i < reportElements.size()) {
- if ("REPORTED".equals(reportElements.get(i))) {
- reportElements.remove(i);
- intensity = TURB_INT.get("NEG");
- }
- }
- } else if ("CODE".equals(o)) {
- reportElements.remove(i);
- } else {
- // Check to see if we have a turbulence range. In these cases if
- // more than one turbulence is found, report the most severe.
- if (o instanceof String) {
- String s = (String) o;
- // Two possible turbulence ranges we may have to work with.
- Integer turbA = null;
- Integer turbB = null;
- if (s.length() > 3) {
- if ((turbA = TURB_INT.get(s.substring(0, 3))) != null) {
- int pos = 3;
- // so now start at position 3 and check for possible
- // matches.
- while (pos < s.length()) {
- if ((turbB = TURB_INT.get(s
- .substring(pos))) != null) {
- break;
- } else {
- pos++;
- }
- }
- }
- }
- if (turbA != null) {
- if (turbB != null) {
- if (turbB > turbA) {
- intensity = turbB;
- } else {
- intensity = turbA;
- }
- } else {
- intensity = turbA;
- }
- } else {
- if (turbB != null) {
- intensity = turbB;
- }
- }
- if (intensity > -1) {
- reportElements.remove(i);
- } else {
- i++;
- }
- } else {
- i++;
- }
- }
- }
- }
- }
- }
- if (intensity > 0) {
- // Check if we found a frequency or type without
- // an intensity.
- if (intensity < 0x10) {
- // if so then set it to light
- intensity |= AirepRecord.TURB_LGT;
- }
- turbulence.setIntensity(intensity);
- }
- }
-
- /**
- * Attempt to locate and decode the 3 digit hazards and weather group.
- */
- private void decodeWeatherGroup() {
- for (int i = 0; i < reportElements.size(); i++) {
- Object o = reportElements.get(i);
- if (o instanceof String) {
- String s = (String) o;
- if (s.length() == 3) {
- if (WX_GROUP.matcher(s).find()) {
- weatherGroup = new AIREPWeather(s);
- reportElements.set(i, weatherGroup);
- break;
- }
- }
- }
- }
- } // decodeWeatherGroup()
-
- /**
- * Decode the wind data group in the following forms. 16080 160080 163/080
- * 163/080KT
- *
- * @throws DecodeException
- * if winds are bad
- */
- private void decodeWinds() {
- // By now we should have found the flight level data.
- int i = 0;
- for (; i < reportElements.size(); i++) {
- if (reportElements.get(i) instanceof AircraftFlightLevel) {
- i++;
- break;
- }
- } // for()
-
- for (; i < reportElements.size(); i++) {
- Object o = reportElements.get(i);
- if (o instanceof String) {
- String s = (String) o;
- if (s != null) {
- if (s.startsWith("M") || s.startsWith("P")
- || s.startsWith("/")) {
- // These are temperatures. Some temps are
- // being reported as 5 digits (MS513 which is -51.3)
- continue;
- } else if (s.endsWith("KT")) {
- s = s.substring(0, s.length() - 2);
- } else if (s.endsWith("KTS")) {
- s = s.substring(0, s.length() - 3);
- }
- int solidusPos = s.indexOf("/");
-
- String windDir = null;
- String windSpd = null;
- if (solidusPos > 0) {
- windDir = s.substring(0, solidusPos);
- windSpd = s.substring(solidusPos + 1);
- } else if (s.length() == 5) {
- windDir = s.substring(0, 2) + "0";
- windSpd = s.substring(2);
- } else if (s.length() == 6) {
- windDir = s.substring(0, 3);
- windSpd = s.substring(3);
- }
- if ((windSpd != null) && (windDir != null)) {
- try {
- double value = Double.parseDouble(windSpd);
- if ((value >= 0) && (value < MAX_WIND_SPEED)) {
- windSpeed = value;
- } else {
- windSpeed = null;
- }
-
- value = Double.parseDouble(windDir);
- // Database constraint is 1 - 360.
- if (value == 0) {
- value = 360;
- }
- windDirection = new Double(value).intValue(); // windDirection.fromDegree(value);
-
- reportElements.set(i, windDirection);
- reportElements.add(i + 1, windSpeed);
- } catch (Exception nothing) {
- String msg = String.format(
- "Error decoding winds: [%s] [%s]", windSpd,
- windDir);
-
- logger.info(msg);
- }
- break;
- }
- }
- }
- }
- }
-
- /**
- * The "MID" section only occurs in the AIREP remarks section. So if we find
- * a "MID" token we create a remarks object using all data from the MID
- * token to the end of the data.
- */
- private void decodeMID() {
- for (int i = 0; i < reportElements.size(); i++) {
- Object o = reportElements.get(i);
- if (o instanceof String) {
- String s = (String) o;
- if ("MID".equals(s)) {
- AircraftRemarks remarks = new AircraftRemarks(s);
- for (i++; i < reportElements.size();) {
- remarks.addRemarks(" ");
- remarks.addRemarks((String) reportElements.get(i));
- reportElements.remove(i);
- }
- rptRemarks = remarks;
- }
- }
- }
- }
-
- /**
- * Iterate over any remaining data left in the observation that is AFTER the
- * time information. These data are bundled together as a remarks string
- * that will be appended to the end of the observation data.
- */
- private void collectRemarks() {
- boolean timeFound = false;
- int i = 0;
- for (; i < reportElements.size(); i++) {
- Object o = reportElements.get(i);
- if (timeFound = (o instanceof Calendar)) {
- i++;
- break;
- }
- } // for
- if (timeFound) {
- StringBuffer remarksBuffer = new StringBuffer();
- // i is pointing to the next element to examine.
- for (; i < reportElements.size();) {
- Object o = reportElements.get(i);
- if (o instanceof String) {
- reportElements.remove(i);
- remarksBuffer.append(o);
- remarksBuffer.append(" ");
- } else {
- i++;
- }
- } // for
- if (remarksBuffer.length() > 0) {
- if (rptRemarks != null) {
- remarksBuffer.insert(0, " ");
- remarksBuffer.insert(0, rptRemarks.getValue());
- }
- rptRemarks = new AircraftRemarks(remarksBuffer.toString());
- }
- }
- } // collectRemarks()
-
- /**
- * @return the reportData
- */
- public String getReportData() {
- return reportData;
- }
-
- /**
- * @return the reportType
- */
- public Integer getReportType() {
- return reportType;
- }
-
- /**
- * @param reportType
- * the reportType to set
- */
- public void setReportType(Integer reportType) {
- this.reportType = reportType;
- }
-
- /**
- * Get the decoded Aircraft id.
- *
- * @return The decoded Aircraft id.
- */
- public String getAircraftId() {
- return aircraftId;
- } // getAircraftId()
-
- /**
- * Get the decoded Latitude instance.
- *
- * @return The decoded Latitude
- */
- public Double getLatitude() {
- return latitude;
- } // getLatitude()
-
- /**
- * Get the decoded Longitude instance.
- *
- * @return The decoded Longitude.
- */
- public Double getLongitude() {
- return longitude;
- } // getLongitude()
-
- /**
- * Get the AIREP observation time.
- *
- * @return The AIREP observation time.
- */
- public Calendar getObservationTime() {
- return observationTime;
- } // getObservationTime()
-
- /**
- * Get the decoded aircraft flight level data.
- *
- * @return The decoded aircraft flight level data.
- */
- public Integer getFlightLevel() {
- Integer retValue = null;
- if (flightLevel != null) {
- retValue = flightLevel.getFlightLevel();
- }
- return retValue;
- } // getFlightLevel()
-
- /**
- * Get the decoded temperature data.
- *
- * @return The decoded temperature.
- */
- public Double getTemperature() {
- return temperature;
- } // getAirTemperature()
-
- /**
- * Get the decoded turbulence data.
- *
- * @return The decoded turbulence.
- */
- public Turbulence getTurbulence() {
- return turbulence;
- }
-
- public AIREPWeather getWeatherGroup() {
- return weatherGroup;
- } // getWeatherGroup()
-
- /**
- * Get the decoded wind direction data.
- *
- * @return The decoded wind direction data.
- */
- public Integer getWindDirection() {
- return windDirection;
- } // getWindDirection()
-
- /**
- * Get the decoded wind speed data.
- *
- * @return The decoded wind speed data.
- */
- public Double getWindSpeed() {
- return windSpeed;
- } // getWindSpeed()
-
- /**
- * Get any remarks information found.
- *
- * @return The remarks information. An empty string is returned if no
- * remarks data was found.
- */
- public String getRemarks() {
- return (rptRemarks != null) ? rptRemarks.toString() : "";
- } // getRemarks()
-
-} // AirepParser
diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/utility/common_static/base/purge/airepPurgeRules.xml b/edexOsgi/com.raytheon.edex.plugin.airep/utility/common_static/base/purge/airepPurgeRules.xml
deleted file mode 100644
index 1182b36c71..0000000000
--- a/edexOsgi/com.raytheon.edex.plugin.airep/utility/common_static/base/purge/airepPurgeRules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- 24
- =00-01:00:00
- 00-01:00:00
-
-
diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/utility/edex_static/base/distribution/airep.xml b/edexOsgi/com.raytheon.edex.plugin.airep/utility/edex_static/base/distribution/airep.xml
deleted file mode 100644
index bf018dd602..0000000000
--- a/edexOsgi/com.raytheon.edex.plugin.airep/utility/edex_static/base/distribution/airep.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- ^UA(US|PA|NT).. KWBC.*
-
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/.settings/org.eclipse.jdt.core.prefs b/edexOsgi/com.raytheon.uf.common.dataplugin.airep/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3cd33abe30..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Feb 09 14:51:45 CST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.airep/META-INF/MANIFEST.MF
deleted file mode 100644
index 47f6fed9e7..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Airep
-Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.airep
-Bundle-Version: 1.0.0.qualifier
-Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
-Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.dataplugin.annotations,
- com.raytheon.uf.common.geospatial,
- com.raytheon.uf.common.pointdata.spatial,
- com.raytheon.uf.common.serialization,
- com.raytheon.uf.common.time,
- com.vividsolutions.jts.geom,
- javax.measure.converter,
- javax.measure.quantity,
- javax.measure.unit,
- javax.persistence
-Require-Bundle: com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
- org.hibernate;bundle-version="1.0.0"
-Export-Package: com.raytheon.uf.common.dataplugin.airep
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/edexOsgi/com.raytheon.uf.common.dataplugin.airep/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
deleted file mode 100644
index 7611d12f1f..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
+++ /dev/null
@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.airep.AirepRecord
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
deleted file mode 100644
index d1803bda21..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
+++ /dev/null
@@ -1,878 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.common.dataplugin.airep;
-
-import java.math.RoundingMode;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.HashMap;
-
-import javax.measure.converter.UnitConverter;
-import javax.measure.quantity.Angle;
-import javax.measure.quantity.Length;
-import javax.measure.quantity.Temperature;
-import javax.measure.quantity.Velocity;
-import javax.measure.unit.NonSI;
-import javax.measure.unit.SI;
-import javax.measure.unit.Unit;
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.hibernate.annotations.Index;
-
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
-import com.raytheon.uf.common.dataplugin.PluginDataObject;
-import com.raytheon.uf.common.dataplugin.annotations.DataURI;
-import com.raytheon.uf.common.geospatial.ISpatialEnabled;
-import com.raytheon.uf.common.pointdata.spatial.AircraftObsLocation;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
-import com.vividsolutions.jts.geom.Geometry;
-
-/**
- *
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Jan 03, 2008 384 jkorman Initial Coding.
- * Jan 07, 2008 720 jkorman remove default assignments from
- * attributes.
- * Apr 05, 2012 435 dgilling Prevent NullPointerExceptions in
- * buildMessageData().
- * Apr 04, 2013 1846 bkowal Added an index on refTime and
- * forecastTime
- * Sep 11, 2012 1011 jkorman Added ability to report turbulence from
- * decoded TB group.
- * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation.
- * May 07, 2013 1869 bsteffen Remove dataURI column from
- * PluginDataObject.
- * Aug 30, 2013 2298 rjpeter Make getPluginName abstract
- *
- *
- *
- * @author jkorman
- * @version 1.0
- */
-@Entity
-@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "airepseq")
-@Table(name = "airep", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) })
-/*
- * Both refTime and forecastTime are included in the refTimeIndex since
- * forecastTime is unlikely to be used.
- */
-@org.hibernate.annotations.Table(appliesTo = "airep", indexes = { @Index(name = "airep_refTimeIndex", columnNames = {
- "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
-@DynamicSerialize
-public class AirepRecord extends PluginDataObject implements ISpatialEnabled,
- IDecoderGettable {
-
- private static final long serialVersionUID = 1L;
-
- public static final Unit TEMPERATURE_UNIT = SI.CELSIUS;
-
- public static final Unit WIND_SPEED_UNIT = NonSI.KNOT;
-
- public static final Unit WIND_DIR_UNIT = NonSI.DEGREE_ANGLE;
-
- public static final Unit ALTITUDE_UNIT = NonSI.FOOT;
-
- public static final Unit LOCATION_UNIT = NonSI.DEGREE_ANGLE;
-
- private static UnitConverter ftToHft = NonSI.FOOT.getConverterTo(SI
- .HECTO(NonSI.FOOT));
-
- private static final HashMap PARM_MAP = new HashMap();
-
- public static final int TURB_TYPE_CAT = 0x4;
-
- public static final int TURB_TYPE_CHOP = 0x8;
-
- public static final int TURB_TYPE_LLWS = 0xC;
-
- public static final int TURB_FREQ_OCN = 0x1;
-
- public static final int TURB_FREQ_INT = 0x2;
-
- public static final int TURB_FREQ_CON = 0x3;
-
- public static final int TURB_NEG = 0x00;
-
- public static final int TURB_NEG_LGT = 0x10;
-
- public static final int TURB_LGT = 0x20;
-
- public static final int TURB_LGT_MOD = 0x30;
-
- public static final int TURB_MOD = 0x40;
-
- public static final int TURB_MOD_SEV = 0x50;
-
- public static final int TURB_SEV = 0x60;
-
- public static final int TURB_XTRM = 0x70;
-
- // private static final HashMap WX_MAP = new
- // HashMap();
-
- static {
- PARM_MAP.put("T", SFC_TEMP);
- PARM_MAP.put("WS", SFC_WNDSPD);
- PARM_MAP.put("WD", SFC_WNDDIR);
- PARM_MAP.put("NLAT", STA_LAT);
- PARM_MAP.put("NLON", STA_LON);
- PARM_MAP.put("FLT_LVL", UA_FLTLVL);
-
- // WX_MAP.put(0, "CLR");
- // WX_MAP.put(1, "SCT");
- // WX_MAP.put(2, "BKN");
- // WX_MAP.put(3, "CONT");
- // WX_MAP.put(4, "LIGHTNING");
- // WX_MAP.put(5, "DZRA");
- // WX_MAP.put(6, "CONT RA");
- // WX_MAP.put(7, "CONT SN");
- // WX_MAP.put(8, "SH");
- // WX_MAP.put(9, "TSRA");
- }
-
- private static final HashMap TURB_MAP = new HashMap();
- static {
- TURB_MAP.put("NEG", new Integer(TURB_NEG));
- TURB_MAP.put("SMOOTHLGT", new Integer(TURB_NEG_LGT));
- TURB_MAP.put("LGT", new Integer(TURB_LGT));
- TURB_MAP.put("LGTMOD", new Integer(TURB_LGT_MOD));
- TURB_MAP.put("MOD", new Integer(TURB_MOD));
- TURB_MAP.put("MODSEV", new Integer(TURB_MOD_SEV));
- TURB_MAP.put("SEV", new Integer(TURB_SEV));
- TURB_MAP.put("EXTRM", new Integer(TURB_XTRM));
- }
-
- @Column
- @DynamicSerializeElement
- @XmlAttribute
- private Integer obsId;
-
- // Time of the observation.
- @Column
- @DynamicSerializeElement
- @XmlAttribute
- private Calendar timeObs;
-
- // Time of the observation to the nearest hour.
- @Column
- @DynamicSerializeElement
- @XmlAttribute
- private Calendar refHour;
-
- //
- @DataURI(position = 1)
- @Column
- @DynamicSerializeElement
- @XmlAttribute
- private Integer reportType;
-
- // Text of the WMO header
- @Column(length = 32)
- @DynamicSerializeElement
- @XmlElement
- private String wmoHeader;
-
- // Correction indicator from wmo header
- @DataURI(position = 2)
- @Column(length = 8)
- @DynamicSerializeElement
- @XmlElement
- private String corIndicator;
-
- // Observation air temperature in degrees Kelvin.
- // Decimal(5,2)
- @Column
- @DynamicSerializeElement
- @XmlElement
- private Double temp;
-
- // Observation wind direction in angular degrees. Integer
- @Column
- @DynamicSerializeElement
- @XmlElement
- private Integer windDirection;
-
- // Observation wind speed in meters per second.
- // Decimal(5,2)
- @Column
- @DynamicSerializeElement
- @XmlElement
- private Double windSpeed;
-
- @Column
- @DynamicSerializeElement
- @XmlElement
- private Integer flightHazard;
-
- @Column
- @DynamicSerializeElement
- @XmlElement
- private Integer flightWeather;
-
- @Column
- @DynamicSerializeElement
- @XmlElement
- private Integer flightConditions;
-
- @Embedded
- @DataURI(position = 3, embedded = true)
- @XmlElement
- @DynamicSerializeElement
- private AircraftObsLocation location;
-
- /**
- *
- */
- public AirepRecord() {
- }
-
- /**
- * Constructor for DataURI construction through base class. This is used by
- * the notification service.
- *
- * @param uri
- * A data uri applicable to this class.
- * @param tableDef
- * The table definitions for this class.
- */
- public AirepRecord(String uri) {
- super(uri);
- }
-
- public Integer getObsId() {
- return obsId;
- }
-
- public void setObsId(Integer obsId) {
- this.obsId = obsId;
- }
-
- /**
- * @return the wmoHeader
- */
- public String getWmoHeader() {
- return wmoHeader;
- }
-
- /**
- * @param wmoHeader
- * the wmoHeader to set
- */
- public void setWmoHeader(String wmoHeader) {
- this.wmoHeader = wmoHeader;
- }
-
- /**
- * Get the report correction indicator.
- *
- * @return The corIndicator
- */
- public String getCorIndicator() {
- return corIndicator;
- }
-
- /**
- * Set the report correction indicator.
- *
- * @param corIndicator
- * The corIndicator.
- */
- public void setCorIndicator(String corIndicator) {
- this.corIndicator = corIndicator;
- }
-
- /**
- * Get the report data for this observation.
- *
- * @return The Report data.
- */
- public String getReportData() {
- String s = null;
- if ((messageData != null) && (messageData instanceof String)) {
- s = (String) messageData;
- } else {
- s = buildMessageData();
- }
- return s;
- }
-
- /**
- * Set the report data for this observation.
- *
- * @param reportData
- * The Report data.
- */
- public void setReportData(String reportData) {
- messageData = reportData;
- }
-
- /**
- * Get this observation's geometry.
- *
- * @return The geometry for this observation.
- */
- public Geometry getGeometry() {
- return location.getGeometry();
- }
-
- /**
- * Get the geometry latitude.
- *
- * @return The geometry latitude.
- */
- public double getLatitude() {
- return location.getLatitude();
- }
-
- /**
- * Get the geometry longitude.
- *
- * @return The geometry longitude.
- */
- public double getLongitude() {
- return location.getLongitude();
- }
-
- /**
- * Get the elevation, in meters, of the observing platform or location.
- *
- * @return The observation elevation, in meters.
- */
- public Boolean getLocationDefined() {
- return location.getLocationDefined();
- }
-
- /**
- * Get the station identifier for this observation.
- *
- * @return the stationId
- */
- public String getStationId() {
- return location.getStationId();
- }
-
- /**
- * Get the elevation, in meters, of the observing platform or location.
- *
- * @return The observation elevation, in meters.
- */
- public Integer getFlightLevel() {
- return location.getFlightLevel();
- }
-
- /**
- * @return the reportType
- */
- public Integer getReportType() {
- return reportType;
- }
-
- /**
- * @param reportType
- * the reportType to set
- */
- public void setReportType(Integer reportType) {
- this.reportType = reportType;
- }
-
- /**
- * @return the timeObs
- */
- public Calendar getTimeObs() {
- return timeObs;
- }
-
- /**
- * @param timeObs
- * the timeObs to set
- */
- public void setTimeObs(Calendar timeObs) {
- this.timeObs = timeObs;
- }
-
- /**
- * @return the refHour
- */
- public Calendar getRefHour() {
- return refHour;
- }
-
- /**
- * @param refHour
- * the refHour to set
- */
- public void setRefHour(Calendar refHour) {
- this.refHour = refHour;
- }
-
- /**
- * @return the temp
- */
- public Double getTemp() {
- return temp;
- }
-
- /**
- * @param temp
- * the temp to set
- */
- public void setTemp(Double temp) {
- this.temp = temp;
- }
-
- /**
- * @return the windDirection
- */
- public Integer getWindDirection() {
- return windDirection;
- }
-
- /**
- * @param windDirection
- * the windDirection to set
- */
- public void setWindDirection(Integer windDirection) {
- this.windDirection = windDirection;
- }
-
- /**
- * @return the windspeed
- */
- public Double getWindSpeed() {
- return windSpeed;
- }
-
- /**
- * @param windspeed
- * the windspeed to set
- */
- public void setWindSpeed(Double windSpeed) {
- this.windSpeed = windSpeed;
- }
-
- /**
- * @return the flightHazard
- */
- public Integer getFlightHazard() {
- return flightHazard;
- }
-
- /**
- * @param flightHazard
- * the wx_past_1 to set
- */
- public void setFlightHazard(Integer flightHazard) {
- this.flightHazard = flightHazard;
- }
-
- /**
- * @return the flightWeather
- */
- public Integer getFlightWeather() {
- return flightWeather;
- }
-
- /**
- * @param flightWeather
- * the getFlightWeather to set
- */
- public void setFlightWeather(Integer flightWeather) {
- this.flightWeather = flightWeather;
- }
-
- /**
- * @return the flightConditions
- */
- public Integer getFlightConditions() {
- return flightConditions;
- }
-
- /**
- * @param flightConditions
- * the flightConditions to set
- */
- public void setFlightConditions(Integer flightConditions) {
- this.flightConditions = flightConditions;
- }
-
- @Override
- public void setDataURI(String dataURI) {
- super.setDataURI(dataURI);
- identifier = dataURI;
- }
-
- /**
- * Get the IDecoderGettable reference for this record.
- *
- * @return The IDecoderGettable reference for this record.
- */
- @Override
- public IDecoderGettable getDecoderGettable() {
- return this;
- }
-
- /**
- * Get the value of a parameter that is represented as a String.
- *
- * @param paramName
- * The name of the parameter value to retrieve.
- * @return The String value of the parameter. If the parameter is unknown, a
- * null reference is returned.
- */
- @Override
- public String getString(String paramName) {
- if ("STA".matches(paramName)) {
- return this.getStationId();
- }
- return null;
- }
-
- /**
- * Get the value and units of a named parameter within this observation.
- *
- * @param paramName
- * The name of the parameter value to retrieve.
- * @return An Amount with value and units. If the parameter is unknown, a
- * null reference is returned.
- */
- @Override
- public Amount getValue(String paramName) {
- Amount a = null;
-
- String pName = PARM_MAP.get(paramName);
-
- if (SFC_TEMP.equals(pName) && (temp != null)) {
- a = new Amount(temp, TEMPERATURE_UNIT);
- } else if (SFC_WNDSPD.equals(pName) && (windSpeed != null)) {
- a = new Amount(windSpeed, WIND_SPEED_UNIT);
- } else if (SFC_WNDDIR.equals(pName) && (windDirection != null)) {
- a = new Amount(windDirection, WIND_DIR_UNIT);
- } else if (STA_LAT.equals(pName)) {
- a = new Amount(this.getLatitude(), LOCATION_UNIT);
- } else if (STA_LON.equals(pName)) {
- a = new Amount(this.getLongitude(), LOCATION_UNIT);
- } else if (UA_FLTLVL.equals(pName) && (getFlightLevel() != null)) {
- a = new Amount(this.getFlightLevel().intValue(), ALTITUDE_UNIT);
-
- }
- return a;
- }
-
- /**
- * Get the value of a parameter that is represented as a String.
- *
- * @param paramName
- * The name of the parameter value to retrieve.
- * @return The String value of the parameter. If the parameter is unknown, a
- * null reference is returned.
- */
- @Override
- public Collection getValues(String paramName) {
- return null;
- }
-
- /**
- * Get the String representation of various AIREP parameters.
- *
- * @param The
- * parameter value to get.
- * @return A String array representing the value. A null reference may be
- * returned if the parameter does not exist or cannot be
- * represented.
- */
- @Override
- public String[] getStrings(String paramName) {
- String[] retValue = null;
- String value = null;
-
- if ("FLT_HZD".matches(paramName) && (flightHazard != null)) {
- if (flightHazard != null) {
- retValue = new String[] { flightHazard.toString() };
- }
- } else if ("TBI".matches(paramName) && (flightConditions != null)) {
- int turb = flightConditions >> 4;
- // Is there turbulence to decode?
- if ((turb & 0x80) > 0) {
- // get the intensity
- switch (turb & 0x70) {
- case TURB_NEG: {
- value = "NEG";
- break;
- }
- case TURB_NEG_LGT: {
- value = "SMOOTHLGT";
- break;
- }
- case TURB_LGT: {
- value = "LGT";
- break;
- }
- case TURB_LGT_MOD: {
- value = "LGTMOD";
- break;
- }
- case TURB_MOD: {
- value = "MOD";
- break;
- }
- case TURB_MOD_SEV: {
- value = "MODSEV";
- break;
- }
- case TURB_SEV: {
- value = "SEV";
- break;
- }
- case TURB_XTRM: {
- value = "EXTRM";
- break;
- }
- }
- }
- } else if ("TBF".matches(paramName) && (flightConditions != null)) {
- int turb = flightConditions >> 4;
- // Is there turbulence to decode?
- if ((turb & 0x80) > 0) {
- // get the intensity
- switch (turb & 0x03) {
- case TURB_FREQ_OCN: {
- value = "OCN";
- break;
- }
- case TURB_FREQ_INT: {
- value = "INT";
- break;
- }
- case TURB_FREQ_CON: {
- value = "CON";
- break;
- }
- }
- }
- }
- if (value != null) {
- retValue = new String[] { value };
- }
- return retValue;
- }
-
- @Override
- public AircraftObsLocation getSpatialObject() {
- return location;
- }
-
- public AircraftObsLocation getLocation() {
- return location;
- }
-
- public void setLocation(AircraftObsLocation location) {
- this.location = location;
- }
-
- @Override
- public String getMessageData() {
- return getReportData();
- }
-
- private String buildMessageData() {
- boolean validLocation = (location != null);
-
- StringBuilder messageData = new StringBuilder("ARP ");
- if (validLocation && (getStationId() != null)) {
- messageData.append(getStationId());
- }
- messageData.append(' ');
-
- if ((validLocation) && (!Double.isNaN(getLatitude()))
- && (!Double.isNaN(getLongitude()))) {
- messageData.append(formatLatLon(getLatitude(), true));
- messageData.append(' ');
- messageData.append(formatLatLon(getLongitude(), false));
- messageData.append(' ');
- }
-
- if (timeObs != null) {
- DateFormat df = new SimpleDateFormat("HHmm");
- messageData.append(df.format(timeObs.getTime()));
- }
- messageData.append(" F");
-
- if (validLocation && (getFlightLevel() != null)) {
- int flightLevel = (int) ftToHft.convert(getFlightLevel());
- messageData.append(flightLevel);
- }
- messageData.append(' ');
-
- if (temp != null) {
- if (temp > 0) {
- messageData.append('P');
- } else {
- messageData.append('M');
- }
- messageData.append(Math.abs(temp.intValue()));
- }
- messageData.append(' ');
-
- if ((windDirection != null) && (windSpeed != null)) {
- messageData.append(windDirection.intValue());
- messageData.append('/');
- messageData.append(windSpeed.intValue());
- messageData.append("KT");
- }
- if (flightConditions != null) {
- int turb = flightConditions >> 4;
- if ((turb & 0x80) > 0) {
- messageData.append(" TB");
- String[] data = getStrings("TBF");
- if ((data != null) && (data.length == 1)) {
- messageData.append(" ");
- messageData.append(data[0]);
- }
- data = getStrings("TBI");
- if ((data != null) && (data.length == 1)) {
- messageData.append(" ");
- messageData.append(data[0]);
- }
- String type = null;
- switch (turb & 0xC) {
- case TURB_TYPE_CAT: {
- type = "CAT";
- break;
- }
- case TURB_TYPE_CHOP: {
- type = "CHOP";
- break;
- }
- case TURB_TYPE_LLWS: {
- type = "LLWS";
- break;
- }
- }
- if (type != null) {
- messageData.append(" ");
- messageData.append(type);
- }
- }
- }
- return messageData.toString();
- }
-
- private String formatLatLon(double value, boolean isLatitude) {
- char dir;
- if (isLatitude) {
- if (value > 0) {
- dir = 'N';
- } else {
- dir = 'S';
- }
- } else {
- if (value > 0) {
- dir = 'E';
- } else {
- dir = 'W';
- }
- }
-
- DecimalFormat df = new DecimalFormat("###.000");
- df.setRoundingMode(RoundingMode.DOWN);
-
- return df.format(Math.abs(value)) + dir;
- }
-
- /**
- * Returns the hashCode for this object. This implementation returns the
- * hashCode of the generated dataURI.
- *
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = (prime * result)
- + ((getDataURI() == null) ? 0 : getDataURI().hashCode());
- return result;
- }
-
- /**
- * Checks if this record is equal to another by checking the generated
- * dataURI.
- *
- * @param obj
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- AirepRecord other = (AirepRecord) obj;
- if (getDataURI() == null) {
- if (other.getDataURI() != null) {
- return false;
- }
- } else if (!getDataURI().equals(other.getDataURI())) {
- return false;
- }
- return true;
- }
-
- @Override
- @Column
- @Access(AccessType.PROPERTY)
- public String getDataURI() {
- return super.getDataURI();
- }
-
- @Override
- public String getPluginName() {
- return "airep";
- }
-}
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
index c71f9887bd..ef4b8d03c5 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
@@ -122,13 +122,6 @@
version="0.0.0"
unpack="false"/>
-
- com.raytheon.uf.common.dataplugin.airep
+ gov.noaa.nws.ncep.common.dataplugin.airep
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/.settings/org.eclipse.jdt.core.prefs b/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/.settings/org.eclipse.jdt.core.prefs
rename to ncep/gov.noaa.nws.ncep.common.dataplugin.airep/.settings/org.eclipse.jdt.core.prefs
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/META-INF/MANIFEST.MF
similarity index 85%
rename from ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/META-INF/MANIFEST.MF
rename to ncep/gov.noaa.nws.ncep.common.dataplugin.airep/META-INF/MANIFEST.MF
index eabdd66cda..752b1159a2 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Ncpirep Plug-in
-Bundle-SymbolicName: gov.noaa.nws.ncep.common.dataplugin.ncairep
+Bundle-Name: Airep Plug-in
+Bundle-SymbolicName: gov.noaa.nws.ncep.common.dataplugin.airep
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.raytheon.uf.common.status;bundle-version="1.12.1174",
@@ -31,6 +31,6 @@ Import-Package: com.raytheon.edex.db.dao,
javax.measure.unit,
javax.persistence,
org.springframework.orm.hibernate3
-Export-Package: gov.noaa.nws.ncep.common.dataplugin.ncairep,
- gov.noaa.nws.ncep.common.dataplugin.ncairep.dao
+Export-Package: gov.noaa.nws.ncep.common.dataplugin.airep,
+ gov.noaa.nws.ncep.common.dataplugin.airep.dao
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
new file mode 100644
index 0000000000..f2fac7788a
--- /dev/null
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
@@ -0,0 +1 @@
+gov.noaa.nws.ncep.common.dataplugin.airep.AirepRecord
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/build.properties b/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/build.properties
similarity index 100%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.airep/build.properties
rename to ncep/gov.noaa.nws.ncep.common.dataplugin.airep/build.properties
diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/com.raytheon.edex.plugin.airep.ecl b/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/gov.noaa.nws.ncep.common.dataplugin.airep.ecl
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.airep/com.raytheon.edex.plugin.airep.ecl
rename to ncep/gov.noaa.nws.ncep.common.dataplugin.airep/gov.noaa.nws.ncep.common.dataplugin.airep.ecl
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/src/gov/noaa/nws/ncep/common/dataplugin/airep/AirepPointDataTransform.java
similarity index 89%
rename from ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
rename to ncep/gov.noaa.nws.ncep.common.dataplugin.airep/src/gov/noaa/nws/ncep/common/dataplugin/airep/AirepPointDataTransform.java
index 1fcac9a8d6..2baefefa4f 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/src/gov/noaa/nws/ncep/common/dataplugin/airep/AirepPointDataTransform.java
@@ -1,4 +1,4 @@
-package gov.noaa.nws.ncep.common.dataplugin.ncairep;
+package gov.noaa.nws.ncep.common.dataplugin.airep;
/**
* This software was developed and / or modified by Raytheon Company,
@@ -20,7 +20,7 @@ package gov.noaa.nws.ncep.common.dataplugin.ncairep;
* further licensing information.
**/
-import gov.noaa.nws.ncep.common.dataplugin.ncairep.dao.NcAirepDao;
+import gov.noaa.nws.ncep.common.dataplugin.airep.dao.AirepDao;
import java.io.File;
import java.util.ArrayList;
@@ -37,8 +37,7 @@ import com.raytheon.uf.common.pointdata.spatial.AircraftObsLocation;
import com.raytheon.uf.common.time.DataTime;
/**
- * Provides a transform from NcAirepRecords to PointDataContainer and vice
- * versa.
+ * Provides a transform from AirepRecords to PointDataContainer and vice versa.
*
*
*
@@ -52,13 +51,14 @@ import com.raytheon.uf.common.time.DataTime;
* fields for TB, IC and SK.
* Oct 18, 2011 286 Q.Zhou Fixed datarui in db
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
+ * Sep 05, 2013 2316 bsteffen Unify airep and ncairep.
*
*
* @author f j yen
* @version 1.0
*/
-public class NcAirepPointDataTransform {
+public class AirepPointDataTransform {
private static final String WIND_SPEED = "windSpeed";
@@ -149,13 +149,13 @@ public class NcAirepPointDataTransform {
ALL_PARAMS_LIST = sb.toString();
}
- private NcAirepDao dao;
+ private AirepDao dao;
private PointDataDescription description;
- public NcAirepPointDataTransform() {
+ public AirepPointDataTransform() {
try {
- this.dao = new NcAirepDao("ncairep");
+ this.dao = new AirepDao("airep");
this.description = dao.getPointDataDescription(null);
} catch (Exception e) {
// TODO Auto-generated catch block
@@ -167,7 +167,7 @@ public class NcAirepPointDataTransform {
long t0 = System.currentTimeMillis();
System.out.println("===============>toPointData"); // in
- // NcAirepPointDataTransform
+ // AirepPointDataTransform
// t0=" + t0);
/* 999 */
@@ -176,7 +176,7 @@ public class NcAirepPointDataTransform {
for (PluginDataObject p : pdo) {
- if (!(p instanceof NcAirepRecord)) {
+ if (!(p instanceof AirepRecord)) {
continue;
}
@@ -189,7 +189,7 @@ public class NcAirepPointDataTransform {
}
- NcAirepRecord nar = (NcAirepRecord) p;
+ AirepRecord nar = (AirepRecord) p;
PointDataView pdv = buildView(pdc, nar);
nar.setPointDataView(pdv);
@@ -202,7 +202,7 @@ public class NcAirepPointDataTransform {
}
private PointDataView buildView(PointDataContainer container,
- NcAirepRecord record) {
+ AirepRecord record) {
PointDataView pdv = container.append();
if (record.getCorIndicator() != null) {
pdv.setString(CORRECTION_CODE, record.getCorIndicator());
@@ -233,8 +233,8 @@ public class NcAirepPointDataTransform {
return pdv;
}
- public static NcAirepRecord toNcAirepRecord(PointDataView pdv) {
- NcAirepRecord nar = new NcAirepRecord();
+ public static AirepRecord toAirepRecord(PointDataView pdv) {
+ AirepRecord nar = new AirepRecord();
nar.setObsId(pdv.getInt(OBS_ID));
nar.setCorIndicator(pdv.getString(CORRECTION_CODE));
@@ -265,13 +265,13 @@ public class NcAirepPointDataTransform {
return nar;
}
- public static NcAirepRecord[] toNcAirepRecords(PointDataContainer container) {
- List records = new ArrayList();
+ public static AirepRecord[] toAirepRecords(PointDataContainer container) {
+ List records = new ArrayList();
container.setCurrentSz(container.getAllocatedSz());
for (int i = 0; i < container.getCurrentSz(); i++) {
PointDataView pdv = container.readRandom(i);
- records.add(toNcAirepRecord(pdv));
+ records.add(toAirepRecord(pdv));
}
- return records.toArray(new NcAirepRecord[records.size()]);
+ return records.toArray(new AirepRecord[records.size()]);
}
}
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/src/gov/noaa/nws/ncep/common/dataplugin/airep/AirepRecord.java
similarity index 97%
rename from ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
rename to ncep/gov.noaa.nws.ncep.common.dataplugin.airep/src/gov/noaa/nws/ncep/common/dataplugin/airep/AirepRecord.java
index c35159c23b..918d5bb082 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/src/gov/noaa/nws/ncep/common/dataplugin/airep/AirepRecord.java
@@ -1,4 +1,4 @@
-package gov.noaa.nws.ncep.common.dataplugin.ncairep;
+package gov.noaa.nws.ncep.common.dataplugin.airep;
/**
* This software was modified from Raytheon's pirep plugin by
@@ -52,7 +52,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
import com.vividsolutions.jts.geom.Geometry;
/**
- * NcAirepRecord is the Data Access component for pirep observation data.
+ * AirepRecord is the Data Access component for pirep observation data.
*
*
*
@@ -77,6 +77,7 @@ import com.vividsolutions.jts.geom.Geometry;
* May 07, 2013 1869 bsteffen Remove dataURI column from
* PluginDataObject.
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
+ * Sep 05, 2013 2316 bsteffen Unify airep and ncairep.
*
*
*
@@ -85,18 +86,18 @@ import com.vividsolutions.jts.geom.Geometry;
*/
@Entity
-@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ncairepseq")
-@Table(name = "ncairep", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) })
+@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "airepseq")
+@Table(name = "airep", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) })
/*
* Both refTime and forecastTime are included in the refTimeIndex since
* forecastTime is unlikely to be used.
*/
-@org.hibernate.annotations.Table(appliesTo = "ncairep", indexes = { @Index(name = "ncairep_refTimeIndex", columnNames = {
+@org.hibernate.annotations.Table(appliesTo = "airep", indexes = { @Index(name = "airep_refTimeIndex", columnNames = {
"refTime", "forecastTime" }) })
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
-public class NcAirepRecord extends PluginDataObject implements ISpatialEnabled,
+public class AirepRecord extends PluginDataObject implements ISpatialEnabled,
IDecoderGettable, IPointData, IPersistable {
private static final long serialVersionUID = 1L;
@@ -291,7 +292,7 @@ public class NcAirepRecord extends PluginDataObject implements ISpatialEnabled,
/**
*
*/
- public NcAirepRecord() {
+ public AirepRecord() {
}
/**
@@ -303,7 +304,7 @@ public class NcAirepRecord extends PluginDataObject implements ISpatialEnabled,
* @param tableDef
* The table definitions for this class.
*/
- public NcAirepRecord(String uri) {
+ public AirepRecord(String uri) {
super(uri);
}
@@ -848,7 +849,7 @@ public class NcAirepRecord extends PluginDataObject implements ISpatialEnabled,
if (getClass() != obj.getClass()) {
return false;
}
- NcAirepRecord other = (NcAirepRecord) obj;
+ AirepRecord other = (AirepRecord) obj;
if (getDataURI() == null) {
if (other.getDataURI() != null) {
return false;
@@ -899,6 +900,6 @@ public class NcAirepRecord extends PluginDataObject implements ISpatialEnabled,
@Override
public String getPluginName() {
- return "ncairep";
+ return "airep";
}
}
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/dao/NcAirepDao.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/src/gov/noaa/nws/ncep/common/dataplugin/airep/dao/AirepDao.java
similarity index 78%
rename from ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/dao/NcAirepDao.java
rename to ncep/gov.noaa.nws.ncep.common.dataplugin.airep/src/gov/noaa/nws/ncep/common/dataplugin/airep/dao/AirepDao.java
index 0594170370..5067a5a60f 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/dao/NcAirepDao.java
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.airep/src/gov/noaa/nws/ncep/common/dataplugin/airep/dao/AirepDao.java
@@ -1,4 +1,4 @@
-package gov.noaa.nws.ncep.common.dataplugin.ncairep.dao;
+package gov.noaa.nws.ncep.common.dataplugin.airep.dao;
/**
* This software was modified from Raytheon's pirep plugin by
@@ -6,9 +6,10 @@ package gov.noaa.nws.ncep.common.dataplugin.ncairep.dao;
**/
//uf.common.status.IUFStatusHandler cannot be resolved. It is indirectly
//referenced from required .class files
-import gov.noaa.nws.ncep.common.dataplugin.ncairep.NcAirepRecord;
+import gov.noaa.nws.ncep.common.dataplugin.airep.AirepRecord;
import java.util.List;
+
import javax.xml.bind.JAXBException;
import com.raytheon.uf.common.dataplugin.PluginException;
@@ -29,22 +30,23 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
* ------------ ---------- ----------- --------------------------
* 04/28/2011 F. J. Yen Initial creation from airep
* 08/31/2011 286 qzhou Moved this from ~edex.plugin.pirep
+ * Sep 05, 2013 2316 bsteffen Unify airep and ncairep.
*
*
* @author qzhou
* @version 1.0
*/
-public class NcAirepDao extends PointDataPluginDao {
+public class AirepDao extends PointDataPluginDao {
private PointDataDescription pdd;
/**
- * Creates a new NcAirepDao
+ * Creates a new AirepDao
*
* @throws PluginException
*/
- public NcAirepDao(String pluginName) throws PluginException {
+ public AirepDao(String pluginName) throws PluginException {
super(pluginName);
}
@@ -55,14 +57,14 @@ public class NcAirepDao extends PointDataPluginDao {
}
/**
- * Retrieves an NcAirep report using the datauri .
+ * Retrieves an Airep report using the datauri .
*
* @param dataURI
* The dataURI to match against.
* @return The report record if it exists.
*/
- public NcAirepRecord queryByDataURI(String dataURI) {
- NcAirepRecord report = null;
+ public AirepRecord queryByDataURI(String dataURI) {
+ AirepRecord report = null;
List obs = null;
try {
obs = queryBySingleCriteria("dataURI", dataURI);
@@ -70,7 +72,7 @@ public class NcAirepDao extends PointDataPluginDao {
e.printStackTrace();
}
if ((obs != null) && (obs.size() > 0)) {
- report = (NcAirepRecord) obs.get(0);
+ report = (AirepRecord) obs.get(0);
}
return report;
}
@@ -85,7 +87,7 @@ public class NcAirepDao extends PointDataPluginDao {
*/
public Object[] queryDataUriColumn(final String dataUri) {
- String sql = "select datauri from awips.ncairep where datauri='"
+ String sql = "select datauri from awips.airep where datauri='"
+ dataUri + "';";
Object[] results = executeSQLQuery(sql);
@@ -99,13 +101,13 @@ public class NcAirepDao extends PointDataPluginDao {
}
@Override
- public NcAirepRecord newObject() {
- return new NcAirepRecord();
+ public AirepRecord newObject() {
+ return new AirepRecord();
}
@Override
- public String getPointDataFileName(NcAirepRecord p) {
- return "ncairep.h5";
+ public String getPointDataFileName(AirepRecord p) {
+ return "airep.h5";
}
/*
@@ -127,7 +129,7 @@ public class NcAirepDao extends PointDataPluginDao {
if (pdd == null) {
pdd = PointDataDescription.fromStream(this.getClass()
- .getResourceAsStream("/res/pointdata/ncairep.xml"));
+ .getResourceAsStream("/res/pointdata/airep.xml"));
}
return pdd;
}
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/.project b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/.project
deleted file mode 100644
index 69a9312db5..0000000000
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- gov.noaa.nws.ncep.common.dataplugin.ncairep
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
deleted file mode 100644
index c865cb3c8c..0000000000
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
+++ /dev/null
@@ -1 +0,0 @@
-gov.noaa.nws.ncep.common.dataplugin.ncairep.NcAirepRecord
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/build.properties b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/build.properties
deleted file mode 100644
index 34d2e4d2da..0000000000
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/gov.noaa.nws.ncep.common.dataplugin.ncairep.ecl b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/gov.noaa.nws.ncep.common.dataplugin.ncairep.ecl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AIREP.xml b/ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AIREP.xml
index cc683ff5ca..b722448a79 100644
--- a/ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AIREP.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AIREP.xml
@@ -7,7 +7,7 @@
-
diff --git a/ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NotUsed/AIREP.xml b/ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NotUsed/AIREP.xml
index cc683ff5ca..b722448a79 100644
--- a/ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NotUsed/AIREP.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NotUsed/AIREP.xml
@@ -7,7 +7,7 @@
-
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/.classpath b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/.classpath
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/.classpath
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/.classpath
diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/.project b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/.project
similarity index 92%
rename from edexOsgi/com.raytheon.edex.plugin.airep/.project
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/.project
index 3538edb1df..6ceab52096 100644
--- a/edexOsgi/com.raytheon.edex.plugin.airep/.project
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/.project
@@ -1,6 +1,6 @@
- com.raytheon.edex.plugin.airep
+ gov.noaa.nws.ncep.edex.plugin.airep
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/.settings/org.eclipse.jdt.core.prefs b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/.settings/org.eclipse.jdt.core.prefs
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/.settings/org.eclipse.jdt.core.prefs
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/META-INF/MANIFEST.MF
similarity index 76%
rename from ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/META-INF/MANIFEST.MF
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/META-INF/MANIFEST.MF
index c72cc89555..6fb2b9fec2 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Ncairep
-Bundle-SymbolicName: gov.noaa.nws.ncep.edex.plugin.ncairep
+Bundle-Name: Airep
+Bundle-SymbolicName: gov.noaa.nws.ncep.edex.plugin.airep
Bundle-Version: 1.12.1174.qualifier
Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
Bundle-Vendor: NOAA/NWS/NCEP/NCO/SIB
@@ -14,9 +14,9 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174",
javax.persistence;bundle-version="1.0.0",
org.apache.camel;bundle-version="1.0.0";resolution:=optional,
com.raytheon.uf.common.status;bundle-version="1.12.1174",
- gov.noaa.nws.ncep.common.dataplugin.ncairep;bundle-version="1.0.0"
-Export-Package: gov.noaa.nws.ncep.edex.plugin.ncairep,
- gov.noaa.nws.ncep.edex.plugin.ncairep.decoder
+ gov.noaa.nws.ncep.common.dataplugin.airep;bundle-version="1.0.0"
+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,
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.airep/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
new file mode 100644
index 0000000000..f2fac7788a
--- /dev/null
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
@@ -0,0 +1 @@
+gov.noaa.nws.ncep.common.dataplugin.airep.AirepRecord
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/build.properties b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/build.properties
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.airep/build.properties
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/build.properties
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/com.raytheon.uf.common.dataplugin.airep.ecl b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/gov.noaa.nws.ncep.edex.plugin.airep.ecl
similarity index 100%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.airep/com.raytheon.uf.common.dataplugin.airep.ecl
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/gov.noaa.nws.ncep.edex.plugin.airep.ecl
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/pointdata/ncairep.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/res/pointdata/airep.xml
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/pointdata/ncairep.xml
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/res/pointdata/airep.xml
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/pointdata/ncairepdb.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/res/pointdata/airepdb.xml
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/pointdata/ncairepdb.xml
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/res/pointdata/airepdb.xml
diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/res/spring/airep-common.xml
similarity index 72%
rename from edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-common.xml
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/res/spring/airep-common.xml
index 53ce6dadc7..11733b0ad0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/res/spring/airep-common.xml
@@ -8,9 +8,9 @@
diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/res/spring/airep-ingest.xml
similarity index 72%
rename from edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/res/spring/airep-ingest.xml
index 3fa5094f14..7b2b8a8241 100644
--- a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/res/spring/airep-ingest.xml
@@ -3,11 +3,13 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
+
-
@@ -18,13 +20,13 @@
-
+
+
-
+
-
airep
@@ -51,18 +53,22 @@
java.lang.Throwable
-
java.lang.Throwable
-
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/AirepDecoder.java
similarity index 84%
rename from ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/AirepDecoder.java
index 2f3d51e4b2..927cf11ec9 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/AirepDecoder.java
@@ -2,11 +2,11 @@
* This software was modified from Raytheon's airep plugin by
* NOAA/NWS/NCEP/NCO to order to output point data in HDF5.
**/
-package gov.noaa.nws.ncep.edex.plugin.ncairep;
+package gov.noaa.nws.ncep.edex.plugin.airep;
-import gov.noaa.nws.ncep.common.dataplugin.ncairep.NcAirepRecord;
-import gov.noaa.nws.ncep.edex.plugin.ncairep.decoder.NcAIREPWeather;
-import gov.noaa.nws.ncep.edex.plugin.ncairep.decoder.NcAirepParser;
+import gov.noaa.nws.ncep.common.dataplugin.airep.AirepRecord;
+import gov.noaa.nws.ncep.edex.plugin.airep.decoder.AIREPWeather;
+import gov.noaa.nws.ncep.edex.plugin.airep.decoder.AirepParser;
import java.util.Calendar;
import java.util.Map;
@@ -23,7 +23,7 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
/**
* Decoder strategy for Aicraft Report (AIREP) observation data. Most common
* usage is as follows.
- * NcAIREPDecoder dec = new NcAIREPDecoder();
+ * AirepDecoder dec = new AirepDecoder();
* dec.setMessage(messageData);
* while(dec.hasNext())
* {
@@ -43,16 +43,17 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* Sep 19, 2011 286 Q.Zhou Modified populateRecord to add 8 new
* fields for TB, IC and SK.
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
+ * Sep 05, 2013 2316 bsteffen Unify airep and ncairep.
*
*
* @author F. J. Yen
* @version 1.0
*/
-public class NcAirepDecoder extends AbstractDecoder {
+public class AirepDecoder extends AbstractDecoder {
// Name of the plugin controlling this decoder.
private final String PLUGIN_NAME;
- public static class NcAirepDecoderInput {
+ public static class AirepDecoderInput {
public WMOHeader wmoHeader;
public String report;
@@ -63,7 +64,7 @@ public class NcAirepDecoder extends AbstractDecoder {
* Name that identifies this decoder.
* @throws DecoderException
*/
- public NcAirepDecoder(String pluginName) throws DecoderException {
+ public AirepDecoder(String pluginName) throws DecoderException {
PLUGIN_NAME = pluginName;
}
@@ -76,21 +77,21 @@ public class NcAirepDecoder extends AbstractDecoder {
* @throws DecoderException
* Thrown if no data is available.
*/
- public PluginDataObject[] decode(NcAirepDecoderInput input)
+ public PluginDataObject[] decode(AirepDecoderInput input)
throws DecoderException {
PluginDataObject[] reports = null;
- NcAirepRecord report = null;
+ AirepRecord report = null;
String traceId = null;
System.out.println("====" + new String(input.report)); // input.report
// );
try {
// traceId = getTraceId(hdrMap);
- logger.debug(traceId + "- NcAirepDecoder.decode()");
+ logger.debug(traceId + "- AirepDecoder.decode()");
- report = populateRecord(new NcAirepParser(input.report));
+ report = populateRecord(new AirepParser(input.report));
if (report != null) {
report.setTraceId(traceId);
@@ -105,7 +106,7 @@ public class NcAirepDecoder extends AbstractDecoder {
}
} catch (Exception e) {
- logger.error(traceId + "- Error in NcAirepDecoder", e);
+ logger.error(traceId + "- Error in AirepDecoder", e);
} finally {
if (reports == null) {
reports = new PluginDataObject[0];
@@ -121,9 +122,9 @@ public class NcAirepDecoder extends AbstractDecoder {
* The reccon parser that contains the decoded data.
* @return The populated record.
*/
- private NcAirepRecord populateRecord(NcAirepParser parser) {
+ private AirepRecord populateRecord(AirepParser parser) {
- NcAirepRecord record = null;
+ AirepRecord record = null;
AircraftObsLocation location = null;
if (parser != null) {
@@ -132,7 +133,7 @@ public class NcAirepDecoder extends AbstractDecoder {
if (oTime != null) {
- record = new NcAirepRecord();
+ record = new AirepRecord();
location = new AircraftObsLocation();
record.setTimeObs(oTime);
@@ -153,7 +154,7 @@ public class NcAirepDecoder extends AbstractDecoder {
record.setWindSpeed(parser.getWindSpeed());
record.setLocation(location);
- NcAIREPWeather wx = parser.getWeatherGroup();
+ AIREPWeather wx = parser.getWeatherGroup();
if (wx != null) {
record.setFlightConditions(wx.getFlightConditions());
record.setFlightHazard(wx.getHazard());
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepSeparator.java b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/AirepSeparator.java
similarity index 91%
rename from ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepSeparator.java
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/AirepSeparator.java
index 3cae3698a3..d9cac352ee 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepSeparator.java
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/AirepSeparator.java
@@ -2,7 +2,9 @@
* This software was modified from Raytheon's airep plugin by
* NOAA/NWS/NCEP/NCO to order to output point data in HDF5.
**/
-package gov.noaa.nws.ncep.edex.plugin.ncairep;
+package gov.noaa.nws.ncep.edex.plugin.airep;
+
+import gov.noaa.nws.ncep.edex.plugin.airep.AirepDecoder.AirepDecoderInput;
import java.util.ArrayList;
import java.util.List;
@@ -15,10 +17,9 @@ import org.apache.commons.logging.LogFactory;
import com.raytheon.edex.esb.Headers;
import com.raytheon.edex.plugin.AbstractRecordSeparator;
import com.raytheon.uf.edex.wmo.message.WMOHeader;
-import gov.noaa.nws.ncep.edex.plugin.ncairep.NcAirepDecoder.NcAirepDecoderInput;
/**
- * The NcAirepSeparator takes a potential weather message and attempts to
+ * The AirepSeparator takes a potential weather message and attempts to
* determine the WMO header and data type of the enclosed data. Normal usage is
* to create an instance and set the message data using the setData method. When
* complete the separator contains the WMO header, the message data with all
@@ -41,12 +42,13 @@ import gov.noaa.nws.ncep.edex.plugin.ncairep.NcAirepDecoder.NcAirepDecoderInput;
* Removed DecoderTools.cleanData(), stripHeader().
* Handle amdar in the airep separator.
* 10/04/2011 286 Q.Zhou Move addDayInTime() to the parser
+ * Sep 05, 2013 2316 bsteffen Unify airep and ncairep.
*
*
* @author F. J. Yen
* @version 1.0
*/
-public class NcAirepSeparator extends AbstractRecordSeparator {
+public class AirepSeparator extends AbstractRecordSeparator {
/** The logger */
private Log logger = LogFactory.getLog(getClass());
@@ -64,10 +66,10 @@ public class NcAirepSeparator extends AbstractRecordSeparator {
private int currentReport = -1;
- public static NcAirepSeparator separate(byte[] data, Headers headers) {
- NcAirepSeparator ncAirepSeparator = new NcAirepSeparator();
- ncAirepSeparator.setData(data, headers);
- return ncAirepSeparator;
+ public static AirepSeparator separate(byte[] data, Headers headers) {
+ AirepSeparator airepSeparator = new AirepSeparator();
+ airepSeparator.setData(data, headers);
+ return airepSeparator;
}
/**
@@ -75,10 +77,10 @@ public class NcAirepSeparator extends AbstractRecordSeparator {
*
* @return The next observation record as a String.
*/
- public NcAirepDecoderInput next() {
- NcAirepDecoderInput data = null;
+ public AirepDecoderInput next() {
+ AirepDecoderInput data = null;
if (hasNext()) {
- data = new NcAirepDecoderInput();
+ data = new AirepDecoderInput();
data.report = reports.get(currentReport++);
data.wmoHeader = wmoHeader;
}
@@ -157,10 +159,10 @@ public class NcAirepSeparator extends AbstractRecordSeparator {
String subMsg = message.substring(start, stop);
//System.out.println("***subMsg "+subMsg);
if (subMsg.contains("AIREP")) {
- separateNcAIREP(subMsg);
+ separateAIREP(subMsg);
}
else if (subMsg.contains("AMDAR")) {
- separateNcAMDAR(subMsg);
+ separateAMDAR(subMsg);
}
else {
separateARPARS(subMsg); //amdar also goes to here
@@ -176,7 +178,7 @@ public class NcAirepSeparator extends AbstractRecordSeparator {
* AMDAR 1901^M
* LVR CNFNXL 3315N 11850E 190113 F226 MS123 278/038 TB/ S//1=^M
*/
- private void separateNcAMDAR(String message) {
+ private void separateAMDAR(String message) {
// find header time. Later append it to observation
String headerTime = findHeaderTime(message);
@@ -209,7 +211,7 @@ public class NcAirepSeparator extends AbstractRecordSeparator {
* AIREP^M
* JST4 0050N17838W 2319 F360 MS46 302/025=^M
*/
- private void separateNcAIREP(String message) {
+ private void separateAIREP(String message) {
// find header time. Later append it to observation
String headerTime = findHeaderTime(message);
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/decoder/NcAIREPObsType.java b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/decoder/AIREPObsType.java
similarity index 77%
rename from ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/decoder/NcAIREPObsType.java
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/decoder/AIREPObsType.java
index 1f3c135e06..c452a618a3 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/decoder/NcAIREPObsType.java
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/decoder/AIREPObsType.java
@@ -2,7 +2,7 @@
* This software was modified from Raytheon's airep plugin by
* NOAA/NWS/NCEP/NCO to order to output point data in HDF5.
**/
-package gov.noaa.nws.ncep.edex.plugin.ncairep.decoder;
+package gov.noaa.nws.ncep.edex.plugin.airep.decoder;
import java.util.HashMap;
@@ -16,9 +16,11 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
* Date PTR# Engineer Description
* ------------ -------- ------------- -------------------------------------
* 04/27/2011 F. J. Yen Initial creation from airep
+ * Sep 05, 2013 2316 bsteffen Unify airep and ncairep.
+
*
*/
-public class NcAIREPObsType
+public class AIREPObsType
{
private static final HashMap AIREP_TYPES =
new HashMap();
@@ -34,20 +36,20 @@ public class NcAIREPObsType
*
* @param aType
*/
- private NcAIREPObsType(String aType) {
+ private AIREPObsType(String aType) {
obsType = aType;
- } // NcAIREPObsType()
+ } // AIREPObsType()
/**
*
* @param anObsType
* @return
*/
- public static NcAIREPObsType obsTypeFactory(String anObsType) {
- NcAIREPObsType obsTypeInstance = null;
+ public static AIREPObsType obsTypeFactory(String anObsType) {
+ AIREPObsType obsTypeInstance = null;
if(AIREP_TYPES.containsKey(anObsType)) {
- obsTypeInstance = new NcAIREPObsType(anObsType);
+ obsTypeInstance = new AIREPObsType(anObsType);
}
return obsTypeInstance;
} // obsTypeFactory()
diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/decoder/AIREPWeather.java b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/decoder/AIREPWeather.java
similarity index 78%
rename from edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/decoder/AIREPWeather.java
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/decoder/AIREPWeather.java
index 53d612e3ce..190f215c43 100644
--- a/edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/decoder/AIREPWeather.java
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/decoder/AIREPWeather.java
@@ -1,33 +1,24 @@
/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
+ * This software was modified from Raytheon's airep plugin by
+ * NOAA/NWS/NCEP/NCO to order to output point data in HDF5.
**/
-package com.raytheon.edex.plugin.airep.decoder;
+package gov.noaa.nws.ncep.edex.plugin.airep.decoder;
-/**
+import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
+
+/*a
* TODO Enter a description here.
*
*
* SOFTWARE HISTORY
* Date PTR# Engineer Description
* ------------ -------- ------------- -------------------------------------
- * 20080103 384 jkorman Initial Coding.
+ * 04/27/2011 F.J.Yen Initial creation from airep.
+ * Sep 05, 2013 2316 bsteffen Unify airep and ncairep.
*
+ * *
+ * @author F. J. Yen
+ * @version 1.0
*/
public class AIREPWeather
{
@@ -38,12 +29,17 @@ 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 final String theRawData;
// Decoded flight hazards - See table 3.3
- private Integer theHazard = null;
- private Integer theWeather = null;
- private Integer theFlightConditions = null;
+// private Integer theHazard = null;
+ private Integer theHazard = IMISSD;
+// private Integer theWeather = null;
+ private Integer theWeather = IMISSD;
+// private Integer theFlightConditions = null;
+ private Integer theFlightConditions = IMISSD;
/**
*
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/decoder/NcAirepParser.java b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/decoder/AirepParser.java
similarity index 98%
rename from ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/decoder/NcAirepParser.java
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/decoder/AirepParser.java
index 966741420e..0d67072b35 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/decoder/NcAirepParser.java
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/decoder/AirepParser.java
@@ -2,7 +2,7 @@
* This software was modified from Raytheon's airep plugin by
* NOAA/NWS/NCEP/NCO to order to output point data in HDF5.
**/
-package gov.noaa.nws.ncep.edex.plugin.ncairep.decoder;
+package gov.noaa.nws.ncep.edex.plugin.airep.decoder;
import java.util.ArrayList;
import java.util.Calendar;
@@ -24,7 +24,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
/**
- * The NcAirepParser takes a String that should contain a single AIREP observation
+ * The AirepParser takes a String that should contain a single AIREP observation
* and parses the individual elements of the observation, and performs a decode
* of those elements. The data is made available to clients through a set of get
* methods for each data item.
@@ -47,9 +47,10 @@ import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
* 10/17/2011 286 Q.Zhou Added WX_COND_WORDS and checking.
* 11/01/2011 286 Q.Zhou Added month and year to decodetime
* 02/15/2012 Q.Zhou Added in decodeHazard() to ice type for possible icing type input
+ * Sep 05, 2013 2316 bsteffen Unify airep and ncairep.
*
*/
-public class NcAirepParser
+public class AirepParser
{
/** The logger */
private Log logger = LogFactory.getLog(getClass());
@@ -155,7 +156,7 @@ public class NcAirepParser
private Calendar observationTime = null;
private AircraftFlightLevel flightLevel = null;
private Float temperature = RMISSD;
- private NcAIREPWeather weatherGroup = null;
+ private AIREPWeather weatherGroup = null;
private Float windDirection = RMISSD;
private Float windSpeed = RMISSD;
private AircraftRemarks rptRemarks = null;
@@ -175,7 +176,7 @@ public class NcAirepParser
* Create the parser for and decode an observation from a String.
* @param anObservation A string containing the observation.
*/
- public NcAirepParser(String anObservation) {
+ public AirepParser(String anObservation) {
reportData = anObservation;
parseElements();
}
@@ -184,7 +185,7 @@ public class NcAirepParser
* Create the parser for and decode an observation from a String.
* @param anObservation A string containing the observation.
*/
- public NcAirepParser(byte [] anObservation) {
+ public AirepParser(byte [] anObservation) {
reportData = new String(anObservation);
parseElements();
}
@@ -232,9 +233,9 @@ public class NcAirepParser
//System.out.println("**********theElements "+s);
// if(!DELIMITER.equals(s)) {
-// Object o = NcAIREPObsType.obsTypeFactory(s);
+// Object o = AIREPObsType.obsTypeFactory(s);
// if((o != null)&&(reportType == null)) {
-// reportType = ((NcAIREPObsType) o).getValue();
+// reportType = ((AIREPObsType) o).getValue();
// } else {
// theElements.add(s);
// }
@@ -635,7 +636,7 @@ public class NcAirepParser
{
if(WX_GROUP.matcher(s).find())
{
- weatherGroup = new NcAIREPWeather(s);
+ weatherGroup = new AIREPWeather(s);
theElements.set(i,weatherGroup);
break;
}
@@ -1044,7 +1045,7 @@ public class NcAirepParser
return temperature;
} // getAirTemperature()
- public NcAIREPWeather getWeatherGroup()
+ public AIREPWeather getWeatherGroup()
{
return weatherGroup;
} // getWeatherGroup()
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/junit/TestParser.java b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/junit/TestParser.java
similarity index 61%
rename from ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/junit/TestParser.java
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/junit/TestParser.java
index 26c22f15c4..aa9f217ae3 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/junit/TestParser.java
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/src/gov/noaa/nws/ncep/edex/plugin/airep/junit/TestParser.java
@@ -1,13 +1,14 @@
-package gov.noaa.nws.ncep.edex.plugin.ncairep.junit;
+package gov.noaa.nws.ncep.edex.plugin.airep.junit;
import com.raytheon.uf.edex.wmo.message.WMOHeader;
-import gov.noaa.nws.ncep.edex.plugin.ncairep.decoder.NcAirepParser;
+
+import gov.noaa.nws.ncep.edex.plugin.airep.decoder.AirepParser;
public class TestParser {
WMOHeader wmoHeader;
String anObservation = "ARP UAL556 4126N 09338W 2359 F370 MS54 220/040KT TB SMTH=";
public TestParser() {
- NcAirepParser parser = new NcAirepParser(anObservation);
+ AirepParser parser = new AirepParser(anObservation);
String turb = parser.getTurbInten();
System.out.println("turb"+turb);
}
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/utility/common_static/base/purge/ncairepPurgeRules.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/utility/common_static/base/purge/airepPurgeRules.xml
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/utility/common_static/base/purge/ncairepPurgeRules.xml
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/utility/common_static/base/purge/airepPurgeRules.xml
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/utility/edex_static/base/distribution/ncairep.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/utility/edex_static/base/distribution/airep.xml
similarity index 91%
rename from ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/utility/edex_static/base/distribution/ncairep.xml
rename to ncep/gov.noaa.nws.ncep.edex.plugin.airep/utility/edex_static/base/distribution/airep.xml
index a5ed2b0971..683a7ae749 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/utility/edex_static/base/distribution/ncairep.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airep/utility/edex_static/base/distribution/airep.xml
@@ -1,6 +1,6 @@
-
-
- ncairep
-
-
-
-
-
-
-
-
- java.lang.Throwable
-
-
-
-
-
- java.lang.Throwable
-
-
-
-
-
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/decoder/NcAIREPWeather.java b/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/decoder/NcAIREPWeather.java
deleted file mode 100644
index 72fc3e79c4..0000000000
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/decoder/NcAIREPWeather.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * This software was modified from Raytheon's airep plugin by
- * NOAA/NWS/NCEP/NCO to order to output point data in HDF5.
- **/
-package gov.noaa.nws.ncep.edex.plugin.ncairep.decoder;
-
-import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
-
-/*a
- * TODO Enter a description here.
- *
- *
- * SOFTWARE HISTORY
- * Date PTR# Engineer Description
- * ------------ -------- ------------- -------------------------------------
- * 04/27/2011 F.J.Yen Initial creation from airep.
- *
- * *
- * @author F. J. Yen
- * @version 1.0
- */
-public class NcAIREPWeather
-{
- private static final String VALID_CHARS = "/0123456789";
- private static final int WX_LENGTH = 3;
-
- private static final int WX_HAZARD = 0;
- private static final int WX_WEATHER = 1;
- private static final int WX_FLIGHT = 2;
-
- private static final int IMISSD = IDecoderConstantsN.INTEGER_MISSING;
-
- private final String theRawData;
-
- // Decoded flight hazards - See table 3.3
-// private Integer theHazard = null;
- private Integer theHazard = IMISSD;
-// private Integer theWeather = null;
- private Integer theWeather = IMISSD;
-// private Integer theFlightConditions = null;
- private Integer theFlightConditions = IMISSD;
-
- /**
- *
- * @param aType
- */
- public NcAIREPWeather(String aWeatherGroup)
- {
- theRawData = aWeatherGroup;
- decodeElement();
- } // NcAIREPWeather()
-
- public Integer getHazard()
- {
- return theHazard;
- } // getHazard()
-
- public Integer getWeather()
- {
- return theWeather;
- } // getWeather()
-
- public Integer getFlightConditions()
- {
- return theFlightConditions;
- } // getFlightConditions()
-
-
- //***********************************************
- // Table 3.3. AIREP Hazards (H).
- // Code Figure Explanation
- // 0 None
- // 1 Light Turbulence
- // 2 Moderate Turbulence
- // 3 Severe Turbulence
- // 4 Extreme Turbulence
- // 5 Trace of Icing
- // 6 Light Icing
- // 7 Moderate Icing
- // 8 Severe Icing
- // 9 Hail
- //
- // Table 3.4. AIREP Weather (W).
- // Code Figure Explanation
- // 0 Clear
- // 1 Scattered Clouds
- // 2 Broken Clouds
- // 3 Continuous Layers
- // 4 Lightning
- // 5 Drizzle
- // 6 Continuous Rain
- // 7 Continuous Snow
- // 8 Rain or Snow Showers
- // 9 Thunderstorms
- //
- //
- // Table 3.5. AIREP Flight Conditions (FC).
- // Code Figure Explanation
- // 0 Clear
- // 1 Above Clouds (tops less than 10,000 ft)
- // 2 Above Clouds (tops 10,000 to 18,000 ft)
- // 3 Above Clouds (tops over 18,000 ft)
- // 4 Below Clouds (bases less than 10,000 ft)
- // 5 Below Clouds (bases 10,000 to 18,000 ft)
- // 6 Below Clouds (bases above 18,000 ft)
- // 7 Between Broken or Overcast Layers
- // 8 In Clouds
- // 9 In and Out of Clouds
- //***********************************************
-
- private void decodeElement()
- {
- if(theRawData.length() == WX_LENGTH)
- {
- int pos = VALID_CHARS.indexOf(theRawData.charAt(WX_HAZARD));
- if(pos >= 0)
- {
- theHazard = pos-1;
- }
- pos = VALID_CHARS.indexOf(theRawData.charAt(WX_WEATHER));
- if(pos >= 0)
- {
- theWeather = pos-1;
- }
- pos = VALID_CHARS.indexOf(theRawData.charAt(WX_FLIGHT));
- if(pos >= 0)
- {
- theFlightConditions = pos-1;
- }
- }
- } // decodeElement()
-
- public String toString()
- {
- StringBuffer retData = new StringBuffer();
- retData.append((theHazard >= 0) ? String.valueOf(theHazard) : "/");
- retData.append((theWeather >= 0) ? String.valueOf(theWeather) : "/");
- retData.append((theFlightConditions >= 0) ? String.valueOf(theFlightConditions) : "/");
-
-
- return retData.toString();
- } // toString()
-}
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_ncairep.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_airep.xml
similarity index 98%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_ncairep.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_airep.xml
index 1c7355a089..92c168c3d6 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_ncairep.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_airep.xml
@@ -1,7 +1,7 @@
- ncairep
+ airep