From b7d48127e60bcaa5d01f45d8df5203f28f9a1667 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 23 Feb 2019 15:33:33 -0800 Subject: Refactor distance handler --- src/org/traccar/BasePipelineFactory.java | 9 +-- src/org/traccar/DistanceHandler.java | 82 ---------------------------- src/org/traccar/MainModule.java | 7 +++ src/org/traccar/config/Keys.java | 18 ++++++ src/org/traccar/handler/DistanceHandler.java | 82 ++++++++++++++++++++++++++++ 5 files changed, 109 insertions(+), 89 deletions(-) delete mode 100644 src/org/traccar/DistanceHandler.java create mode 100644 src/org/traccar/handler/DistanceHandler.java (limited to 'src') diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java index 7f617c470..d32e1fc6c 100644 --- a/src/org/traccar/BasePipelineFactory.java +++ b/src/org/traccar/BasePipelineFactory.java @@ -36,6 +36,7 @@ import org.traccar.events.MotionEventHandler; import org.traccar.events.OverspeedEventHandler; import org.traccar.handler.ComputedAttributesHandler; import org.traccar.handler.CopyAttributesHandler; +import org.traccar.handler.DistanceHandler; import org.traccar.handler.FilterHandler; import org.traccar.handler.NetworkMessageHandler; import org.traccar.handler.OpenChannelHandler; @@ -50,7 +51,6 @@ public abstract class BasePipelineFactory extends ChannelInitializer { private final TrackerServer server; private int timeout; - private DistanceHandler distanceHandler; private EngineHoursHandler engineHoursHandler; private RemoteAddressHandler remoteAddressHandler; private MotionHandler motionHandler; @@ -78,11 +78,6 @@ public abstract class BasePipelineFactory extends ChannelInitializer { timeout = Context.getConfig().getInteger(Keys.SERVER_TIMEOUT); } - distanceHandler = new DistanceHandler( - Context.getConfig().getBoolean("coordinates.filter"), - Context.getConfig().getInteger("coordinates.minError"), - Context.getConfig().getInteger("coordinates.maxError")); - if (Context.getConfig().getBoolean("handler.remoteAddress.enable")) { remoteAddressHandler = new RemoteAddressHandler(); } @@ -182,7 +177,7 @@ public abstract class BasePipelineFactory extends ChannelInitializer { pipeline, geolocationHandler, hemisphereHandler, - distanceHandler, + Main.getInjector().getInstance(DistanceHandler.class), remoteAddressHandler); addDynamicHandlers(pipeline); diff --git a/src/org/traccar/DistanceHandler.java b/src/org/traccar/DistanceHandler.java deleted file mode 100644 index 657f74edf..000000000 --- a/src/org/traccar/DistanceHandler.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2015 Amila Silva - * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org) - * - * 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 io.netty.channel.ChannelHandler; -import org.traccar.helper.DistanceCalculator; -import org.traccar.model.Position; - -import java.math.BigDecimal; -import java.math.RoundingMode; - -@ChannelHandler.Sharable -public class DistanceHandler extends BaseDataHandler { - - private final boolean filter; - private final int coordinatesMinError; - private final int coordinatesMaxError; - - public DistanceHandler(boolean filter, int coordinatesMinError, int coordinatesMaxError) { - this.filter = filter; - this.coordinatesMinError = coordinatesMinError; - this.coordinatesMaxError = coordinatesMaxError; - } - - private Position getLastPosition(long deviceId) { - if (Context.getIdentityManager() != null) { - return Context.getIdentityManager().getLastPosition(deviceId); - } - return null; - } - - @Override - protected Position handlePosition(Position position) { - - double distance = 0.0; - if (position.getAttributes().containsKey(Position.KEY_DISTANCE)) { - distance = position.getDouble(Position.KEY_DISTANCE); - } - double totalDistance = 0.0; - - Position last = getLastPosition(position.getDeviceId()); - if (last != null) { - totalDistance = last.getDouble(Position.KEY_TOTAL_DISTANCE); - if (!position.getAttributes().containsKey(Position.KEY_DISTANCE)) { - distance = DistanceCalculator.distance( - position.getLatitude(), position.getLongitude(), - last.getLatitude(), last.getLongitude()); - distance = BigDecimal.valueOf(distance).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); - } - if (filter && last.getValid() && last.getLatitude() != 0 && last.getLongitude() != 0) { - boolean satisfiesMin = coordinatesMinError == 0 || distance > coordinatesMinError; - boolean satisfiesMax = coordinatesMaxError == 0 - || distance < coordinatesMaxError || position.getValid(); - if (!satisfiesMin || !satisfiesMax) { - position.setLatitude(last.getLatitude()); - position.setLongitude(last.getLongitude()); - distance = 0; - } - } - } - position.set(Position.KEY_DISTANCE, distance); - totalDistance = BigDecimal.valueOf(totalDistance + distance).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); - position.set(Position.KEY_TOTAL_DISTANCE, totalDistance); - - return position; - } - -} diff --git a/src/org/traccar/MainModule.java b/src/org/traccar/MainModule.java index 30cf25d3d..9b16185df 100644 --- a/src/org/traccar/MainModule.java +++ b/src/org/traccar/MainModule.java @@ -22,6 +22,7 @@ import com.google.inject.Singleton; import org.traccar.config.Config; import org.traccar.config.Keys; import org.traccar.database.IdentityManager; +import org.traccar.handler.DistanceHandler; import org.traccar.handler.FilterHandler; import javax.ws.rs.client.Client; @@ -48,6 +49,12 @@ public class MainModule extends AbstractModule { return Context.getClient(); } + @Singleton + @Provides + public static DistanceHandler provideDistanceHandler(Config config, IdentityManager identityManager) { + return new DistanceHandler(config, identityManager); + } + @Singleton @Provides public static FilterHandler provideFilterHandler(Config config) { diff --git a/src/org/traccar/config/Keys.java b/src/org/traccar/config/Keys.java index aea8e1ebe..6d4653a94 100644 --- a/src/org/traccar/config/Keys.java +++ b/src/org/traccar/config/Keys.java @@ -126,6 +126,24 @@ public final class Keys { Boolean.class, "Enable attributes skipping. Attribute skipping can be enabled in the config or device attributes"); + public static final ConfigKey COORDINATES_FILTER = new ConfigKey( + "coordinates.filter", + Boolean.class, + "Replaces coordinates with last known if change is less than a 'coordinates.error' meters. Helps to avoid " + + "coordinates jumps during parking period."); + + public static final ConfigKey COORDINATES_MIN_ERROR = new ConfigKey( + "coordinates.minError", + Integer.class, + "Distance in meters. Distances below this value gets handled like explained in 'coordinates.filter'."); + + public static final ConfigKey COORDINATES_MAX_ERROR = new ConfigKey( + "filter.maxError", + Integer.class, + "Distance in meters. Distances above this value gets handled like explained in 'coordinates.filter', but " + + "only if Position is also marked as 'invalid'."); + + private Keys() { } diff --git a/src/org/traccar/handler/DistanceHandler.java b/src/org/traccar/handler/DistanceHandler.java new file mode 100644 index 000000000..a336a884e --- /dev/null +++ b/src/org/traccar/handler/DistanceHandler.java @@ -0,0 +1,82 @@ +/* + * Copyright 2015 Amila Silva + * Copyright 2016 - 2019 Anton Tananaev (anton@traccar.org) + * + * 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.handler; + +import io.netty.channel.ChannelHandler; +import org.traccar.BaseDataHandler; +import org.traccar.config.Config; +import org.traccar.config.Keys; +import org.traccar.database.IdentityManager; +import org.traccar.helper.DistanceCalculator; +import org.traccar.model.Position; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +@ChannelHandler.Sharable +public class DistanceHandler extends BaseDataHandler { + + private final IdentityManager identityManager; + + private final boolean filter; + private final int coordinatesMinError; + private final int coordinatesMaxError; + + public DistanceHandler(Config config, IdentityManager identityManager) { + this.identityManager = identityManager; + this.filter = config.getBoolean(Keys.COORDINATES_FILTER); + this.coordinatesMinError = config.getInteger(Keys.COORDINATES_MIN_ERROR); + this.coordinatesMaxError = config.getInteger(Keys.COORDINATES_MAX_ERROR); + } + + @Override + protected Position handlePosition(Position position) { + + double distance = 0.0; + if (position.getAttributes().containsKey(Position.KEY_DISTANCE)) { + distance = position.getDouble(Position.KEY_DISTANCE); + } + double totalDistance = 0.0; + + Position last = identityManager != null ? identityManager.getLastPosition(position.getDeviceId()) : null; + if (last != null) { + totalDistance = last.getDouble(Position.KEY_TOTAL_DISTANCE); + if (!position.getAttributes().containsKey(Position.KEY_DISTANCE)) { + distance = DistanceCalculator.distance( + position.getLatitude(), position.getLongitude(), + last.getLatitude(), last.getLongitude()); + distance = BigDecimal.valueOf(distance).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); + } + if (filter && last.getValid() && last.getLatitude() != 0 && last.getLongitude() != 0) { + boolean satisfiesMin = coordinatesMinError == 0 || distance > coordinatesMinError; + boolean satisfiesMax = coordinatesMaxError == 0 + || distance < coordinatesMaxError || position.getValid(); + if (!satisfiesMin || !satisfiesMax) { + position.setLatitude(last.getLatitude()); + position.setLongitude(last.getLongitude()); + distance = 0; + } + } + } + position.set(Position.KEY_DISTANCE, distance); + totalDistance = BigDecimal.valueOf(totalDistance + distance).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); + position.set(Position.KEY_TOTAL_DISTANCE, totalDistance); + + return position; + } + +} -- cgit v1.2.3