Add exception classes and more renames

1 files changed, 0 insertions, 80 deletions

diff --git a/src/org/traccar/ReverseGeocoderHandler.java b/src/org/traccar/ReverseGeocoderHandler.java
deleted file mode 100644
index 5813c1136..000000000
--- a/src/org/traccar/ReverseGeocoderHandler.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2012 - 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;
-
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.traccar.geocoder.AddressFormat;
-import org.traccar.geocoder.ReverseGeocoder;
-import org.traccar.helper.Log;
-import org.traccar.model.Position;
-
-public class ReverseGeocoderHandler implements ChannelUpstreamHandler {
-
-    private final ReverseGeocoder geocoder;
-    private final boolean processInvalidPositions;
-    private final AddressFormat addressFormat;
-
-    public ReverseGeocoderHandler(ReverseGeocoder geocoder, boolean processInvalidPositions) {
-        this.geocoder = geocoder;
-        this.processInvalidPositions = processInvalidPositions;
-
-        String formatString = Context.getConfig().getString("geocoder.format");
-        if (formatString != null) {
-            addressFormat = new AddressFormat(formatString);
-        } else {
-            addressFormat = new AddressFormat();
-        }
-    }
-
-    @Override
-    public void handleUpstream(final ChannelHandlerContext ctx, ChannelEvent evt) throws Exception {
-        if (!(evt instanceof MessageEvent)) {
-            ctx.sendUpstream(evt);
-            return;
-        }
-
-        final MessageEvent event = (MessageEvent) evt;
-        Object message = event.getMessage();
-        if (message instanceof Position) {
-            final Position position = (Position) message;
-            if (processInvalidPositions || position.getValid()) {
-                geocoder.getAddress(addressFormat, position.getLatitude(), position.getLongitude(),
-                        new ReverseGeocoder.ReverseGeocoderCallback() {
-                    @Override
-                    public void onSuccess(String address) {
-                        position.setAddress(address);
-                        Channels.fireMessageReceived(ctx, position, event.getRemoteAddress());
-                    }
-
-                    @Override
-                    public void onFailure(Throwable e) {
-                        Log.warning("Geocoding failed", e);
-                        Channels.fireMessageReceived(ctx, position, event.getRemoteAddress());
-                    }
-                });
-            } else {
-                Channels.fireMessageReceived(ctx, position, event.getRemoteAddress());
-            }
-        } else {
-            Channels.fireMessageReceived(ctx, message, event.getRemoteAddress());
-        }
-    }
-
-}