- Renamed calculateFuel

- Used int in BigDecimal constructor
- Added extra space

4 files changed, 9 insertions, 7 deletions

diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java
index 03e23498a..baa799e90 100644
--- a/src/org/traccar/reports/ReportUtils.java
+++ b/src/org/traccar/reports/ReportUtils.java
@@ -49,7 +49,7 @@ public final class ReportUtils {
                 && lastPosition.getAttributes().containsKey(Position.KEY_ODOMETER)) {
             distance = new BigDecimal(lastPosition.getAttributes().get(Position.KEY_ODOMETER).toString())
                     .subtract(new BigDecimal(firstPosition.getAttributes().get(Position.KEY_ODOMETER).toString()))
-                    .multiply(new BigDecimal("1000"));
+                    .multiply(new BigDecimal(1000));
         } else if (firstPosition.getAttributes().containsKey(Position.KEY_TOTAL_DISTANCE)
                 && lastPosition.getAttributes().containsKey(Position.KEY_TOTAL_DISTANCE)) {
             distance = new BigDecimal(lastPosition.getAttributes().get(Position.KEY_TOTAL_DISTANCE).toString())
@@ -59,7 +59,7 @@ public final class ReportUtils {
         return distance.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
     }
 
-    public static String calculateSpentFuel(Position firstPosition, Position lastPosition) {
+    public static String calculateFuel(Position firstPosition, Position lastPosition) {
 
         if (firstPosition.getAttributes().get(Position.KEY_FUEL) != null
                 && lastPosition.getAttributes().get(Position.KEY_FUEL) != null) {
diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java
index 068c47b8f..b661ffffa 100644
--- a/src/org/traccar/reports/Trips.java
+++ b/src/org/traccar/reports/Trips.java
@@ -65,7 +65,7 @@ public final class Trips {
         trip.setDuration(tripDuration);
         trip.setAverageSpeed(speedSum / (endIndex - startIndex));
         trip.setMaxSpeed(speedMax);
-        trip.setSpentFuel(ReportUtils.calculateSpentFuel(startTrip, endTrip));
+        trip.setSpentFuel(ReportUtils.calculateFuel(startTrip, endTrip));
 
         return trip;
     }
diff --git a/src/org/traccar/reports/model/BaseReport.java b/src/org/traccar/reports/model/BaseReport.java
index bcbed29fe..8c5807c9b 100644
--- a/src/org/traccar/reports/model/BaseReport.java
+++ b/src/org/traccar/reports/model/BaseReport.java
@@ -57,7 +57,7 @@ public class BaseReport {
         this.averageSpeed = new BigDecimal(averageSpeed.toString()).setScale(3, RoundingMode.HALF_EVEN).doubleValue();
     }
 
-    private double maxSpeed; //knots
+    private double maxSpeed; // knots
     public double getMaxSpeed() {
         return maxSpeed;
     }
diff --git a/test/org/traccar/reports/ReportUtilsTest.java b/test/org/traccar/reports/ReportUtilsTest.java
index e7f762b28..80b0f6287 100644
--- a/test/org/traccar/reports/ReportUtilsTest.java
+++ b/test/org/traccar/reports/ReportUtilsTest.java
@@ -22,13 +22,15 @@ public class ReportUtilsTest {
     public void testCalculateSpentFuel() {
         Position startPosition = new Position();
         Position endPosition = new Position();
-        Assert.assertEquals(ReportUtils.calculateSpentFuel(startPosition, endPosition), "-");
+        Assert.assertEquals(ReportUtils.calculateFuel(startPosition, endPosition), "-");
         startPosition.setProtocol("meitrack");
         startPosition.set(Position.KEY_FUEL, 0.07);
         endPosition.set(Position.KEY_FUEL, 0.05);
-        Assert.assertEquals(ReportUtils.calculateSpentFuel(startPosition, endPosition), "0.02 %");
+        Assert.assertEquals(ReportUtils.calculateFuel(startPosition, endPosition), "0.02 %");
         startPosition.setProtocol("galileo");
-        Assert.assertEquals(ReportUtils.calculateSpentFuel(startPosition, endPosition), "0.02 %");
+        Assert.assertEquals(ReportUtils.calculateFuel(startPosition, endPosition), "0.02 %");
+        startPosition.setProtocol("noran");
+        Assert.assertEquals(ReportUtils.calculateFuel(startPosition, endPosition), "0.02 %");
     }
 
 }