aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/DistanceHandler.java4
-rw-r--r--src/org/traccar/StringProtocolEncoder.java2
-rw-r--r--src/org/traccar/WebDataHandler.java2
-rw-r--r--src/org/traccar/database/DataManager.java6
-rw-r--r--src/org/traccar/model/Command.java18
-rw-r--r--src/org/traccar/model/Event.java16
-rw-r--r--src/org/traccar/model/MiscFormatter.java26
7 files changed, 38 insertions, 36 deletions
diff --git a/src/org/traccar/DistanceHandler.java b/src/org/traccar/DistanceHandler.java
index 6232c555f..1586d116b 100644
--- a/src/org/traccar/DistanceHandler.java
+++ b/src/org/traccar/DistanceHandler.java
@@ -36,8 +36,8 @@ public class DistanceHandler extends BaseDataHandler {
Position last = getLastPosition(position.getDeviceId());
if (last != null) {
- if (last.getOther().containsKey(Event.KEY_DISTANCE)) {
- distance = ((Number) last.getOther().get(Event.KEY_DISTANCE)).doubleValue();
+ if (last.getAttributes().containsKey(Event.KEY_DISTANCE)) {
+ distance = ((Number) last.getAttributes().get(Event.KEY_DISTANCE)).doubleValue();
}
distance += DistanceCalculator.distance(
diff --git a/src/org/traccar/StringProtocolEncoder.java b/src/org/traccar/StringProtocolEncoder.java
index dcb9ccc0e..c64e1d03f 100644
--- a/src/org/traccar/StringProtocolEncoder.java
+++ b/src/org/traccar/StringProtocolEncoder.java
@@ -30,7 +30,7 @@ public abstract class StringProtocolEncoder extends BaseProtocolEncoder {
String result = String.format(format, (Object[]) keys);
result = result.replaceAll("\\{" + Command.KEY_UNIQUE_ID + "}", getUniqueId(command.getDeviceId()));
- for (Map.Entry<String, Object> entry : command.getOther().entrySet()) {
+ for (Map.Entry<String, Object> entry : command.getAttributes().entrySet()) {
String value = null;
if (valueFormatter != null) {
value = valueFormatter.formatValue(entry.getKey(), entry.getValue());
diff --git a/src/org/traccar/WebDataHandler.java b/src/org/traccar/WebDataHandler.java
index 6a359ba0f..d694212e2 100644
--- a/src/org/traccar/WebDataHandler.java
+++ b/src/org/traccar/WebDataHandler.java
@@ -58,7 +58,7 @@ public class WebDataHandler extends BaseDataHandler {
}
private String calculateStatus(Position position) {
- if (position.getOther().containsKey(Event.KEY_ALARM) && (Boolean) position.getOther().get(Event.KEY_ALARM)) {
+ if (position.getAttributes().containsKey(Event.KEY_ALARM) && (Boolean) position.getAttributes().get(Event.KEY_ALARM)) {
return "0xF841"; // STATUS_PANIC_ON
} else if (position.getSpeed() < 1.0) {
return "0xF020"; // STATUS_LOCATION
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index add355ea7..89df198fa 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -331,7 +331,8 @@ public class DataManager implements IdentityManager {
.setDate("time", position.getFixTime()) // tmp
.setLong("device_id", position.getDeviceId()) // tmp
.setLong("power", 0) // tmp
- .setString("extended_info", MiscFormatter.toXmlString(position.getOther())) // tmp
+ .setString("extended_info", MiscFormatter.toXmlString(position.getAttributes())) // tmp
+ .setString("other", MiscFormatter.toXmlString(position.getAttributes())) // tmp
.executeUpdate());
}
@@ -341,7 +342,8 @@ public class DataManager implements IdentityManager {
.setDate("time", position.getFixTime()) // tmp
.setLong("device_id", position.getDeviceId()) // tmp
.setLong("power", 0) // tmp
- .setString("extended_info", MiscFormatter.toXmlString(position.getOther())) // tmp
+ .setString("extended_info", MiscFormatter.toXmlString(position.getAttributes())) // tmp
+ .setString("other", MiscFormatter.toXmlString(position.getAttributes())) // tmp
.executeUpdate();
}
diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java
index cfebaa38e..16772e0cb 100644
--- a/src/org/traccar/model/Command.java
+++ b/src/org/traccar/model/Command.java
@@ -18,15 +18,15 @@ public class Command implements Factory {
public String getType() { return type; }
public void setType(String type) { this.type = type; }
- private Map<String, Object> other = new LinkedHashMap<>();
- public Map<String, Object> getOther() { return other; }
- public void setOther(Map<String, Object> other) { this.other = other; }
-
- public void set(String key, boolean value) { other.put(key, value); }
- public void set(String key, int value) { other.put(key, value); }
- public void set(String key, long value) { other.put(key, value); }
- public void set(String key, double value) { other.put(key, value); }
- public void set(String key, String value) { if (value != null && !value.isEmpty()) other.put(key, value); }
+ private Map<String, Object> attributes = new LinkedHashMap<>();
+ public Map<String, Object> getAttributes() { return attributes; }
+ public void setAttributes(Map<String, Object> attributes) { this.attributes = attributes; }
+
+ public void set(String key, boolean value) { attributes.put(key, value); }
+ public void set(String key, int value) { attributes.put(key, value); }
+ public void set(String key, long value) { attributes.put(key, value); }
+ public void set(String key, double value) { attributes.put(key, value); }
+ public void set(String key, String value) { if (value != null && !value.isEmpty()) attributes.put(key, value); }
public static final String TYPE_POSITION_SINGLE = "positionSingle";
public static final String TYPE_POSITION_PERIODIC = "positionPeriodic";
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 40ea38e26..5ad6c38fe 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -41,15 +41,15 @@ public abstract class Event {
public Date getDeviceTime() { return deviceTime; }
public void setDeviceTime(Date deviceTime) { this.deviceTime = deviceTime; }
- private Map<String, Object> other = new LinkedHashMap<>();
- public Map<String, Object> getOther() { return other; }
- public void setOther(Map<String, Object> other) { this.other = other; }
+ private Map<String, Object> attributes = new LinkedHashMap<>();
+ public Map<String, Object> getAttributes() { return attributes; }
+ public void setAttributes(Map<String, Object> attributes) { this.attributes = attributes; }
- public void set(String key, boolean value) { other.put(key, value); }
- public void set(String key, int value) { other.put(key, value); }
- public void set(String key, long value) { other.put(key, value); }
- public void set(String key, double value) { other.put(key, value); }
- public void set(String key, String value) { if (value != null && !value.isEmpty()) other.put(key, value); }
+ public void set(String key, boolean value) { attributes.put(key, value); }
+ public void set(String key, int value) { attributes.put(key, value); }
+ public void set(String key, long value) { attributes.put(key, value); }
+ public void set(String key, double value) { attributes.put(key, value); }
+ public void set(String key, String value) { if (value != null && !value.isEmpty()) attributes.put(key, value); }
// Words separated by dashes (word-second-third)
public static final String KEY_INDEX = "index";
diff --git a/src/org/traccar/model/MiscFormatter.java b/src/org/traccar/model/MiscFormatter.java
index 7a1e69082..38aa853d4 100644
--- a/src/org/traccar/model/MiscFormatter.java
+++ b/src/org/traccar/model/MiscFormatter.java
@@ -44,12 +44,12 @@ public class MiscFormatter {
}
}
- public static String toXmlString(Map<String, Object> other) {
+ public static String toXmlString(Map<String, Object> attributes) {
StringBuilder result = new StringBuilder();
result.append("<").append(xmlRootNode).append(">");
- for (Map.Entry<String, Object> entry : other.entrySet()) {
+ for (Map.Entry<String, Object> entry : attributes.entrySet()) {
result.append("<").append(entry.getKey()).append(">");
result.append(format(entry.getValue()));
@@ -61,10 +61,10 @@ public class MiscFormatter {
return result.toString();
}
- public static JsonObject toJson(Map<String, Object> other) {
+ public static JsonObject toJson(Map<String, Object> attributes) {
JsonObjectBuilder json = Json.createObjectBuilder();
- for (Map.Entry<String, Object> entry : other.entrySet()) {
+ for (Map.Entry<String, Object> entry : attributes.entrySet()) {
if (entry.getValue() instanceof String) {
json.add(entry.getKey(), (String) entry.getValue());
} else if (entry.getValue() instanceof Integer) {
@@ -87,35 +87,35 @@ public class MiscFormatter {
public static Map<String, Object> fromJson(JsonObject json) {
- Map<String, Object> other = new LinkedHashMap<>();
+ Map<String, Object> attributes = new LinkedHashMap<>();
for (Map.Entry<String, JsonValue> entry : json.entrySet()) {
switch (entry.getValue().getValueType()) {
case STRING:
- other.put(entry.getKey(), ((JsonString) entry.getValue()).getString());
+ attributes.put(entry.getKey(), ((JsonString) entry.getValue()).getString());
break;
case NUMBER:
JsonNumber number = (JsonNumber) entry.getValue();
if (number.isIntegral()) {
- other.put(entry.getKey(), number.longValue());
+ attributes.put(entry.getKey(), number.longValue());
} else {
- other.put(entry.getKey(), number.doubleValue());
+ attributes.put(entry.getKey(), number.doubleValue());
}
break;
case TRUE:
- other.put(entry.getKey(), true);
+ attributes.put(entry.getKey(), true);
break;
case FALSE:
- other.put(entry.getKey(), false);
+ attributes.put(entry.getKey(), false);
break;
}
}
- return other;
+ return attributes;
}
- public static String toJsonString(Map<String, Object> other) {
- return toJson(other).toString();
+ public static String toJsonString(Map<String, Object> attributes) {
+ return toJson(attributes).toString();
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 15:01:56 +0000