3 files changed, 94 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java
index 11100f66e..aaa82adfc 100644
--- a/src/main/java/org/traccar/MainModule.java
+++ b/src/main/java/org/traccar/MainModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2021 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 - 2022 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.
@@ -34,6 +34,7 @@ import org.traccar.geocoder.AddressFormat;
 import org.traccar.geocoder.BanGeocoder;
 import org.traccar.geocoder.BingMapsGeocoder;
 import org.traccar.geocoder.FactualGeocoder;
+import org.traccar.geocoder.GeoapifyGeocoder;
 import org.traccar.geocoder.GeocodeFarmGeocoder;
 import org.traccar.geocoder.GeocodeXyzGeocoder;
 import org.traccar.geocoder.Geocoder;
@@ -197,6 +198,8 @@ public class MainModule extends AbstractModule {
                     return new MapboxGeocoder(key, cacheSize, addressFormat);
                 case "maptiler":
                     return new MapTilerGeocoder(key, cacheSize, addressFormat);
+                case "geoapify":
+                    return new GeoapifyGeocoder(key, language, cacheSize, addressFormat);
                 default:
                     return new GoogleGeocoder(key, language, cacheSize, addressFormat);
             }
diff --git a/src/main/java/org/traccar/geocoder/GeoapifyGeocoder.java b/src/main/java/org/traccar/geocoder/GeoapifyGeocoder.java
new file mode 100644
index 000000000..ef0e4c8bd
--- /dev/null
+++ b/src/main/java/org/traccar/geocoder/GeoapifyGeocoder.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2022 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.JsonArray;
+import javax.json.JsonObject;
+
+public class GeoapifyGeocoder extends JsonGeocoder {
+
+    private static String formatUrl(String key, String language) {
+        String url = "https://api.geoapify.com/v1/geocode/reverse?format=json&lat=%f&lon=%f";
+        if (key != null) {
+            url += "&apiKey=" + key;
+        }
+        if (language != null) {
+            url += "&lang=" + language;
+        }
+        return url;
+    }
+
+    public GeoapifyGeocoder(String key, String language, int cacheSize, AddressFormat addressFormat) {
+        super(formatUrl(key, language), cacheSize, addressFormat);
+    }
+
+    @Override
+    public Address parseAddress(JsonObject json) {
+        JsonArray results = json.getJsonArray("results");
+        if (results.size() > 0) {
+            JsonObject result = results.getJsonObject(0);
+
+            Address address = new Address();
+
+            if (json.containsKey("formatted")) {
+                address.setFormattedAddress(json.getString("formatted"));
+            }
+
+            if (result.containsKey("housenumber")) {
+                address.setHouse(result.getString("housenumber"));
+            }
+            if (result.containsKey("street")) {
+                address.setStreet(result.getString("street"));
+            }
+            if (result.containsKey("suburb")) {
+                address.setSuburb(result.getString("suburb"));
+            }
+            if (result.containsKey("city")) {
+                address.setSettlement(result.getString("city"));
+            }
+            if (result.containsKey("district")) {
+                address.setDistrict(result.getString("district"));
+            }
+            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;
+    }
+
+}
diff --git a/src/test/java/org/traccar/geocoder/GeocoderTest.java b/src/test/java/org/traccar/geocoder/GeocoderTest.java
index 380980d2b..9134194f2 100644
--- a/src/test/java/org/traccar/geocoder/GeocoderTest.java
+++ b/src/test/java/org/traccar/geocoder/GeocoderTest.java
@@ -105,9 +105,17 @@ public class GeocoderTest {
     @Ignore
     @Test
     public void testMapTiler() {
-        Geocoder geocoder = new MapTilerGeocoder("mnbnwLErpdspq13f0kC6", 0, new AddressFormat());
+        Geocoder geocoder = new MapTilerGeocoder("", 0, new AddressFormat());
         String address = geocoder.getAddress(40.733, -73.989, null);
         assertEquals("East 13th Street, New York City, New York, United States", address);
     }
 
+    @Ignore
+    @Test
+    public void testGeoapify() {
+        Geocoder geocoder = new GeoapifyGeocoder("", null, 0, new AddressFormat());
+        String address = geocoder.getAddress(40.733, -73.989, null);
+        assertEquals("114 East 13th Street, New York, New York, US", address);
+    }
+
 }