Add exception classes and more renames

1 files changed, 0 insertions, 81 deletions

diff --git a/src/org/traccar/geocoder/NominatimReverseGeocoder.java b/src/org/traccar/geocoder/NominatimReverseGeocoder.java
deleted file mode 100644
index faeaf247f..000000000
--- a/src/org/traccar/geocoder/NominatimReverseGeocoder.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2014 - 2015 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.geocoder;
-
-import javax.json.JsonObject;
-
-public class NominatimReverseGeocoder extends JsonReverseGeocoder {
-
-    public NominatimReverseGeocoder() {
-        this("http://nominatim.openstreetmap.org/reverse", 0);
-    }
-
-    public NominatimReverseGeocoder(String url, int cacheSize) {
-        super(url + "?format=json&lat=%f&lon=%f&zoom=18&addressdetails=1", cacheSize);
-    }
-
-    public NominatimReverseGeocoder(String url, String key, int cacheSize) {
-        super(url + "?format=json&lat=%f&lon=%f&zoom=18&addressdetails=1&key=" + key, cacheSize);
-    }
-
-    @Override
-    public Address parseAddress(JsonObject json) {
-        JsonObject result = json.getJsonObject("address");
-
-        if (result != null) {
-            Address address = new Address();
-
-            if (result.containsKey("house_number")) {
-                address.setHouse(result.getString("house_number"));
-            }
-            if (result.containsKey("road")) {
-                address.setStreet(result.getString("road"));
-            }
-            if (result.containsKey("suburb")) {
-                address.setSuburb(result.getString("suburb"));
-            }
-
-            if (result.containsKey("village")) {
-                address.setSettlement(result.getString("village"));
-            } else if (result.containsKey("town")) {
-                address.setSettlement(result.getString("town"));
-            } else if (result.containsKey("city")) {
-                address.setSettlement(result.getString("city"));
-            }
-
-            if (result.containsKey("state_district")) {
-                address.setDistrict(result.getString("state_district"));
-            } else if (result.containsKey("region")) {
-                address.setDistrict(result.getString("region"));
-            }
-
-            if (result.containsKey("state")) {
-                address.setState(result.getString("state"));
-            }
-            if (result.containsKey("country_code")) {
-                address.setCountry(result.getString("country_code").toUpperCase());
-            }
-            if (result.containsKey("postcode")) {
-                address.setPostcode(result.getString("postcode"));
-            }
-
-            return address;
-        }
-
-        return null;
-    }
-
-}