Fixed invalid JSON output in station_sample (comma)

mnit-rtmc · Jun 25, 2024 · 91c03cd · 91c03cd
1 parent 5fc2a4d
commit 91c03cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/us/mn/state/dot/tms/server/StationImpl.java b/src/us/mn/state/dot/tms/server/StationImpl.java
@@ -293,12 +293,14 @@ public void writeSampleXml(Writer w, long stamp, int per_ms)
  }
 
  /** Write the current sample as a JSON object */
- public boolean writeSampleJson(long stamp, int per_ms, Writer writer)
- throws IOException
+ public boolean writeSampleJson(long stamp, int per_ms, Writer writer,
+ boolean first) throws IOException
  {
  int f = getFlow(stamp, per_ms);
  int s = Math.round(getSpeed(stamp, per_ms));
  if (f > MISSING_DATA || s > 0) {
+ if (first)
+ writer.write(',');
  writeSampleJson(f, s, writer);
  return true;
  } else

diff --git a/src/us/mn/state/dot/tms/server/StationManager.java b/src/us/mn/state/dot/tms/server/StationManager.java
@@ -120,13 +120,15 @@ private void writeSampleJson(BufferedWriter writer) throws IOException {
  writer.write("\"period\":30,\n");
  writer.write("\"samples\":{\n");
  Iterator<Station> it = StationHelper.iterator();
+ boolean first = true;
  while (it.hasNext()) {
  Station s = it.next();
  if (s instanceof StationImpl) {
  StationImpl si = (StationImpl) s;
- if (si.writeSampleJson(stamp, per_ms, writer)) {
- if (it.hasNext())
- writer.write(',');
+ if (si.writeSampleJson(stamp, per_ms, writer,
+ first))
+ {
+ first = false;
  writer.write('\n');
  }
  }