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

McIDAS decoder now accounts for UNIWISC GOES East and West AREA file ranges

Browse source 
Former-commit-id: 7264d6397f27951aaf83cc8e99551d95fdd66215 [formerly 30480ef382]
Former-commit-id: cf692bd996
This commit is contained in:
AWIPS User 2015-07-12 11:52:13 -06:00
parent 06afacc6e3
commit 0f09ba217e
2 changed files with 11 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,6 +77,7 @@ import com.raytheon.uf.edex.plugin.satellite.mcidas.util.McidasSatelliteLookups.
* 09/18/2014 3627 mapeters Updated deprecated method calls.
* 05/11/2015 mjames@ucar PS (south and north) stereogrpahic support added.
* 05/19/2015 mjames@ucar Added decoding of GVAR native projection products
* 07/12/2015 mjames@ucar Account for GOES E and W UNIWISC AREA file numbers
* </pre>
*
* @author
@ -502,6 +503,14 @@ public class McidasSatelliteDecoder {
}
private String getAreaName(int areaNumber) {
// GOES-West UNIWISC McIDAS AREA files
if ( (1161 <= areaNumber && areaNumber <= 1254) ||
(1801 <= areaNumber && areaNumber <= 1851) ){
areaNumber = 1161;
// GOES-East UNIWISC McIDAS AREA files
} else if (1261 <= areaNumber && areaNumber <= 1524) {
areaNumber = 1261;
}
String value = McidasSatelliteLookups.getInstance().getAreaName(
areaNumber);
return value != null ? value : String.format("AREA%04d", areaNumber);

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

@ -11,65 +11,8 @@
<entry><key>13</key><value>GOES-Sounder</value></entry>
<entry><key>14</key><value>GOES-Sounder</value></entry>
<entry><key>15</key><value>GOES-Sounder</value></entry>
<entry><key>1174</key><value>GOES-West</value></entry>
<entry><key>1175</key><value>GOES-West</value></entry>
<entry><key>1176</key><value>GOES-West</value></entry>
<entry><key>1177</key><value>GOES-West</value></entry>
<entry><key>1178</key><value>GOES-West</value></entry>
<entry><key>1179</key><value>GOES-West</value></entry>
<entry><key>1214</key><value>GOES-West</value></entry>
<entry><key>1215</key><value>GOES-West</value></entry>
<entry><key>1216</key><value>GOES-West</value></entry>
<entry><key>1217</key><value>GOES-West</value></entry>
<entry><key>1218</key><value>GOES-West</value></entry>
<entry><key>1219</key><value>GOES-West</value></entry>
<entry><key>1244</key><value>GOES-West</value></entry>
<entry><key>1245</key><value>GOES-West</value></entry>
<entry><key>1246</key><value>GOES-West</value></entry>
<entry><key>1247</key><value>GOES-West</value></entry>
<entry><key>1248</key><value>GOES-West</value></entry>
<entry><key>1249</key><value>GOES-West</value></entry>
<entry><key>1274</key><value>GOES-East</value></entry>
<entry><key>1275</key><value>GOES-East</value></entry>
<entry><key>1276</key><value>GOES-East</value></entry>
<entry><key>1277</key><value>GOES-East</value></entry>
<entry><key>1278</key><value>GOES-East</value></entry>
<entry><key>1279</key><value>GOES-East</value></entry>
<entry><key>1344</key><value>GOES-East</value></entry>
<entry><key>1345</key><value>GOES-East</value></entry>
<entry><key>1346</key><value>GOES-East</value></entry>
<entry><key>1347</key><value>GOES-East</value></entry>
<entry><key>1348</key><value>GOES-East</value></entry>
<entry><key>1349</key><value>GOES-East</value></entry>
<entry><key>1444</key><value>GOES-East</value></entry>
<entry><key>1445</key><value>GOES-East</value></entry>
<entry><key>1446</key><value>GOES-East</value></entry>
<entry><key>1447</key><value>GOES-East</value></entry>
<entry><key>1448</key><value>GOES-East</value></entry>
<entry><key>1449</key><value>GOES-East</value></entry>
<entry><key>1474</key><value>GOES-East</value></entry>
<entry><key>1475</key><value>GOES-East</value></entry>
<entry><key>1476</key><value>GOES-East</value></entry>
<entry><key>1477</key><value>GOES-East</value></entry>
<entry><key>1478</key><value>GOES-East</value></entry>
<entry><key>1479</key><value>GOES-East</value></entry>
<entry><key>1514</key><value>GOES-East</value></entry>
<entry><key>1515</key><value>GOES-East</value></entry>
<entry><key>1516</key><value>GOES-East</value></entry>
<entry><key>1518</key><value>GOES-East</value></entry>
<entry><key>1519</key><value>GOES-East</value></entry>
<entry><key>1814</key><value>GOES-West</value></entry>
<entry><key>1815</key><value>GOES-West</value></entry>
<entry><key>1816</key><value>GOES-West</value></entry>
<entry><key>1817</key><value>GOES-West</value></entry>
<entry><key>1818</key><value>GOES-West</value></entry>
<entry><key>1819</key><value>GOES-West</value></entry>
<entry><key>1844</key><value>GOES-West</value></entry>
<entry><key>1845</key><value>GOES-West</value></entry>
<entry><key>1846</key><value>GOES-West</value></entry>
<entry><key>1847</key><value>GOES-West</value></entry>
<entry><key>1848</key><value>GOES-West</value></entry>
<entry><key>1849</key><value>GOES-West</value></entry>
<entry><key>1161</key><value>GOES-West</value></entry>
<entry><key>1261</key><value>GOES-East</value></entry>
<entry><key>3100</key><value>Global</value></entry>
<entry><key>3101</key><value>Global</value></entry>
<entry><key>601</key><value>Mollweide</value></entry>