aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/model
diff options
context:
space:
mode:
authorninioe <ninioe@gmail.com>2016-07-17 09:54:15 +0300
committerninioe <ninioe@gmail.com>2016-07-17 09:54:15 +0300
commit4d55b911bd252c90d1d0ec4053d8502154192676 (patch)
tree5cb88f24fb5ba9edbec1bd0593ed2878c401bb2d /src/org/traccar/model
parent636f6e19b4ae7fbd80ff083498fface8c12ee9c8 (diff)
downloadtrackermap-server-4d55b911bd252c90d1d0ec4053d8502154192676.tar.gz
trackermap-server-4d55b911bd252c90d1d0ec4053d8502154192676.tar.bz2
trackermap-server-4d55b911bd252c90d1d0ec4053d8502154192676.zip
Added AlertEventHandler & Mute button for all notifications
Diffstat (limited to 'src/org/traccar/model')
-rw-r--r--src/org/traccar/model/Event.java5
-rw-r--r--src/org/traccar/model/Position.java1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 235a39f9a..3a0056bd6 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -48,6 +48,11 @@ public class Event extends Message {
public static final String TYPE_GEOFENCE_ENTER = "geofenceEnter";
public static final String TYPE_GEOFENCE_EXIT = "geofenceExit";
+ public static final String TYPE_SOS_ALARM = "sosAlarm";
+ public static final String TYPE_VIBRATION_ALARM = "vibrationAlarm";
+ public static final String TYPE_MOVEMENT_ALARM = "movementAlarm";
+ public static final String TYPE_OVERSPEED_ALARM = "overspeedAlarm";
+
private Date serverTime;
public Date getServerTime() {
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index c5a7889bd..4e03b2097 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -28,7 +28,6 @@ public class Position extends Message {
public static final String KEY_GPS = "gps";
public static final String KEY_EVENT = "event";
public static final String KEY_ALARM = "alarm";
- public static final String KEY_ALARM_TYPE = "alarm-type";
public static final String KEY_STATUS = "status";
public static final String KEY_ODOMETER = "odometer";
public static final String KEY_HOURS = "hours";