From d4e4a4a00c04d2a848d1f1f8d58724202d578ea6 Mon Sep 17 00:00:00 2001 From: Matjaž Črnko Date: Sat, 15 Jun 2024 21:09:18 +0200 Subject: Photon Geocoder --- src/main/java/org/traccar/MainModule.java | 4 ++ .../java/org/traccar/geocoder/PhotonGeocoder.java | 75 ++++++++++++++++++++++ .../java/org/traccar/geocoder/GeocoderTest.java | 7 ++ 3 files changed, 86 insertions(+) create mode 100644 src/main/java/org/traccar/geocoder/PhotonGeocoder.java diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java index 66238ab44..5df8015d9 100644 --- a/src/main/java/org/traccar/MainModule.java +++ b/src/main/java/org/traccar/MainModule.java @@ -68,6 +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.geolocation.GeolocationProvider; import org.traccar.geolocation.GoogleGeolocationProvider; import org.traccar.geolocation.OpenCellIdGeolocationProvider; @@ -261,6 +262,9 @@ 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); + break; default: geocoder = new GoogleGeocoder(client, key, language, cacheSize, addressFormat); break; diff --git a/src/main/java/org/traccar/geocoder/PhotonGeocoder.java b/src/main/java/org/traccar/geocoder/PhotonGeocoder.java new file mode 100644 index 000000000..898c04afd --- /dev/null +++ b/src/main/java/org/traccar/geocoder/PhotonGeocoder.java @@ -0,0 +1,75 @@ +/* + * 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 PhotonGeocoder 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 (language != null) { + url += "&lang=" + language; + } + return url; + } + + public PhotonGeocoder( + 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("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.setState(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/test/java/org/traccar/geocoder/GeocoderTest.java b/src/test/java/org/traccar/geocoder/GeocoderTest.java index ef2dd062d..e05477ac3 100644 --- a/src/test/java/org/traccar/geocoder/GeocoderTest.java +++ b/src/test/java/org/traccar/geocoder/GeocoderTest.java @@ -122,4 +122,11 @@ public class GeocoderTest { assertEquals("114 East 13th Street, New York, New York, US", address); } + @Disabled + @Test + public void testPhoton() { + Geocoder geocoder = new PhotonGeocoder(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); + } } -- cgit v1.2.3 From 3a3bc33a35122f8231fb145bd2958876a094e039 Mon Sep 17 00:00:00 2001 From: Matjaž Črnko Date: Sat, 15 Jun 2024 21:29:30 +0200 Subject: fix: Support key, like in Nominatim --- src/main/java/org/traccar/geocoder/PhotonGeocoder.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/traccar/geocoder/PhotonGeocoder.java b/src/main/java/org/traccar/geocoder/PhotonGeocoder.java index 898c04afd..05bd40b23 100644 --- a/src/main/java/org/traccar/geocoder/PhotonGeocoder.java +++ b/src/main/java/org/traccar/geocoder/PhotonGeocoder.java @@ -27,6 +27,9 @@ public class PhotonGeocoder extends JsonGeocoder { url = "https://photon.komoot.io/reverse"; } url += "?lat=%f&lon=%f"; + if (key != null) { + url += "&key=" + key; + } if (language != null) { url += "&lang=" + language; } -- cgit v1.2.3 From 0530bdb6c644d67ed90231e902898e74532ef1b7 Mon Sep 17 00:00:00 2001 From: Matjaž Črnko Date: Mon, 17 Jun 2024 14:47:53 +0200 Subject: refactor: GeocodeJSON implementation and basing BanGeocoder on it. --- src/main/java/org/traccar/MainModule.java | 6 +- .../java/org/traccar/geocoder/BanGeocoder.java | 35 ++-------- .../org/traccar/geocoder/GeocodeJSONGeocoder.java | 81 ++++++++++++++++++++++ .../java/org/traccar/geocoder/PhotonGeocoder.java | 78 --------------------- .../java/org/traccar/geocoder/GeocoderTest.java | 8 +-- 5 files changed, 94 insertions(+), 114 deletions(-) create mode 100644 src/main/java/org/traccar/geocoder/GeocodeJSONGeocoder.java delete mode 100644 src/main/java/org/traccar/geocoder/PhotonGeocoder.java 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/GeocodeJSONGeocoder.java b/src/main/java/org/traccar/geocoder/GeocodeJSONGeocoder.java new file mode 100644 index 000000000..bbadfa9f1 --- /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/PhotonGeocoder.java b/src/main/java/org/traccar/geocoder/PhotonGeocoder.java deleted file mode 100644 index 05bd40b23..000000000 --- a/src/main/java/org/traccar/geocoder/PhotonGeocoder.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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 PhotonGeocoder 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 PhotonGeocoder( - 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("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.setState(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/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); } -- cgit v1.2.3 From a12690a6acffb356cc90791159c1cb60161bf1af Mon Sep 17 00:00:00 2001 From: Matjaž Črnko Date: Mon, 17 Jun 2024 20:03:04 +0200 Subject: fix: CamelCase --- src/main/java/org/traccar/MainModule.java | 4 +- .../java/org/traccar/geocoder/BanGeocoder.java | 2 +- .../org/traccar/geocoder/GeocodeJSONGeocoder.java | 81 ---------------------- .../org/traccar/geocoder/GeocodeJsonGeocoder.java | 81 ++++++++++++++++++++++ .../java/org/traccar/geocoder/GeocoderTest.java | 2 +- 5 files changed, 85 insertions(+), 85 deletions(-) delete mode 100644 src/main/java/org/traccar/geocoder/GeocodeJSONGeocoder.java create mode 100644 src/main/java/org/traccar/geocoder/GeocodeJsonGeocoder.java 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 deleted file mode 100644 index bbadfa9f1..000000000 --- a/src/main/java/org/traccar/geocoder/GeocodeJSONGeocoder.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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/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/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); } -- cgit v1.2.3