diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-06-16 18:44:32 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-16 18:44:32 +1200 |
commit | fe4ea97dabc55c4585d8b32bd4dae32cd255add3 (patch) | |
tree | 682c24e519446f419de1f01ac5e3879f49934a93 /src/org/traccar/reports/ReportUtils.java | |
parent | 65bec416c56715cd4a24ef69f136e4f67be56851 (diff) | |
parent | b1d5a5cfd165d2b52cf4dcdc57a6825e0ff1db8f (diff) | |
download | trackermap-server-fe4ea97dabc55c4585d8b32bd4dae32cd255add3.tar.gz trackermap-server-fe4ea97dabc55c4585d8b32bd4dae32cd255add3.tar.bz2 trackermap-server-fe4ea97dabc55c4585d8b32bd4dae32cd255add3.zip |
Merge pull request #3256 from Abyss777/motion_detection
Centralized motion detection
Diffstat (limited to 'src/org/traccar/reports/ReportUtils.java')
-rw-r--r-- | src/org/traccar/reports/ReportUtils.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java index 1e004beae..705f11429 100644 --- a/src/org/traccar/reports/ReportUtils.java +++ b/src/org/traccar/reports/ReportUtils.java @@ -220,7 +220,12 @@ public final class ReportUtils { >= tripsConfig.getMinimalNoDataDuration()) { return false; } - return positions.get(index).getSpeed() > speedThreshold; + if (positions.get(index).getAttributes().containsKey(Position.KEY_MOTION) + && positions.get(index).getAttributes().get(Position.KEY_MOTION) instanceof Boolean) { + return positions.get(index).getBoolean(Position.KEY_MOTION); + } else { + return positions.get(index).getSpeed() > speedThreshold; + } } public static Collection<BaseReport> detectTripsAndStops(TripsConfig tripsConfig, boolean ignoreOdometer, @@ -295,7 +300,7 @@ public final class ReportUtils { previousEndParkingIndex)); } } - result.add(calculateStop(positions, startParkingIndex, endParkingIndex)); + result.add(calculateStop(positions, startParkingIndex, isLast ? i : endParkingIndex)); } } previousEndParkingIndex = endParkingIndex; |