From 9abdc8454042f67190957b85e244dc15f9695661 Mon Sep 17 00:00:00 2001 From: AWIPS User Date: Mon, 18 May 2015 01:57:08 -0500 Subject: [PATCH] SPS support added for satellite.mcidas decoder; various menu/SatResource edits to support dynamic area menu items. Former-commit-id: dcb05bac397ce69276ecf8255a7b576df1d9cad4 --- cave/com.raytheon.uf.viz.d2d.ui/plugin.xml | 98 ++++++++----------- .../feature.xml | 3 +- .../META-INF/MANIFEST.MF | 3 +- .../menus/satellite/baseSatellite.xml | 69 +++++++++++++ .../viz/satellite/rsc/SatResource.java | 18 +++- .../viz/satellite/rsc/SatResourceData.java | 20 +++- .../util/satellite/SatSpatialFactory.java | 3 +- .../mcidas/McidasSatelliteDecoder.java | 1 + .../base/satellite/mcidas/areaNames.xml | 6 +- .../satellite/mcidas/creatingEntities.xml | 6 +- .../satellite/mcidas/physicalElements.xml | 14 +-- 11 files changed, 165 insertions(+), 76 deletions(-) diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml index d1f4e98737..b815dbc73b 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml @@ -708,34 +708,6 @@ value="5"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml index 201590f1a5..5194f6900d 100644 --- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml +++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml @@ -64,11 +64,10 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java index 294f382bc4..dc910d6452 100644 --- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java +++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java @@ -84,6 +84,10 @@ import com.raytheon.viz.satellite.tileset.SatDataRetriever; import com.raytheon.viz.satellite.tileset.SatTileSetRenderable; import com.vividsolutions.jts.geom.Coordinate; +import gov.noaa.nws.ncep.viz.common.area.AreaName.AreaSource; +import gov.noaa.nws.ncep.viz.common.area.IAreaProviderCapable; + + /** * Provides satellite raster rendering support * @@ -131,8 +135,9 @@ import com.vividsolutions.jts.geom.Coordinate; */ public class SatResource extends AbstractPluginDataObjectResource - implements ImageProvider, Interrogatable { + implements ImageProvider, Interrogatable, IAreaProviderCapable { + protected SatResourceData satRscData; /** * String id to look for satellite-provided data values * @@ -290,6 +295,7 @@ public class SatResource extends */ public SatResource(SatResourceData data, LoadProperties props) { super(data, props); + satRscData = data; addDataObject(data.getRecords()); } @@ -647,5 +653,15 @@ public class SatResource extends return result; } + + @Override + public AreaSource getSourceProvider() { + return satRscData.getSourceProvider(); + } + + @Override + public String getAreaName() { + return satRscData.getAreaName(); + } } diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResourceData.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResourceData.java index 39007c159d..ee4f8b1cf0 100644 --- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResourceData.java +++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResourceData.java @@ -19,8 +19,13 @@ **/ package com.raytheon.viz.satellite.rsc; +import gov.noaa.nws.ncep.viz.common.area.IAreaProviderCapable; +import gov.noaa.nws.ncep.viz.common.area.AreaName.AreaSource; + +import java.io.File; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -31,6 +36,8 @@ import java.util.Set; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import org.eclipse.core.runtime.CoreException; + import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord; import com.raytheon.uf.common.dataquery.requests.RequestConstraint; @@ -66,7 +73,9 @@ import com.raytheon.viz.satellite.inventory.SatelliteDataCubeAdapter; */ @XmlAccessorType(XmlAccessType.NONE) -public class SatResourceData extends AbstractRequestableResourceData { +public class SatResourceData extends AbstractRequestableResourceData + implements IAreaProviderCapable{ + private static final transient IUFStatusHandler statusHandler = UFStatus .getHandler(SatResourceData.class); @@ -200,4 +209,13 @@ public class SatResourceData extends AbstractRequestableResourceData { return super.equals(obj); } + + public AreaSource getSourceProvider() { + return AreaSource.getAreaSource("GINI_SECTOR_ID"); + } + + public String getAreaName() { + return metadataMap.get("creatingEntity").getConstraintValue()+"/"+metadataMap.get("sectorID").getConstraintValue(); + } + } diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java index c87dd39ab0..a55f065719 100644 --- a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java +++ b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java @@ -47,6 +47,7 @@ import com.vividsolutions.jts.geom.Envelope; * Sep 15, 2014 17303 jgerth Support for second standard latitude * Nov 05, 2014 2714 bclement replaced DecoderException with SatelliteDecoderException * Nov 05, 2014 3788 bsteffen use getOrCreateCoverage in place of queryByMapId + * May 11, 2015 mjames South polar stereogrpahic support added. * * * @@ -63,8 +64,6 @@ public class SatSpatialFactory { public static final int PROJ_POLAR = 5; - public static final int PROJ_POLAR_SOUTH = 6; - public static final int PROJ_CYLIN_EQUIDISTANT = 7; public static final int UNDEFINED = -1; diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/src/com/raytheon/uf/edex/plugin/satellite/mcidas/McidasSatelliteDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/src/com/raytheon/uf/edex/plugin/satellite/mcidas/McidasSatelliteDecoder.java index 869a1bcd3d..09f0bf1114 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/src/com/raytheon/uf/edex/plugin/satellite/mcidas/McidasSatelliteDecoder.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/src/com/raytheon/uf/edex/plugin/satellite/mcidas/McidasSatelliteDecoder.java @@ -71,6 +71,7 @@ import com.raytheon.uf.edex.plugin.satellite.mcidas.util.McidasSatelliteLookups. * IDataRecord required by the SatelliteDao * 12/03/2013 DR 16841 D. Friedman Allow record overwrites * 09/18/2014 3627 mapeters Updated deprecated method calls. + * 05/11/2015 mjames PS (south and north) stereogrpahic support added. * * * @author diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/areaNames.xml b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/areaNames.xml index 524218b46b..0023ad4408 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/areaNames.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/areaNames.xml @@ -2,9 +2,9 @@ 7101Arctic - 1000Antarctica - 2000Antarctica - 3000Antarctica + 1000Antarctic + 2000Antarctic + 3000Antarctic 10GOES-Sounder 11GOES-Sounder 12GOES-Sounder diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/creatingEntities.xml b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/creatingEntities.xml index 779512ad90..6927ebb495 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/creatingEntities.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/creatingEntities.xml @@ -21,7 +21,7 @@ - 9Global + 9COMP 10SOUNDER 12GMS 13GMS @@ -50,7 +50,7 @@ 180GOES13 184GOES15 185SOUNDER - 401ARCTIC - 72ANTARCTICA + 401COMP + 72COMP diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/physicalElements.xml b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/physicalElements.xml index 69f6229194..6f05200e94 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/physicalElements.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/physicalElements.xml @@ -63,13 +63,13 @@ - - - - - - - + + + + + + +