Fixed some erros

2 files changed, 86 insertions, 1 deletions

diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index c36c66322..fb85de0a4 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -25,6 +25,8 @@ import org.traccar.geocode.GoogleReverseGeocoder;
 import org.traccar.geocode.MapQuestReverseGeocoder;
 import org.traccar.geocode.NominatimReverseGeocoder;
 import org.traccar.geocode.ReverseGeocoder;
+import org.traccar.geocode.MapQuestReverseGeocoder;
+import org.traccar.geocode.OpenCageReverseGeocoder;
 import org.traccar.helper.Log;
 import org.traccar.web.WebServer;
 
@@ -110,6 +112,7 @@ public class Context {
         if (config.getBoolean("geocoder.enable")) {
             String type = config.getString("geocoder.type", "google");
             String url = config.getString("geocoder.url");
+	    String key = config.getString("geocoder.key");
             
             int cacheSize = config.getInteger("geocoder.cacheSize");
             switch (type) {
@@ -123,8 +126,12 @@ public class Context {
                     reverseGeocoder = new GisgraphyReverseGeocoder(url, cacheSize);
                     break;
                 case "mapquest":
-                    String key = config.getString("geocoder.key");
                     reverseGeocoder = new MapQuestReverseGeocoder(url, key, cacheSize);
+		case "mapquest":
+		    reverseGeocoder = new MapQuestReverseGeocoder(url, key, cacheSize);
+		    break;
+                case "opencage":
+                    reverseGeocoder = new OpenCageReverseGeocoder(url, key, cacheSize);
                     break;
             }
         }
diff --git a/src/org/traccar/geocode/OpenCageReverseGeocoder.java b/src/org/traccar/geocode/OpenCageReverseGeocoder.java
new file mode 100644
index 000000000..7dd23f2e0
--- /dev/null
+++ b/src/org/traccar/geocode/OpenCageReverseGeocoder.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014 - 2015 Stefaan Van Dooren (stefaan.vandooren@gmail.com)
+ *
+ * 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.geocode;
+
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.traccar.helper.Log;
+import org.w3c.dom.Document;
+
+public class OpenCageReverseGeocoder extends JsonReverseGeocoder {
+    public OpenCageReverseGeocoder() {
+        this("https://api.opencagedata.com/geocode/v1", "ABCDE", 0);
+    }
+    public OpenCageReverseGeocoder(String url, String key, int cacheSize) {
+        super(url +  "/json?q=%f,%f&key=" + key, cacheSize);
+    }
+
+    @Override
+    protected Address parseAddress(JsonObject json) {
+	JsonArray result = json.getJsonArray("results");
+        if (result != null) {
+	    JsonObject result1 = result.getJsonObject(0);
+	    JsonObject location = result1.getJsonObject("components");
+	    if (location != null) {
+        	Address address = new Address();
+                if (location.containsKey("house_number")) {
+                    address.setHouse(location.getString("house_number"));
+                }            
+
+		if (location.containsKey("road")) {
+                    address.setStreet(location.getString("road"));
+            	}	
+
+                if (location.containsKey("city_district")) {
+                    address.setSettlement(location.getString("city_district"));
+            	}	
+
+            	if (location.containsKey("county")) {
+                    address.setDistrict(location.getString("county"));
+            	}
+
+            	if (location.containsKey("state")) {
+                    address.setState(location.getString("state"));
+            	}
+
+            	if (location.containsKey("country_code")) {
+                    address.setCountry(location.getString("country_code").toUpperCase());
+            	}
+
+            	if (location.containsKey("postcode")) {
+                    address.setPostcode(location.getString("postcode"));
+            	} return address;
+	    }
+        }
+        return null;
+    }
+
+}