diff options
| author | Abyss777 <abyss@fox5.ru> | 2016-08-23 11:03:31 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2016-08-23 11:03:31 +0500 |
| commit | 16ae4c2e1b03c38f9f21791d844959764892f8d0 (patch) | |
| tree | 217530ae767235624a6f8ff37c27e6d470086aa2 /src/org/traccar/model | |
| parent | 6c6b62351aadd68928b9bd3e39e2bf96d78695e8 (diff) | |
| download | trackermap-server-16ae4c2e1b03c38f9f21791d844959764892f8d0.tar.gz trackermap-server-16ae4c2e1b03c38f9f21791d844959764892f8d0.tar.bz2 trackermap-server-16ae4c2e1b03c38f9f21791d844959764892f8d0.zip | |
- Fixed units of KEY_ODOMETER to meters in some protocols
- Fixed some wrong using of odometer and distance
- Waiting meters in ReportUtils.calculateDistance
Diffstat (limited to 'src/org/traccar/model')
| -rw-r--r-- | src/org/traccar/model/Position.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java index aacf57c33..a259e773a 100644 --- a/src/org/traccar/model/Position.java +++ b/src/org/traccar/model/Position.java @@ -28,7 +28,8 @@ public class Position extends Message { public static final String KEY_EVENT = "event"; public static final String KEY_ALARM = "alarm"; public static final String KEY_STATUS = "status"; - public static final String KEY_ODOMETER = "odometer"; + public static final String KEY_ODOMETER = "odometer"; // meters + public static final String KEY_TRIP_ODOMETER = "tripOdometer"; public static final String KEY_HOURS = "hours"; public static final String KEY_INPUT = "input"; public static final String KEY_OUTPUT = "output"; @@ -48,7 +49,7 @@ public class Position extends Message { public static final String KEY_CHARGE = "charge"; 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_DISTANCE = "distance"; // meters public static final String KEY_TOTAL_DISTANCE = "totalDistance"; public static final String KEY_RPM = "rpm"; public static final String KEY_VIN = "vin"; |