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

Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1

Browse source 
Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]]
Former-commit-id: 57f42761d7
Former-commit-id: 7ff64bf8cc [formerly b423579e4a] [formerly 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62]]
Former-commit-id: 276acc0cf2f69b884f078f338890570213eec929 [formerly b630339eb7]
Former-commit-id: d842ed88a7
This commit is contained in:
Steve Harris 2013-03-05 12:27:31 -06:00
commit 2104c8b533
13 changed files with 87 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/CreateProjectionDialog.java
View file

@ -20,8 +20,10 @@
package com.raytheon.uf.viz.d2d.ui.dialogs;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -64,8 +66,6 @@ import com.raytheon.uf.viz.core.IDisplayPaneContainer;
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.status.StatusConstants;
import com.raytheon.uf.viz.d2d.ui.Activator;
import com.raytheon.uf.viz.d2d.ui.map.actions.NewMapEditor;
import com.raytheon.viz.ui.EditorUtil;
import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
@ -78,7 +78,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
*
* Jan. 29, 2013 15567 snaples Remove Orthographic projection from list temporarily
*
* </pre>
*
@ -106,7 +106,7 @@ public class CreateProjectionDialog extends CaveJFACEDialog {
}
}
private Map<Parameter<?>, ParamUI> paramMap = new HashMap<Parameter<?>, ParamUI>();
private final Map<Parameter<?>, ParamUI> paramMap = new HashMap<Parameter<?>, ParamUI>();
// private Composite paramComp;
private Group paramGroup;
@ -186,15 +186,32 @@ public class CreateProjectionDialog extends CaveJFACEDialog {
factory = new DefaultMathTransformFactory();
Set<?> methods = factory.getAvailableMethods(Projection.class);
//Removed for DR 15567
// String[] projections = new String[methods.size()];
String[] projections = new String[methods.size()];
int i = 0;
//int i = 0;
List<Object> prjj = new ArrayList<Object>();
for (Object obj : methods) {
if (obj instanceof MapProjection.AbstractProvider) {
MapProjection.AbstractProvider prj = (MapProjection.AbstractProvider) obj;
projections[i++] = prj.getName().getCode();
// DR15567 Remove "Orthographic" projection temporarily
String orthProj = prj.getName().getCode();
if (orthProj == "Orthographic"){
continue;
} else {
prjj.add(prj.getName().getCode());
}
//Put this back in when ready to revert the code
//projections[i++] = prj.getName().getCode();
}
}
// DR15567
String[] projections = new String[prjj.size()];
int j = 0;
for (Object obj : prjj){
projections[j++] = obj.toString();
}
// End of mods
Arrays.sort(projections);
new Label(projComp, SWT.NONE).setText("Projection:");

22
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableUtil.java
View file

@ -49,6 +49,7 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
* Dec. 3, 2009 3424 zhao Initial creation.
* Jan 25, 2010 4281 wkwock/Zhao Added history-table-row-data related modules
* May 23, 2012 14410 zhao Modified getCellTypeForBlizWarn and getCellTypeForHsnowWarn modules
* Feb 28, 2013 14410 zhao Modified getCellTypeForBlizWarn
*
* </pre>
*
@ -752,13 +753,26 @@ public final class TableUtil {
String presentWx = report.getPresentWx();
CellType windSpeed = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_WIND_SPEED.getXmlKey(), report.getWindSpeed());
CellType windSpeed = CellType.NotAvailable;
if ( report.getWindSpeed() != ObConst.MISSING ) {
windSpeed = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_WIND_SPEED.getXmlKey(), report.getWindSpeed());
}
CellType peakWind = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_PEAK_WIND.getXmlKey(), report.getMaxWindSpeed());
CellType peakWind = CellType.NotAvailable;
if ( report.getMaxWindSpeed() != ObConst.MISSING ) {
peakWind = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_PEAK_WIND.getXmlKey(), report.getMaxWindSpeed());
}
CellType windGust = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_GUST_SPEED.getXmlKey(), report.getWindGust());
CellType windGust = CellType.NotAvailable;
if ( report.getWindGust() != ObConst.MISSING ) {
windGust = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_GUST_SPEED.getXmlKey(), report.getWindGust());
}
CellType visibility = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_VIS.getXmlKey(), report.getVisibility());
CellType visibility = CellType.NotAvailable;
if ( report.getVisibility() != ObConst.MISSING ) {
// vis in units of "miles/16" is used to compare with Red/Yellow threshold values
visibility = tm.getThresholdValueCellType(DataUsageKey.DISPLAY, zone, MonitorConfigConstants.SnowDisplay.SNOW_DISP_PROD_BLIZZ_VIS.getXmlKey(), report.getVisibility()*16.0f);
}
if ( presentWx.contains("SN") || presentWx.contains("BLSN") ) {
// snow or blowing snow observed

15
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
View file

@ -69,6 +69,7 @@ import com.raytheon.viz.hydrocommon.util.DbUtils;
* June 01 2011 9499 djingtao add dur in getGraphData()
* July 25 2011 10082 djingtao modify edit()
* May 30 2012 14967 wkwock overload insertRejectedData method
* Feb 22 2013 14676 lbousaidi check when producttime is null
* </pre>
*
* @author dhladky
@ -1101,7 +1102,7 @@ public class TimeSeriesDataManager extends HydroDataManager {
sql.addString(
"producttime",
dateFormat.format(Calendar.getInstance(
TimeZone.getTimeZone("GMT")).getTime()));
TimeZone.getTimeZone("GMT")).getTime()));
} else {
sql.addString("producttime",
dateFormat.format(data.getProductTime()));
@ -1156,6 +1157,11 @@ public class TimeSeriesDataManager extends HydroDataManager {
sql.setSqlType(SqlBuilder.UPDATE);
sql.addDouble("value", data.getValue());
sql.addString("postingTime", HydroConstants.DATE_FORMAT.format(now));
if (data.getProductTime() == null) {
sql.addString("producttime",
HydroConstants.DATE_FORMAT.format(Calendar.getInstance(
TimeZone.getTimeZone("GMT")).getTime()));
}
StringBuilder where = new StringBuilder();
where.append(" where lid = '" + data.getLid().toUpperCase() + "' ");
@ -1177,6 +1183,11 @@ public class TimeSeriesDataManager extends HydroDataManager {
if (data.getValue() == HydroConstants.MISSING_VALUE) {
DataRecord dr = new DataRecord();
Date productTime=data.getProductTime();
if (productTime==null) {
productTime= now;
}
dr.setDur(data.getDur());
dr.setExt(data.getExtremum().toUpperCase());
dr.setLid(data.getLid());
@ -1188,7 +1199,7 @@ public class TimeSeriesDataManager extends HydroDataManager {
dr.setShefQualCode("M");
dr.setTs(data.getTs().toUpperCase());
dr.setValue(data.getPreviousValue());
dr.setProductTime(data.getProductTime());
dr.setProductTime(productTime);
dr.setProductId(data.getProductID());
if (data.getValidTime() != null) {
dr.setValidTime(data.getValidTime());

2
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
View file

@ -418,7 +418,7 @@ public class TemplateRunner {
if (timeZones.size() > 1 && cityTimezone != null) {
String timezone;
while (iterator.hasNext()) {
timezone = iterator.next().toUpperCase();
timezone = iterator.next();
if (timezone.equals(cityTimezone) && context.get("localtimezone") == null) {
context.put("localtimezone", timezone);
} else if (context.get("secondtimezone") == null) {

2
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/officeCityTimezone.txt
View file

@ -1,7 +1,7 @@
MSO \ M
BOI \ M
VEF \ P
PSR \ M
PSR \ m
BIS \ C
ABR \ C
UNR \ M

7
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java
View file

@ -57,7 +57,8 @@ import com.raytheon.uf.edex.menus.AbstractMenuUtil;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jun 30, 2010 mnash Initial creation
* Jun 30, 2010 mnash Initial creation
* Feb 25, 2013 DR14418 zwang Change radar menu to dual pol style
*
* </pre>
*
@ -110,6 +111,7 @@ public class RadarMenuUtil extends AbstractMenuUtil implements
.get(i).toLowerCase());
if (terminal) {
includeMenuItem.fileName = new File(path
+ "dualPol" + File.separator
+ "baseTerminalLocalRadarMenu.xml");
List<Double> elevations = map.get(radars.get(i));
vars = new VariableSubstitution[(elevations.size() + 1)
@ -137,6 +139,7 @@ public class RadarMenuUtil extends AbstractMenuUtil implements
includeMenuItem.substitutions = vars;
} else {
includeMenuItem.fileName = new File(path
+ "dualPol" + File.separator
+ "baseLocalRadarMenu.xml");
vars = new VariableSubstitution[1];
vars[0] = new VariableSubstitution();
@ -176,6 +179,7 @@ public class RadarMenuUtil extends AbstractMenuUtil implements
if (terminal) {
List<Double> elevations = map.get(radars.get(i));
includeMenuContribution.fileName = new File(path
+ "dualPol" + File.separator
+ File.separator + "baseTerminalLocalRadarMenu.xml");
vars = new VariableSubstitution[(elevations.size() + 1)
+ NUM_POSSIBLE_RADARS + 1];
@ -203,6 +207,7 @@ public class RadarMenuUtil extends AbstractMenuUtil implements
terminal = true;
} else {
includeMenuContribution.fileName = new File(path
+ "dualPol" + File.separator
+ "baseLocalRadarMenu.xml");
vars = new VariableSubstitution[1];
vars[0] = new VariableSubstitution();

8
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
View file

@ -50,6 +50,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
* 26 Nov 2012 #15554 lbousaidi used obstime instead of system time in isNear12Z
* routine.
* 4 Dec 2012 #15569 lbousaidi fixed daily pp value when token is set to USE_REVCODE
* 02 Feb 2012 #15845 lbousaidi added check for data that comes in as -999
* </pre>
*
* @author mnash
@ -309,6 +310,13 @@ public class GagePP {
+ MISSING_PRECIP);
value = MISSING_PRECIP;
}
/* This was added for KRF site that was getting missing values -999
*
*/
if (value ==-99900.0) {
value = MISSING_PRECIP;
}
/*
* Make certain that the value is properly rounded. This will

2
rpms/awips2.core/Installer.ldm/component.spec
View file

@ -5,7 +5,7 @@
Name: awips2-ldm
Summary: AWIPS II LDM Distribution
Version: 6.8.1
Release: 30
Release: 31
Group: AWIPSII
BuildRoot: /tmp
URL: N/A

8
rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.gum
View file

@ -130,12 +130,12 @@ EXEC "readnoaaport -m 224.0.1.5 -n -u 7 -t mhs -r 1"
# The LDM will NOT start if the entry is commented-out.
ALLOW ANY ^((localhost|loopback)|(127\.0\.0\.1\.?$)) .*
ALLOW NEXRAD3 ^.* SDUS...PGUM|SDUS...PHFO|NXUS6..PGUM|NXUS6..PHFO|SDUS4..KWBC
ALLOW NGRID ^.* .* [LM].[GHRT]....KWBC|[LM].C....KWBE|[LM].V....KWBL|[LM].D....KWBG|E.[BH]....KWBJ|[LM].[BEFS]....KWB.|Y.W....KWBG|[YZ].Q....KWBG|[YZ].[JKLNOPT]|[YZ].[BS]....KWBE|[LM].R.*KWBE|[LMYZ].D.*|E.P....KWBJ
ALLOW NIMAGE ^.* .* TIT[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*
ALLOW NGRID ^.* .* [LMYZ].[GHIJQRT]....KWBC|[LMYZ].[IJL]....KWBH|[LMYZ].[ABCJKMNRQSUVYZ]....KWBE|[LM].[VR]....KWBL|[LM].D....KWBG|E.[BEFHI]....KWBJ|O.[MN]....KWBJ|[LM].[ABCE]....KWBS|Y.W....KWBG|[LM].[ABCDIJKMNP]....KWBR|O.N....KWBM|[LM].[EF]....KWBD|L......KWBQ|L.U....KMDL|[YZ]......KKCI|[LM].U....KWNO
ALLOW NIMAGE ^.* .* TIT[EQ].*|TIG[ABENPQ].*|TIC[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*|[YZ]......K(WBD|WNO|WBG|KCI|ALR|FWR|KRF|MSR|ORN|PTR|RHA|RSA|STR|TAR|TIR|TUA|WNH)|[LMYZ].[ABCJKMNRQSUVYZ]....KWBE|[YZ].[HIJQ]....KWBC|[YZ].[IJL]....KWBH|O.[MN]....KWBJ
ALLOW EXP ^.* .*
ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH
ALLOW NOTHER ^.* .*
ALLOW NOTHER ^.* .* TIPB.*
#
# Give permission to the Unidata Program Center
ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .*

8
rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.hfo
View file

@ -130,12 +130,12 @@ EXEC "readnoaaport -m 224.0.1.5 -n -u 7 -t mhs -r 1"
# The LDM will NOT start if the entry is commented-out.
ALLOW ANY ^((localhost|loopback)|(127\.0\.0\.1\.?$)) .*
ALLOW NEXRAD3 ^.* SDUS...PGUM|SDUS...PHFO|NXUS6..PGUM|NXUS6..PHFO|SDUS4..KWBC
ALLOW NGRID ^.* .* [LM].[GHRT]....KWBC|[LM].C....KWBE|[LM].V....KWBL|[LM].D....KWBG|E.[BH]....KWBJ|[LM].[BEFS]....KWB.|Y.W....KWBG|[YZ].Q....KWBG|[YZ].[JKLNOPT]|[YZ].[BS]....KWBE|[LM].R.*KWBE|[LMYZ].D.*|E.P....KWBJ
ALLOW NIMAGE ^.* .* TIT[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*
ALLOW NGRID ^.* .* [LMYZ].[GHIJQRT]....KWBC|[LMYZ].[IJL]....KWBH|[LMYZ].[ABCJKMNRQSUVYZ]....KWBE|[LM].[VR]....KWBL|[LM].D....KWBG|E.[BEFHI]....KWBJ|O.[MN]....KWBJ|[LM].[ABCE]....KWBS|Y.W....KWBG|[LM].[ABCDIJKMNP]....KWBR|O.N....KWBM|[LM].[EF]....KWBD|L......KWBQ|L.U....KMDL|[YZ]......KKCI|[LM].U....KWNO
ALLOW NIMAGE ^.* .* TIT[EQ].*|TIG[ABENPQ].*|TIC[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*|[YZ]......K(WBD|WNO|WBG|KCI|ALR|FWR|KRF|MSR|ORN|PTR|RHA|RSA|STR|TAR|TIR|TUA|WNH)|[LMYZ].[ABCJKMNRQSUVYZ]....KWBE|[YZ].[HIJQ]....KWBC|[YZ].[IJL]....KWBH|O.[MN]....KWBJ
ALLOW EXP ^.* .*
ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH
ALLOW NOTHER ^.* .*
ALLOW NOTHER ^.* .* TIPB.*
#
# Give permission to the Unidata Program Center
ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .*

8
rpms/awips2.core/Installer.ldm/patch/etc/ldmd.conf.pbp
View file

@ -130,12 +130,12 @@ EXEC "readnoaaport -m 224.0.1.5 -n -u 7 -t mhs -r 1"
# The LDM will NOT start if the entry is commented-out.
ALLOW ANY ^((localhost|loopback)|(127\.0\.0\.1\.?$)) .*
ALLOW NEXRAD3 ^.* SDUS...PGUM|SDUS...PHFO|NXUS6..PGUM|NXUS6..PHFO|SDUS4..KWBC
ALLOW NGRID ^.* .* [LM].[GHRT]....KWBC|[LM].C....KWBE|[LM].V....KWBL|[LM].D....KWBG|E.[BH]....KWBJ|[LM].[BEFS]....KWB.|Y.W....KWBG|[YZ].Q....KWBG|[YZ].[JKLNOPT]|[YZ].[BS]....KWBE|[LM].R.*KWBE|[LMYZ].D.*|E.P....KWBJ
ALLOW NIMAGE ^.* .* TIT[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*
ALLOW NGRID ^.* .* [LMYZ].[GHIJQRT]....KWBC|[LMYZ].[IJL]....KWBH|[LMYZ].[ABCJKMNRQSUVYZ]....KWBE|[LM].[VR]....KWBL|[LM].D....KWBG|E.[BEFHI]....KWBJ|O.[MN]....KWBJ|[LM].[ABCE]....KWBS|Y.W....KWBG|[LM].[ABCDIJKMNP]....KWBR|O.N....KWBM|[LM].[EF]....KWBD|L......KWBQ|L.U....KMDL|[YZ]......KKCI|[LM].U....KWNO
ALLOW NIMAGE ^.* .* TIT[EQ].*|TIG[ABENPQ].*|TIC[EQ].*
ALLOW HDS ^.* .* [IJ]UTX0[0-689].*|JUSX4[0-689].*|[YZ]......K(WBD|WNO|WBG|KCI|ALR|FWR|KRF|MSR|ORN|PTR|RHA|RSA|STR|TAR|TIR|TUA|WNH)|[LMYZ].[ABCJKMNRQSUVYZ]....KWBE|[YZ].[HIJQ]....KWBC|[YZ].[IJL]....KWBH|O.[MN]....KWBJ
ALLOW EXP ^.* .*
ALLOW IDS|DDPLUS ^.* .* SXUS2[03-9].KWOH|SXUS[3-9].KWOH|SXUS8[0-3].KWOH|SRUS[2-8].KWOH
ALLOW NOTHER ^.* .*
ALLOW NOTHER ^.* .* TIPB.*
#
# Give permission to the Unidata Program Center
ALLOW ANY ^[a-z].*\.unidata\.ucar\.edu\.?$ .*

2
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
View file

@ -300,7 +300,7 @@ NGRID ^(E.[ABCDEFGHI].{1,3}) (KWBJ) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)
# AWIPS1 OCONUS: GRID ^[LM].[ABCDE].*KWBS* /Grid/SBN/rawGrib2
# LMDA98 KWBS 160000 !grib2/ncep/WRF_EM/#130/201012160000F000/WXTZ/0 - NONE
ANY ^([LM].[ABCDE].{1,3}) (KWBS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
ANY ^([LM].[ABCDEF].{1,3}) (KWBS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H
# AWIPS1: GRID ^LGXT[0-2][0-9].*KNHC /Grid/SBN/rawGrib2

3
rpms/build/i386/build.sh
View file

@ -86,6 +86,7 @@ fi
if [ "${1}" = "-python-qpid" ]; then
buildRPM "awips2"
buildRPM "awips2-python-qpid"
buildRPM "awips2-python"
buildRPM "awips2-python-cherrypy"
buildRPM "awips2-python-dynamicserialize"
@ -97,7 +98,6 @@ if [ "${1}" = "-python-qpid" ]; then
buildRPM "awips2-python-pil"
buildRPM "awips2-python-pmw"
buildRPM "awips2-python-pupynere"
buildRPM "awips2-python-qpid"
buildRPM "awips2-python-scientific"
buildRPM "awips2-python-scipy"
buildRPM "awips2-python-tables"
@ -343,6 +343,7 @@ fi
if [ "${1}" = "-edex" ]; then
buildRPM "awips2"
buildRPM "awips2-cli"
buildRPM "awips2-gfesuite-client"
buildRPM "awips2-gfesuite-server"
buildRPM "Installer.ncep-database"