diff options
Diffstat (limited to 'src/main/java/org/traccar/geocoder')
| -rw-r--r-- | src/main/java/org/traccar/geocoder/BanGeocoder.java | 35 | ||||
| -rw-r--r-- | src/main/java/org/traccar/geocoder/GeocodeJSONGeocoder.java (renamed from src/main/java/org/traccar/geocoder/PhotonGeocoder.java) | 9 |
2 files changed, 12 insertions, 32 deletions
diff --git a/src/main/java/org/traccar/geocoder/BanGeocoder.java b/src/main/java/org/traccar/geocoder/BanGeocoder.java index e2ff72311..91610e952 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/PhotonGeocoder.java b/src/main/java/org/traccar/geocoder/GeocodeJSONGeocoder.java index 05bd40b23..bbadfa9f1 100644 --- a/src/main/java/org/traccar/geocoder/PhotonGeocoder.java +++ b/src/main/java/org/traccar/geocoder/GeocodeJSONGeocoder.java @@ -20,7 +20,7 @@ import jakarta.json.JsonArray; import jakarta.json.JsonObject; import jakarta.ws.rs.client.Client; -public class PhotonGeocoder extends JsonGeocoder { +public class GeocodeJSONGeocoder extends JsonGeocoder { private static String formatUrl(String url, String key, String language) { if (url == null) { @@ -36,7 +36,7 @@ public class PhotonGeocoder extends JsonGeocoder { return url; } - public PhotonGeocoder( + public GeocodeJSONGeocoder( Client client, String url, String key, String language, int cacheSize, AddressFormat addressFormat) { super(client, formatUrl(url, key, language), cacheSize, addressFormat); } @@ -48,6 +48,9 @@ public class PhotonGeocoder extends JsonGeocoder { 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")); } @@ -58,7 +61,7 @@ public class PhotonGeocoder extends JsonGeocoder { address.setSettlement(properties.getString("city")); } if (properties.containsKey("district")) { - address.setState(properties.getString("district")); + address.setDistrict(properties.getString("district")); } if (properties.containsKey("state")) { address.setState(properties.getString("state")); |