aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-09-08 21:56:44 +1200
committerGitHub <noreply@github.com>2017-09-08 21:56:44 +1200
commit2721bf4adc12eeacf19c00af30e266ae65e6a4a9 (patch)
treed728cea2cf1c4a1b8d19b12c7bb6aae91e576900
parentd36fa0963f8e1045d2f974cd88a0be68aea6f2ef (diff)
parent640770638943146f5c2e7dcfb0c05b84fc9b3cff (diff)
downloadtrackermap-server-2721bf4adc12eeacf19c00af30e266ae65e6a4a9.tar.gz
trackermap-server-2721bf4adc12eeacf19c00af30e266ae65e6a4a9.tar.bz2
trackermap-server-2721bf4adc12eeacf19c00af30e266ae65e6a4a9.zip
Merge pull request #3514 from Abyss777/skip_filter
Implement skipping filtering by list of attributes
-rw-r--r--src/org/traccar/FilterHandler.java23
-rw-r--r--test/org/traccar/BaseTest.java8
-rw-r--r--test/org/traccar/FilterHandlerTest.java64
3 files changed, 82 insertions, 13 deletions
diff --git a/src/org/traccar/FilterHandler.java b/src/org/traccar/FilterHandler.java
index f63fd17dd..4cd3eb0eb 100644
--- a/src/org/traccar/FilterHandler.java
+++ b/src/org/traccar/FilterHandler.java
@@ -30,7 +30,7 @@ public class FilterHandler extends BaseDataHandler {
private int filterDistance;
private int filterMaxSpeed;
private long skipLimit;
- private boolean skipAlarms;
+ private boolean skipAttributes;
public void setFilterInvalid(boolean filterInvalid) {
this.filterInvalid = filterInvalid;
@@ -68,8 +68,8 @@ public class FilterHandler extends BaseDataHandler {
this.skipLimit = skipLimit;
}
- public void setSkipAlarms(boolean skipAlarms) {
- this.skipAlarms = skipAlarms;
+ public void setSkipAttributes(boolean skipAttributes) {
+ this.skipAttributes = skipAttributes;
}
public FilterHandler() {
@@ -84,7 +84,7 @@ public class FilterHandler extends BaseDataHandler {
filterDistance = config.getInteger("filter.distance");
filterMaxSpeed = config.getInteger("filter.maxSpeed");
skipLimit = config.getLong("filter.skipLimit") * 1000;
- skipAlarms = config.getBoolean("filter.skipAlarms");
+ skipAttributes = config.getBoolean("filter.skipAttributes.enable");
}
}
@@ -145,8 +145,17 @@ public class FilterHandler extends BaseDataHandler {
return false;
}
- private boolean skipAlarms(Position position) {
- return skipAlarms && position.getAttributes().containsKey(Position.KEY_ALARM);
+ private boolean skipAttributes(Position position) {
+ if (skipAttributes) {
+ String attributesString = Context.getIdentityManager().lookupAttributeString(
+ position.getDeviceId(), "filter.skipAttributes", "", true);
+ for (String attribute : attributesString.split("[ ,]")) {
+ if (position.getAttributes().containsKey(attribute)) {
+ return true;
+ }
+ }
+ }
+ return false;
}
private boolean filter(Position position) {
@@ -158,7 +167,7 @@ public class FilterHandler extends BaseDataHandler {
last = Context.getIdentityManager().getLastPosition(position.getDeviceId());
}
- if (skipLimit(position, last) || skipAlarms(position)) {
+ if (skipLimit(position, last) || skipAttributes(position)) {
return false;
}
diff --git a/test/org/traccar/BaseTest.java b/test/org/traccar/BaseTest.java
index 37956f11d..4b9ee5451 100644
--- a/test/org/traccar/BaseTest.java
+++ b/test/org/traccar/BaseTest.java
@@ -40,25 +40,25 @@ public class BaseTest {
@Override
public boolean lookupAttributeBoolean(
long deviceId, String attributeName, boolean defaultValue, boolean lookupConfig) {
- return false;
+ return defaultValue;
}
@Override
public String lookupAttributeString(
long deviceId, String attributeName, String defaultValue, boolean lookupConfig) {
- return null;
+ return defaultValue;
}
@Override
public int lookupAttributeInteger(
long deviceId, String attributeName, int defaultValue, boolean lookupConfig) {
- return 0;
+ return defaultValue;
}
@Override
public long lookupAttributeLong(
long deviceId, String attributeName, long defaultValue, boolean lookupConfig) {
- return 0;
+ return defaultValue;
}
});
diff --git a/test/org/traccar/FilterHandlerTest.java b/test/org/traccar/FilterHandlerTest.java
index e91566635..7ebab3af5 100644
--- a/test/org/traccar/FilterHandlerTest.java
+++ b/test/org/traccar/FilterHandlerTest.java
@@ -3,6 +3,8 @@ package org.traccar;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.traccar.database.IdentityManager;
+import org.traccar.model.Device;
import org.traccar.model.Position;
import java.util.Date;
@@ -10,7 +12,65 @@ import java.util.Date;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-public class FilterHandlerTest extends BaseTest {
+public class FilterHandlerTest {
+
+ static {
+ Context.init(new IdentityManager() {
+
+ private Device createDevice() {
+ Device device = new Device();
+ device.setId(1);
+ device.setName("test");
+ device.setUniqueId("123456789012345");
+ return device;
+ }
+
+ @Override
+ public Device getById(long id) {
+ return createDevice();
+ }
+
+ @Override
+ public Device getByUniqueId(String uniqueId) {
+ return createDevice();
+ }
+
+ @Override
+ public Position getLastPosition(long deviceId) {
+ return null;
+ }
+
+ @Override
+ public boolean isLatestPosition(Position position) {
+ return true;
+ }
+
+ @Override
+ public boolean lookupAttributeBoolean(
+ long deviceId, String attributeName, boolean defaultValue, boolean lookupConfig) {
+ return defaultValue;
+ }
+
+ @Override
+ public String lookupAttributeString(
+ long deviceId, String attributeName, String defaultValue, boolean lookupConfig) {
+ return "alarm,result";
+ }
+
+ @Override
+ public int lookupAttributeInteger(
+ long deviceId, String attributeName, int defaultValue, boolean lookupConfig) {
+ return defaultValue;
+ }
+
+ @Override
+ public long lookupAttributeLong(
+ long deviceId, String attributeName, long defaultValue, boolean lookupConfig) {
+ return defaultValue;
+ }
+
+ });
+ }
private FilterHandler filtingHandler;
private FilterHandler passingHandler;
@@ -77,7 +137,7 @@ public class FilterHandlerTest extends BaseTest {
assertNotNull(passingHandler.decode(null, null, position));
position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
- filtingHandler.setSkipAlarms(true);
+ filtingHandler.setSkipAttributes(true);
assertNotNull(filtingHandler.decode(null, null, position));
}