From 8d521a40d0cbd373abce58e082a05494515769d0 Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Mon, 16 Jun 2014 10:55:48 -0500 Subject: [PATCH] Omaha #2061 Update ncep copies of radar resources. Former-commit-id: 8064a74866df91f8f6e31ad74d051c0ba0a0969b [formerly 64b5e484c0dd8409ab0b791763c31681c94a38d3] Former-commit-id: 14b5c0d792514da8c2f1806d8f97f8c3f20845ab --- .../ncradar/rsc/AbstractRadarResource.java | 9 +++--- .../rsc/image/RadarRadialResource.java | 29 ++++++------------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/AbstractRadarResource.java b/ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/AbstractRadarResource.java index b94695faf4..edb625c501 100644 --- a/ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/AbstractRadarResource.java +++ b/ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/AbstractRadarResource.java @@ -16,9 +16,10 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import javax.measure.Measure; +import javax.measure.quantity.Length; import javax.measure.unit.NonSI; -import com.raytheon.uf.common.dataplugin.IDecoderGettable.Amount; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.radar.RadarRecord; import com.raytheon.uf.common.dataplugin.radar.util.RadarInfoDict; @@ -39,7 +40,6 @@ import com.raytheon.uf.viz.core.rsc.ResourceType; import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability; import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability; import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability; -import com.raytheon.uf.viz.d2d.core.map.IDataScaleResource; import com.raytheon.viz.awipstools.capabilityInterfaces.IRangeableResource; import com.raytheon.viz.radar.DefaultVizRadarRecord; import com.raytheon.viz.radar.VizRadarRecord; @@ -63,6 +63,7 @@ import com.vividsolutions.jts.geom.Coordinate; * 06/10/13 #999 G. Hull rm interrogate and inspect. (add back when supported by NCP.) * 06/10/13 #999 G. Hull rm IRadarTextGeneratingResource and IRadarConfigListener since not supported by NCP. * 06/10/2013 #999 G. Hull rm IDataScaleResource + * 06/16/2014 #2061 bsteffen update IRangeableResource * * * @@ -316,8 +317,8 @@ implements IResourceDataChanged, IRangeableResource { * getElevation() */ @Override - public Amount getElevation() { - return new Amount(0.0, NonSI.FOOT); + public Measure getElevation() { + return Measure.valueOf(0.0, NonSI.FOOT); } /* diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/image/RadarRadialResource.java b/ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/image/RadarRadialResource.java index 6328073f40..c0b9329529 100644 --- a/ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/image/RadarRadialResource.java +++ b/ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/image/RadarRadialResource.java @@ -7,43 +7,31 @@ */ package gov.noaa.nws.ncep.viz.rsc.ncradar.rsc.image; -import java.awt.Rectangle; -import java.util.HashMap; -import java.util.Map; +import gov.noaa.nws.ncep.viz.rsc.ncradar.rsc.RadarImageResource; +import gov.noaa.nws.ncep.viz.rsc.ncradar.rsc.RadarResourceData; +import java.awt.Rectangle; + +import javax.measure.Measure; +import javax.measure.quantity.Length; import javax.measure.unit.NonSI; import org.opengis.referencing.crs.CoordinateReferenceSystem; import com.raytheon.uf.common.colormap.prefs.ColorMapParameters; -import com.raytheon.uf.common.dataplugin.IDecoderGettable.Amount; import com.raytheon.uf.common.dataplugin.radar.RadarRecord; -import com.raytheon.uf.common.dataquery.requests.RequestConstraint; -import com.raytheon.uf.common.time.DataTime; import com.raytheon.uf.viz.core.DrawableImage; import com.raytheon.uf.viz.core.IGraphicsTarget; import com.raytheon.uf.viz.core.IMesh; -import com.raytheon.uf.viz.core.catalog.LayerProperty; -import com.raytheon.uf.viz.core.catalog.ScriptCreator; -import com.raytheon.uf.viz.core.comm.Connector; import com.raytheon.uf.viz.core.drawables.IImage; import com.raytheon.uf.viz.core.drawables.ext.colormap.IColormappedImageExtension; import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.map.IMapDescriptor; import com.raytheon.uf.viz.core.map.MapDescriptor; import com.raytheon.uf.viz.core.rsc.LoadProperties; -import com.raytheon.uf.viz.core.rsc.ResourceType; -import com.raytheon.viz.awipstools.capabilities.EAVCapability; -import com.raytheon.viz.awipstools.common.EstimatedActualVelocity; - -import com.raytheon.viz.radar.DefaultVizRadarRecord; import com.raytheon.viz.radar.VizRadarRecord; -import gov.noaa.nws.ncep.viz.rsc.ncradar.rsc.RadarImageResource; -import gov.noaa.nws.ncep.viz.rsc.ncradar.rsc.RadarResourceData; import com.raytheon.viz.radar.rsc.image.IRadialMeshExtension; -import com.vividsolutions.jts.geom.Coordinate; - /** * TODO Add Description * @@ -59,6 +47,7 @@ import com.vividsolutions.jts.geom.Coordinate; * 03/30/2012 #651 S. Gurung Removed method resourceChanged * 09-04-2012 B. Hebbard Add getGridGeometry() to descriptor per OB12.9.1 RTS * change IRadialMeshExtension.constructMesh 2nd param + * 06/16/2014 #2061 bsteffen update IRangeableResource * * * @@ -85,11 +74,11 @@ public class RadarRadialResource extends RadarImageResource { * @see com.raytheon.viz.radar.rsc.AbstractRadarResource#getElevation() */ @Override - public Amount getElevation() { + public Measure getElevation() { RadarRecord radarRecord = getCurrentRadarRecord(); if (radarRecord != null) { - return new Amount(radarRecord.getElevation(), NonSI.FOOT); + return Measure.valueOf(radarRecord.getElevation(), NonSI.FOOT); } return super.getElevation(); }