[Pkg-running-devel] [openambit] 49/131: Do not send empty sets in JSON content

[Christian Perrier]

This is an automated email from the git hooks/post-receive script.

bubulle pushed a commit to branch master
in repository openambit.

commit 5effb7a30cb7d36ffbdd527ab97b6a2f3289c32b
Author: Emil Ljungdahl <emil at kratern.se>
Date:   Tue Jan 14 21:19:03 2014 +0100

    Do not send empty sets in JSON content
---
 src/openambit/movescountjson.cpp | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/openambit/movescountjson.cpp b/src/openambit/movescountjson.cpp
index b67ae10..e15dce7 100644
--- a/src/openambit/movescountjson.cpp
+++ b/src/openambit/movescountjson.cpp
@@ -220,11 +220,13 @@ int MovesCountJSON::generateLogData(LogEntry *logEntry, QByteArray &output)
     content.insert("Energy", logEntry->logEntry->header.energy_consumption);
     content.insert("FlatTime", QVariant::Invalid);
     content.insert("HighAltitude", (double)logEntry->logEntry->header.altitude_max);
-    uncompressedData = serializer.serialize(IBIContent);
-    compressData(uncompressedData, compressedData);
-    QVariantMap IBIDataMap;
-    IBIDataMap.insert("CompressedValues", compressedData.toBase64());
-    content.insert("IBIData", IBIDataMap);                        /* compressed */
+    if (IBIContent.count() > 0) {
+        uncompressedData = serializer.serialize(IBIContent);
+        compressData(uncompressedData, compressedData);
+        QVariantMap IBIDataMap;
+        IBIDataMap.insert("CompressedValues", compressedData.toBase64());
+        content.insert("IBIData", IBIDataMap);                        /* compressed */
+    }
     content.insert("LocalStartTime", dateTimeString(localBaseTime));
     content.insert("LowAltitude", (double)logEntry->logEntry->header.altitude_min);
     content.insert("Marks", marksContent);
@@ -236,19 +238,23 @@ int MovesCountJSON::generateLogData(LogEntry *logEntry, QByteArray &output)
     content.insert("PeakHR", logEntry->logEntry->header.heartrate_max);
     content.insert("PeakTrainingEffect", (double)logEntry->logEntry->header.peak_training_effect/10.0);
     content.insert("RecoveryTime", (double)logEntry->logEntry->header.recovery_time/1000.0);
-    uncompressedData = serializer.serialize(periodicSamplesContent);
-    compressData(uncompressedData, compressedData);
-    QVariantMap periodicSamplesDataMap;
-    periodicSamplesDataMap.insert("CompressedSampleSets", compressedData.toBase64());
-    content.insert("Samples", periodicSamplesDataMap);            /* compressed */
+    if (periodicSamplesContent.count() > 0) {
+        uncompressedData = serializer.serialize(periodicSamplesContent);
+        compressData(uncompressedData, compressedData);
+        QVariantMap periodicSamplesDataMap;
+        periodicSamplesDataMap.insert("CompressedSampleSets", compressedData.toBase64());
+        content.insert("Samples", periodicSamplesDataMap);            /* compressed */
+    }
     content.insert("SerialNumber", QVariant::Invalid);
     content.insert("StartLatitude", QVariant::Invalid);
     content.insert("StartLongitude", QVariant::Invalid);
-    uncompressedData = serializer.serialize(GPSSamplesContent);
-    compressData(uncompressedData, compressedData);
-    QVariantMap GPSSamplesDataMap;
-    GPSSamplesDataMap.insert("CompressedTrackPoints", compressedData.toBase64());
-    content.insert("Track", GPSSamplesDataMap);                   /* compressed */
+    if (GPSSamplesContent.count() > 0) {
+        uncompressedData = serializer.serialize(GPSSamplesContent);
+        compressData(uncompressedData, compressedData);
+        QVariantMap GPSSamplesDataMap;
+        GPSSamplesDataMap.insert("CompressedTrackPoints", compressedData.toBase64());
+        content.insert("Track", GPSSamplesDataMap);                   /* compressed */
+    }
 
     output = serializer.serialize(content, &ok);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/openambit.git