aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main/java/org/traccar/MainModule.java6
-rw-r--r--src/main/java/org/traccar/geocoder/BanGeocoder.java35
-rw-r--r--src/main/java/org/traccar/geocoder/GeocodeJSONGeocoder.java (renamed from src/main/java/org/traccar/geocoder/PhotonGeocoder.java)9
-rw-r--r--src/test/java/org/traccar/geocoder/GeocoderTest.java8
4 files changed, 19 insertions, 39 deletions
diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java
index 5df8015d9..2b345847f 100644
--- a/src/main/java/org/traccar/MainModule.java
+++ b/src/main/java/org/traccar/MainModule.java
@@ -68,7 +68,7 @@ import org.traccar.geocoder.OpenCageGeocoder;
import org.traccar.geocoder.PositionStackGeocoder;
import org.traccar.geocoder.PlusCodesGeocoder;
import org.traccar.geocoder.TomTomGeocoder;
-import org.traccar.geocoder.PhotonGeocoder;
+import org.traccar.geocoder.GeocodeJSONGeocoder;
import org.traccar.geolocation.GeolocationProvider;
import org.traccar.geolocation.GoogleGeolocationProvider;
import org.traccar.geolocation.OpenCellIdGeolocationProvider;
@@ -262,8 +262,8 @@ public class MainModule extends AbstractModule {
case "geoapify":
geocoder = new GeoapifyGeocoder(client, key, language, cacheSize, addressFormat);
break;
- case "photon":
- geocoder = new PhotonGeocoder(client, url, key, language, cacheSize, addressFormat);
+ case "geocodejson":
+ geocoder = new GeocodeJSONGeocoder(client, url, key, language, cacheSize, addressFormat);
break;
default:
geocoder = new GoogleGeocoder(client, key, language, cacheSize, addressFormat);
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"));
diff --git a/src/test/java/org/traccar/geocoder/GeocoderTest.java b/src/test/java/org/traccar/geocoder/GeocoderTest.java
index e05477ac3..fb2c5198f 100644
--- a/src/test/java/org/traccar/geocoder/GeocoderTest.java
+++ b/src/test/java/org/traccar/geocoder/GeocoderTest.java
@@ -69,9 +69,9 @@ public class GeocoderTest {
@Disabled
@Test
public void testBan() {
- Geocoder geocoder = new BanGeocoder(client, 0, new AddressFormat("%f [%d], %c"));
+ Geocoder geocoder = new BanGeocoder(client, 0, new AddressFormat());
String address = geocoder.getAddress(48.8575, 2.2944, null);
- assertEquals("8 Avenue Gustave Eiffel 75007 Paris [75, Paris, Île-de-France], FR", address);
+ assertEquals("8 Avenue Gustave Eiffel, Paris, FR", address);
}
@Disabled
@@ -124,8 +124,8 @@ public class GeocoderTest {
@Disabled
@Test
- public void testPhoton() {
- Geocoder geocoder = new PhotonGeocoder(client, null, null, null, 0, new AddressFormat());
+ public void testGeocodeJSON() {
+ Geocoder geocoder = new GeocodeJSONGeocoder(client, null, null, null, 0, new AddressFormat());
String address = geocoder.getAddress(40.7337807, -73.9974401, null);
assertEquals("35 West 9th Street, New York, New York, US", address);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 13:49:34 +0000