aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/events
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2018-04-13 12:21:05 +0500
committerAbyss777 <abyss@fox5.ru>2018-04-13 12:21:05 +0500
commit30ae3d104e9b0446364ebc316dc10d0f811e1480 (patch)
treeb1e0a223e4cb68c5869fcb5cec9b13e893e749da /src/org/traccar/events
parent87de21e95c34936e7d7635c3dd8c07f6221f46eb (diff)
downloadtrackermap-server-30ae3d104e9b0446364ebc316dc10d0f811e1480.tar.gz
trackermap-server-30ae3d104e9b0446364ebc316dc10d0f811e1480.tar.bz2
trackermap-server-30ae3d104e9b0446364ebc316dc10d0f811e1480.zip
- Rename field to Period
- Remove unnecessary check for null - Move MaintenanceManager initialization with other event related managers
Diffstat (limited to 'src/org/traccar/events')
-rw-r--r--src/org/traccar/events/MaintenanceEventHandler.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/events/MaintenanceEventHandler.java b/src/org/traccar/events/MaintenanceEventHandler.java
index b556e1003..4a6122826 100644
--- a/src/org/traccar/events/MaintenanceEventHandler.java
+++ b/src/org/traccar/events/MaintenanceEventHandler.java
@@ -42,12 +42,12 @@ public class MaintenanceEventHandler extends BaseEventHandler {
Map<Event, Position> events = new HashMap<>();
for (long maintenanceId : Context.getMaintenancesManager().getAllDeviceItems(position.getDeviceId())) {
Maintenance maintenance = Context.getMaintenancesManager().getById(maintenanceId);
- if (maintenance.getLapse() != 0) {
+ if (maintenance.getPeriod() != 0) {
double oldValue = lastPosition.getDouble(maintenance.getType());
double newValue = position.getDouble(maintenance.getType());
if (oldValue != 0.0 && newValue != 0.0
- && (long) ((oldValue - maintenance.getStart()) / maintenance.getLapse())
- < (long) ((newValue - maintenance.getStart()) / maintenance.getLapse())) {
+ && (long) ((oldValue - maintenance.getStart()) / maintenance.getPeriod())
+ < (long) ((newValue - maintenance.getStart()) / maintenance.getPeriod())) {
Event event = new Event(Event.TYPE_MAINTENANCE, position.getDeviceId(), position.getId());
event.setMaintenanceId(maintenanceId);
event.set(maintenance.getType(), newValue);