diff options
| author | Ivan Martinez <ivanfmartinez@users.noreply.github.com> | 2018-04-06 19:19:02 -0300 |
|---|---|---|
| committer | Ivan Martinez <ivanfmartinez@users.noreply.github.com> | 2018-04-06 19:19:02 -0300 |
| commit | 8d0dadde10bad915c4571d227ccb17a2810a44bb (patch) | |
| tree | 04cd3f8c42d4d85e6e615ad8a7f510a7eeaa7b2f /src/org | |
| parent | 4d80cb140474f5d47d1dca67580bb2db0f829a9f (diff) | |
| download | traccar-server-8d0dadde10bad915c4571d227ccb17a2810a44bb.tar.gz traccar-server-8d0dadde10bad915c4571d227ccb17a2810a44bb.tar.bz2 traccar-server-8d0dadde10bad915c4571d227ccb17a2810a44bb.zip | |
check for valid speed and accuracy before printing, remove uncessary calls to append with comma
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/traccar/MainEventHandler.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/org/traccar/MainEventHandler.java b/src/org/traccar/MainEventHandler.java index 3c8876846..6228f3709 100644 --- a/src/org/traccar/MainEventHandler.java +++ b/src/org/traccar/MainEventHandler.java @@ -60,14 +60,18 @@ public class MainEventHandler extends IdleStateAwareChannelHandler { // Log position StringBuilder s = new StringBuilder(); s.append(formatChannel(e.getChannel())).append(" "); - s.append("id: ").append(uniqueId).append(", "); - s.append("time: ").append( - new SimpleDateFormat(Log.DATE_FORMAT).format(position.getFixTime())).append(", "); - s.append("lat: ").append(String.format("%.5f", position.getLatitude())).append(", "); - s.append("lon: ").append(String.format("%.5f", position.getLongitude())).append(", "); - s.append("speed: ").append(String.format("%.1f", position.getSpeed())).append(", "); - s.append("course: ").append(String.format("%.1f", position.getCourse())).append(", "); - s.append("accuracy: ").append(String.format("%.1f", position.getAccuracy())); + s.append("id: ").append(uniqueId); + s.append(", time: ").append( + new SimpleDateFormat(Log.DATE_FORMAT).format(position.getFixTime())); + s.append(", lat: ").append(String.format("%.5f", position.getLatitude())); + s.append(", lon: ").append(String.format("%.5f", position.getLongitude())); + if (position.getSpeed() > 0) { + s.append(", speed: ").append(String.format("%.1f", position.getSpeed())); + } + s.append(", course: ").append(String.format("%.1f", position.getCourse())); + if (position.getAccuracy() > 0) { + s.append(", accuracy: ").append(String.format("%.1f", position.getAccuracy())); + } Object cmdResult = position.getAttributes().get(Position.KEY_RESULT); if (cmdResult != null) { s.append(", result: ").append(cmdResult); |