diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2024-06-17 17:13:36 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-17 17:13:36 -0700 |
commit | 195512f41776f663665b9bcc733affc5b19fa52a (patch) | |
tree | e623c42ab3ab1416131aa6adebb47a59b0b2a50f /src/main/java/org/traccar/geocoder/BanGeocoder.java | |
parent | bc65eb120807b7c899d3fd95fbb6684934bfa3ef (diff) | |
parent | a12690a6acffb356cc90791159c1cb60161bf1af (diff) | |
download | trackermap-server-195512f41776f663665b9bcc733affc5b19fa52a.tar.gz trackermap-server-195512f41776f663665b9bcc733affc5b19fa52a.tar.bz2 trackermap-server-195512f41776f663665b9bcc733affc5b19fa52a.zip |
Merge pull request #5347 from jinzo/photon-geocoder
Photon Geocoder
Diffstat (limited to 'src/main/java/org/traccar/geocoder/BanGeocoder.java')
-rw-r--r-- | src/main/java/org/traccar/geocoder/BanGeocoder.java | 35 |
1 files changed, 6 insertions, 29 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; |