3 files changed, 133 insertions, 0 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 46cb89fe0..340167286 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -20,6 +20,8 @@ import org.traccar.database.ConnectionManager;
 import org.traccar.database.DataManager;
 import org.traccar.database.IdentityManager;
 import org.traccar.database.PermissionsManager;
+import org.traccar.geocode.BingMapsReverseGeocoder;
+import org.traccar.geocode.FactualReverseGeocoder;
 import org.traccar.geocode.GisgraphyReverseGeocoder;
 import org.traccar.geocode.GoogleReverseGeocoder;
 import org.traccar.geocode.MapQuestReverseGeocoder;
@@ -115,6 +117,12 @@ public class Context {
             
             int cacheSize = config.getInteger("geocoder.cacheSize");
             switch (type) {
+                case "bingmaps":
+                    reverseGeocoder = new BingMapsReverseGeocoder(url, key, cacheSize);
+                    break;
+                case "factual":
+                    reverseGeocoder = new FactualReverseGeocoder(url, key, cacheSize);
+                    break;
                 case "google":
                     reverseGeocoder = new GoogleReverseGeocoder(cacheSize);
                     break;
diff --git a/src/org/traccar/geocode/BingMapsReverseGeocoder.java b/src/org/traccar/geocode/BingMapsReverseGeocoder.java
new file mode 100644
index 000000000..6c79010c2
--- /dev/null
+++ b/src/org/traccar/geocode/BingMapsReverseGeocoder.java
@@ -0,0 +1,62 @@
+/*
+ * 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 javax.json.JsonArray;
+import javax.json.JsonObject;
+
+public class BingMapsReverseGeocoder extends JsonReverseGeocoder {
+
+    public BingMapsReverseGeocoder() {
+        this("http://dev.virtualearth.net/REST/v1", "ABCDE", 0);
+    }
+
+    public BingMapsReverseGeocoder(String url, String key, int cacheSize) {
+        super(url + "/Locations/%f,%f?key=" + key + "&include=ciso2", cacheSize);
+    }
+
+    @Override
+    protected Address parseAddress(JsonObject json) {
+        JsonArray result = json.getJsonArray("resourceSets");
+        if (result != null) {
+            JsonObject location = result.getJsonObject(0).getJsonArray("resources").getJsonObject(0).getJsonObject("address");
+            if (location != null) {
+                Address address = new Address();
+                if (location.containsKey("addressLine")) {
+                    address.setStreet(location.getString("addressLine"));
+                }    
+                if (location.containsKey("locality")) {
+                    address.setSettlement(location.getString("locality"));
+                }    
+                if (location.containsKey("adminDistrict2")) {
+                    address.setDistrict(location.getString("adminDistrict2"));
+                }
+                if (location.containsKey("adminDistrict")) {
+                    address.setState(location.getString("adminDistrict"));
+                }
+                if (location.containsKey("countryRegionIso2")) {
+                    address.setCountry(location.getString("countryRegionIso2").toUpperCase());
+                }
+                if (location.containsKey("postalCode")) {
+                    address.setPostcode(location.getString("postalCode"));
+                }
+                return address;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/src/org/traccar/geocode/FactualReverseGeocoder.java b/src/org/traccar/geocode/FactualReverseGeocoder.java
new file mode 100644
index 000000000..ce4523c69
--- /dev/null
+++ b/src/org/traccar/geocode/FactualReverseGeocoder.java
@@ -0,0 +1,63 @@
+/*
+ * 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 javax.json.JsonArray;
+import javax.json.JsonObject;
+import org.traccar.helper.Log;
+
+public class FactualReverseGeocoder extends JsonReverseGeocoder {
+
+    public FactualReverseGeocoder() {
+        this("https://api.factual.com/geotag", "ABCDE", 0);
+    }
+
+    public FactualReverseGeocoder(String url, String key, int cacheSize) {
+        super(url + "?latitude=%f&longitude=%f&KEY=" + key, cacheSize);
+    }
+
+    @Override
+    protected Address parseAddress(JsonObject json) {
+        JsonObject result = json.getJsonObject("response").getJsonObject("data");
+	JsonObject dummy;
+        if (result != null) {
+                Address address = new Address();
+                if (result.getJsonObject("street_number") != null) { 
+                    address.setHouse(result.getJsonObject("street_number").getString("name"));
+                }
+                if (result.getJsonObject("street_name") != null) {
+                    address.setStreet(result.getJsonObject("street_name").getString("name"));
+                }  
+                if (result.getJsonObject("locality") != null) {
+                    address.setSettlement(result.getJsonObject("locality").getString("name"));
+                }    
+                if (result.getJsonObject("county") != null) {
+                    address.setDistrict(result.getJsonObject("county").getString("name"));
+                }
+                if (result.getJsonObject("region") != null) {
+                    address.setState(result.getJsonObject("region").getString("name"));
+                }
+                if (result.getJsonObject("country") != null) {
+                    address.setCountry(result.getJsonObject("country").getString("name"));
+                }
+                if (result.getJsonObject("postcode") != null) {
+                    address.setPostcode(result.getJsonObject("postcode").getString("name"));
+                }
+                return address;
+        }
+        return null;
+    }
+}