Merge pull request #228 from gustavo-iniguez-goya/enforce_limits

enforce field limits to still allow to upload moves where values are out of range

Author: centic9

src/movescount/movescountjson.cpp

@@ -839,18 +839,22 @@ bool MovesCountJSON::writePeriodicSample(ambit_log_sample_t *sample, QVariantMap
 
         switch(value->type) {
         case ambit_log_sample_periodic_type_latitude:
-            output.insert("Latitude", (double)value->u.latitude/10000000);
+            if (value->u.latitude <= 90 && value->u.latitude >= -90){
+                output.insert("Latitude", (double)value->u.latitude/10000000);
+            }
             break;
         case ambit_log_sample_periodic_type_longitude:
-            output.insert("Longitude", (double)value->u.longitude/10000000);
+            if (value->u.longitude <= 180 && value->u.longitude >= -180){
+                output.insert("Longitude", (double)value->u.longitude/10000000);
+            }
             break;
         case ambit_log_sample_periodic_type_distance:
-            if (value->u.distance != 0xffffffff) {
+            if (value->u.distance != 0xffffffff && value->u.distance != 0xb400000) {
                 output.insert("Distance", value->u.distance);
             }
             break;
         case ambit_log_sample_periodic_type_speed:
-            if (value->u.speed != 0xffff) {
+            if (value->u.speed != 0xffff && (value->u.speed/100) <= 556) {
                 output.insert("Speed", (double)value->u.speed/100.0);
             }
             break;
@@ -884,15 +888,15 @@ bool MovesCountJSON::writePeriodicSample(ambit_log_sample_t *sample, QVariantMap
             output.insert("EVPE", value->u.evpe);
             break;
         case ambit_log_sample_periodic_type_altitude:
-            if (value->u.altitude >= -1000 && value->u.altitude <= 10000) {
+            if (value->u.altitude >= -1000 && value->u.altitude <= 15000) {
                 output.insert("Altitude", (double)value->u.altitude);
             }
             break;
         case ambit_log_sample_periodic_type_abspressure:
             output.insert("AbsPressure", (int)round((double)value->u.abspressure/10.0));
             break;
         case ambit_log_sample_periodic_type_energy:
-            if (value->u.energy) {
+            if (value->u.energy && value->u.energy <= 1000) {
                 output.insert("EnergyConsumption", (double)value->u.energy/10.0);
             }
             break;
@@ -907,12 +911,12 @@ bool MovesCountJSON::writePeriodicSample(ambit_log_sample_t *sample, QVariantMap
             }
             break;
         case ambit_log_sample_periodic_type_gpsaltitude:
-            if (value->u.gpsaltitude >= -1000 && value->u.gpsaltitude <= 10000) {
+            if (value->u.gpsaltitude >= -1000 && value->u.gpsaltitude <= 15000) {
                 output.insert("GPSAltitude", value->u.gpsaltitude);
             }
             break;
         case ambit_log_sample_periodic_type_gpsheading:
-            if (value->u.gpsheading != 0xffff) {
+            if (value->u.gpsheading != 0xffff && value->u.gpsheading >= 0 && value->u.gpsheading <= 360) {
                 output.insert("GPSHeading", (double)value->u.gpsheading/10000000);
             }
             break;
@@ -964,15 +968,17 @@ bool MovesCountJSON::writePeriodicSample(ambit_log_sample_t *sample, QVariantMap
             }
             break;
         case ambit_log_sample_periodic_type_verticalspeed:
-            output.insert("VerticalSpeed", (double)value->u.verticalspeed/100.0);
+            if ((value->u.verticalspeed/100.0) >= -59 && (value->u.verticalspeed/100.0) <= 59){
+                output.insert("VerticalSpeed", (double)value->u.verticalspeed/100.0);
+            }
             break;
         case ambit_log_sample_periodic_type_cadence:
             if (value->u.cadence != 0xff) {
                 output.insert("Cadence", value->u.cadence);
             }
             break;
         case ambit_log_sample_periodic_type_bikepower:
-            if (value->u.bikepower != 0xffff) {
+            if (value->u.bikepower <= 2000) {
                 output.insert("BikePower", value->u.bikepower);
             }
             break;