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

Omaha #5134 fix loading redbook upper air data

Browse source 
Change-Id: Ie0f0a137a68134a69003fd49579fc0bd412b1866

Former-commit-id: 10772bbe00adbd499a606eebe4d8ad9a68070924
This commit is contained in:
Nate Jensen 2015-11-17 12:31:34 -06:00
parent 238edb9cc5
commit fe4c0691b1
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/RedbookUpperAirDecoder.java
View file

@ -24,6 +24,9 @@ import java.nio.charset.Charset;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.geotools.coverage.grid.GeneralGridEnvelope; import org.geotools.coverage.grid.GeneralGridEnvelope;
import org.geotools.coverage.grid.GridGeometry2D; import org.geotools.coverage.grid.GridGeometry2D;
import org.geotools.geometry.DirectPosition2D; import org.geotools.geometry.DirectPosition2D;
@ -33,6 +36,7 @@ import org.opengis.referencing.crs.ProjectedCRS;
import org.opengis.referencing.datum.PixelInCell; import org.opengis.referencing.datum.PixelInCell;
import org.opengis.referencing.operation.MathTransform; import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException; import org.opengis.referencing.operation.TransformException;
import org.osgi.framework.Bundle;
import com.raytheon.uf.common.geospatial.MapUtil; import com.raytheon.uf.common.geospatial.MapUtil;
import com.raytheon.uf.common.pointdata.PointDataContainer; import com.raytheon.uf.common.pointdata.PointDataContainer;
@ -41,9 +45,7 @@ import com.raytheon.uf.common.pointdata.PointDataView;
import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.status.StatusConstants;
import com.raytheon.viz.redbook.Activator; import com.raytheon.viz.redbook.Activator;
import com.raytheon.viz.redbookua.rsc.RedbookUpperAirResource;
/** /**
* Decoder for redbook upper air products. * Decoder for redbook upper air products.
@ -54,6 +56,7 @@ import com.raytheon.viz.redbookua.rsc.RedbookUpperAirResource;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Mar 24, 2010 1029 dfriedma Initial creation * Mar 24, 2010 1029 dfriedma Initial creation
* Nov 17, 2015 5134 njensen Fixed loading pointDataDescription
* *
* </pre> * </pre>
* *
@ -289,20 +292,17 @@ public class RedbookUpperAirDecoder {
private static synchronized PointDataDescription getPointDataDescription() { private static synchronized PointDataDescription getPointDataDescription() {
if (pointDataDescription == null) { if (pointDataDescription == null) {
InputStream is = RedbookUpperAirResource.class Bundle bundle = Activator.getDefault().getBundle();
.getResourceAsStream("/res/pointdata/redbookua.xml"); IPath path = new Path("/res/pointdata/redbookua.xml");
try (InputStream is = FileLocator.openStream(bundle, path, false)) {
if (is != null) { if (is != null) {
try { pointDataDescription = PointDataDescription.fromStream(is);
try {
pointDataDescription = PointDataDescription
.fromStream(is);
} finally {
is.close();
} }
} catch (Exception e) { } catch (Exception e) {
statusHandler.handle(Priority.PROBLEM, statusHandler
"Could load point data description", e); .handle(Priority.PROBLEM,
} "Couldn't load point data description for redbookua",
e);
} }
} }
return pointDataDescription; return pointDataDescription;