aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/model
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/model')
-rw-r--r--src/org/traccar/model/Position.java24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index 8600b5dd0..82b7e03ce 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -31,16 +31,20 @@ 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"; // kilometers
- public static final String KEY_ODOMETER_SERVICE = "serviceOdometer"; // kilometers
- public static final String KEY_ODOMETER_TRIP = "tripOdometer"; // kilometers
- public static final String KEY_HOURS = "hours"; // hours
+ public static final String KEY_ODOMETER = "odometer"; // meters
+ public static final String KEY_ODOMETER_SERVICE = "serviceOdometer"; // meters
+ public static final String KEY_ODOMETER_TRIP = "tripOdometer"; // meters
+ public static final String KEY_HOURS = "hours";
public static final String KEY_INPUT = "input";
public static final String KEY_OUTPUT = "output";
+
+ // The units for the below four KEYs currently vary.
+ // The preferred units of measure are specified in the comment for each.
public static final String KEY_POWER = "power"; // volts
- public static final String KEY_BATTERY = "battery"; // volts
+ public static final String KEY_BATTERY = "battery"; // volts (or percentage appending '%')
public static final String KEY_FUEL_LEVEL = "fuel"; // liters
- public static final String KEY_FUEL_CONSUMPTION = "fuelConsumption"; // liter/hour
+ public static final String KEY_FUEL_CONSUMPTION = "fuelConsumption"; // liters/hour
+
public static final String KEY_RFID = "rfid";
public static final String KEY_VERSION_FW = "versionFw";
public static final String KEY_VERSION_HW = "versionHw";
@@ -50,8 +54,8 @@ 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"; // kilometers
- public static final String KEY_TOTAL_DISTANCE = "totalDistance"; // kilometers
+ public static final String KEY_DISTANCE = "distance"; // meters
+ public static final String KEY_TOTAL_DISTANCE = "totalDistance"; // meters
public static final String KEY_RPM = "rpm";
public static final String KEY_VIN = "vin";
public static final String KEY_APPROXIMATE = "approximate";
@@ -66,7 +70,7 @@ public class Position extends Message {
public static final String KEY_DTCS = "dtcs";
public static final String KEY_OBD_SPEED = "obdSpeed"; // knots
- public static final String KEY_OBD_ODOMETER = "obdOdometer"; // kilometers
+ public static final String KEY_OBD_ODOMETER = "obdOdometer"; // meters
public static final String KEY_RESULT = "result";
@@ -217,7 +221,7 @@ public class Position extends Message {
this.longitude = longitude;
}
- private double altitude; // value in meters
+ private double altitude; // value in meters
public double getAltitude() {
return altitude;