diff options
| author | Rafael Guterres <guterresrafael@gmail.com> | 2015-11-21 02:13:24 -0200 |
|---|---|---|
| committer | Rafael Guterres <guterresrafael@gmail.com> | 2015-11-21 02:13:24 -0200 |
| commit | 77cd23da84ebebcf99a97a8aef88aa9a4884ca40 (patch) | |
| tree | f95fa042b4755e925be8d0c8416fcb648ea23aa3 /src/org/traccar/model | |
| parent | f5a266953e53a7f1785bcb584759582621ec9de3 (diff) | |
| parent | 7623704e12a3e60420c86add5cfdc18b14061752 (diff) | |
| download | trackermap-server-77cd23da84ebebcf99a97a8aef88aa9a4884ca40.tar.gz trackermap-server-77cd23da84ebebcf99a97a8aef88aa9a4884ca40.tar.bz2 trackermap-server-77cd23da84ebebcf99a97a8aef88aa9a4884ca40.zip | |
Merge tananaev/master
Diffstat (limited to 'src/org/traccar/model')
| -rw-r--r-- | src/org/traccar/model/Event.java | 3 | ||||
| -rw-r--r-- | src/org/traccar/model/Position.java | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java index 1dbfe5812..6e3aa7f22 100644 --- a/src/org/traccar/model/Event.java +++ b/src/org/traccar/model/Event.java @@ -47,10 +47,9 @@ public abstract class Event extends Extensible { public static final String KEY_IP = "ip"; public static final String KEY_ARCHIVE = "archive"; public static final String KEY_DISTANCE = "distance"; - public static final String KEY_DOOR = "door"; public static final String KEY_RPM = "rpm"; - public static final String KEY_HOURS = "hours"; public static final String KEY_VIN = "vin"; + public static final String KEY_APPROXIMATE = "approximate"; public static final String KEY_OBD_SPEED = "obd-speed"; public static final String KEY_OBD_ODOMETER = "obd-odometer"; diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java index 1ed559ecd..9494da042 100644 --- a/src/org/traccar/model/Position.java +++ b/src/org/traccar/model/Position.java @@ -47,6 +47,16 @@ public class Position extends Event implements Factory { setFixTime(time); } + private boolean outdated; + + public boolean getOutdated() { + return outdated; + } + + public void setOutdated(boolean outdated) { + this.outdated = outdated; + } + private boolean valid; public boolean getValid() { |