Convert project to gradle

24 files changed, 0 insertions, 1869 deletions

diff --git a/src/org/traccar/handler/ComputedAttributesHandler.java b/src/org/traccar/handler/ComputedAttributesHandler.java
deleted file mode 100644
index 153da29b9..000000000
--- a/src/org/traccar/handler/ComputedAttributesHandler.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright 2017 - 2019 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@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 java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import io.netty.channel.ChannelHandler;
-import org.apache.commons.jexl2.JexlEngine;
-import org.apache.commons.jexl2.JexlException;
-import org.apache.commons.jexl2.MapContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.traccar.BaseDataHandler;
-import org.traccar.config.Config;
-import org.traccar.config.Keys;
-import org.traccar.database.AttributesManager;
-import org.traccar.database.IdentityManager;
-import org.traccar.model.Attribute;
-import org.traccar.model.Device;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class ComputedAttributesHandler extends BaseDataHandler {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ComputedAttributesHandler.class);
-
-    private final IdentityManager identityManager;
-    private final AttributesManager attributesManager;
-
-    private final JexlEngine engine;
-
-    private final boolean includeDeviceAttributes;
-
-    public ComputedAttributesHandler(
-            Config config, IdentityManager identityManager, AttributesManager attributesManager) {
-        this.identityManager = identityManager;
-        this.attributesManager = attributesManager;
-        engine = new JexlEngine();
-        engine.setStrict(true);
-        engine.setFunctions(Collections.singletonMap("math", Math.class));
-        includeDeviceAttributes = config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_DEVICE_ATTRIBUTES);
-    }
-
-    private MapContext prepareContext(Position position) {
-        MapContext result = new MapContext();
-        if (includeDeviceAttributes) {
-            Device device = identityManager.getById(position.getDeviceId());
-            if (device != null) {
-                for (Object key : device.getAttributes().keySet()) {
-                    result.set((String) key, device.getAttributes().get(key));
-                }
-            }
-        }
-        Set<Method> methods = new HashSet<>(Arrays.asList(position.getClass().getMethods()));
-        methods.removeAll(Arrays.asList(Object.class.getMethods()));
-        for (Method method : methods) {
-            if (method.getName().startsWith("get") && method.getParameterTypes().length == 0) {
-                String name = Character.toLowerCase(method.getName().charAt(3)) + method.getName().substring(4);
-
-                try {
-                    if (!method.getReturnType().equals(Map.class)) {
-                        result.set(name, method.invoke(position));
-                    } else {
-                        for (Object key : ((Map) method.invoke(position)).keySet()) {
-                            result.set((String) key, ((Map) method.invoke(position)).get(key));
-                        }
-                    }
-                } catch (IllegalAccessException | InvocationTargetException error) {
-                    LOGGER.warn("Attribute reflection error", error);
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * @deprecated logic needs to be extracted to be used in API resource
-     */
-    @Deprecated
-    public Object computeAttribute(Attribute attribute, Position position) throws JexlException {
-        return engine.createExpression(attribute.getExpression()).evaluate(prepareContext(position));
-    }
-
-    @Override
-    protected Position handlePosition(Position position) {
-        Collection<Attribute> attributes = attributesManager.getItems(
-                attributesManager.getAllDeviceItems(position.getDeviceId()));
-        for (Attribute attribute : attributes) {
-            if (attribute.getAttribute() != null) {
-                Object result = null;
-                try {
-                    result = computeAttribute(attribute, position);
-                } catch (JexlException error) {
-                    LOGGER.warn("Attribute computation error", error);
-                }
-                if (result != null) {
-                    try {
-                        switch (attribute.getType()) {
-                            case "number":
-                                Number numberValue = (Number) result;
-                                position.getAttributes().put(attribute.getAttribute(), numberValue);
-                                break;
-                            case "boolean":
-                                Boolean booleanValue = (Boolean) result;
-                                position.getAttributes().put(attribute.getAttribute(), booleanValue);
-                                break;
-                            default:
-                                position.getAttributes().put(attribute.getAttribute(), result.toString());
-                        }
-                    } catch (ClassCastException error) {
-                        LOGGER.warn("Attribute cast error", error);
-                    }
-                }
-            }
-        }
-        return position;
-    }
-
-}
diff --git a/src/org/traccar/handler/CopyAttributesHandler.java b/src/org/traccar/handler/CopyAttributesHandler.java
deleted file mode 100644
index 6a0966d33..000000000
--- a/src/org/traccar/handler/CopyAttributesHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2016 - 2019 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@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.database.IdentityManager;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class CopyAttributesHandler extends BaseDataHandler {
-
-    private IdentityManager identityManager;
-
-    public CopyAttributesHandler(IdentityManager identityManager) {
-        this.identityManager = identityManager;
-    }
-
-    @Override
-    protected Position handlePosition(Position position) {
-        String attributesString = identityManager.lookupAttributeString(
-                position.getDeviceId(), "processing.copyAttributes", "", true);
-        if (attributesString.isEmpty()) {
-            attributesString = Position.KEY_DRIVER_UNIQUE_ID;
-        } else {
-            attributesString += "," + Position.KEY_DRIVER_UNIQUE_ID;
-        }
-        Position last = identityManager.getLastPosition(position.getDeviceId());
-        if (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;
-    }
-
-}
diff --git a/src/org/traccar/handler/DefaultDataHandler.java b/src/org/traccar/handler/DefaultDataHandler.java
deleted file mode 100644
index 9d8ea044d..000000000
--- a/src/org/traccar/handler/DefaultDataHandler.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2015 - 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.traccar.BaseDataHandler;
-import org.traccar.database.DataManager;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class DefaultDataHandler extends BaseDataHandler {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultDataHandler.class);
-
-    private final DataManager dataManager;
-
-    public DefaultDataHandler(DataManager dataManager) {
-        this.dataManager = dataManager;
-    }
-
-    @Override
-    protected Position handlePosition(Position position) {
-
-        try {
-            dataManager.addObject(position);
-        } catch (Exception error) {
-            LOGGER.warn("Failed to store position", error);
-        }
-
-        return position;
-    }
-
-}
diff --git a/src/org/traccar/handler/DistanceHandler.java b/src/org/traccar/handler/DistanceHandler.java
deleted file mode 100644
index a336a884e..000000000
--- a/src/org/traccar/handler/DistanceHandler.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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;
-    }
-
-}
diff --git a/src/org/traccar/handler/EngineHoursHandler.java b/src/org/traccar/handler/EngineHoursHandler.java
deleted file mode 100644
index 92da84e6b..000000000
--- a/src/org/traccar/handler/EngineHoursHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2018 - 2019 Anton Tananaev (anton@traccar.org)
- * Copyright 2018 Andrey Kunitsyn (andrey@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.database.IdentityManager;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class EngineHoursHandler extends BaseDataHandler {
-
-    private final IdentityManager identityManager;
-
-    public EngineHoursHandler(IdentityManager identityManager) {
-        this.identityManager = identityManager;
-    }
-
-    @Override
-    protected Position handlePosition(Position position) {
-        if (!position.getAttributes().containsKey(Position.KEY_HOURS)) {
-            Position last = identityManager.getLastPosition(position.getDeviceId());
-            if (last != null) {
-                long hours = last.getLong(Position.KEY_HOURS);
-                if (last.getBoolean(Position.KEY_IGNITION) && position.getBoolean(Position.KEY_IGNITION)) {
-                    hours += position.getFixTime().getTime() - last.getFixTime().getTime();
-                }
-                if (hours != 0) {
-                    position.set(Position.KEY_HOURS, hours);
-                }
-            }
-        }
-        return position;
-    }
-
-}
diff --git a/src/org/traccar/handler/FilterHandler.java b/src/org/traccar/handler/FilterHandler.java
deleted file mode 100644
index dceaede01..000000000
--- a/src/org/traccar/handler/FilterHandler.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright 2014 - 2018 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.traccar.BaseDataHandler;
-import org.traccar.Context;
-import org.traccar.config.Config;
-import org.traccar.config.Keys;
-import org.traccar.helper.UnitsConverter;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class FilterHandler extends BaseDataHandler {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(FilterHandler.class);
-
-    private boolean filterInvalid;
-    private boolean filterZero;
-    private boolean filterDuplicate;
-    private long filterFuture;
-    private boolean filterApproximate;
-    private int filterAccuracy;
-    private boolean filterStatic;
-    private int filterDistance;
-    private int filterMaxSpeed;
-    private long filterMinPeriod;
-    private long skipLimit;
-    private boolean skipAttributes;
-
-    public FilterHandler(Config config) {
-        filterInvalid = config.getBoolean(Keys.FILTER_INVALID);
-        filterZero = config.getBoolean(Keys.FILTER_ZERO);
-        filterDuplicate = config.getBoolean(Keys.FILTER_DUPLICATE);
-        filterFuture = config.getLong(Keys.FILTER_FUTURE) * 1000;
-        filterAccuracy = config.getInteger(Keys.FILTER_ACCURACY);
-        filterApproximate = config.getBoolean(Keys.FILTER_APPROXIMATE);
-        filterStatic = config.getBoolean(Keys.FILTER_STATIC);
-        filterDistance = config.getInteger(Keys.FILTER_DISTANCE);
-        filterMaxSpeed = config.getInteger(Keys.FILTER_MAX_SPEED);
-        filterMinPeriod = config.getInteger(Keys.FILTER_MIN_PERIOD) * 1000;
-        skipLimit = config.getLong(Keys.FILTER_SKIP_LIMIT) * 1000;
-        skipAttributes = config.getBoolean(Keys.FILTER_SKIP_ATTRIBUTES_ENABLE);
-    }
-
-    private boolean filterInvalid(Position position) {
-        return filterInvalid && (!position.getValid()
-           || position.getLatitude() > 90 || position.getLongitude() > 180
-           || position.getLatitude() < -90 || position.getLongitude() < -180);
-    }
-
-    private boolean filterZero(Position position) {
-        return filterZero && position.getLatitude() == 0.0 && position.getLongitude() == 0.0;
-    }
-
-    private boolean filterDuplicate(Position position, Position last) {
-        if (filterDuplicate && last != null && position.getFixTime().equals(last.getFixTime())) {
-            for (String key : position.getAttributes().keySet()) {
-                if (!last.getAttributes().containsKey(key)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    private boolean filterFuture(Position position) {
-        return filterFuture != 0 && position.getFixTime().getTime() > System.currentTimeMillis() + filterFuture;
-    }
-
-    private boolean filterAccuracy(Position position) {
-        return filterAccuracy != 0 && position.getAccuracy() > filterAccuracy;
-    }
-
-    private boolean filterApproximate(Position position) {
-        return filterApproximate && position.getBoolean(Position.KEY_APPROXIMATE);
-    }
-
-    private boolean filterStatic(Position position) {
-        return filterStatic && position.getSpeed() == 0.0;
-    }
-
-    private boolean filterDistance(Position position, Position last) {
-        if (filterDistance != 0 && last != null) {
-            return position.getDouble(Position.KEY_DISTANCE) < filterDistance;
-        }
-        return false;
-    }
-
-    private boolean filterMaxSpeed(Position position, Position last) {
-        if (filterMaxSpeed != 0 && last != null) {
-            double distance = position.getDouble(Position.KEY_DISTANCE);
-            double time = position.getFixTime().getTime() - last.getFixTime().getTime();
-            return UnitsConverter.knotsFromMps(distance / (time / 1000)) > filterMaxSpeed;
-        }
-        return false;
-    }
-
-    private boolean filterMinPeriod(Position position, Position last) {
-        if (filterMinPeriod != 0 && last != null) {
-            long time = position.getFixTime().getTime() - last.getFixTime().getTime();
-            return time > 0 && time < filterMinPeriod;
-        }
-        return false;
-    }
-
-    private boolean skipLimit(Position position, Position last) {
-        if (skipLimit != 0 && last != null) {
-            return (position.getServerTime().getTime() - last.getServerTime().getTime()) > skipLimit;
-        }
-        return false;
-    }
-
-    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) {
-
-        StringBuilder filterType = new StringBuilder();
-
-        Position last = null;
-        if (Context.getIdentityManager() != null) {
-            last = Context.getIdentityManager().getLastPosition(position.getDeviceId());
-        }
-
-        if (filterInvalid(position)) {
-            filterType.append("Invalid ");
-        }
-        if (filterZero(position)) {
-            filterType.append("Zero ");
-        }
-        if (filterDuplicate(position, last) && !skipLimit(position, last) && !skipAttributes(position)) {
-            filterType.append("Duplicate ");
-        }
-        if (filterFuture(position)) {
-            filterType.append("Future ");
-        }
-        if (filterAccuracy(position)) {
-            filterType.append("Accuracy ");
-        }
-        if (filterApproximate(position)) {
-            filterType.append("Approximate ");
-        }
-        if (filterStatic(position) && !skipLimit(position, last) && !skipAttributes(position)) {
-            filterType.append("Static ");
-        }
-        if (filterDistance(position, last) && !skipLimit(position, last) && !skipAttributes(position)) {
-            filterType.append("Distance ");
-        }
-        if (filterMaxSpeed(position, last)) {
-            filterType.append("MaxSpeed ");
-        }
-        if (filterMinPeriod(position, last)) {
-            filterType.append("MinPeriod ");
-        }
-
-        if (filterType.length() > 0) {
-
-            StringBuilder message = new StringBuilder();
-            message.append("Position filtered by ");
-            message.append(filterType.toString());
-            message.append("filters from device: ");
-            message.append(Context.getIdentityManager().getById(position.getDeviceId()).getUniqueId());
-
-            LOGGER.info(message.toString());
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    protected Position handlePosition(Position position) {
-        if (filter(position)) {
-            return null;
-        }
-        return position;
-    }
-
-}
diff --git a/src/org/traccar/handler/GeocoderHandler.java b/src/org/traccar/handler/GeocoderHandler.java
deleted file mode 100644
index b96f01b3a..000000000
--- a/src/org/traccar/handler/GeocoderHandler.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2012 - 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 io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.traccar.Context;
-import org.traccar.config.Config;
-import org.traccar.config.Keys;
-import org.traccar.database.IdentityManager;
-import org.traccar.database.StatisticsManager;
-import org.traccar.geocoder.Geocoder;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class GeocoderHandler extends ChannelInboundHandlerAdapter {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(GeocoderHandler.class);
-
-    private final Geocoder geocoder;
-    private final IdentityManager identityManager;
-    private final StatisticsManager statisticsManager;
-    private final boolean ignorePositions;
-    private final boolean processInvalidPositions;
-    private final int geocoderReuseDistance;
-
-    public GeocoderHandler(
-            Config config, Geocoder geocoder, IdentityManager identityManager, StatisticsManager statisticsManager) {
-        this.geocoder = geocoder;
-        this.identityManager = identityManager;
-        this.statisticsManager = statisticsManager;
-        ignorePositions = Context.getConfig().getBoolean(Keys.GEOCODER_IGNORE_POSITIONS);
-        processInvalidPositions = config.getBoolean(Keys.GEOCODER_PROCESS_INVALID_POSITIONS);
-        geocoderReuseDistance = config.getInteger(Keys.GEOCODER_REUSE_DISTANCE, 0);
-    }
-
-    @Override
-    public void channelRead(final ChannelHandlerContext ctx, Object message) {
-        if (message instanceof Position && !ignorePositions) {
-            final Position position = (Position) message;
-            if (processInvalidPositions || position.getValid()) {
-                if (geocoderReuseDistance != 0) {
-                    Position lastPosition = identityManager.getLastPosition(position.getDeviceId());
-                    if (lastPosition != null && lastPosition.getAddress() != null
-                            && position.getDouble(Position.KEY_DISTANCE) <= geocoderReuseDistance) {
-                        position.setAddress(lastPosition.getAddress());
-                        ctx.fireChannelRead(position);
-                        return;
-                    }
-                }
-
-                if (statisticsManager != null) {
-                    statisticsManager.registerGeocoderRequest();
-                }
-
-                geocoder.getAddress(position.getLatitude(), position.getLongitude(),
-                        new Geocoder.ReverseGeocoderCallback() {
-                    @Override
-                    public void onSuccess(String address) {
-                        position.setAddress(address);
-                        ctx.fireChannelRead(position);
-                    }
-
-                    @Override
-                    public void onFailure(Throwable e) {
-                        LOGGER.warn("Geocoding failed", e);
-                        ctx.fireChannelRead(position);
-                    }
-                });
-            } else {
-                ctx.fireChannelRead(position);
-            }
-        } else {
-            ctx.fireChannelRead(message);
-        }
-    }
-
-}
diff --git a/src/org/traccar/handler/GeolocationHandler.java b/src/org/traccar/handler/GeolocationHandler.java
deleted file mode 100644
index c7b39e491..000000000
--- a/src/org/traccar/handler/GeolocationHandler.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2015 - 2018 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 io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.traccar.config.Config;
-import org.traccar.config.Keys;
-import org.traccar.database.StatisticsManager;
-import org.traccar.geolocation.GeolocationProvider;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class GeolocationHandler extends ChannelInboundHandlerAdapter {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(GeolocationHandler.class);
-
-    private final GeolocationProvider geolocationProvider;
-    private final StatisticsManager statisticsManager;
-    private final boolean processInvalidPositions;
-
-    public GeolocationHandler(
-            Config config, GeolocationProvider geolocationProvider, StatisticsManager statisticsManager) {
-        this.geolocationProvider = geolocationProvider;
-        this.statisticsManager = statisticsManager;
-        this.processInvalidPositions = config.getBoolean(Keys.GEOLOCATION_PROCESS_INVALID_POSITIONS);
-    }
-
-    @Override
-    public void channelRead(final ChannelHandlerContext ctx, Object message) {
-        if (message instanceof Position) {
-            final Position position = (Position) message;
-            if ((position.getOutdated() || processInvalidPositions && !position.getValid())
-                    && position.getNetwork() != null) {
-                if (statisticsManager != null) {
-                    statisticsManager.registerGeolocationRequest();
-                }
-
-                geolocationProvider.getLocation(position.getNetwork(),
-                        new GeolocationProvider.LocationProviderCallback() {
-                    @Override
-                    public void onSuccess(double latitude, double longitude, double accuracy) {
-                        position.set(Position.KEY_APPROXIMATE, true);
-                        position.setValid(true);
-                        position.setFixTime(position.getDeviceTime());
-                        position.setLatitude(latitude);
-                        position.setLongitude(longitude);
-                        position.setAccuracy(accuracy);
-                        position.setAltitude(0);
-                        position.setSpeed(0);
-                        position.setCourse(0);
-                        position.set(Position.KEY_RSSI, 0);
-                        ctx.fireChannelRead(position);
-                    }
-
-                    @Override
-                    public void onFailure(Throwable e) {
-                        LOGGER.warn("Geolocation network error", e);
-                        ctx.fireChannelRead(position);
-                    }
-                });
-            } else {
-                ctx.fireChannelRead(position);
-            }
-        } else {
-            ctx.fireChannelRead(message);
-        }
-    }
-
-}
diff --git a/src/org/traccar/handler/HemisphereHandler.java b/src/org/traccar/handler/HemisphereHandler.java
deleted file mode 100644
index aff3d8a64..000000000
--- a/src/org/traccar/handler/HemisphereHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.model.Position;
-
-@ChannelHandler.Sharable
-public class HemisphereHandler extends BaseDataHandler {
-
-    private int latitudeFactor;
-    private int longitudeFactor;
-
-    public HemisphereHandler(Config config) {
-        String latitudeHemisphere = config.getString(Keys.LOCATION_LATITUDE_HEMISPHERE);
-        if (latitudeHemisphere != null) {
-            if (latitudeHemisphere.equalsIgnoreCase("N")) {
-                latitudeFactor = 1;
-            } else if (latitudeHemisphere.equalsIgnoreCase("S")) {
-                latitudeFactor = -1;
-            }
-        }
-        String longitudeHemisphere = config.getString(Keys.LOCATION_LATITUDE_HEMISPHERE);
-        if (longitudeHemisphere != null) {
-            if (longitudeHemisphere.equalsIgnoreCase("E")) {
-                longitudeFactor = 1;
-            } else if (longitudeHemisphere.equalsIgnoreCase("W")) {
-                longitudeFactor = -1;
-            }
-        }
-    }
-
-    @Override
-    protected Position handlePosition(Position position) {
-        if (latitudeFactor != 0) {
-            position.setLatitude(Math.abs(position.getLatitude()) * latitudeFactor);
-        }
-        if (longitudeFactor != 0) {
-            position.setLongitude(Math.abs(position.getLongitude()) * longitudeFactor);
-        }
-        return position;
-    }
-
-}
diff --git a/src/org/traccar/handler/MotionHandler.java b/src/org/traccar/handler/MotionHandler.java
deleted file mode 100644
index e8051dd75..000000000
--- a/src/org/traccar/handler/MotionHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017 - 2019 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@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.model.Position;
-
-@ChannelHandler.Sharable
-public class MotionHandler extends BaseDataHandler {
-
-    private double speedThreshold;
-
-    public MotionHandler(double speedThreshold) {
-        this.speedThreshold = speedThreshold;
-    }
-
-    @Override
-    protected Position handlePosition(Position position) {
-        if (!position.getAttributes().containsKey(Position.KEY_MOTION)) {
-            position.set(Position.KEY_MOTION, position.getSpeed() > speedThreshold);
-        }
-        return position;
-    }
-
-}
diff --git a/src/org/traccar/handler/NetworkMessageHandler.java b/src/org/traccar/handler/NetworkMessageHandler.java
deleted file mode 100644
index b1d926bfa..000000000
--- a/src/org/traccar/handler/NetworkMessageHandler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 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.buffer.ByteBuf;
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
-import io.netty.channel.socket.DatagramChannel;
-import io.netty.channel.socket.DatagramPacket;
-import org.traccar.NetworkMessage;
-
-import java.net.InetSocketAddress;
-
-public class NetworkMessageHandler extends ChannelDuplexHandler {
-
-    @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg) {
-        if (ctx.channel() instanceof DatagramChannel) {
-            DatagramPacket packet = (DatagramPacket) msg;
-            ctx.fireChannelRead(new NetworkMessage(packet.content(), packet.sender()));
-        } else if (msg instanceof ByteBuf) {
-            ByteBuf buffer = (ByteBuf) msg;
-            ctx.fireChannelRead(new NetworkMessage(buffer, ctx.channel().remoteAddress()));
-        }
-    }
-
-    @Override
-    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
-        if (msg instanceof NetworkMessage) {
-            NetworkMessage message = (NetworkMessage) msg;
-            if (ctx.channel() instanceof DatagramChannel) {
-                InetSocketAddress recipient = (InetSocketAddress) message.getRemoteAddress();
-                InetSocketAddress sender = (InetSocketAddress) ctx.channel().localAddress();
-                ctx.write(new DatagramPacket((ByteBuf) message.getMessage(), recipient, sender), promise);
-            } else {
-                ctx.write(message.getMessage(), promise);
-            }
-        } else {
-            ctx.write(msg, promise);
-        }
-    }
-
-}
diff --git a/src/org/traccar/handler/OpenChannelHandler.java b/src/org/traccar/handler/OpenChannelHandler.java
deleted file mode 100644
index d09d617ab..000000000
--- a/src/org/traccar/handler/OpenChannelHandler.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 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.ChannelDuplexHandler;
-import io.netty.channel.ChannelHandlerContext;
-import org.traccar.TrackerServer;
-
-public class OpenChannelHandler extends ChannelDuplexHandler {
-
-    private final TrackerServer server;
-
-    public OpenChannelHandler(TrackerServer server) {
-        this.server = server;
-    }
-
-    @Override
-    public void channelActive(ChannelHandlerContext ctx) throws Exception {
-        super.channelActive(ctx);
-        server.getChannelGroup().add(ctx.channel());
-    }
-
-    @Override
-    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-        super.channelInactive(ctx);
-        server.getChannelGroup().remove(ctx.channel());
-    }
-
-}
diff --git a/src/org/traccar/handler/RemoteAddressHandler.java b/src/org/traccar/handler/RemoteAddressHandler.java
deleted file mode 100644
index c09b8c39a..000000000
--- a/src/org/traccar/handler/RemoteAddressHandler.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2015 - 2018 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 io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import org.traccar.model.Position;
-
-import java.net.InetSocketAddress;
-
-@ChannelHandler.Sharable
-public class RemoteAddressHandler extends ChannelInboundHandlerAdapter {
-
-    @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg) {
-
-        InetSocketAddress remoteAddress = (InetSocketAddress) ctx.channel().remoteAddress();
-        String hostAddress = remoteAddress != null ? remoteAddress.getAddress().getHostAddress() : null;
-
-        if (msg instanceof Position) {
-            Position position = (Position) msg;
-            position.set(Position.KEY_IP, hostAddress);
-        }
-
-        ctx.fireChannelRead(msg);
-    }
-
-}
diff --git a/src/org/traccar/handler/StandardLoggingHandler.java b/src/org/traccar/handler/StandardLoggingHandler.java
deleted file mode 100644
index 88010458f..000000000
--- a/src/org/traccar/handler/StandardLoggingHandler.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 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.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.traccar.NetworkMessage;
-
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-
-public class StandardLoggingHandler extends ChannelDuplexHandler {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(StandardLoggingHandler.class);
-
-    @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-        log(ctx, false, msg);
-        super.channelRead(ctx, msg);
-    }
-
-    @Override
-    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-        log(ctx, true, msg);
-        super.write(ctx, msg, promise);
-    }
-
-    public void log(ChannelHandlerContext ctx, boolean downstream, Object o) {
-        if (o instanceof NetworkMessage) {
-            NetworkMessage networkMessage = (NetworkMessage) o;
-            if (networkMessage.getMessage() instanceof ByteBuf) {
-                log(ctx, downstream, networkMessage.getRemoteAddress(), (ByteBuf) networkMessage.getMessage());
-            }
-        } else if (o instanceof ByteBuf) {
-            log(ctx, downstream, ctx.channel().remoteAddress(), (ByteBuf) o);
-        }
-    }
-
-    public void log(ChannelHandlerContext ctx, boolean downstream, SocketAddress remoteAddress, ByteBuf buf) {
-        StringBuilder message = new StringBuilder();
-
-        message.append("[").append(ctx.channel().id().asShortText()).append(": ");
-        message.append(((InetSocketAddress) ctx.channel().localAddress()).getPort());
-        if (downstream) {
-            message.append(" > ");
-        } else {
-            message.append(" < ");
-        }
-
-        if (remoteAddress instanceof InetSocketAddress) {
-            message.append(((InetSocketAddress) remoteAddress).getHostString());
-        } else {
-            message.append("unknown");
-        }
-        message.append("]");
-
-        message.append(" HEX: ");
-        message.append(ByteBufUtil.hexDump(buf));
-
-        LOGGER.info(message.toString());
-    }
-
-}
diff --git a/src/org/traccar/handler/events/AlertEventHandler.java b/src/org/traccar/handler/events/AlertEventHandler.java
deleted file mode 100644
index 0b7c8d23e..000000000
--- a/src/org/traccar/handler/events/AlertEventHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.events;
-
-import java.util.Collections;
-import java.util.Map;
-
-import io.netty.channel.ChannelHandler;
-import org.traccar.config.Config;
-import org.traccar.config.Keys;
-import org.traccar.database.IdentityManager;
-import org.traccar.model.Event;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class AlertEventHandler extends BaseEventHandler {
-
-    private final IdentityManager identityManager;
-    private final boolean ignoreDuplicateAlerts;
-
-    public AlertEventHandler(Config config, IdentityManager identityManager) {
-        this.identityManager = identityManager;
-        ignoreDuplicateAlerts = config.getBoolean(Keys.EVENT_IGNORE_DUPLICATE_ALERTS);
-    }
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-        Object alarm = position.getAttributes().get(Position.KEY_ALARM);
-        if (alarm != null) {
-            boolean ignoreAlert = false;
-            if (ignoreDuplicateAlerts) {
-                Position lastPosition = identityManager.getLastPosition(position.getDeviceId());
-                if (lastPosition != null && alarm.equals(lastPosition.getAttributes().get(Position.KEY_ALARM))) {
-                    ignoreAlert = true;
-                }
-            }
-            if (!ignoreAlert) {
-                Event event = new Event(Event.TYPE_ALARM, position.getDeviceId(), position.getId());
-                event.set(Position.KEY_ALARM, (String) alarm);
-                return Collections.singletonMap(event, position);
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/src/org/traccar/handler/events/BaseEventHandler.java b/src/org/traccar/handler/events/BaseEventHandler.java
deleted file mode 100644
index 41f677f6c..000000000
--- a/src/org/traccar/handler/events/BaseEventHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2016 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.events;
-
-import java.util.Map;
-
-import org.traccar.BaseDataHandler;
-import org.traccar.Context;
-import org.traccar.model.Event;
-import org.traccar.model.Position;
-
-public abstract class BaseEventHandler extends BaseDataHandler {
-
-    @Override
-    protected Position handlePosition(Position position) {
-        Map<Event, Position> events = analyzePosition(position);
-        if (events != null && Context.getNotificationManager() != null) {
-            Context.getNotificationManager().updateEvents(events);
-        }
-        return position;
-    }
-
-    protected abstract Map<Event, Position> analyzePosition(Position position);
-
-}
diff --git a/src/org/traccar/handler/events/CommandResultEventHandler.java b/src/org/traccar/handler/events/CommandResultEventHandler.java
deleted file mode 100644
index cfe676653..000000000
--- a/src/org/traccar/handler/events/CommandResultEventHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2016 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.events;
-
-import java.util.Collections;
-import java.util.Map;
-
-import io.netty.channel.ChannelHandler;
-import org.traccar.model.Event;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class CommandResultEventHandler extends BaseEventHandler {
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-        Object commandResult = position.getAttributes().get(Position.KEY_RESULT);
-        if (commandResult != null) {
-            Event event = new Event(Event.TYPE_COMMAND_RESULT, position.getDeviceId(), position.getId());
-            event.set(Position.KEY_RESULT, (String) commandResult);
-            return Collections.singletonMap(event, position);
-        }
-        return null;
-    }
-
-}
diff --git a/src/org/traccar/handler/events/DriverEventHandler.java b/src/org/traccar/handler/events/DriverEventHandler.java
deleted file mode 100644
index 994df93fa..000000000
--- a/src/org/traccar/handler/events/DriverEventHandler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2017 - 2019 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@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.events;
-
-import java.util.Collections;
-import java.util.Map;
-
-import io.netty.channel.ChannelHandler;
-import org.traccar.database.IdentityManager;
-import org.traccar.model.Event;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class DriverEventHandler extends BaseEventHandler {
-
-    private final IdentityManager identityManager;
-
-    public DriverEventHandler(IdentityManager identityManager) {
-        this.identityManager = identityManager;
-    }
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-        if (!identityManager.isLatestPosition(position)) {
-            return null;
-        }
-        String driverUniqueId = position.getString(Position.KEY_DRIVER_UNIQUE_ID);
-        if (driverUniqueId != null) {
-            String oldDriverUniqueId = null;
-            Position lastPosition = identityManager.getLastPosition(position.getDeviceId());
-            if (lastPosition != null) {
-                oldDriverUniqueId = lastPosition.getString(Position.KEY_DRIVER_UNIQUE_ID);
-            }
-            if (!driverUniqueId.equals(oldDriverUniqueId)) {
-                Event event = new Event(Event.TYPE_DRIVER_CHANGED, position.getDeviceId(), position.getId());
-                event.set(Position.KEY_DRIVER_UNIQUE_ID, driverUniqueId);
-                return Collections.singletonMap(event, position);
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/src/org/traccar/handler/events/FuelDropEventHandler.java b/src/org/traccar/handler/events/FuelDropEventHandler.java
deleted file mode 100644
index 59de61bba..000000000
--- a/src/org/traccar/handler/events/FuelDropEventHandler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2017 - 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.events;
-
-import io.netty.channel.ChannelHandler;
-import org.traccar.database.IdentityManager;
-import org.traccar.model.Device;
-import org.traccar.model.Event;
-import org.traccar.model.Position;
-
-import java.util.Collections;
-import java.util.Map;
-
-@ChannelHandler.Sharable
-public class FuelDropEventHandler extends BaseEventHandler {
-
-    public static final String ATTRIBUTE_FUEL_DROP_THRESHOLD = "fuelDropThreshold";
-
-    private final IdentityManager identityManager;
-
-    public FuelDropEventHandler(IdentityManager identityManager) {
-        this.identityManager = identityManager;
-    }
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-
-        Device device = identityManager.getById(position.getDeviceId());
-        if (device == null) {
-            return null;
-        }
-        if (!identityManager.isLatestPosition(position)) {
-            return null;
-        }
-
-        double fuelDropThreshold = identityManager
-                .lookupAttributeDouble(device.getId(), ATTRIBUTE_FUEL_DROP_THRESHOLD, 0, false);
-
-        if (fuelDropThreshold > 0) {
-            Position lastPosition = identityManager.getLastPosition(position.getDeviceId());
-            if (position.getAttributes().containsKey(Position.KEY_FUEL_LEVEL)
-                    && lastPosition != null && lastPosition.getAttributes().containsKey(Position.KEY_FUEL_LEVEL)) {
-
-                double drop = lastPosition.getDouble(Position.KEY_FUEL_LEVEL)
-                        - position.getDouble(Position.KEY_FUEL_LEVEL);
-                if (drop >= fuelDropThreshold) {
-                    Event event = new Event(Event.TYPE_DEVICE_FUEL_DROP, position.getDeviceId(), position.getId());
-                    event.set(ATTRIBUTE_FUEL_DROP_THRESHOLD, fuelDropThreshold);
-                    return Collections.singletonMap(event, position);
-                }
-            }
-        }
-
-        return null;
-    }
-
-}
diff --git a/src/org/traccar/handler/events/GeofenceEventHandler.java b/src/org/traccar/handler/events/GeofenceEventHandler.java
deleted file mode 100644
index 067c97957..000000000
--- a/src/org/traccar/handler/events/GeofenceEventHandler.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.events;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import io.netty.channel.ChannelHandler;
-import org.traccar.database.CalendarManager;
-import org.traccar.database.GeofenceManager;
-import org.traccar.database.IdentityManager;
-import org.traccar.model.Calendar;
-import org.traccar.model.Device;
-import org.traccar.model.Event;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class GeofenceEventHandler extends BaseEventHandler {
-
-    private final IdentityManager identityManager;
-    private final GeofenceManager geofenceManager;
-    private final CalendarManager calendarManager;
-
-    public GeofenceEventHandler(
-            IdentityManager identityManager, GeofenceManager geofenceManager, CalendarManager calendarManager) {
-        this.identityManager = identityManager;
-        this.geofenceManager = geofenceManager;
-        this.calendarManager = calendarManager;
-    }
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-        Device device = identityManager.getById(position.getDeviceId());
-        if (device == null) {
-            return null;
-        }
-        if (!identityManager.isLatestPosition(position) || !position.getValid()) {
-            return null;
-        }
-
-        List<Long> currentGeofences = geofenceManager.getCurrentDeviceGeofences(position);
-        List<Long> oldGeofences = new ArrayList<>();
-        if (device.getGeofenceIds() != null) {
-            oldGeofences.addAll(device.getGeofenceIds());
-        }
-        List<Long> newGeofences = new ArrayList<>(currentGeofences);
-        newGeofences.removeAll(oldGeofences);
-        oldGeofences.removeAll(currentGeofences);
-
-        device.setGeofenceIds(currentGeofences);
-
-        Map<Event, Position> events = new HashMap<>();
-        for (long geofenceId : oldGeofences) {
-            long calendarId = geofenceManager.getById(geofenceId).getCalendarId();
-            Calendar calendar = calendarId != 0 ? calendarManager.getById(calendarId) : null;
-            if (calendar == null || calendar.checkMoment(position.getFixTime())) {
-                Event event = new Event(Event.TYPE_GEOFENCE_EXIT, position.getDeviceId(), position.getId());
-                event.setGeofenceId(geofenceId);
-                events.put(event, position);
-            }
-        }
-        for (long geofenceId : newGeofences) {
-            long calendarId = geofenceManager.getById(geofenceId).getCalendarId();
-            Calendar calendar = calendarId != 0 ? calendarManager.getById(calendarId) : null;
-            if (calendar == null || calendar.checkMoment(position.getFixTime())) {
-                Event event = new Event(Event.TYPE_GEOFENCE_ENTER, position.getDeviceId(), position.getId());
-                event.setGeofenceId(geofenceId);
-                events.put(event, position);
-            }
-        }
-        return events;
-    }
-
-}
diff --git a/src/org/traccar/handler/events/IgnitionEventHandler.java b/src/org/traccar/handler/events/IgnitionEventHandler.java
deleted file mode 100644
index ec133bafc..000000000
--- a/src/org/traccar/handler/events/IgnitionEventHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2016 - 2019 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@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.events;
-
-import java.util.Collections;
-import java.util.Map;
-
-import io.netty.channel.ChannelHandler;
-import org.traccar.database.IdentityManager;
-import org.traccar.model.Device;
-import org.traccar.model.Event;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class IgnitionEventHandler extends BaseEventHandler {
-
-    private final IdentityManager identityManager;
-
-    public IgnitionEventHandler(IdentityManager identityManager) {
-        this.identityManager = identityManager;
-    }
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-        Device device = identityManager.getById(position.getDeviceId());
-        if (device == null || !identityManager.isLatestPosition(position)) {
-            return null;
-        }
-
-        Map<Event, Position> result = null;
-
-        if (position.getAttributes().containsKey(Position.KEY_IGNITION)) {
-            boolean ignition = position.getBoolean(Position.KEY_IGNITION);
-
-            Position lastPosition = identityManager.getLastPosition(position.getDeviceId());
-            if (lastPosition != null && lastPosition.getAttributes().containsKey(Position.KEY_IGNITION)) {
-                boolean oldIgnition = lastPosition.getBoolean(Position.KEY_IGNITION);
-
-                if (ignition && !oldIgnition) {
-                    result = Collections.singletonMap(
-                            new Event(Event.TYPE_IGNITION_ON, position.getDeviceId(), position.getId()), position);
-                } else if (!ignition && oldIgnition) {
-                    result = Collections.singletonMap(
-                            new Event(Event.TYPE_IGNITION_OFF, position.getDeviceId(), position.getId()), position);
-                }
-            }
-        }
-        return result;
-    }
-
-}
diff --git a/src/org/traccar/handler/events/MaintenanceEventHandler.java b/src/org/traccar/handler/events/MaintenanceEventHandler.java
deleted file mode 100644
index 93ae74142..000000000
--- a/src/org/traccar/handler/events/MaintenanceEventHandler.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 - 2018 Andrey Kunitsyn (andrey@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.events;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import io.netty.channel.ChannelHandler;
-import org.traccar.database.IdentityManager;
-import org.traccar.database.MaintenancesManager;
-import org.traccar.model.Event;
-import org.traccar.model.Maintenance;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class MaintenanceEventHandler extends BaseEventHandler {
-
-    private final IdentityManager identityManager;
-    private final MaintenancesManager maintenancesManager;
-
-    public MaintenanceEventHandler(IdentityManager identityManager, MaintenancesManager maintenancesManager) {
-        this.identityManager = identityManager;
-        this.maintenancesManager = maintenancesManager;
-    }
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-        if (identityManager.getById(position.getDeviceId()) == null
-                || !identityManager.isLatestPosition(position)) {
-            return null;
-        }
-
-        Position lastPosition = identityManager.getLastPosition(position.getDeviceId());
-        if (lastPosition == null) {
-            return null;
-        }
-
-        Map<Event, Position> events = new HashMap<>();
-        for (long maintenanceId : maintenancesManager.getAllDeviceItems(position.getDeviceId())) {
-            Maintenance maintenance = maintenancesManager.getById(maintenanceId);
-            if (maintenance.getPeriod() != 0) {
-                double oldValue = lastPosition.getDouble(maintenance.getType());
-                double newValue = position.getDouble(maintenance.getType());
-                if (oldValue != 0.0 && newValue != 0.0
-                        && (long) ((oldValue - maintenance.getStart()) / maintenance.getPeriod())
-                        < (long) ((newValue - maintenance.getStart()) / maintenance.getPeriod())) {
-                    Event event = new Event(Event.TYPE_MAINTENANCE, position.getDeviceId(), position.getId());
-                    event.setMaintenanceId(maintenanceId);
-                    event.set(maintenance.getType(), newValue);
-                    events.put(event, position);
-                }
-            }
-        }
-
-        return events;
-    }
-
-}
diff --git a/src/org/traccar/handler/events/MotionEventHandler.java b/src/org/traccar/handler/events/MotionEventHandler.java
deleted file mode 100644
index 9ec02ccfb..000000000
--- a/src/org/traccar/handler/events/MotionEventHandler.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2016 - 2019 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@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.events;
-
-import java.util.Collections;
-import java.util.Map;
-
-import io.netty.channel.ChannelHandler;
-import org.traccar.database.DeviceManager;
-import org.traccar.database.IdentityManager;
-import org.traccar.model.Device;
-import org.traccar.model.DeviceState;
-import org.traccar.model.Event;
-import org.traccar.model.Position;
-import org.traccar.reports.ReportUtils;
-import org.traccar.reports.model.TripsConfig;
-
-@ChannelHandler.Sharable
-public class MotionEventHandler extends BaseEventHandler {
-
-    private final IdentityManager identityManager;
-    private final DeviceManager deviceManager;
-    private final TripsConfig tripsConfig;
-
-    public MotionEventHandler(IdentityManager identityManager, DeviceManager deviceManager, TripsConfig tripsConfig) {
-        this.identityManager = identityManager;
-        this.deviceManager = deviceManager;
-        this.tripsConfig = tripsConfig;
-    }
-
-    private Map<Event, Position> newEvent(DeviceState deviceState, boolean newMotion) {
-        String eventType = newMotion ? Event.TYPE_DEVICE_MOVING : Event.TYPE_DEVICE_STOPPED;
-        Position position = deviceState.getMotionPosition();
-        Event event = new Event(eventType, position.getDeviceId(), position.getId());
-        deviceState.setMotionState(newMotion);
-        deviceState.setMotionPosition(null);
-        return Collections.singletonMap(event, position);
-    }
-
-    public Map<Event, Position> updateMotionState(DeviceState deviceState) {
-        Map<Event, Position> result = null;
-        if (deviceState.getMotionState() != null && deviceState.getMotionPosition() != null) {
-            boolean newMotion = !deviceState.getMotionState();
-            Position motionPosition = deviceState.getMotionPosition();
-            long currentTime = System.currentTimeMillis();
-            long motionTime = motionPosition.getFixTime().getTime()
-                    + (newMotion ? tripsConfig.getMinimalTripDuration() : tripsConfig.getMinimalParkingDuration());
-            if (motionTime <= currentTime) {
-                result = newEvent(deviceState, newMotion);
-            }
-        }
-        return result;
-    }
-
-    public Map<Event, Position> updateMotionState(DeviceState deviceState, Position position) {
-        return updateMotionState(deviceState, position, position.getBoolean(Position.KEY_MOTION));
-    }
-
-    public Map<Event, Position> updateMotionState(DeviceState deviceState, Position position, boolean newMotion) {
-        Map<Event, Position> result = null;
-        Boolean oldMotion = deviceState.getMotionState();
-
-        long currentTime = position.getFixTime().getTime();
-        if (newMotion != oldMotion) {
-            if (deviceState.getMotionPosition() == null) {
-                deviceState.setMotionPosition(position);
-            }
-        } else {
-            deviceState.setMotionPosition(null);
-        }
-
-        Position motionPosition = deviceState.getMotionPosition();
-        if (motionPosition != null) {
-            long motionTime = motionPosition.getFixTime().getTime();
-            double distance = ReportUtils.calculateDistance(motionPosition, position, false);
-            Boolean ignition = null;
-            if (tripsConfig.getUseIgnition()
-                    && position.getAttributes().containsKey(Position.KEY_IGNITION)) {
-                ignition = position.getBoolean(Position.KEY_IGNITION);
-            }
-            if (newMotion) {
-                if (motionTime + tripsConfig.getMinimalTripDuration() <= currentTime
-                        || distance >= tripsConfig.getMinimalTripDistance()) {
-                    result = newEvent(deviceState, newMotion);
-                }
-            } else {
-                if (motionTime + tripsConfig.getMinimalParkingDuration() <= currentTime
-                        || ignition != null && !ignition) {
-                    result = newEvent(deviceState, newMotion);
-                }
-            }
-        }
-        return result;
-    }
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-
-        long deviceId = position.getDeviceId();
-        Device device = identityManager.getById(deviceId);
-        if (device == null) {
-            return null;
-        }
-        if (!identityManager.isLatestPosition(position)
-                || !tripsConfig.getProcessInvalidPositions() && !position.getValid()) {
-            return null;
-        }
-
-        Map<Event, Position> result = null;
-        DeviceState deviceState = deviceManager.getDeviceState(deviceId);
-
-        if (deviceState.getMotionState() == null) {
-            deviceState.setMotionState(position.getBoolean(Position.KEY_MOTION));
-        } else {
-            result = updateMotionState(deviceState, position);
-        }
-        deviceManager.setDeviceState(deviceId, deviceState);
-        return result;
-    }
-
-}
diff --git a/src/org/traccar/handler/events/OverspeedEventHandler.java b/src/org/traccar/handler/events/OverspeedEventHandler.java
deleted file mode 100644
index 157bb64e0..000000000
--- a/src/org/traccar/handler/events/OverspeedEventHandler.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 2016 - 2019 Anton Tananaev (anton@traccar.org)
- * Copyright 2018 Andrey Kunitsyn (andrey@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.events;
-
-import java.util.Collections;
-import java.util.Map;
-
-import io.netty.channel.ChannelHandler;
-import org.traccar.config.Config;
-import org.traccar.config.Keys;
-import org.traccar.database.DeviceManager;
-import org.traccar.database.GeofenceManager;
-import org.traccar.model.Device;
-import org.traccar.model.DeviceState;
-import org.traccar.model.Event;
-import org.traccar.model.Geofence;
-import org.traccar.model.Position;
-
-@ChannelHandler.Sharable
-public class OverspeedEventHandler extends BaseEventHandler {
-
-    public static final String ATTRIBUTE_SPEED = "speed";
-    public static final String ATTRIBUTE_SPEED_LIMIT = "speedLimit";
-
-    private final DeviceManager deviceManager;
-    private final GeofenceManager geofenceManager;
-
-    private final boolean notRepeat;
-    private final long minimalDuration;
-    private final boolean preferLowest;
-
-    public OverspeedEventHandler(Config config, DeviceManager deviceManager, GeofenceManager geofenceManager) {
-        this.deviceManager = deviceManager;
-        this.geofenceManager = geofenceManager;
-        notRepeat = config.getBoolean(Keys.EVENT_OVERSPEED_NOT_REPEAT);
-        minimalDuration = config.getLong(Keys.EVENT_OVERSPEED_MINIMAL_DURATION) * 1000;
-        preferLowest = config.getBoolean(Keys.EVENT_OVERSPEED_PREFER_LOWEST);
-    }
-
-    private Map<Event, Position> newEvent(DeviceState deviceState, double speedLimit) {
-        Position position = deviceState.getOverspeedPosition();
-        Event event = new Event(Event.TYPE_DEVICE_OVERSPEED, position.getDeviceId(), position.getId());
-        event.set(ATTRIBUTE_SPEED, deviceState.getOverspeedPosition().getSpeed());
-        event.set(ATTRIBUTE_SPEED_LIMIT, speedLimit);
-        event.setGeofenceId(deviceState.getOverspeedGeofenceId());
-        deviceState.setOverspeedState(notRepeat);
-        deviceState.setOverspeedPosition(null);
-        deviceState.setOverspeedGeofenceId(0);
-        return Collections.singletonMap(event, position);
-    }
-
-    public Map<Event, Position> updateOverspeedState(DeviceState deviceState, double speedLimit) {
-        Map<Event, Position> result = null;
-        if (deviceState.getOverspeedState() != null && !deviceState.getOverspeedState()
-                && deviceState.getOverspeedPosition() != null && speedLimit != 0) {
-            long currentTime = System.currentTimeMillis();
-            Position overspeedPosition = deviceState.getOverspeedPosition();
-            long overspeedTime = overspeedPosition.getFixTime().getTime();
-            if (overspeedTime + minimalDuration <= currentTime) {
-                result = newEvent(deviceState, speedLimit);
-            }
-        }
-        return result;
-    }
-
-    public Map<Event, Position> updateOverspeedState(
-            DeviceState deviceState, Position position, double speedLimit, long geofenceId) {
-        Map<Event, Position> result = null;
-
-        Boolean oldOverspeed = deviceState.getOverspeedState();
-
-        long currentTime = position.getFixTime().getTime();
-        boolean newOverspeed = position.getSpeed() > speedLimit;
-        if (newOverspeed && !oldOverspeed) {
-            if (deviceState.getOverspeedPosition() == null) {
-                deviceState.setOverspeedPosition(position);
-                deviceState.setOverspeedGeofenceId(geofenceId);
-            }
-        } else if (oldOverspeed && !newOverspeed) {
-            deviceState.setOverspeedState(false);
-            deviceState.setOverspeedPosition(null);
-            deviceState.setOverspeedGeofenceId(0);
-        } else {
-            deviceState.setOverspeedPosition(null);
-            deviceState.setOverspeedGeofenceId(0);
-        }
-        Position overspeedPosition = deviceState.getOverspeedPosition();
-        if (overspeedPosition != null) {
-            long overspeedTime = overspeedPosition.getFixTime().getTime();
-            if (newOverspeed && overspeedTime + minimalDuration <= currentTime) {
-                result = newEvent(deviceState, speedLimit);
-            }
-        }
-        return result;
-    }
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-
-        long deviceId = position.getDeviceId();
-        Device device = deviceManager.getById(deviceId);
-        if (device == null) {
-            return null;
-        }
-        if (!deviceManager.isLatestPosition(position) || !position.getValid()) {
-            return null;
-        }
-
-        double speedLimit = deviceManager.lookupAttributeDouble(deviceId, ATTRIBUTE_SPEED_LIMIT, 0, false);
-
-        double geofenceSpeedLimit = 0;
-        long overspeedGeofenceId = 0;
-
-        if (geofenceManager != null && device.getGeofenceIds() != null) {
-            for (long geofenceId : device.getGeofenceIds()) {
-                Geofence geofence = geofenceManager.getById(geofenceId);
-                if (geofence != null) {
-                    double currentSpeedLimit = geofence.getDouble(ATTRIBUTE_SPEED_LIMIT);
-                    if (currentSpeedLimit > 0 && geofenceSpeedLimit == 0
-                            || preferLowest && currentSpeedLimit < geofenceSpeedLimit
-                            || !preferLowest && currentSpeedLimit > geofenceSpeedLimit) {
-                        geofenceSpeedLimit = currentSpeedLimit;
-                        overspeedGeofenceId = geofenceId;
-                    }
-                }
-            }
-        }
-        if (geofenceSpeedLimit > 0) {
-            speedLimit = geofenceSpeedLimit;
-        }
-
-        if (speedLimit == 0) {
-            return null;
-        }
-
-        Map<Event, Position> result = null;
-        DeviceState deviceState = deviceManager.getDeviceState(deviceId);
-
-        if (deviceState.getOverspeedState() == null) {
-            deviceState.setOverspeedState(position.getSpeed() > speedLimit);
-            deviceState.setOverspeedGeofenceId(position.getSpeed() > speedLimit ? overspeedGeofenceId : 0);
-        } else {
-            result = updateOverspeedState(deviceState, position, speedLimit, overspeedGeofenceId);
-        }
-
-        deviceManager.setDeviceState(deviceId, deviceState);
-        return result;
-    }
-
-}