Merge pull request #4047 from oliv3/fr_3769

Add Base Adresse Nationale reverse geocoder

4 files changed, 89 insertions, 0 deletions

diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 334503640..b310d6740 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -57,6 +57,7 @@ import org.traccar.geocoder.FactualGeocoder;
 import org.traccar.geocoder.GeocodeFarmGeocoder;
 import org.traccar.geocoder.GeocodeXyzGeocoder;
 import org.traccar.geocoder.GisgraphyGeocoder;
+import org.traccar.geocoder.BanGeocoder;
 import org.traccar.geocoder.GoogleGeocoder;
 import org.traccar.geocoder.MapQuestGeocoder;
 import org.traccar.geocoder.NominatimGeocoder;
@@ -339,6 +340,8 @@ public final class Context {
                 return new GeocodeFarmGeocoder(key, language, cacheSize, addressFormat);
             case "geocodexyz":
                 return new GeocodeXyzGeocoder(key, cacheSize, addressFormat);
+            case "ban":
+                return new BanGeocoder(cacheSize, addressFormat);
             default:
                 return new GoogleGeocoder(key, language, cacheSize, addressFormat);
         }
diff --git a/src/org/traccar/geocoder/AddressFormat.java b/src/org/traccar/geocoder/AddressFormat.java
index 220f268f1..ad19432b9 100644
--- a/src/org/traccar/geocoder/AddressFormat.java
+++ b/src/org/traccar/geocoder/AddressFormat.java
@@ -30,6 +30,7 @@ import java.text.ParsePosition;
  * %u - suburb
  * %r - street (road)
  * %h - house
+ * %f - formatted address
  *
  */
 public class AddressFormat extends Format {
diff --git a/src/org/traccar/geocoder/BanGeocoder.java b/src/org/traccar/geocoder/BanGeocoder.java
new file mode 100644
index 000000000..b1f0900a4
--- /dev/null
+++ b/src/org/traccar/geocoder/BanGeocoder.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2018 Olivier Girondel (olivier@biniou.info)
+ * Copyright 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.geocoder;
+
+/*
+ * API documentation: https://adresse.data.gouv.fr/api
+ */
+
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+
+public class BanGeocoder extends JsonGeocoder {
+
+    public BanGeocoder(int cacheSize, AddressFormat addressFormat) {
+        super("https://api-adresse.data.gouv.fr/reverse/?lat=%f&lon=%f", cacheSize, addressFormat);
+    }
+
+    @Override
+    public Address parseAddress(JsonObject json) {
+        JsonArray result = json.getJsonArray("features");
+
+        if (result != null && !result.isEmpty()) {
+            JsonObject location = result.getJsonObject(0).getJsonObject("properties");
+            Address address = new Address();
+
+            address.setCountry("FR");
+            if (location.containsKey("postcode")) {
+                address.setPostcode(location.getString("postcode"));
+            }
+            if (location.containsKey("context")) {
+                address.setDistrict(location.getString("context"));
+            }
+            if (location.containsKey("name")) {
+                address.setStreet(location.getString("name"));
+            }
+            if (location.containsKey("city")) {
+                address.setSettlement(location.getString("city"));
+            }
+            if (location.containsKey("housenumber")) {
+                address.setHouse(location.getString("housenumber"));
+            }
+            if (location.containsKey("label")) {
+                address.setFormattedAddress(location.getString("label"));
+            }
+
+            return address;
+        }
+
+        return null;
+    }
+
+}
diff --git a/test/org/traccar/geocoder/GeocoderTest.java b/test/org/traccar/geocoder/GeocoderTest.java
index 12d8b4cd6..7b3c6662c 100644
--- a/test/org/traccar/geocoder/GeocoderTest.java
+++ b/test/org/traccar/geocoder/GeocoderTest.java
@@ -135,4 +135,23 @@ public class GeocoderTest {
         assertEquals("605 ESTRELLA AVE, ARCADIA, California United States of America, US", waitAddress());
     }
 
+    @Ignore
+    @Test
+    public void testBan() throws InterruptedException {
+        Geocoder geocoder = new BanGeocoder(0, new AddressFormat("%f [%d], %c"));
+
+        geocoder.getAddress(48.8575, 2.2944, new Geocoder.ReverseGeocoderCallback() {
+            @Override
+            public void onSuccess(String address) {
+                setAddress(address);
+            }
+
+            @Override
+            public void onFailure(Throwable e) {
+            }
+        });
+
+        assertEquals("8 Avenue Gustave Eiffel 75007 Paris [75, Paris, Île-de-France], FR", waitAddress());
+    }
+
 }