aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-10-21 16:03:52 +1300
committerGitHub <noreply@github.com>2016-10-21 16:03:52 +1300
commitaa358c035e97ed5bcfc0b859b80d68187146d828 (patch)
treed279c1468d8e20f54ac2d216dc15b1f6fbbf4e9f
parenteb15c16571c0070ae60f39dce6ae974128ff1be1 (diff)
parentd57fba24dcff412339a09e102bfdbe91e38da7d9 (diff)
downloadtraccar-server-aa358c035e97ed5bcfc0b859b80d68187146d828.tar.gz
traccar-server-aa358c035e97ed5bcfc0b859b80d68187146d828.tar.bz2
traccar-server-aa358c035e97ed5bcfc0b859b80d68187146d828.zip
Merge pull request #2467 from Abyss777/sticky_attributes
Copy some attributes from last position
-rw-r--r--debug.xml3
-rw-r--r--src/org/traccar/BasePipelineFactory.java9
-rw-r--r--src/org/traccar/CopyAttributesHandler.java45
3 files changed, 57 insertions, 0 deletions
diff --git a/debug.xml b/debug.xml
index d32d9eaf8..779a7e3c5 100644
--- a/debug.xml
+++ b/debug.xml
@@ -45,6 +45,9 @@
<entry key='decoder.ignoreSessionCache'>false</entry>
+ <entry key='processing.copyAttributes.enable'>false</entry>
+ <entry key='processing.copyAttributes'>power ignition battery</entry>
+
<entry key='event.enable'>true</entry>
<entry key='event.overspeedHandler'>true</entry>
<entry key='event.overspeed.notRepeat'>true</entry>
diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 837712e84..6d7089644 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -50,6 +50,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
private ReverseGeocoderHandler reverseGeocoderHandler;
private LocationProviderHandler locationProviderHandler;
private HemisphereHandler hemisphereHandler;
+ private CopyAttributesHandler copyAttributesHandler;
private CommandResultEventHandler commandResultEventHandler;
private OverspeedEventHandler overspeedEventHandler;
@@ -139,6 +140,10 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
hemisphereHandler = new HemisphereHandler();
}
+ if (Context.getConfig().getBoolean("processing.copyAttributes.enable")) {
+ copyAttributesHandler = new CopyAttributesHandler();
+ }
+
if (Context.getConfig().getBoolean("event.enable")) {
commandResultEventHandler = new CommandResultEventHandler();
@@ -201,6 +206,10 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
pipeline.addLast("distance", distanceHandler);
}
+ if (copyAttributesHandler != null) {
+ pipeline.addLast("copyAttributes", copyAttributesHandler);
+ }
+
if (Context.getDataManager() != null) {
pipeline.addLast("dataHandler", new DefaultDataHandler());
}
diff --git a/src/org/traccar/CopyAttributesHandler.java b/src/org/traccar/CopyAttributesHandler.java
new file mode 100644
index 000000000..10a065113
--- /dev/null
+++ b/src/org/traccar/CopyAttributesHandler.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 Andrey Kunitsyn (abyss@fox5.ru)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar;
+
+import org.traccar.model.Position;
+
+public class CopyAttributesHandler extends BaseDataHandler {
+
+ private Position getLastPosition(long deviceId) {
+ if (Context.getIdentityManager() != null) {
+ return Context.getIdentityManager().getLastPosition(deviceId);
+ }
+ return null;
+ }
+
+ @Override
+ protected Position handlePosition(Position position) {
+ String attributesString = Context.getDeviceManager().lookupConfigString(position.getDeviceId(),
+ "processing.copyAttributes", null);
+ Position last = getLastPosition(position.getDeviceId());
+ if (attributesString != null && last != null) {
+ for (String attribute : attributesString.split(" ")) {
+ if (last.getAttributes().containsKey(attribute) && !position.getAttributes().containsKey(attribute)) {
+ position.getAttributes().put(attribute, last.getAttributes().get(attribute));
+ }
+ }
+ }
+ return position;
+ }
+
+}