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

Merge "ASM #16923 - Fix METAR decoder extra whitespace problem" into asm_15.1.1

Browse source 
Former-commit-id: 7f97eebdc018f3f9876e0a48c7a9b911ba5f5f96
This commit is contained in:
Juliya Dynina 2015-04-23 12:03:42 -05:00 • committed by Gerrit Code Review
commit 427242a092
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
View file

@ -85,6 +85,7 @@ import com.vividsolutions.jts.geom.impl.CoordinateArraySequence;
* May 14, 2014 2536 bclement moved WMO Header to common, removed TimeTools usage
* Jul 23, 2014 3410 bclement location changed to floats
* Oct 02, 2014 3693 mapeters Added Pattern constants.
* Apr 22, 2015 DR 16923 MPorricelli Modified cleanMessage to eliminate extra spaces
*
* </pre>
*
@ -988,7 +989,8 @@ public class MetarDecoder extends AbstractDecoder {
}
/**
* Get rid of any control characters prior to parsing data.
* Get rid of any control characters and extraneous spaces
* prior to parsing data.
*
* @param message
* @return
@ -998,15 +1000,18 @@ public class MetarDecoder extends AbstractDecoder {
char lastChar = 0;
for (int i = 0; i < message.length(); i++) {
char c = message.charAt(i);
if (c < ' ') {
if (lastChar != c) {
// if current char is a control char or space and prev char is
// not a space, then add a space to string
if (c <= ' ') {
if (lastChar != ' ') {
sb.append(' ');
lastChar = ' ';
}
} else {
sb.append(c);
}
lastChar = c;
}
}
return sb.toString();
}