diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-21 00:23:36 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-21 00:23:36 +1200 |
| commit | 27d1708b0e8062b143e4ca0ea818a6f0301e9a3e (patch) | |
| tree | c4001e4576f454d41e0e8ec4cef39a2b54978310 | |
| parent | e2389cbb4876a52c787352f0e3866095a66eb4d5 (diff) | |
| download | trackermap-server-27d1708b0e8062b143e4ca0ea818a6f0301e9a3e.tar.gz trackermap-server-27d1708b0e8062b143e4ca0ea818a6f0301e9a3e.tar.bz2 trackermap-server-27d1708b0e8062b143e4ca0ea818a6f0301e9a3e.zip | |
Add language support for Nominatim (fix #3098)
| -rw-r--r-- | src/org/traccar/Context.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/geocoder/NominatimGeocoder.java | 9 | ||||
| -rw-r--r-- | test/org/traccar/geocoder/GeocoderTest.java | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java index 348b7edc2..bfef3807b 100644 --- a/src/org/traccar/Context.java +++ b/src/org/traccar/Context.java @@ -222,7 +222,7 @@ public final class Context { int cacheSize = config.getInteger("geocoder.cacheSize"); switch (type) { case "nominatim": - geocoder = new NominatimGeocoder(url, key, cacheSize); + geocoder = new NominatimGeocoder(url, key, language, cacheSize); break; case "gisgraphy": geocoder = new GisgraphyGeocoder(url, cacheSize); diff --git a/src/org/traccar/geocoder/NominatimGeocoder.java b/src/org/traccar/geocoder/NominatimGeocoder.java index 4f33468fd..051727e93 100644 --- a/src/org/traccar/geocoder/NominatimGeocoder.java +++ b/src/org/traccar/geocoder/NominatimGeocoder.java @@ -19,7 +19,7 @@ import javax.json.JsonObject; public class NominatimGeocoder extends JsonGeocoder { - private static String formatUrl(String url, String key) { + private static String formatUrl(String url, String key, String language) { if (url == null) { url = "http://nominatim.openstreetmap.org/reverse"; } @@ -27,11 +27,14 @@ public class NominatimGeocoder extends JsonGeocoder { if (key != null) { url += "&key=" + key; } + if (language != null) { + url += "&accept-language=" + language; + } return url; } - public NominatimGeocoder(String url, String key, int cacheSize) { - super(formatUrl(url, key), cacheSize); + public NominatimGeocoder(String url, String key, String language, int cacheSize) { + super(formatUrl(url, key, language), cacheSize); } @Override diff --git a/test/org/traccar/geocoder/GeocoderTest.java b/test/org/traccar/geocoder/GeocoderTest.java index 6f4fc1710..40b6fd75d 100644 --- a/test/org/traccar/geocoder/GeocoderTest.java +++ b/test/org/traccar/geocoder/GeocoderTest.java @@ -45,7 +45,7 @@ public class GeocoderTest { } public void testNominatim() throws InterruptedException { - Geocoder geocoder = new NominatimGeocoder(null, null, 0); + Geocoder geocoder = new NominatimGeocoder(null, null, null, 0); geocoder.getAddress(new AddressFormat(), 40.7337807, -73.9974401, new Geocoder.ReverseGeocoderCallback() { @Override |