aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-11-25 10:37:24 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-11-25 10:37:24 +1300
commitf1038fa65fe2befb2a1828c46cab99de6b560f67 (patch)
tree1feae894f580125b6528378b6d567e41497bc14c /src/org/traccar
parentab8fc4daef86295f9bab39890aa6de2e51342400 (diff)
downloadtrackermap-server-f1038fa65fe2befb2a1828c46cab99de6b560f67.tar.gz
trackermap-server-f1038fa65fe2befb2a1828c46cab99de6b560f67.tar.bz2
trackermap-server-f1038fa65fe2befb2a1828c46cab99de6b560f67.zip
Rename maintenance events
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/events/MaintenanceEventHandler.java2
-rw-r--r--src/org/traccar/model/Event.java2
-rw-r--r--src/org/traccar/notification/NotificationFormatter.java14
3 files changed, 9 insertions, 9 deletions
diff --git a/src/org/traccar/events/MaintenanceEventHandler.java b/src/org/traccar/events/MaintenanceEventHandler.java
index 5a36a74d1..9e0da97f5 100644
--- a/src/org/traccar/events/MaintenanceEventHandler.java
+++ b/src/org/traccar/events/MaintenanceEventHandler.java
@@ -58,7 +58,7 @@ public class MaintenanceEventHandler extends BaseEventHandler {
oldTotalDistance -= maintenanceStart;
newTotalDistance -= maintenanceStart;
if ((long) (oldTotalDistance / maintenanceInterval) < (long) (newTotalDistance / maintenanceInterval)) {
- events.add(new Event(Event.TYPE_MAINTENANCE_NEEDED, position.getDeviceId(), position.getId()));
+ events.add(new Event(Event.TYPE_MAINTENANCE, position.getDeviceId(), position.getId()));
}
return events;
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 45da9a711..ee62f9776 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -56,7 +56,7 @@ public class Event extends Message {
public static final String TYPE_IGNITION_ON = "ignitionOn";
public static final String TYPE_IGNITION_OFF = "ignitionOff";
- public static final String TYPE_MAINTENANCE_NEEDED = "maintenanceNeeded";
+ public static final String TYPE_MAINTENANCE = "maintenance";
private Date serverTime;
diff --git a/src/org/traccar/notification/NotificationFormatter.java b/src/org/traccar/notification/NotificationFormatter.java
index 38a228beb..6753873ed 100644
--- a/src/org/traccar/notification/NotificationFormatter.java
+++ b/src/org/traccar/notification/NotificationFormatter.java
@@ -92,9 +92,9 @@ public final class NotificationFormatter {
+ "Ignition OFF%n"
+ "Point: https://www.openstreetmap.org/?mlat=%3$f&mlon=%4$f#map=16/%3$f/%4$f%n"
+ "Time: %2$tc%n";
- public static final String TITLE_TEMPLATE_TYPE_MAINTENANCE_NEEDED = "%1$s: maintenance is needed";
- public static final String MESSAGE_TEMPLATE_TYPE_MAINTENANCE_NEEDED = "Device: %1$s%n"
- + "Maintenance is needed%n"
+ public static final String TITLE_TEMPLATE_TYPE_MAINTENANCE = "%1$s: maintenance is required";
+ public static final String MESSAGE_TEMPLATE_TYPE_MAINTENANCE = "Device: %1$s%n"
+ + "Maintenance is required%n"
+ "Point: https://www.openstreetmap.org/?mlat=%3$f&mlon=%4$f#map=16/%3$f/%4$f%n"
+ "Time: %2$tc%n";
@@ -140,8 +140,8 @@ public final class NotificationFormatter {
case Event.TYPE_IGNITION_OFF:
formatter.format(TITLE_TEMPLATE_TYPE_IGNITION_OFF, device.getName());
break;
- case Event.TYPE_MAINTENANCE_NEEDED:
- formatter.format(TITLE_TEMPLATE_TYPE_MAINTENANCE_NEEDED, device.getName());
+ case Event.TYPE_MAINTENANCE:
+ formatter.format(TITLE_TEMPLATE_TYPE_MAINTENANCE, device.getName());
break;
default:
formatter.format("Unknown type");
@@ -206,8 +206,8 @@ public final class NotificationFormatter {
formatter.format(MESSAGE_TEMPLATE_TYPE_IGNITION_OFF, device.getName(), position.getFixTime(),
position.getLatitude(), position.getLongitude());
break;
- case Event.TYPE_MAINTENANCE_NEEDED:
- formatter.format(MESSAGE_TEMPLATE_TYPE_MAINTENANCE_NEEDED, device.getName(), position.getFixTime(),
+ case Event.TYPE_MAINTENANCE:
+ formatter.format(MESSAGE_TEMPLATE_TYPE_MAINTENANCE, device.getName(), position.getFixTime(),
position.getLatitude(), position.getLongitude());
break;
default: