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

SPS support added for satellite.mcidas decoder; various menu/SatResource edits to support dynamic area menu items.

Browse source 
Former-commit-id: 6640c90ea44fc0380f845cb0066bbae47625464d [formerly 7574f65f15fe8b817ae358fc7448241484be1ace] [formerly 9abdc84540 [formerly dcb05bac39]]
Former-commit-id: 9abdc84540
Former-commit-id: 75bee340f2
This commit is contained in:
AWIPS User 2015-05-18 01:57:08 -05:00 • committed by mjames-upc
parent 44e68c14c7
commit 76f03a420e
11 changed files with 165 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
View file

@ -708,47 +708,12 @@
value="5">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="6">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="7">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="8">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="9">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="10">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="15">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
@ -757,13 +722,6 @@
value="20">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="5">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
@ -785,6 +743,34 @@
value="50">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="100">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="150">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="200">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="250">
</parameter>
</command>
</menuContribution>
<menuContribution
locationURI="menu:com.raytheon.viz.ui.actions.magnification">

3
cave/com.raytheon.viz.feature.awips.developer/feature.xml
View file

@ -64,11 +64,10 @@
<includes
id="com.raytheon.viz.text.feature"
version="0.0.0"/>
<!--
<includes
id="com.raytheon.viz.warngen.feature"
version="0.0.0"/>
-->
<includes
id="gov.noaa.gsd.viz.ensemble.feature"

3
cave/com.raytheon.viz.satellite/META-INF/MANIFEST.MF
View file

@ -28,6 +28,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8",
com.raytheon.uf.viz.core.rsc;bundle-version="1.14",
javax.measure
Import-Package: com.raytheon.viz.core.rsc,
com.raytheon.viz.core.rsc.hdf5
com.raytheon.viz.core.rsc.hdf5,
gov.noaa.nws.ncep.viz.common.area
Export-Package: com.raytheon.viz.satellite,
com.raytheon.viz.satellite.rsc

69
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSatellite.xml
View file

@ -19,6 +19,75 @@
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="titleItem" titleText="--- UNIWISC Imagery ---" id="UniwiscImagery" />
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="GOES Sounder - Ozone" id="GOES-Sounder-Ozone">
<substitute key="element" value="Sounder Based Total Column Ozone"/>
<substitute key="entity" value="SOUNDER" />
<substitute key="sector" value="GOES-Sounder" />
<substitute key="colormap" value="Sat/Ozone/Ozone"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - VIS" id="Arctic-Vis">
<substitute key="element" value="Imager Visible"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - 11 micron IR" id="Arctic-IR1">
<substitute key="element" value="Imager 11 micron IR"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - 12 micron IR" id="Arctic-IR2">
<substitute key="element" value="Imager 12 micron IR"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - WV" id="Arctic-WV">
<substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - 3.5-4.0 micro IR (Fog)" id="Arctic-Fog">
<substitute key="element" value="Imager 3.5-4.0 micro IR (Fog)"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/IR/Fog"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Antarctica - VIS" id="Arctic-Vis">
<substitute key="element" value="Imager Visible"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Antarctic" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Antarctica - IR" id="Arctic-IR1">
<substitute key="element" value="Imager 12 micron IR"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Antarctic" />
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Antarctica - WV" id="Arctic-WV">
<substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Antarctica" />
<substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultCompositeSatellite.xml"
menuText="IR Window" id="irWindow">
<substitute key="timeMatchMode" value="${blendedTimeMatchMode;ALL_IMAGES}"/>

18
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
View file

@ -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<SatResourceData, IMapDescriptor>
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());
}
@ -648,4 +654,14 @@ public class SatResource extends
return result;
}
@Override
public AreaSource getSourceProvider() {
return satRscData.getSourceProvider();
}
@Override
public String getAreaName() {
return satRscData.getAreaName();
}
}

20
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResourceData.java
View file

@ -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();
}
}

3
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
View file

@ -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.
*
*
* </pre>
@ -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;

1
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/src/com/raytheon/uf/edex/plugin/satellite/mcidas/McidasSatelliteDecoder.java
View file

@ -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.
* </pre>
*
* @author

6
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/areaNames.xml
View file

@ -2,9 +2,9 @@
<areaNames>
<map>
<entry><key>7101</key><value>Arctic</value></entry>
<entry><key>1000</key><value>Antarctica</value></entry>
<entry><key>2000</key><value>Antarctica</value></entry>
<entry><key>3000</key><value>Antarctica</value></entry>
<entry><key>1000</key><value>Antarctic</value></entry>
<entry><key>2000</key><value>Antarctic</value></entry>
<entry><key>3000</key><value>Antarctic</value></entry>
<entry><key>10</key><value>GOES-Sounder</value></entry>
<entry><key>11</key><value>GOES-Sounder</value></entry>
<entry><key>12</key><value>GOES-Sounder</value></entry>

6
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/creatingEntities.xml
View file

@ -21,7 +21,7 @@
<!-- Source: http://www.ssec.wisc.edu/mcidas/doc/users_guide/current/app_c-1.html -->
<creatingEntities>
<map>
<entry><key>9</key><value>Global</value></entry>
<entry><key>9</key><value>COMP</value></entry>
<entry><key>10</key><value>SOUNDER</value></entry>
<entry><key>12</key><value>GMS</value></entry>
<entry><key>13</key><value>GMS</value></entry>
@ -50,7 +50,7 @@
<entry><key>180</key><value>GOES13</value></entry>
<entry><key>184</key><value>GOES15</value></entry>
<entry><key>185</key><value>SOUNDER</value></entry>
<entry><key>401</key><value>ARCTIC</value></entry>
<entry><key>72</key><value>ANTARCTICA</value></entry>
<entry><key>401</key><value>COMP</value></entry>
<entry><key>72</key><value>COMP</value></entry>
</map>
</creatingEntities>

14
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/physicalElements.xml
View file

@ -63,13 +63,13 @@
<entry><key ss="185" band="6"/><value name="Imager 3.5-4.0 micro IR (Fog)" /></entry>
<!-- UNIWISC GOES Sounder -->
<entry><key ss="71" band="26"/><value name="Gridded Cloud Top Pressure or Height" /></entry>
<entry><key ss="185" band="26"/><value name="Gridded Cloud Top Pressure or Height" /></entry>
<entry><key ss="185" band="27"/><value name="Sounder Based Derived Precipitable Water (PW)" /></entry>
<entry><key ss="185" band="28"/><value name="Sounder Based Derived Lifted Index (LI)" /></entry>
<entry><key ss="185" band="29"/><value name="CAPE" /></entry>
<entry><key ss="185" band="30"/><value name="Sounder Based Total Column Ozone" /></entry>
<entry><key ss="10" band="30"/><value name="Sounder Based Derived Surface Skin Temp (SFC Skin)" /></entry>
<entry><key ss="71" band="27"/><value name="Gridded Cloud Top Pressure or Height" /></entry>
<entry><key ss="185" band="27"/><value name="Gridded Cloud Top Pressure or Height" /></entry>
<entry><key ss="185" band="28"/><value name="Sounder Based Derived Precipitable Water (PW)" /></entry>
<entry><key ss="185" band="29"/><value name="Sounder Based Derived Lifted Index (LI)" /></entry>
<entry><key ss="185" band="30"/><value name="CAPE" /></entry>
<entry><key ss="185" band="31"/><value name="Sounder Based Total Column Ozone" /></entry>
<entry><key ss="10" band="31"/><value name="Sounder Based Derived Surface Skin Temp (SFC Skin)" /></entry>
<!-- Arctic -->
<entry><key ss="401" band="1"/><value name="Imager Visible" /></entry>