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

Merge branch 'omaha_16.2.1' into omaha_16.2.2

Browse source 
Former-commit-id: b6c20007e2d4fc9e54085d1d0e7b0db003f2220a
This commit is contained in:
Steve Harris 2016-03-10 13:22:55 -06:00
commit cee8d3d87f
5 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cave/com.raytheon.viz.avnconfig/localization/aviation/python/TafDecoder.py
View file

@ -321,6 +321,7 @@
# May 12, 2014 16928 zhao Modified check_prev_time()
# Sep 17, 2014 16928 zhao Added a line break "\n" to message 25 (since it appears together with message 49)
# Jul 07, 2015 16973 zhao Added 'DRSN' as valid value of sig weather
# Mar 03, 2016 18664 zhao Fixed an indentation error in check_vsby_wx()
#
#
import exceptions, re, time, types
@ -1117,11 +1118,11 @@ class Decoder(tpg.VerboseParser):
raise Error(_Errors[15])
if wx in ('DS', 'SS'):
if tok[0] in '+-':
i = tok[0]
else:
i = ''
if invalid_ds_vsby(i, vsby):
raise Error(_Errors[55])
i = tok[0]
else:
i = ''
if invalid_ds_vsby(i, vsby):
raise Error(_Errors[55])
if snow == -1:
raise Error(_Errors[54])
else:

2
edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/radarInfo.txt
View file

@ -65,7 +65,7 @@
25 |16 |0 |0.25 |60 |V |Velocity |{S} {T} Velocity {B}bit ({U}) |{S} {T} Vel {B} |Radial |y | | | |V | | | | |1 |kts |
26 |16 |0 |0.50 |115 |V |Velocity |{S} {T} Velocity ({U}) |{S} {T} V |Radial |y | | | |V | | | | |1 |kts |
27 |16 |0 |1.00 |230 |V |Velocity |{S} {T} Velocity ({U}) |{S} {T} V |Radial |y | | | |V | | | | |1 |kts |
184|256 |0 |0.15 |90 |SW |Spectrum Width |{S} {T} Spec Width ({U}) |{S} {T} Spec Width |Radial |y | | | | | | | | |2 |kts | y
184|256 |0 |0.15 |90 |SW |Spec Width |{S} {T} Spectrum Width ({U}) {B}bit |{S} {T} SW {B}bit |Radial |y | | | |5m | | | | |2 |(m/s)/10| y
185|8 |0 |0.15 |90 |SW |Spectrum Width |{S} {T} Spec Width ({U}) |{S} {T} Spec Width |Radial |y | | | | | | | | |2 |kts |
28 |8 |0 |0.25 |60 |SW |Spectrum Width |{S} {T} Spectrum Width ({U}) {B}bit |{S} {T} SW {B}bit |Radial |y | | | | | | | | |2 |kts |
29 |8 |0 |0.50 |115 |SW |Spectrum Width |{S} {T} Spectrum Width ({U}) {B}bit |{S} {T} SW {B}bit |Radial |y | | | | | | | | |2 |kts |

3
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
View file

@ -139,6 +139,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Nov 06, 2014 16776 zwang Handle AMDA product
* Mar 25, 2015 4319 bsteffen Add volume scan number.
* Sep 09, 2015 17568 wkwock Fix incorrect 8-bit SW display
* Mar 04, 2016 18731 wkwock Fix the TDWR 8-bit SW issues
*
* </pre>
*
@ -913,7 +914,7 @@ public class RadarRecord extends PersistablePluginDataObject implements
nLevels = 255;
}
double[] pix = { 256 - nLevels, 255 };
if (getProductCode() == 155) {
if ((getProductCode() == 155) || (getProductCode() == 184)) {
pix = new double[] { 129, 171 };
} else if(getProductCode() == 32) {
pix = new double[]{ 2, 256 };

6
edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/styleRules/RadarUpperText.xml
View file

@ -84,6 +84,12 @@
<productDependent format='MX: %dkt' index='3' />
<sails />
</upperText>
<upperText productCodes='184'>
<vcp />
<resolution />
<productDependent format='MX: %dkt' index='3' />
</upperText>
<!-- Storm Rel Vel Region -->
<upperText productCodes='55'>

1
edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/styleRules/radarImageryStyleRules.xml
View file

@ -113,6 +113,7 @@
<styleRule>
<paramLevelMatches>
<parameter>155</parameter>
<parameter>184</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>kts</displayUnits>