diff options
| -rw-r--r-- | src/main/java/org/traccar/MainModule.java | 4 | ||||
| -rw-r--r-- | src/main/java/org/traccar/geocoder/BanGeocoder.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/traccar/geocoder/GeocodeJsonGeocoder.java (renamed from src/main/java/org/traccar/geocoder/GeocodeJSONGeocoder.java) | 4 | ||||
| -rw-r--r-- | src/test/java/org/traccar/geocoder/GeocoderTest.java | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java index 2b345847f..806e6da18 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.GeocodeJSONGeocoder; +import org.traccar.geocoder.GeocodeJsonGeocoder; import org.traccar.geolocation.GeolocationProvider; import org.traccar.geolocation.GoogleGeolocationProvider; import org.traccar.geolocation.OpenCellIdGeolocationProvider; @@ -263,7 +263,7 @@ public class MainModule extends AbstractModule { geocoder = new GeoapifyGeocoder(client, key, language, cacheSize, addressFormat); break; case "geocodejson": - geocoder = new GeocodeJSONGeocoder(client, url, key, language, cacheSize, addressFormat); + 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 91610e952..128ef4b84 100644 --- a/src/main/java/org/traccar/geocoder/BanGeocoder.java +++ b/src/main/java/org/traccar/geocoder/BanGeocoder.java @@ -23,7 +23,7 @@ package org.traccar.geocoder; import jakarta.json.JsonObject; import jakarta.ws.rs.client.Client; -public class BanGeocoder extends GeocodeJSONGeocoder { +public class BanGeocoder extends GeocodeJsonGeocoder { public BanGeocoder(Client client, int cacheSize, AddressFormat addressFormat) { super(client, "https://api-adresse.data.gouv.fr/reverse/", null, null, cacheSize, addressFormat); diff --git a/src/main/java/org/traccar/geocoder/GeocodeJSONGeocoder.java b/src/main/java/org/traccar/geocoder/GeocodeJsonGeocoder.java index bbadfa9f1..da4688423 100644 --- a/src/main/java/org/traccar/geocoder/GeocodeJSONGeocoder.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 GeocodeJSONGeocoder 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 GeocodeJSONGeocoder extends JsonGeocoder { return url; } - public GeocodeJSONGeocoder( + public GeocodeJsonGeocoder( Client client, String url, String key, String language, int cacheSize, AddressFormat addressFormat) { super(client, formatUrl(url, key, language), cacheSize, addressFormat); } diff --git a/src/test/java/org/traccar/geocoder/GeocoderTest.java b/src/test/java/org/traccar/geocoder/GeocoderTest.java index fb2c5198f..3e65d20c7 100644 --- a/src/test/java/org/traccar/geocoder/GeocoderTest.java +++ b/src/test/java/org/traccar/geocoder/GeocoderTest.java @@ -125,7 +125,7 @@ public class GeocoderTest { @Disabled @Test public void testGeocodeJSON() { - Geocoder geocoder = new GeocodeJSONGeocoder(client, null, null, null, 0, new AddressFormat()); + 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); } |