Merge tag 'tags/v6.3'

4 files changed, 94 insertions, 38 deletions

diff --git a/src/main/java/org/traccar/geocoder/BanGeocoder.java b/src/main/java/org/traccar/geocoder/BanGeocoder.java
index e2ff72311..128ef4b84 100644
--- a/src/main/java/org/traccar/geocoder/BanGeocoder.java
+++ b/src/main/java/org/traccar/geocoder/BanGeocoder.java
@@ -20,45 +20,22 @@ package org.traccar.geocoder;
  * API documentation: https://adresse.data.gouv.fr/api
  */
 
-import jakarta.json.JsonArray;
 import jakarta.json.JsonObject;
 import jakarta.ws.rs.client.Client;
 
-public class BanGeocoder extends JsonGeocoder {
+public class BanGeocoder extends GeocodeJsonGeocoder {
 
     public BanGeocoder(Client client, int cacheSize, AddressFormat addressFormat) {
-        super(client, "https://api-adresse.data.gouv.fr/reverse/?lat=%f&lon=%f", cacheSize, addressFormat);
+        super(client, "https://api-adresse.data.gouv.fr/reverse/", null, null, cacheSize, addressFormat);
     }
 
     @Override
     public Address parseAddress(JsonObject json) {
-        JsonArray result = json.getJsonArray("features");
+        Address geodecoded = super.parseAddress(json);
+        if (geodecoded != null) {
+            geodecoded.setCountry("FR");
 
-        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 geodecoded;
         }
 
         return null;
diff --git a/src/main/java/org/traccar/geocoder/GeocodeJsonGeocoder.java b/src/main/java/org/traccar/geocoder/GeocodeJsonGeocoder.java
new file mode 100644
index 000000000..da4688423
--- /dev/null
+++ b/src/main/java/org/traccar/geocoder/GeocodeJsonGeocoder.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2014 - 2024 Anton Tananaev (anton@traccar.org)
+ * Copyright 2024 - 2024 Matjaž Črnko (m.crnko@txt.i)
+ *
+ * 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 jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.client.Client;
+
+public class GeocodeJsonGeocoder extends JsonGeocoder {
+
+    private static String formatUrl(String url, String key, String language) {
+        if (url == null) {
+            url = "https://photon.komoot.io/reverse";
+        }
+        url += "?lat=%f&lon=%f";
+        if (key != null) {
+            url += "&key=" + key;
+        }
+        if (language != null) {
+            url += "&lang=" + language;
+        }
+        return url;
+    }
+
+    public GeocodeJsonGeocoder(
+            Client client, String url, String key, String language, int cacheSize, AddressFormat addressFormat) {
+        super(client, formatUrl(url, key, language), cacheSize, addressFormat);
+    }
+
+    @Override
+    public Address parseAddress(JsonObject json) {
+        JsonArray features = json.getJsonArray("features");
+        if (!features.isEmpty()) {
+            Address address = new Address();
+            JsonObject properties = features.getJsonObject(0).getJsonObject("properties");
+
+            if (properties.containsKey("label")) {
+                address.setFormattedAddress(properties.getString("label"));
+            }
+            if (properties.containsKey("housenumber")) {
+                address.setHouse(properties.getString("housenumber"));
+            }
+            if (properties.containsKey("street")) {
+                address.setStreet(properties.getString("street"));
+            }
+            if (properties.containsKey("city")) {
+                address.setSettlement(properties.getString("city"));
+            }
+            if (properties.containsKey("district")) {
+                address.setDistrict(properties.getString("district"));
+            }
+            if (properties.containsKey("state")) {
+                address.setState(properties.getString("state"));
+            }
+            if (properties.containsKey("countrycode")) {
+                address.setCountry(properties.getString("countrycode").toUpperCase());
+            }
+            if (properties.containsKey("postcode")) {
+                address.setPostcode(properties.getString("postcode"));
+            }
+
+            return address;
+        }
+        return null;
+    }
+
+}
diff --git a/src/main/java/org/traccar/geocoder/GoogleGeocoder.java b/src/main/java/org/traccar/geocoder/GoogleGeocoder.java
index 93f128b46..174ef66c8 100644
--- a/src/main/java/org/traccar/geocoder/GoogleGeocoder.java
+++ b/src/main/java/org/traccar/geocoder/GoogleGeocoder.java
@@ -22,8 +22,10 @@ import jakarta.ws.rs.client.Client;
 
 public class GoogleGeocoder extends JsonGeocoder {
 
-    private static String formatUrl(String key, String language) {
-        String url = "https://maps.googleapis.com/maps/api/geocode/json?latlng=%f,%f";
+    private static String formatUrl(String url, String key, String language) {
+        if (url == null) {
+            url = "https://maps.googleapis.com/maps/api/geocode/json?latlng=%f,%f";
+        }
         if (key != null) {
             url += "&key=" + key;
         }
@@ -33,8 +35,9 @@ public class GoogleGeocoder extends JsonGeocoder {
         return url;
     }
 
-    public GoogleGeocoder(Client client, String key, String language, int cacheSize, AddressFormat addressFormat) {
-        super(client, formatUrl(key, language), cacheSize, addressFormat);
+    public GoogleGeocoder(
+            Client client, String url, String key, String language, int cacheSize, AddressFormat addressFormat) {
+        super(client, formatUrl(url, key, language), cacheSize, addressFormat);
     }
 
     @Override
diff --git a/src/main/java/org/traccar/geocoder/MapTilerGeocoder.java b/src/main/java/org/traccar/geocoder/MapTilerGeocoder.java
index 24c9da2ad..11394339a 100644
--- a/src/main/java/org/traccar/geocoder/MapTilerGeocoder.java
+++ b/src/main/java/org/traccar/geocoder/MapTilerGeocoder.java
@@ -66,9 +66,4 @@ public class MapTilerGeocoder extends JsonGeocoder {
         return null;
     }
 
-    @Override
-    protected String parseError(JsonObject json) {
-        return null;
-    }
-
 }