result writer: write volume-oriented results only if cargo volume is greater than 0

VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/CO2Writer.cs

@@ -42,11 +42,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
 		protected override IList<ConvertedSI> GetCO2ResultEntries(Kilogram CO2Total, Meter distance, Kilogram payload,
 			CubicMeter volume, double? passengers)
 		{
-			return new[] {
+			var retVal = new List<ConvertedSI>() {
 				(CO2Total / distance).ConvertToGrammPerKiloMeter(),
 				(CO2Total / distance / payload).ConvertToGrammPerTonKilometer(),
-				(CO2Total / distance / volume).ConvertToGrammPerCubicMeterKiloMeter(),
 			};
+			if (volume.IsGreater(0)) {
+				retVal.Add((CO2Total / distance / volume).ConvertToGrammPerCubicMeterKiloMeter());
+			}
+			return retVal;
 		}
 
 	}

VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/FuelConsumptionWriter.cs

@@ -52,20 +52,27 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
         {
             var retVal = new List<ConvertedSI> {
                 (fc / distance).ConvertToGrammPerKiloMeter(),
-                (fc / distance /payload).ConvertToGrammPerTonKilometer(),
-                (fc / distance / volume).ConvertToGrammPerCubicMeterKiloMeter(),
+                (fc / distance /payload).ConvertToGrammPerTonKilometer()};
+            if (volume.IsGreater(0)) {
+				retVal.Add((fc / distance / volume).ConvertToGrammPerCubicMeterKiloMeter());
+			}
 
+			retVal.AddRange(new [] {
                 (fc * fuel.LowerHeatingValueVecto / distance).ConvertToMegaJoulePerKilometer(),
                 (fc * fuel.LowerHeatingValueVecto / distance / payload).ConvertToMegaJoulePerTonKiloMeter(),
-                (fc * fuel.LowerHeatingValueVecto / distance / volume).ConvertToMegaJoulePerCubicMeterKiloMeter(),
-            };
+			});
+			if (volume.IsGreater(0)) {
+                retVal.Add((fc * fuel.LowerHeatingValueVecto / distance / volume).ConvertToMegaJoulePerCubicMeterKiloMeter());
+			}
 
             if (fuel.FuelDensity != null) {
                 retVal.AddRange(new[] {
                     (fc / fuel.FuelDensity / distance).ConvertToLiterPer100KiloMeter(),
                     (fc / fuel.FuelDensity / distance / payload).ConvertToLiterPerTonKiloMeter(),
-                    (fc / fuel.FuelDensity / distance /volume).ConvertToLiterPerCubicMeterKiloMeter(),
-                });
+				});
+				if (volume.IsGreater(0)) {
+					retVal.Add((fc / fuel.FuelDensity / distance / volume).ConvertToLiterPerCubicMeterKiloMeter());
+				}
             }
 
             return retVal;