2 files changed, 55 insertions, 13 deletions

diff --git a/src/org/traccar/reports/model/TripReport.java b/src/org/traccar/reports/model/TripReport.java
index efe556f79..42a4240b7 100644
--- a/src/org/traccar/reports/model/TripReport.java
+++ b/src/org/traccar/reports/model/TripReport.java
@@ -145,4 +145,24 @@ public class TripReport extends BaseReport {
     public void setDuration(long duration) {
         this.duration = duration;
     }
+
+    private String driverUniqueId;
+
+    public String getDriverUniqueId() {
+        return driverUniqueId;
+    }
+
+    public void setDriverUniqueId(String driverUniqueId) {
+        this.driverUniqueId = driverUniqueId;
+    }
+
+    private String driverName;
+
+    public String getDriverName() {
+        return driverName;
+    }
+
+    public void setDriverName(String driverName) {
+        this.driverName = driverName;
+    }
 }
diff --git a/src/org/traccar/reports/model/TripsConfig.java b/src/org/traccar/reports/model/TripsConfig.java
index 7067781d7..0f0c615d3 100644
--- a/src/org/traccar/reports/model/TripsConfig.java
+++ b/src/org/traccar/reports/model/TripsConfig.java
@@ -21,13 +21,15 @@ public class TripsConfig {
     public TripsConfig() {
     }
 
-    public TripsConfig(double minimalTripDistance, long minimalTripDuration,
-            long minimalParkingDuration, boolean greedyParking, long minimalNoDataDuration) {
+    public TripsConfig(double minimalTripDistance, long minimalTripDuration, long minimalParkingDuration,
+            long minimalNoDataDuration, boolean useIgnition, boolean processInvalidPositions, double speedThreshold) {
         this.minimalTripDistance = minimalTripDistance;
         this.minimalTripDuration = minimalTripDuration;
         this.minimalParkingDuration = minimalParkingDuration;
-        this.greedyParking = greedyParking;
         this.minimalNoDataDuration = minimalNoDataDuration;
+        this.useIgnition = useIgnition;
+        this.processInvalidPositions = processInvalidPositions;
+        this.speedThreshold = speedThreshold;
     }
 
     private double minimalTripDistance;
@@ -60,16 +62,6 @@ public class TripsConfig {
         this.minimalParkingDuration = minimalParkingDuration;
     }
 
-    private boolean greedyParking;
-
-    public boolean getGreedyParking() {
-        return greedyParking;
-    }
-
-    public void setGreedyParking(boolean greedyParking) {
-        this.greedyParking = greedyParking;
-    }
-
     private long minimalNoDataDuration;
 
     public long getMinimalNoDataDuration() {
@@ -80,4 +72,34 @@ public class TripsConfig {
         this.minimalNoDataDuration = minimalNoDataDuration;
     }
 
+    private boolean useIgnition;
+
+    public boolean getUseIgnition() {
+        return useIgnition;
+    }
+
+    public void setUseIgnition(boolean useIgnition) {
+        this.useIgnition = useIgnition;
+    }
+
+    private boolean processInvalidPositions;
+
+    public boolean getProcessInvalidPositions() {
+        return processInvalidPositions;
+    }
+
+    public void setProcessInvalidPositions(boolean processInvalidPositions) {
+        this.processInvalidPositions = processInvalidPositions;
+    }
+
+    private double speedThreshold;
+
+    public double getSpeedThreshold() {
+        return speedThreshold;
+    }
+
+    public void setSpeedThreshold(double speedThreshold) {
+        this.speedThreshold = speedThreshold;
+    }
+
 }