diff options
author | Anton Tananaev <anton@traccar.org> | 2023-05-14 14:07:50 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2023-05-14 14:07:50 -0700 |
commit | a96a75cc268f2819431b7441090052b01bf61bed (patch) | |
tree | 287c556e270b05a489bc96a4756c82a754af7a41 /src/main/java/org/traccar/reports/common/ReportUtils.java | |
parent | f68d23d79d0321ef47f72fff2388b5f4aac1beff (diff) | |
download | trackermap-server-a96a75cc268f2819431b7441090052b01bf61bed.tar.gz trackermap-server-a96a75cc268f2819431b7441090052b01bf61bed.tar.bz2 trackermap-server-a96a75cc268f2819431b7441090052b01bf61bed.zip |
Per device trip config
Diffstat (limited to 'src/main/java/org/traccar/reports/common/ReportUtils.java')
-rw-r--r-- | src/main/java/org/traccar/reports/common/ReportUtils.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/org/traccar/reports/common/ReportUtils.java b/src/main/java/org/traccar/reports/common/ReportUtils.java index 0c168e4ef..f5aa6d040 100644 --- a/src/main/java/org/traccar/reports/common/ReportUtils.java +++ b/src/main/java/org/traccar/reports/common/ReportUtils.java @@ -31,6 +31,7 @@ import org.traccar.config.Config; import org.traccar.config.Keys; import org.traccar.geocoder.Geocoder; import org.traccar.helper.UnitsConverter; +import org.traccar.helper.model.AttributeUtil; import org.traccar.helper.model.PositionUtil; import org.traccar.helper.model.UserUtil; import org.traccar.model.BaseModel; @@ -67,18 +68,16 @@ public class ReportUtils { private final Config config; private final Storage storage; private final PermissionsService permissionsService; - private final TripsConfig tripsConfig; private final VelocityEngine velocityEngine; private final Geocoder geocoder; @Inject public ReportUtils( Config config, Storage storage, PermissionsService permissionsService, - TripsConfig tripsConfig, VelocityEngine velocityEngine, @Nullable Geocoder geocoder) { + VelocityEngine velocityEngine, @Nullable Geocoder geocoder) { this.config = config; this.storage = storage; this.permissionsService = permissionsService; - this.tripsConfig = tripsConfig; this.velocityEngine = velocityEngine; this.geocoder = geocoder; } @@ -306,6 +305,8 @@ public class ReportUtils { Class<T> reportClass) throws StorageException { Collection<T> result = new ArrayList<>(); + TripsConfig tripsConfig = new TripsConfig( + new AttributeUtil.StorageProvider(config, storage, permissionsService, device)); ArrayList<Position> positions = new ArrayList<>(positionCollection); if (!positions.isEmpty()) { |